diff -Nru gnupg2-2.2.20/aclocal.m4 gnupg2-2.2.27/aclocal.m4
--- gnupg2-2.2.20/aclocal.m4	2020-03-19 12:53:29.000000000 +0100
+++ gnupg2-2.2.27/aclocal.m4	2021-01-11 18:45:40.000000000 +0100
@@ -21,18 +21,18 @@
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Checks for special options needed on Mac OS X.
diff -Nru gnupg2-2.2.20/agent/agent.h gnupg2-2.2.27/agent/agent.h
--- gnupg2-2.2.20/agent/agent.h	2020-02-10 16:19:59.000000000 +0100
+++ gnupg2-2.2.27/agent/agent.h	2020-11-13 15:56:53.000000000 +0100
@@ -125,7 +125,11 @@
      passphrase change.  */
   int enable_passphrase_history;
 
-  /* If set the extended key format is used for new keys.  */
+  /* If set the extended key format is used for new keys.  Note that
+   * this may have the value 2 in which case
+   * --disable-extended-key-format won't have any effect and thus
+   * effectivley locking it.  This is required to support existing
+   * profiles which lock the use of --enable-extended-key-format. */
   int enable_extended_key_format;
 
   int running_detached; /* We are running detached from the tty. */
@@ -409,7 +413,8 @@
 gpg_error_t agent_modify_description (const char *in, const char *comment,
                                       const gcry_sexp_t key, char **result);
 int agent_write_private_key (const unsigned char *grip,
-                             const void *buffer, size_t length, int force);
+                             const void *buffer, size_t length, int force,
+                             time_t timestamp);
 gpg_error_t agent_key_from_file (ctrl_t ctrl,
                                  const char *cache_nonce,
                                  const char *desc_text,
@@ -447,7 +452,8 @@
 int agent_get_passphrase (ctrl_t ctrl, char **retpass,
                           const char *desc, const char *prompt,
                           const char *errtext, int with_qualitybar,
-			  const char *keyinfo, cache_mode_t cache_mode);
+			  const char *keyinfo, cache_mode_t cache_mode,
+                          struct pin_entry_info_s *pininfo);
 int agent_get_confirmation (ctrl_t ctrl, const char *desc, const char *ok,
 			    const char *notokay, int with_cancel);
 int agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn);
@@ -484,11 +490,11 @@
                      membuf_t *outbuf, int *r_padding);
 
 /*-- genkey.c --*/
-int check_passphrase_constraints (ctrl_t ctrl, const char *pw,
+int check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
 				  char **failed_constraint);
 gpg_error_t agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
                                       char **r_passphrase);
-int agent_genkey (ctrl_t ctrl, const char *cache_nonce,
+int agent_genkey (ctrl_t ctrl, const char *cache_nonce, time_t timestamp,
                   const char *keyparam, size_t keyparmlen,
                   int no_protection, const char *override_passphrase,
                   int preset, membuf_t *outbuf);
@@ -539,10 +545,12 @@
 /*-- divert-scd.c --*/
 int divert_pksign (ctrl_t ctrl, const char *desc_text,
                    const unsigned char *digest, size_t digestlen, int algo,
+                   const unsigned char *grip,
                    const unsigned char *shadow_info, unsigned char **r_sig,
                    size_t *r_siglen);
 int divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                       const unsigned char *cipher,
+                      const unsigned char *grip,
                       const unsigned char *shadow_info,
                       char **r_buf, size_t *r_len, int *r_padding);
 int divert_generic_cmd (ctrl_t ctrl,
diff -Nru gnupg2-2.2.20/agent/call-pinentry.c gnupg2-2.2.27/agent/call-pinentry.c
--- gnupg2-2.2.20/agent/call-pinentry.c	2019-11-25 11:41:02.000000000 +0100
+++ gnupg2-2.2.27/agent/call-pinentry.c	2020-08-26 15:12:06.000000000 +0200
@@ -85,6 +85,7 @@
   int lines;
   size_t size;
   unsigned char *buffer;
+  int status;
 };
 
 
@@ -454,7 +455,7 @@
         return unlock_pinentry (ctrl, rc);
     }
   value = session_env_getenv (ctrl->session_env, "TERM");
-  if (value)
+  if (value && *value)
     {
       char *optstr;
       if (asprintf (&optstr, "OPTION ttytype=%s", value) < 0 )
@@ -836,7 +837,7 @@
       else
         {
           percent = estimate_passphrase_quality (pin);
-          if (check_passphrase_constraints (NULL, pin, NULL))
+          if (check_passphrase_constraints (NULL, pin, 0, NULL))
             percent = -percent;
           snprintf (numbuf, sizeof numbuf, "%d", percent);
           rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
@@ -953,6 +954,36 @@
 }
 
 
+/* Ask pinentry to get a pin by "GETPIN" command, spawning a thread
+ * detecting the socket's EOF.   */
+static gpg_error_t
+do_getpin (ctrl_t ctrl, struct entry_parm_s *parm)
+{
+  gpg_error_t rc;
+  int saveflag = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
+
+  (void)ctrl;
+
+  assuan_begin_confidential (entry_ctx);
+  rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, parm,
+                        inq_quality, entry_ctx,
+                        pinentry_status_cb, &parm->status);
+  assuan_set_flag (entry_ctx, ASSUAN_CONFIDENTIAL, saveflag);
+  /* Most pinentries out in the wild return the old Assuan error code
+     for canceled which gets translated to an assuan Cancel error and
+     not to the code for a user cancel.  Fix this here. */
+  if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
+    rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
+  /* Change error code in case the window close button was clicked
+     to cancel the operation.  */
+  if ((parm->status & PINENTRY_STATUS_CLOSE_BUTTON)
+      && gpg_err_code (rc) == GPG_ERR_CANCELED)
+    rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_FULLY_CANCELED);
+
+  return rc;
+}
+
+
 
 /* Call the Entry and ask for the PIN.  We do check for a valid PIN
    number here and repeat it as long as we have invalid formed
@@ -970,7 +1001,6 @@
   struct entry_parm_s parm;
   const char *errtext = NULL;
   int is_pin = 0;
-  int saveflag;
 
   if (opt.batch)
     return 0; /* fixme: we should return BAD PIN */
@@ -1114,25 +1144,8 @@
             return unlock_pinentry (ctrl, rc);
         }
 
-      saveflag = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
-      assuan_begin_confidential (entry_ctx);
-      rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, &parm,
-                            inq_quality, entry_ctx,
-                            pinentry_status_cb, &pininfo->status);
-      assuan_set_flag (entry_ctx, ASSUAN_CONFIDENTIAL, saveflag);
-      /* Most pinentries out in the wild return the old Assuan error code
-         for canceled which gets translated to an assuan Cancel error and
-         not to the code for a user cancel.  Fix this here. */
-      if (rc && gpg_err_source (rc)
-          && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
-        rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
-
-
-      /* Change error code in case the window close button was clicked
-         to cancel the operation.  */
-      if ((pininfo->status & PINENTRY_STATUS_CLOSE_BUTTON)
-	  && gpg_err_code (rc) == GPG_ERR_CANCELED)
-        rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_FULLY_CANCELED);
+      rc = do_getpin (ctrl, &parm);
+      pininfo->status = parm.status;
 
       if (gpg_err_code (rc) == GPG_ERR_ASS_TOO_MUCH_DATA)
         errtext = is_pin? L_("PIN too long")
@@ -1183,9 +1196,11 @@
         }
 
       if ((pininfo->status & PINENTRY_STATUS_PASSWORD_FROM_CACHE))
-	/* The password was read from the cache.  Don't count this
-	   against the retry count.  */
-	pininfo->failed_tries --;
+        {
+          /* The password was read from the cache.  Don't count this
+             against the retry count.  */
+          pininfo->failed_tries --;
+        }
     }
 
   return unlock_pinentry (ctrl, gpg_error (pininfo->min_digits? GPG_ERR_BAD_PIN
@@ -1195,19 +1210,22 @@
 
 
 /* Ask for the passphrase using the supplied arguments.  The returned
-   passphrase needs to be freed by the caller. */
+   passphrase needs to be freed by the caller.  PININFO is optional
+   and can be used to have constraints checinkg while the pinentry
+   dialog is open (like what we do in agent_askpin).  This is very
+   similar to agent_akpin and we should eventually merge the two
+   functions. */
 int
 agent_get_passphrase (ctrl_t ctrl,
                       char **retpass, const char *desc, const char *prompt,
                       const char *errtext, int with_qualitybar,
-		      const char *keyinfo, cache_mode_t cache_mode)
+		      const char *keyinfo, cache_mode_t cache_mode,
+                      struct pin_entry_info_s *pininfo)
 {
-
   int rc;
+  int is_pin;
   char line[ASSUAN_LINELENGTH];
   struct entry_parm_s parm;
-  int saveflag;
-  unsigned int pinentry_status;
 
   *retpass = NULL;
   if (opt.batch)
@@ -1215,17 +1233,42 @@
 
   if (ctrl->pinentry_mode != PINENTRY_MODE_ASK)
     {
+      unsigned char *passphrase;
+      size_t size;
+
       if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL)
         return gpg_error (GPG_ERR_CANCELED);
 
-      if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK)
+      if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK && pininfo)
         {
-	  size_t size;
+	  *pininfo->pin = 0; /* Reset the PIN. */
+	  rc = pinentry_loopback (ctrl, "PASSPHRASE",
+                                  &passphrase, &size,
+                                  pininfo->max_length - 1);
+          if (rc)
+            return rc;
+
+	  memcpy (&pininfo->pin, passphrase, size);
+          wipememory (passphrase, size);
+	  xfree (passphrase);
+	  pininfo->pin[size] = 0;
+	  if (pininfo->check_cb)
+	    {
+	      /* More checks by utilizing the optional callback. */
+	      pininfo->cb_errtext = NULL;
+	      rc = pininfo->check_cb (pininfo);
+	    }
+	  return rc;
 
+        }
+      else if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK)
+        {
+          /* Legacy variant w/o PININFO.  */
 	  return pinentry_loopback (ctrl, "PASSPHRASE",
 				    (unsigned char **)retpass, &size,
                                     MAX_PASSPHRASE_LEN);
         }
+
       return gpg_error (GPG_ERR_NO_PIN_ENTRY);
     }
 
@@ -1233,9 +1276,14 @@
   if (rc)
     return rc;
 
-  if (!prompt)
-    prompt = desc && strstr (desc, "PIN")? L_("PIN:"): L_("Passphrase:");
-
+  /* Set IS_PIN and if needed a default prompt.  */
+  if (prompt)
+    is_pin = !!strstr (prompt, "PIN");
+  else
+    {
+      is_pin = desc && strstr (desc, "PIN");
+      prompt = is_pin? L_("PIN:"): L_("Passphrase:");
+    }
 
   /* If we have a KEYINFO string and are normal, user, or ssh cache
      mode, we tell that the Pinentry so it may use it for own caching
@@ -1256,7 +1304,6 @@
   if (rc && gpg_err_code (rc) != GPG_ERR_ASS_UNKNOWN_CMD)
     return unlock_pinentry (ctrl, rc);
 
-
   if (desc)
     build_cmd_setdesc (line, DIM(line), desc);
   else
@@ -1270,7 +1317,8 @@
   if (rc)
     return unlock_pinentry (ctrl, rc);
 
-  if (with_qualitybar && opt.min_passphrase_len)
+  if ((with_qualitybar || (pininfo && pininfo->with_qualitybar))
+       && opt.min_passphrase_len)
     {
       rc = setup_qualitybar (ctrl);
       if (rc)
@@ -1280,40 +1328,132 @@
   if (errtext)
     {
       snprintf (line, DIM(line), "SETERROR %s", errtext);
-      rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
+      rc = assuan_transact (entry_ctx, line,
+                            NULL, NULL, NULL, NULL, NULL, NULL);
       if (rc)
         return unlock_pinentry (ctrl, rc);
     }
 
-  memset (&parm, 0, sizeof parm);
-  parm.size = ASSUAN_LINELENGTH/2 - 5;
-  parm.buffer = gcry_malloc_secure (parm.size+10);
-  if (!parm.buffer)
-    return unlock_pinentry (ctrl, out_of_core ());
+  if (!pininfo)
+    {
+      /* Legacy method without PININFO.  */
+      memset (&parm, 0, sizeof parm);
+      parm.size = ASSUAN_LINELENGTH/2 - 5;
+      parm.buffer = gcry_malloc_secure (parm.size+10);
+      if (!parm.buffer)
+        return unlock_pinentry (ctrl, out_of_core ());
 
-  saveflag = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
-  assuan_begin_confidential (entry_ctx);
-  pinentry_status = 0;
-  rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, &parm,
-                        inq_quality, entry_ctx,
-                        pinentry_status_cb, &pinentry_status);
-  assuan_set_flag (entry_ctx, ASSUAN_CONFIDENTIAL, saveflag);
-  /* Most pinentries out in the wild return the old Assuan error code
-     for canceled which gets translated to an assuan Cancel error and
-     not to the code for a user cancel.  Fix this here. */
-  if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
-    rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
-  /* Change error code in case the window close button was clicked
-     to cancel the operation.  */
-  if ((pinentry_status & PINENTRY_STATUS_CLOSE_BUTTON)
-      && gpg_err_code (rc) == GPG_ERR_CANCELED)
-    rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_FULLY_CANCELED);
+      rc = do_getpin (ctrl, &parm);
+      if (rc)
+        xfree (parm.buffer);
+      else
+        *retpass = parm.buffer;
+      return unlock_pinentry (ctrl, rc);
+    }
 
-  if (rc)
-    xfree (parm.buffer);
-  else
-    *retpass = parm.buffer;
-  return unlock_pinentry (ctrl, rc);
+  /* We got PININFO.  */
+
+  if (pininfo->with_repeat)
+    {
+      snprintf (line, DIM(line), "SETREPEATERROR %s",
+                L_("does not match - try again"));
+      rc = assuan_transact (entry_ctx, line,
+                            NULL, NULL, NULL, NULL, NULL, NULL);
+      if (rc)
+        pininfo->with_repeat = 0; /* Pinentry does not support it.  */
+    }
+  pininfo->repeat_okay = 0;
+  pininfo->status = 0;
+
+  for (;pininfo->failed_tries < pininfo->max_tries; pininfo->failed_tries++)
+    {
+      memset (&parm, 0, sizeof parm);
+      parm.size = pininfo->max_length;
+      parm.buffer = (unsigned char*)pininfo->pin;
+      *pininfo->pin = 0; /* Reset the PIN. */
+
+      if (errtext)
+        {
+          /* TRANSLATORS: 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. */
+          snprintf (line, DIM(line), L_("SETERROR %s (try %d of %d)"),
+                    errtext, pininfo->failed_tries+1, pininfo->max_tries);
+          rc = assuan_transact (entry_ctx, line,
+                                NULL, NULL, NULL, NULL, NULL, NULL);
+          if (rc)
+            return unlock_pinentry (ctrl, rc);
+          errtext = NULL;
+        }
+
+      if (pininfo->with_repeat)
+        {
+          snprintf (line, DIM(line), "SETREPEAT %s", L_("Repeat:"));
+          rc = assuan_transact (entry_ctx, line,
+                                NULL, NULL, NULL, NULL, NULL, NULL);
+          if (rc)
+            return unlock_pinentry (ctrl, rc);
+        }
+
+      rc = do_getpin (ctrl, &parm);
+      pininfo->status = parm.status;
+      if (gpg_err_code (rc) == GPG_ERR_ASS_TOO_MUCH_DATA)
+        errtext = is_pin? L_("PIN too long")
+                        : L_("Passphrase too long");
+      else if (rc)
+        return unlock_pinentry (ctrl, rc);
+
+      if (!errtext && pininfo->min_digits)
+        {
+          /* do some basic checks on the entered PIN. */
+          if (!all_digitsp (pininfo->pin))
+            errtext = L_("Invalid characters in PIN");
+          else if (pininfo->max_digits
+                   && strlen (pininfo->pin) > pininfo->max_digits)
+            errtext = L_("PIN too long");
+          else if (strlen (pininfo->pin) < pininfo->min_digits)
+            errtext = L_("PIN too short");
+        }
+
+      if (!errtext && pininfo->check_cb)
+        {
+          /* More checks by utilizing the optional callback. */
+          pininfo->cb_errtext = NULL;
+          rc = pininfo->check_cb (pininfo);
+          /* When pinentry cache causes an error, return now.  */
+          if (rc && (pininfo->status & PINENTRY_STATUS_PASSWORD_FROM_CACHE))
+            return unlock_pinentry (ctrl, rc);
+
+          if (gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE)
+            {
+              if (pininfo->cb_errtext)
+                errtext = pininfo->cb_errtext;
+              else if (gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE
+                       || gpg_err_code (rc) == GPG_ERR_BAD_PIN)
+                errtext = (is_pin? L_("Bad PIN") : L_("Bad Passphrase"));
+            }
+          else if (rc)
+            return unlock_pinentry (ctrl, rc);
+        }
+
+      if (!errtext)
+        {
+          if (pininfo->with_repeat
+              && (pininfo->status & PINENTRY_STATUS_PIN_REPEATED))
+            pininfo->repeat_okay = 1;
+          return unlock_pinentry (ctrl, 0); /* okay, got a PIN or passphrase */
+        }
+
+      if ((pininfo->status & PINENTRY_STATUS_PASSWORD_FROM_CACHE))
+        {
+          /* The password was read from the Pinentry's own cache.
+             Don't count this against the retry count.  */
+          pininfo->failed_tries--;
+        }
+    }
+
+  return unlock_pinentry (ctrl, gpg_error (pininfo->min_digits? GPG_ERR_BAD_PIN
+                          : GPG_ERR_BAD_PASSPHRASE));
 }
 
 
diff -Nru gnupg2-2.2.20/agent/command.c gnupg2-2.2.27/agent/command.c
--- gnupg2-2.2.20/agent/command.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/command.c	2020-11-09 11:56:05.000000000 +0100
@@ -835,8 +835,8 @@
 
 
 static const char hlp_genkey[] =
-  "GENKEY [--no-protection] [--preset] [--inq-passwd]\n"
-  "       [--passwd-nonce=<s>] [<cache_nonce>]\n"
+  "GENKEY [--no-protection] [--preset] [--timestamp=<isodate>]\n"
+  "       [--inq-passwd] [--passwd-nonce=<s>] [<cache_nonce>]\n"
   "\n"
   "Generate a new key, store the secret part and return the public\n"
   "part.  Here is an example transaction:\n"
@@ -849,11 +849,13 @@
   "  S: D   (rsa (n 326487324683264) (e 10001)))\n"
   "  S: OK key created\n"
   "\n"
-  "When the --preset option is used the passphrase for the generated\n"
-  "key will be added to the cache.  When --inq-passwd is used an inquire\n"
+  "If the --preset option is used the passphrase for the generated\n"
+  "key will be added to the cache.  If --inq-passwd is used an inquire\n"
   "with the keyword NEWPASSWD is used to request the passphrase for the\n"
-  "new key.  When a --passwd-nonce is used, the corresponding cached\n"
-  "passphrase is used to protect the new key.";
+  "new key.  If a --passwd-nonce is used, the corresponding cached\n"
+  "passphrase is used to protect the new key.  If --timestamp is given\n"
+  "its value is recorded as the key's creation time; the value is\n"
+  "expected in ISO format (e.g. \"20030316T120000\").";
 static gpg_error_t
 cmd_genkey (assuan_context_t ctx, char *line)
 {
@@ -870,6 +872,8 @@
   int opt_inq_passwd;
   size_t n;
   char *p, *pend;
+  const char *s;
+  time_t opt_timestamp;
   int c;
 
   if (ctrl->restricted)
@@ -893,6 +897,22 @@
           goto leave;
         }
     }
+  if ((s=has_option_name (line, "--timestamp")))
+    {
+      if (*s != '=')
+        {
+          rc = set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
+          goto leave;
+        }
+      opt_timestamp = isotime2epoch (s+1);
+      if (opt_timestamp < 1)
+        {
+          rc = set_error (GPG_ERR_ASS_PARAMETER, "invalid time value");
+          goto leave;
+        }
+    }
+  else
+    opt_timestamp = 0;
   line = skip_options (line);
 
   for (p=line; *p && *p != ' ' && *p != '\t'; p++)
@@ -932,7 +952,8 @@
   else if (passwd_nonce)
     newpasswd = agent_get_cache (ctrl, passwd_nonce, CACHE_MODE_NONCE);
 
-  rc = agent_genkey (ctrl, cache_nonce, (char*)value, valuelen, no_protection,
+  rc = agent_genkey (ctrl, cache_nonce, opt_timestamp,
+                     (char*)value, valuelen, no_protection,
                      newpasswd, opt_preset, &outbuf);
 
  leave:
@@ -1239,7 +1260,7 @@
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int err;
   unsigned char grip[20];
-  DIR *dir = NULL;
+  gnupg_dir_t dir = NULL;
   int list_mode;
   int opt_data, opt_ssh_fpr, opt_with_ssh;
   ssh_control_file_t cf = NULL;
@@ -1295,7 +1316,7 @@
   else if (list_mode)
     {
       char *dirname;
-      struct dirent *dir_entry;
+      gnupg_dirent_t dir_entry;
 
       dirname = make_filename_try (gnupg_homedir (),
                                    GNUPG_PRIVATE_KEYS_DIR, NULL);
@@ -1304,7 +1325,7 @@
           err = gpg_error_from_syserror ();
           goto leave;
         }
-      dir = opendir (dirname);
+      dir = gnupg_opendir (dirname);
       if (!dir)
         {
           err = gpg_error_from_syserror ();
@@ -1313,7 +1334,7 @@
         }
       xfree (dirname);
 
-      while ( (dir_entry = readdir (dir)) )
+      while ( (dir_entry = gnupg_readdir (dir)) )
         {
           if (strlen (dir_entry->d_name) != 44
               || strcmp (dir_entry->d_name + 40, ".key"))
@@ -1364,8 +1385,7 @@
 
  leave:
   ssh_close_control_file (cf);
-  if (dir)
-    closedir (dir);
+  gnupg_closedir (dir);
   if (err && gpg_err_code (err) != GPG_ERR_NOT_FOUND)
     leave_cmd (ctx, err);
   return err;
@@ -1400,9 +1420,22 @@
 }
 
 
+/* Callback function to compare the first entered PIN with the one
+   currently being entered. */
+static gpg_error_t
+reenter_passphrase_cmp_cb (struct pin_entry_info_s *pi)
+{
+  const char *pin1 = pi->check_cb_arg;
+
+  if (!strcmp (pin1, pi->pin))
+    return 0; /* okay */
+  return gpg_error (GPG_ERR_BAD_PASSPHRASE);
+}
+
+
 static const char hlp_get_passphrase[] =
   "GET_PASSPHRASE [--data] [--check] [--no-ask] [--repeat[=N]]\n"
-  "               [--qualitybar] <cache_id>\n"
+  "               [--qualitybar] [--newsymkey] <cache_id>\n"
   "               [<error_message> <prompt> <description>]\n"
   "\n"
   "This function is usually used to ask for a passphrase to be used\n"
@@ -1424,6 +1457,9 @@
   "cache the user will not be asked to enter a passphrase but the error\n"
   "code GPG_ERR_NO_DATA is returned.  \n"
   "\n"
+  "If the option\"--newsymkey\" is used the agent asks for a new passphrase\n"
+  "to be used in symmetric-only encryption.  This must not be empty.\n"
+  "\n"
   "If the option \"--qualitybar\" is used a visual indication of the\n"
   "entered passphrase quality is shown.  (Unless no minimum passphrase\n"
   "length has been configured.)";
@@ -1433,13 +1469,19 @@
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *pw;
-  char *response;
-  char *cacheid = NULL, *desc = NULL, *prompt = NULL, *errtext = NULL;
+  char *response = NULL;
+  char *response2 = NULL;
+  char *cacheid = NULL;  /* May point into LINE.  */
+  char *desc = NULL;     /* Ditto  */
+  char *prompt = NULL;   /* Ditto  */
+  char *errtext = NULL;  /* Ditto  */
   const char *desc2 = _("Please re-enter this passphrase");
   char *p;
-  int opt_data, opt_check, opt_no_ask, opt_qualbar;
+  int opt_data, opt_check, opt_no_ask, opt_qualbar, opt_newsymkey;
   int opt_repeat = 0;
   char *entry_errtext = NULL;
+  struct pin_entry_info_s *pi = NULL;
+  struct pin_entry_info_s *pi2 = NULL;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
@@ -1456,6 +1498,7 @@
 	opt_repeat = 1;
     }
   opt_qualbar = has_option (line, "--qualitybar");
+  opt_newsymkey = has_option (line, "--newsymkey");
   line = skip_options (line);
 
   cacheid = line;
@@ -1505,26 +1548,125 @@
     {
       rc = send_back_passphrase (ctx, opt_data, pw);
       xfree (pw);
+      goto leave;
     }
   else if (opt_no_ask)
-    rc = gpg_error (GPG_ERR_NO_DATA);
-  else
     {
-      /* Note, that we only need to replace the + characters and
-         should leave the other escaping in place because the escaped
-         string is send verbatim to the pinentry which does the
-         unescaping (but not the + replacing) */
-      if (errtext)
-        plus_to_blank (errtext);
-      if (prompt)
-        plus_to_blank (prompt);
-      if (desc)
-        plus_to_blank (desc);
+      rc = gpg_error (GPG_ERR_NO_DATA);
+      goto leave;
+    }
+
+  /* Note, that we only need to replace the + characters and should
+   * leave the other escaping in place because the escaped string is
+   * send verbatim to the pinentry which does the unescaping (but not
+   * the + replacing) */
+  if (errtext)
+    plus_to_blank (errtext);
+  if (prompt)
+    plus_to_blank (prompt);
+  if (desc)
+    plus_to_blank (desc);
+
+  /* If opt_repeat is 2 or higher we can't use our pin_entry_info_s
+   * based method but fallback to the old simple method.  It is
+   * anyway questionable whether this extra repeat count makes any
+   * real sense.  */
+  if (opt_newsymkey && opt_repeat < 2)
+    {
+      /* We do not want to break any existing usage of this command
+       * and thus we introduced the option --newsymkey to make this
+       * command more useful to query the passphrase for symmetric
+       * encryption.  */
+      pi = gcry_calloc_secure (1, sizeof (*pi) + MAX_PASSPHRASE_LEN + 1);
+      if (!pi)
+        {
+          rc = gpg_error_from_syserror ();
+          goto leave;
+        }
+      pi2 = gcry_calloc_secure (1, sizeof (*pi2) + MAX_PASSPHRASE_LEN + 1);
+      if (!pi2)
+        {
+          rc = gpg_error_from_syserror ();
+          goto leave;
+        }
+      pi->max_length = MAX_PASSPHRASE_LEN + 1;
+      pi->max_tries = 3;
+      pi->with_qualitybar = opt_qualbar;
+      pi->with_repeat = opt_repeat;
+      pi2->max_length = MAX_PASSPHRASE_LEN + 1;
+      pi2->max_tries = 3;
+      pi2->check_cb = reenter_passphrase_cmp_cb;
+      pi2->check_cb_arg = pi->pin;
 
+      for (;;) /* (degenerated for-loop) */
+        {
+          xfree (response);
+          response = NULL;
+          rc = agent_get_passphrase (ctrl, &response,
+                                     desc,
+                                     prompt,
+                                     entry_errtext? entry_errtext:errtext,
+                                     opt_qualbar, cacheid, CACHE_MODE_USER,
+                                     pi);
+          if (rc)
+            goto leave;
+          xfree (entry_errtext);
+          entry_errtext = NULL;
+          /* We don't allow an empty passpharse in this mode.  */
+          if (check_passphrase_constraints (ctrl, pi->pin, 1, &entry_errtext))
+            {
+              pi->failed_tries = 0;
+              pi2->failed_tries = 0;
+              continue;
+            }
+          if (*pi->pin && !pi->repeat_okay
+              && ctrl->pinentry_mode != PINENTRY_MODE_LOOPBACK
+              && opt_repeat)
+            {
+              /* The passphrase is empty and the pinentry did not
+               * already run the repetition check, do it here.  This
+               * is only called when using an old and simple pinentry.
+               * It is neither called in loopback mode because the
+               * caller does any passphrase repetition by herself nor if
+               * no repetition was requested. */
+              xfree (response);
+              response = NULL;
+              rc = agent_get_passphrase (ctrl, &response,
+                                         L_("Please re-enter this passphrase"),
+                                         prompt,
+                                         entry_errtext? entry_errtext:errtext,
+                                         opt_qualbar, cacheid, CACHE_MODE_USER,
+                                         pi2);
+              if (gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE)
+                { /* The re-entered passphrase one did not match and
+                   * the user did not hit cancel. */
+                  entry_errtext = xtrystrdup (L_("does not match - try again"));
+                  if (!entry_errtext)
+                    {
+                      rc = gpg_error_from_syserror ();
+                      goto leave;
+                    }
+                  continue;
+                }
+            }
+          break;
+        }
+      if (!rc && *pi->pin)
+        {
+          /* Return the passphrase. */
+          if (cacheid)
+            agent_put_cache (ctrl, cacheid, CACHE_MODE_USER, pi->pin, 0);
+          rc = send_back_passphrase (ctx, opt_data, pi->pin);
+        }
+    }
+  else
+    {
     next_try:
+      xfree (response);
+      response = NULL;
       rc = agent_get_passphrase (ctrl, &response, desc, prompt,
                                  entry_errtext? entry_errtext:errtext,
-                                 opt_qualbar, cacheid, CACHE_MODE_USER);
+                                 opt_qualbar, cacheid, CACHE_MODE_USER, NULL);
       xfree (entry_errtext);
       entry_errtext = NULL;
       if (!rc)
@@ -1532,27 +1674,24 @@
           int i;
 
           if (opt_check
-	      && check_passphrase_constraints (ctrl, response, &entry_errtext))
+	      && check_passphrase_constraints (ctrl, response,0,&entry_errtext))
             {
-              xfree (response);
               goto next_try;
             }
           for (i = 0; i < opt_repeat; i++)
             {
-              char *response2;
-
               if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK)
                 break;
 
+              xfree (response2);
+              response2 = NULL;
               rc = agent_get_passphrase (ctrl, &response2, desc2, prompt,
                                          errtext, 0,
-					 cacheid, CACHE_MODE_USER);
+					 cacheid, CACHE_MODE_USER, NULL);
               if (rc)
                 break;
               if (strcmp (response2, response))
                 {
-                  xfree (response2);
-                  xfree (response);
                   entry_errtext = try_percent_escape
                     (_("does not match - try again"), NULL);
                   if (!entry_errtext)
@@ -1562,7 +1701,6 @@
                     }
                   goto next_try;
                 }
-              xfree (response2);
             }
           if (!rc)
             {
@@ -1570,10 +1708,15 @@
                 agent_put_cache (ctrl, cacheid, CACHE_MODE_USER, response, 0);
               rc = send_back_passphrase (ctx, opt_data, response);
             }
-          xfree (response);
         }
     }
 
+ leave:
+  xfree (response);
+  xfree (response2);
+  xfree (entry_errtext);
+  xfree (pi2);
+  xfree (pi);
   return leave_cmd (ctx, rc);
 }
 
@@ -2053,7 +2196,8 @@
 
 
 static const char hlp_import_key[] =
-  "IMPORT_KEY [--unattended] [--force] [<cache_nonce>]\n"
+  "IMPORT_KEY [--unattended] [--force] [--timestamp=<isodate>]\n"
+  "           [<cache_nonce>]\n"
   "\n"
   "Import a secret key into the key store.  The key is expected to be\n"
   "encrypted using the current session's key wrapping key (cf. command\n"
@@ -2061,13 +2205,16 @@
   "no arguments but uses the inquiry \"KEYDATA\" to ask for the actual\n"
   "key data.  The unwrapped key must be a canonical S-expression.  The\n"
   "option --unattended tries to import the key as-is without any\n"
-  "re-encryption.  Existing key can be overwritten with --force.";
+  "re-encryption.  An existing key can be overwritten with --force.\n"
+  "If --timestamp is given its value is recorded as the key's creation\n"
+  "time; the value is expected in ISO format (e.g. \"20030316T120000\").";
 static gpg_error_t
 cmd_import_key (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   gpg_error_t err;
   int opt_unattended;
+  time_t opt_timestamp;
   int force;
   unsigned char *wrappedkey = NULL;
   size_t wrappedkeylen;
@@ -2081,6 +2228,7 @@
   gcry_sexp_t openpgp_sexp = NULL;
   char *cache_nonce = NULL;
   char *p;
+  const char *s;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
@@ -2093,6 +2241,22 @@
 
   opt_unattended = has_option (line, "--unattended");
   force = has_option (line, "--force");
+  if ((s=has_option_name (line, "--timestamp")))
+    {
+      if (*s != '=')
+        {
+          err = set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
+          goto leave;
+        }
+      opt_timestamp = isotime2epoch (s+1);
+      if (opt_timestamp < 1)
+        {
+          err = set_error (GPG_ERR_ASS_PARAMETER, "invalid time value");
+          goto leave;
+        }
+    }
+  else
+    opt_timestamp = 0;
   line = skip_options (line);
 
   for (p=line; *p && *p != ' ' && *p != '\t'; p++)
@@ -2164,7 +2328,6 @@
         goto leave; /* Note that ERR is still set.  */
     }
 
-
   if (openpgp_sexp)
     {
       /* In most cases the key is encrypted and thus the conversion
@@ -2228,10 +2391,12 @@
       err = agent_protect (key, passphrase, &finalkey, &finalkeylen,
                            ctrl->s2k_count, -1);
       if (!err)
-        err = agent_write_private_key (grip, finalkey, finalkeylen, force);
+        err = agent_write_private_key (grip, finalkey, finalkeylen, force,
+                                       opt_timestamp);
     }
   else
-    err = agent_write_private_key (grip, key, realkeylen, force);
+    err = agent_write_private_key (grip, key, realkeylen, force,
+                                   opt_timestamp);
 
  leave:
   gcry_sexp_release (openpgp_sexp);
@@ -3007,7 +3172,6 @@
     }
   else if (!strcmp (line, "jent_active"))
     {
-#if GCRYPT_VERSION_NUMBER >= 0x010800
       char *buf;
       char *fields[5];
 
@@ -3019,9 +3183,6 @@
       else
         rc = gpg_error (GPG_ERR_FALSE);
       gcry_free (buf);
-#else
-      rc = gpg_error (GPG_ERR_FALSE);
-#endif
     }
   else if (!strcmp (line, "s2k_count_cal"))
     {
@@ -3233,7 +3394,9 @@
   if (!strcmp (cmd, "GET_PASSPHRASE"))
     {
       if (!strcmp (cmdopt, "repeat"))
-          return 1;
+        return 1;
+      if (!strcmp (cmdopt, "newsymkey"))
+        return 1;
     }
 
   return 0;
diff -Nru gnupg2-2.2.20/agent/command-ssh.c gnupg2-2.2.27/agent/command-ssh.c
--- gnupg2-2.2.20/agent/command-ssh.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/command-ssh.c	2020-10-23 20:08:54.000000000 +0200
@@ -216,7 +216,7 @@
 struct ssh_control_file_s
 {
   char *fname;  /* Name of the file.  */
-  FILE *fp;     /* This is never NULL. */
+  estream_t fp; /* This is never NULL. */
   int lnr;      /* The current line number.  */
   struct {
     int valid;           /* True if the data of this structure is valid.  */
@@ -852,7 +852,7 @@
     }
   /* FIXME: With "a+" we are not able to check whether this will
      be created and thus the blurb needs to be written first.  */
-  cf->fp = fopen (cf->fname, append? "a+":"r");
+  cf->fp = es_fopen (cf->fname, append? "a+":"r");
   if (!cf->fp && errno == ENOENT)
     {
       estream_t stream = es_fopen (cf->fname, "wx,mode=-rw-r");
@@ -865,7 +865,7 @@
         }
       es_fputs (sshcontrolblurb, stream);
       es_fclose (stream);
-      cf->fp = fopen (cf->fname, append? "a+":"r");
+      cf->fp = es_fopen (cf->fname, append? "a+":"r");
     }
 
   if (!cf->fp)
@@ -882,7 +882,7 @@
   if (err && cf)
     {
       if (cf->fp)
-        fclose (cf->fp);
+        es_fclose (cf->fp);
       xfree (cf->fname);
       xfree (cf);
     }
@@ -896,9 +896,9 @@
 static void
 rewind_control_file (ssh_control_file_t cf)
 {
-  fseek (cf->fp, 0, SEEK_SET);
+  es_fseek (cf->fp, 0, SEEK_SET);
   cf->lnr = 0;
-  clearerr (cf->fp);
+  es_clearerr (cf->fp);
 }
 
 
@@ -907,7 +907,7 @@
 {
   if (!cf)
     return;
-  fclose (cf->fp);
+  es_fclose (cf->fp);
   xfree (cf->fname);
   xfree (cf);
 }
@@ -924,13 +924,13 @@
   long ttl = 0;
 
   cf->item.valid = 0;
-  clearerr (cf->fp);
+  es_clearerr (cf->fp);
 
   do
     {
-      if (!fgets (line, DIM(line)-1, cf->fp) )
+      if (!es_fgets (line, DIM(line)-1, cf->fp) )
         {
-          if (feof (cf->fp))
+          if (es_feof (cf->fp))
             return gpg_error (GPG_ERR_EOF);
           return gpg_error_from_syserror ();
         }
@@ -939,7 +939,7 @@
       if (!*line || line[strlen(line)-1] != '\n')
         {
           /* Eat until end of line */
-          while ( (c=getc (cf->fp)) != EOF && c != '\n')
+          while ((c = es_getc (cf->fp)) != EOF && c != '\n')
             ;
           return gpg_error (*line? GPG_ERR_LINE_TOO_LONG
                                  : GPG_ERR_INCOMPLETE_LINE);
@@ -1095,7 +1095,7 @@
       /* Not yet in the file - add it. Because the file has been
          opened in append mode, we simply need to write to it.  */
       tp = localtime (&atime);
-      fprintf (cf->fp,
+      es_fprintf (cf->fp,
                ("# %s key added on: %04d-%02d-%02d %02d:%02d:%02d\n"
                 "# Fingerprints:  %s\n"
                 "#                %s\n"
@@ -3136,8 +3136,9 @@
   if (err)
     goto out;
 
-  /* Store this key to our key storage.  */
-  err = agent_write_private_key (key_grip_raw, buffer, buffer_n, 0);
+  /* Store this key to our key storage.  We do not store a creation
+   * timestamp because we simply do not know.  */
+  err = agent_write_private_key (key_grip_raw, buffer, buffer_n, 0, 0);
   if (err)
     goto out;
 
diff -Nru gnupg2-2.2.20/agent/cvt-openpgp.c gnupg2-2.2.27/agent/cvt-openpgp.c
--- gnupg2-2.2.20/agent/cvt-openpgp.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/cvt-openpgp.c	2020-11-02 07:51:33.000000000 +0100
@@ -158,7 +158,7 @@
           if (!strcmp (curve, "Ed25519"))
             /* Do not store the OID as name but the real name and the
                EdDSA flag.  */
-            format = "(private-key(ecc(curve %s)(flags eddsa)(q%m)(d%m)))";
+            format = "(private-key(ecc(curve %s)(flags eddsa)(q%m)(d%M)))";
           else if (!strcmp (curve, "Curve25519"))
             format = "(private-key(ecc(curve %s)(flags djb-tweak)(q%m)(d%m)))";
           else
@@ -878,11 +878,11 @@
   log_debug ("XXX pubkey_algo=%d\n", pubkey_algo);
   log_debug ("XXX is_protected=%d\n", is_protected);
   log_debug ("XXX protect_algo=%d\n", protect_algo);
-  log_printhex ("XXX iv", iv, ivlen);
+  log_printhex (iv, ivlen, "XXX iv");
   log_debug ("XXX ivlen=%d\n", ivlen);
   log_debug ("XXX s2k_mode=%d\n", s2k_mode);
   log_debug ("XXX s2k_algo=%d\n", s2k_algo);
-  log_printhex ("XXX s2k_salt", s2k_salt, sizeof s2k_salt);
+  log_printhex (s2k_salt, sizeof s2k_salt, "XXX s2k_salt");
   log_debug ("XXX s2k_count=%lu\n", (unsigned long)s2k_count);
   log_debug ("XXX curve='%s'\n", curve);
   for (idx=0; skey[idx]; idx++)
@@ -1067,7 +1067,7 @@
           if (!agent_protect (*r_key, passphrase,
                               &protectedkey, &protectedkeylen,
                               ctrl->s2k_count, -1))
-            agent_write_private_key (grip, protectedkey, protectedkeylen, 1);
+            agent_write_private_key (grip, protectedkey, protectedkeylen, 1, 0);
           xfree (protectedkey);
         }
       else
@@ -1076,7 +1076,7 @@
           agent_write_private_key (grip,
                                    *r_key,
                                    gcry_sexp_canon_len (*r_key, 0, NULL,NULL),
-                                   1);
+                                   1, 0);
         }
     }
 
diff -Nru gnupg2-2.2.20/agent/divert-scd.c gnupg2-2.2.27/agent/divert-scd.c
--- gnupg2-2.2.20/agent/divert-scd.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/divert-scd.c	2020-11-13 15:59:15.000000000 +0100
@@ -79,7 +79,7 @@
       rc = agent_card_serialno (ctrl, &serialno, want_sn);
       if (!rc)
         {
-          log_debug ("detected card with S/N %s\n", serialno);
+          log_info ("detected card with S/N %s\n", serialno);
           i = strcmp (serialno, want_sn);
           xfree (serialno);
           serialno = NULL;
@@ -93,13 +93,13 @@
         }
       else if (gpg_err_code (rc) == GPG_ERR_ENODEV)
         {
-          log_debug ("no device present\n");
+          log_info ("no device present\n");
           rc = 0;
           no_card = 1;
         }
       else if (gpg_err_code (rc) == GPG_ERR_CARD_NOT_PRESENT)
         {
-          log_debug ("no card present\n");
+          log_info ("no card present\n");
           rc = 0;
           no_card = 2;
         }
@@ -169,7 +169,7 @@
   memcpy (frame, asn, asnlen);
   memcpy (frame+asnlen, digest, digestlen);
   if (DBG_CRYPTO)
-    log_printhex ("encoded hash:", frame, asnlen+digestlen);
+    log_printhex (frame, asnlen+digestlen, "encoded hash:");
 
   *r_val = frame;
   *r_len = asnlen+digestlen;
@@ -436,6 +436,7 @@
 int
 divert_pksign (ctrl_t ctrl, const char *desc_text,
                const unsigned char *digest, size_t digestlen, int algo,
+               const unsigned char *grip,
                const unsigned char *shadow_info, unsigned char **r_sig,
                size_t *r_siglen)
 {
@@ -450,6 +451,22 @@
   if (rc)
     return rc;
 
+  /* For OpenPGP cards we better use the keygrip as key reference.
+   * This has the advantage that app-openpgp can check that the stored
+   * key matches our expectation.  This is important in case new keys
+   * have been created on the same card but the sub file has not been
+   * updated.  In that case we would get a error from our final
+   * signature checking code or, if the pubkey algo is different,
+   * weird errors from the card (Conditions of use not satisfied).  */
+  if (kid && grip && !strncmp (kid, "OPENPGP.", 8))
+    {
+      xfree (kid);
+      kid = bin2hex (grip, KEYGRIP_LEN, NULL);
+      if (!kid)
+        return gpg_error_from_syserror ();
+    }
+
+
   if (algo == MD_USER_TLS_MD5SHA1)
     {
       int save = ctrl->use_auth_call;
@@ -491,6 +508,7 @@
 int
 divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                   const unsigned char *cipher,
+                  const unsigned char *grip,
                   const unsigned char *shadow_info,
                   char **r_buf, size_t *r_len, int *r_padding)
 {
@@ -585,6 +603,21 @@
   if (rc)
     return rc;
 
+  /* For OpenPGP cards we better use the keygrip as key reference.
+   * This has the advantage that app-openpgp can check that the stored
+   * key matches our expectation.  This is important in case new keys
+   * have been created on the same card but the sub file has not been
+   * updated.  In that case we would get a error from our final
+   * signature checking code or, if the pubkey algo is different,
+   * weird errors from the card (Conditions of use not satisfied).  */
+  if (kid && grip && !strncmp (kid, "OPENPGP.", 8))
+    {
+      xfree (kid);
+      kid = bin2hex (grip, KEYGRIP_LEN, NULL);
+      if (!kid)
+        return gpg_error_from_syserror ();
+    }
+
   rc = agent_card_pkdecrypt (ctrl, kid, getpin_cb, ctrl, NULL,
                              ciphertext, ciphertextlen,
                              &plaintext, &plaintextlen, r_padding);
diff -Nru gnupg2-2.2.20/agent/findkey.c gnupg2-2.2.27/agent/findkey.c
--- gnupg2-2.2.20/agent/findkey.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/findkey.c	2020-11-13 15:33:25.000000000 +0100
@@ -54,8 +54,8 @@
 
 /* Note: Ownership of FNAME and FP are moved to this function.  */
 static gpg_error_t
-write_extended_private_key (char *fname, estream_t fp, int update,
-                            const void *buf, size_t len)
+write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
+                            const void *buf, size_t len, time_t timestamp)
 {
   gpg_error_t err;
   nvc_t pk = NULL;
@@ -93,6 +93,19 @@
   if (err)
     goto leave;
 
+  /* If a timestamp has been supplied and the key is new write a
+   * creation timestamp.  (We double check that there is no Created
+   * item yet.)*/
+  if (timestamp && newkey && !nvc_lookup (pk, "Created:"))
+    {
+      gnupg_isotime_t timebuf;
+
+      epoch2isotime (timebuf, timestamp);
+      err = nvc_add (pk, "Created:", timebuf);
+      if (err)
+        goto leave;
+    }
+
   err = es_fseek (fp, 0, SEEK_SET);
   if (err)
     goto leave;
@@ -136,11 +149,13 @@
 }
 
 /* Write an S-expression formatted key to our key storage.  With FORCE
-   passed as true an existing key with the given GRIP will get
-   overwritten.  */
+ * passed as true an existing key with the given GRIP will get
+ * overwritten.  If TIMESTAMP is not zero and the key does not yet
+ * exists it will be recorded as creation date.  */
 int
 agent_write_private_key (const unsigned char *grip,
-                         const void *buffer, size_t length, int force)
+                         const void *buffer, size_t length,
+                         int force, time_t timestamp)
 {
   char *fname;
   estream_t fp;
@@ -155,7 +170,7 @@
   /* FIXME: Write to a temp file first so that write failures during
      key updates won't lead to a key loss.  */
 
-  if (!force && !access (fname, F_OK))
+  if (!force && !gnupg_access (fname, F_OK))
     {
       log_error ("secret key file '%s' already exists\n", fname);
       xfree (fname);
@@ -208,17 +223,20 @@
       if (first != '(')
         {
           /* Key is already in the extended format.  */
-          return write_extended_private_key (fname, fp, 1, buffer, length);
+          return write_extended_private_key (fname, fp, 1, 0, buffer, length,
+                                             timestamp);
         }
       if (first == '(' && opt.enable_extended_key_format)
         {
           /* Key is in the old format - but we want the extended format.  */
-          return write_extended_private_key (fname, fp, 0, buffer, length);
+          return write_extended_private_key (fname, fp, 0, 0, buffer, length,
+                                             timestamp);
         }
     }
 
   if (opt.enable_extended_key_format)
-    return write_extended_private_key (fname, fp, 0, buffer, length);
+    return write_extended_private_key (fname, fp, 0, 1, buffer, length,
+                                       timestamp);
 
   if (es_fwrite (buffer, length, 1, fp) != 1)
     {
@@ -1359,7 +1377,7 @@
 
   fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
                          hexgrip, NULL);
-  result = !access (fname, R_OK)? 0 : -1;
+  result = !gnupg_access (fname, R_OK)? 0 : -1;
   xfree (fname);
   return result;
 }
@@ -1596,7 +1614,7 @@
     }
 
   len = gcry_sexp_canon_len (shdkey, 0, NULL, NULL);
-  err = agent_write_private_key (grip, shdkey, len, force);
+  err = agent_write_private_key (grip, shdkey, len, force, 0);
   xfree (shdkey);
   if (err)
     log_error ("error writing key: %s\n", gpg_strerror (err));
diff -Nru gnupg2-2.2.20/agent/genkey.c gnupg2-2.2.27/agent/genkey.c
--- gnupg2-2.2.20/agent/genkey.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/genkey.c	2020-08-23 12:14:24.000000000 +0200
@@ -33,7 +33,7 @@
 
 static int
 store_key (gcry_sexp_t private, const char *passphrase, int force,
-	unsigned long s2k_count)
+           unsigned long s2k_count, time_t timestamp)
 {
   int rc;
   unsigned char *buf;
@@ -68,7 +68,7 @@
       buf = p;
     }
 
-  rc = agent_write_private_key (grip, buf, len, force);
+  rc = agent_write_private_key (grip, buf, len, force, timestamp);
   xfree (buf);
   return rc;
 }
@@ -179,7 +179,7 @@
    message describing the problem is returned in
    *FAILED_CONSTRAINT.  */
 int
-check_passphrase_constraints (ctrl_t ctrl, const char *pw,
+check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
 			      char **failed_constraint)
 {
   gpg_error_t err = 0;
@@ -198,7 +198,7 @@
   /* The first check is to warn about an empty passphrase. */
   if (!*pw)
     {
-      const char *desc = (opt.enforce_passphrase_constraints?
+      const char *desc = (opt.enforce_passphrase_constraints || no_empty?
                           L_("You have not entered a passphrase!%0A"
                              "An empty passphrase is not allowed.") :
                           L_("You have not entered a passphrase - "
@@ -209,7 +209,7 @@
       err = 1;
       if (failed_constraint)
 	{
-	  if (opt.enforce_passphrase_constraints)
+	  if (opt.enforce_passphrase_constraints || no_empty)
 	    *failed_constraint = xstrdup (desc);
 	  else
 	    err = take_this_one_anyway2 (ctrl, desc,
@@ -386,7 +386,7 @@
     }
   pi->max_length = MAX_PASSPHRASE_LEN + 1;
   pi->max_tries = 3;
-  pi->with_qualitybar = 1;
+  pi->with_qualitybar = 0;
   pi->with_repeat = 1;
   pi2->max_length = MAX_PASSPHRASE_LEN + 1;
   pi2->max_tries = 3;
@@ -399,7 +399,7 @@
   initial_errtext = NULL;
   if (!err)
     {
-      if (check_passphrase_constraints (ctrl, pi->pin, &initial_errtext))
+      if (check_passphrase_constraints (ctrl, pi->pin, 0, &initial_errtext))
         {
           pi->failed_tries = 0;
           pi2->failed_tries = 0;
@@ -441,9 +441,11 @@
    KEYPARAM.  If CACHE_NONCE is given first try to lookup a passphrase
    using the cache nonce.  If NO_PROTECTION is true the key will not
    be protected by a passphrase.  If OVERRIDE_PASSPHRASE is true that
-   passphrase will be used for the new key.  */
+   passphrase will be used for the new key.  If TIMESTAMP is not zero
+   it will be recorded as creation date of the key (unless extended
+   format is disabled) . */
 int
-agent_genkey (ctrl_t ctrl, const char *cache_nonce,
+agent_genkey (ctrl_t ctrl, const char *cache_nonce, time_t timestamp,
               const char *keyparam, size_t keyparamlen, int no_protection,
               const char *override_passphrase, int preset, membuf_t *outbuf)
 {
@@ -517,7 +519,7 @@
   /* store the secret key */
   if (DBG_CRYPTO)
     log_debug ("storing private key\n");
-  rc = store_key (s_private, passphrase, 0, ctrl->s2k_count);
+  rc = store_key (s_private, passphrase, 0, ctrl->s2k_count, timestamp);
   if (!rc)
     {
       if (!cache_nonce)
@@ -591,7 +593,7 @@
     {
       /* Take an empty string as request not to protect the key.  */
       err = store_key (s_skey, **passphrase_addr? *passphrase_addr:NULL, 1,
-	      ctrl->s2k_count);
+                       ctrl->s2k_count, 0);
     }
   else
     {
@@ -606,7 +608,7 @@
                                       L_("Please enter the new passphrase"),
                                       &pass);
       if (!err)
-        err = store_key (s_skey, pass, 1, ctrl->s2k_count);
+        err = store_key (s_skey, pass, 1, ctrl->s2k_count, 0);
       if (!err && passphrase_addr)
         *passphrase_addr = pass;
       else
diff -Nru gnupg2-2.2.20/agent/gpg-agent.c gnupg2-2.2.27/agent/gpg-agent.c
--- gnupg2-2.2.20/agent/gpg-agent.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/agent/gpg-agent.c	2020-12-21 17:23:15.000000000 +0100
@@ -1,6 +1,7 @@
 /* gpg-agent.c  -  The GnuPG Agent
- * Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
- * Copyright (C) 2000-2016 Werner Koch
+ * Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ * Copyright (C) 2000-2019 Werner Koch
+ * Copyright (C) 2015-2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -113,6 +115,7 @@
   oCheckPassphrasePattern,
   oMaxPassphraseDays,
   oEnablePassphraseHistory,
+  oDisableExtendedKeyFormat,
   oEnableExtendedKeyFormat,
   oUseStandardSocket,
   oNoUseStandardSocket,
@@ -140,7 +143,9 @@
   oAutoExpandSecmem,
   oListenBacklog,
 
-  oWriteEnvFile
+  oWriteEnvFile,
+
+  oNoop
 };
 
 
@@ -166,7 +171,7 @@
   ARGPARSE_s_n (oQuiet,	  "quiet",     N_("be somewhat more quiet")),
   ARGPARSE_s_n (oSh,	  "sh",        N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,	  "csh",       N_("csh-style command output")),
-  ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
 
   ARGPARSE_s_s (oDebug,	     "debug",       "@"),
   ARGPARSE_s_n (oDebugAll,   "debug-all",   "@"),
@@ -252,6 +257,7 @@
                 /* */           "@"
 #endif
                 ),
+  ARGPARSE_s_n (oDisableExtendedKeyFormat, "disable-extended-key-format", "@"),
   ARGPARSE_s_n (oEnableExtendedKeyFormat, "enable-extended-key-format", "@"),
 
   ARGPARSE_s_u (oS2KCount, "s2k-count", "@"),
@@ -260,12 +266,16 @@
   ARGPARSE_op_u (oAutoExpandSecmem, "auto-expand-secmem", "@"),
 
   ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
 
   /* Dummy options for backward compatibility.  */
   ARGPARSE_o_s (oWriteEnvFile, "write-env-file", "@"),
   ARGPARSE_s_n (oUseStandardSocket, "use-standard-socket", "@"),
   ARGPARSE_s_n (oNoUseStandardSocket, "no-use-standard-socket", "@"),
 
+  /* Dummy options.  */
+
+
   ARGPARSE_end () /* End of list */
 };
 
@@ -390,7 +400,9 @@
 static char *default_lc_messages;
 static char *default_xauthority;
 
-/* Name of a config file, which will be reread on a HUP if it is not NULL. */
+/* Name of a config file which was last read on startup or, if missing,
+ * the name of the standard config file.  Any value here enables the
+ * rereading of the standard config files on SIGHUP. */
 static char *config_filename;
 
 /* Helper to implement --debug-level */
@@ -507,9 +519,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@GPG_AGENT@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
       /* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
          reporting address.  This is so that we can change the
@@ -826,7 +840,7 @@
       opt.check_passphrase_pattern = NULL;
       opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
       opt.enable_passphrase_history = 0;
-      opt.enable_extended_key_format = 0;
+      opt.enable_extended_key_format = 1;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 1;
       opt.allow_external_cache = 1;
@@ -902,7 +916,11 @@
       break;
 
     case oEnableExtendedKeyFormat:
-      opt.enable_extended_key_format = 1;
+      opt.enable_extended_key_format = 2;
+      break;
+    case oDisableExtendedKeyFormat:
+      if (opt.enable_extended_key_format != 2)
+        opt.enable_extended_key_format = 0;
       break;
 
     case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;
@@ -937,6 +955,8 @@
       set_s2k_calibration_time (pargs->r.ret_ulong);
       break;
 
+    case oNoop: break;
+
     default:
       return 0; /* not handled */
     }
@@ -971,9 +991,7 @@
    * has already been initialized but at that point nPth was not
    * initialized and thus Libgcrypt could not set its system call
    * clamp.  */
-#if GCRYPT_VERSION_NUMBER >= 0x010800 /* 1.8.0 */
   gcry_control (GCRYCTL_REINIT_SYSCALL_CLAMP, 0, 0);
-#endif
 }
 
 
@@ -996,12 +1014,10 @@
   ARGPARSE_ARGS pargs;
   int orig_argc;
   char **orig_argv;
-  FILE *configfp = NULL;
-  char *configname = NULL;
+  char *last_configname = NULL;
+  const char *configname = NULL;
+  int debug_argparser = 0;
   const char *shell;
-  unsigned configlineno;
-  int parse_debug = 0;
-  int default_config =1;
   int pipe_server = 0;
   int is_daemon = 0;
   int nodetach = 0;
@@ -1100,80 +1116,67 @@
   orig_argv = argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1|(1<<6);  /* do not remove the args, ignore version */
-  while (arg_parse( &pargs, opts))
+  pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
-      if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
-        parse_debug++;
-      else if (pargs.r_opt == oOptions)
-        { /* yes there is one, so we do not try the default one, but
-	     read the option file when it is encountered at the
-	     commandline */
-          default_config = 0;
-	}
-	else if (pargs.r_opt == oNoOptions)
-          default_config = 0; /* --no-options */
-	else if (pargs.r_opt == oHomedir)
+      switch (pargs.r_opt)
+        {
+        case oDebug:
+        case oDebugAll:
+          debug_argparser++;
+          break;
+
+        case oHomedir:
           gnupg_set_homedir (pargs.r.ret_str);
-	else if (pargs.r_opt == oDebugQuickRandom)
-          {
-            gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
-          }
+          break;
 
+        case oDebugQuickRandom:
+          gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+          break;
+        }
     }
+  /* Reset the flags.  */
+  pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
   /* Initialize the secure memory. */
   gcry_control (GCRYCTL_INIT_SECMEM, SECMEM_BUFFER_SIZE, 0);
   maybe_setuid = 0;
 
   /*
-     Now we are now working under our real uid
-  */
+   *  Now we are now working under our real uid
+   */
 
-  if (default_config)
-    configname = make_filename (gnupg_homedir (),
-                                GPG_AGENT_NAME EXTSEP_S "conf", NULL);
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
 
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* do not remove the args */
- next_pass:
-  if (configname)
-    {
-      configlineno = 0;
-      configfp = fopen (configname, "r");
-      if (!configfp)
-        {
-          if (default_config)
+  /* We are re-using the struct, thus the reset flag.  We OR the
+   * flags so that the internal intialized flag won't be cleared. */
+  pargs.flags |= (ARGPARSE_FLAG_RESET
+                  | ARGPARSE_FLAG_KEEP
+                  | ARGPARSE_FLAG_SYS
+                  | ARGPARSE_FLAG_USER);
+
+  while (gnupg_argparser (&pargs, opts, GPG_AGENT_NAME EXTSEP_S "conf"))
+    {
+      if (pargs.r_opt == ARGPARSE_CONFFILE)
+        {
+          if (debug_argparser)
+            log_info (_("reading options from '%s'\n"),
+                      pargs.r_type? pargs.r.ret_str: "[cmdline]");
+          if (pargs.r_type)
             {
-              if( parse_debug )
-                log_info (_("Note: no default option file '%s'\n"),
-                          configname );
-              /* Save the default conf file name so that
-                 reread_configuration is able to test whether the
-                 config file has been created in the meantime.  */
-              xfree (config_filename);
-              config_filename = configname;
-              configname = NULL;
-	    }
+              xfree (last_configname);
+              last_configname = xstrdup (pargs.r.ret_str);
+              configname = last_configname;
+            }
           else
-            {
-              log_error (_("option file '%s': %s\n"),
-                         configname, strerror(errno) );
-              exit(2);
-	    }
-          xfree (configname);
-          configname = NULL;
-	}
-      if (parse_debug && configname )
-        log_info (_("reading options from '%s'\n"), configname );
-      default_config = 0;
-    }
-
-  while (optfile_parse( configfp, configname, &configlineno, &pargs, opts) )
-    {
+            configname = NULL;
+          continue;
+        }
       if (parse_rereadable_options (&pargs, 0))
         continue; /* Already handled */
       switch (pargs.r_opt)
@@ -1185,18 +1188,8 @@
 
         case oDebugWait: debug_wait = pargs.r.ret_int; break;
 
-        case oOptions:
-          /* config files may not be nested (silently ignore them) */
-          if (!configfp)
-            {
-		xfree(configname);
-		configname = xstrdup(pargs.r.ret_str);
-		goto next_pass;
-	    }
-          break;
         case oNoGreeting: /* Dummy option.  */ break;
         case oNoVerbose: opt.verbose = 0; break;
-        case oNoOptions: break; /* no-options */
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
         case oNoDetach: nodetach = 1; break;
         case oLogFile: logfile = pargs.r.ret_str; break;
@@ -1217,7 +1210,7 @@
 
         case oUseStandardSocket:
         case oNoUseStandardSocket:
-          obsolete_option (configname, configlineno, "use-standard-socket");
+          obsolete_option (configname, pargs.lineno, "use-standard-socket");
           break;
 
         case oFakedSystemTime:
@@ -1269,28 +1262,29 @@
           break;
 
         case oWriteEnvFile:
-          obsolete_option (configname, configlineno, "write-env-file");
+          obsolete_option (configname, pargs.lineno, "write-env-file");
           break;
 
-        default : pargs.err = configfp? 1:2; break;
+        default:
+          if (configname)
+            pargs.err = ARGPARSE_PRINT_WARNING;
+          else
+            pargs.err = ARGPARSE_PRINT_ERROR;
+          break;
 	}
     }
-  if (configfp)
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
+  if (!last_configname)
+    config_filename = make_filename (gnupg_homedir (),
+                                     GPG_AGENT_NAME EXTSEP_S "conf",
+                                     NULL);
+  else
     {
-      fclose( configfp );
-      configfp = NULL;
-      /* Keep a copy of the name so that it can be read on SIGHUP. */
-      if (config_filename != configname)
-        {
-          xfree (config_filename);
-          config_filename = configname;
-        }
-      configname = NULL;
-      goto next_pass;
+      config_filename = last_configname;
+      last_configname = NULL;
     }
 
-  xfree (configname);
-  configname = NULL;
   if (log_get_errorcount(0))
     exit(2);
 
@@ -1365,7 +1359,8 @@
     }
 
   /* Try to create missing directories. */
-  create_directories ();
+  if (!gpgconf_list)
+    create_directories ();
 
   if (debug_wait && pipe_server)
     {
@@ -1386,18 +1381,13 @@
     agent_exit (0);
   else if (gpgconf_list)
     {
-      char *filename;
       char *filename_esc;
 
       /* List options and default values in the GPG Conf format.  */
-      filename = make_filename (gnupg_homedir (),
-                                GPG_AGENT_NAME EXTSEP_S "conf", NULL);
-      filename_esc = percent_escape (filename, NULL);
-
+      filename_esc = percent_escape (config_filename, NULL);
       es_printf ("%s-%s.conf:%lu:\"%s\n",
                  GPGCONF_NAME, GPG_AGENT_NAME,
                  GC_OPT_FLAG_DEFAULT, filename_esc);
-      xfree (filename);
       xfree (filename_esc);
 
       es_printf ("verbose:%lu:\n"
@@ -1452,8 +1442,6 @@
                  GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
       es_printf ("pinentry-timeout:%lu:0:\n",
                  GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
-      es_printf ("enable-extended-key-format:%lu:\n",
-                 GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
       es_printf ("grab:%lu:\n",
                  GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
 
@@ -1852,23 +1840,6 @@
       break;
   if (dispatch && dispatch->cb)
     dispatch->cb (dispatch->ctrl, what, printchar, current, total);
-
-  /* Libgcrypt < 1.8 does not know about nPth and thus when it reads
-   * from /dev/random this will block the process.  To mitigate this
-   * problem we yield the thread when Libgcrypt tells us that it needs
-   * more entropy.  This way other threads have chance to run.  */
-#if GCRYPT_VERSION_NUMBER < 0x010800 /* 1.8.0 */
-  if (what && !strcmp (what, "need_entropy"))
-    {
-#if GPGRT_VERSION_NUMBER < 0x011900 /* 1.25 */
-      /* In older gpg-error versions gpgrt_yield is buggy for use with
-       * nPth and thus we need to resort to a sleep call.  */
-      npth_usleep (1000); /* 1ms */
-#else
-      gpgrt_yield ();
-#endif
-    }
-#endif
 }
 
 
@@ -2026,35 +1997,39 @@
 reread_configuration (void)
 {
   ARGPARSE_ARGS pargs;
-  FILE *fp;
-  unsigned int configlineno = 0;
+  char *twopart;
   int dummy;
 
   if (!config_filename)
     return; /* No config file. */
 
-  fp = fopen (config_filename, "r");
-  if (!fp)
-    {
-      log_info (_("option file '%s': %s\n"),
-                config_filename, strerror(errno) );
-      return;
-    }
+  twopart = strconcat (GPG_AGENT_NAME EXTSEP_S "conf" PATHSEP_S,
+                       config_filename, NULL);
+  if (!twopart)
+    return;  /* Out of core.  */
 
   parse_rereadable_options (NULL, 1); /* Start from the default values. */
 
   memset (&pargs, 0, sizeof pargs);
   dummy = 0;
   pargs.argc = &dummy;
-  pargs.flags = 1;  /* do not remove the args */
-  while (optfile_parse (fp, config_filename, &configlineno, &pargs, opts) )
+  pargs.flags = (ARGPARSE_FLAG_KEEP
+                 |ARGPARSE_FLAG_SYS
+                 |ARGPARSE_FLAG_USER);
+  while (gnupg_argparser (&pargs, opts, twopart))
     {
-      if (pargs.r_opt < -1)
-        pargs.err = 1; /* Print a warning. */
+      if (pargs.r_opt == ARGPARSE_CONFFILE)
+        {
+          log_info (_("reading options from '%s'\n"),
+                    pargs.r_type? pargs.r.ret_str: "[cmdline]");
+        }
+      else if (pargs.r_opt < -1)
+        pargs.err = ARGPARSE_PRINT_WARNING;
       else /* Try to parse this option - ignore unchangeable ones. */
         parse_rereadable_options (&pargs, 1);
     }
-  fclose (fp);
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+  xfree (twopart);
   finalize_rereadable_options ();
   set_debug ();
 }
@@ -2295,17 +2270,27 @@
   struct stat statbuf;
 
   fname = make_filename (home, GNUPG_PRIVATE_KEYS_DIR, NULL);
-  if (stat (fname, &statbuf) && errno == ENOENT)
+  if (gnupg_stat (fname, &statbuf) && errno == ENOENT)
     {
       if (gnupg_mkdir (fname, "-rwx"))
         log_error (_("can't create directory '%s': %s\n"),
                    fname, strerror (errno) );
       else if (!opt.quiet)
         log_info (_("directory '%s' created\n"), fname);
+
+      if (gnupg_chmod (fname, "-rwx"))
+        log_error (_("can't set permissions of '%s': %s\n"),
+                   fname, strerror (errno));
+    }
+  else
+    {
+      /* The file exists or another error.  Make sure we have sensible
+       * permissions.  We enforce rwx for user but keep existing group
+       * permissions.  Permissions for other are always cleared.  */
+      if (gnupg_chmod (fname, "-rwx...---"))
+        log_error (_("can't set permissions of '%s': %s\n"),
+                   fname, strerror (errno));
     }
-  if (gnupg_chmod (fname, "-rwx"))
-    log_error (_("can't set permissions of '%s': %s\n"),
-               fname, strerror (errno));
   xfree (fname);
 }
 
@@ -2324,7 +2309,7 @@
   char *home;
 
   home = make_filename (gnupg_homedir (), NULL);
-  if ( stat (home, &statbuf) )
+  if (gnupg_stat (home, &statbuf))
     {
       if (errno == ENOENT)
         {
@@ -2412,7 +2397,7 @@
   /* Check whether the homedir is still available.  */
   if (!shutdown_pending
       && (!have_homedir_inotify || !reliable_homedir_inotify)
-      && stat (gnupg_homedir (), &statbuf) && errno == ENOENT)
+      && gnupg_stat (gnupg_homedir (), &statbuf) && errno == ENOENT)
     {
       shutdown_pending = 1;
       log_info ("homedir has been removed - shutting down\n");
@@ -2618,7 +2603,7 @@
   if (!data)
     goto leave;
 
-  /* log_printhex ("request:", data, 20); */
+  /* log_printhex (data, 20, "request:"); */
 
   ctrl = xtrycalloc (1, sizeof *ctrl);
   if (!ctrl)
@@ -2639,7 +2624,7 @@
   if (!serve_mmapped_ssh_request (ctrl, data, PUTTY_IPC_MAXLEN))
     ret = 1; /* Valid ssh message has been constructed.  */
   agent_deinit_default_ctrl (ctrl);
-  /* log_printhex ("  reply:", data, 20); */
+  /* log_printhex (data, 20, "  reply:"); */
 
  leave:
   xfree (ctrl);
diff -Nru gnupg2-2.2.20/agent/gpg-agent-w32info.rc gnupg2-2.2.27/agent/gpg-agent-w32info.rc
--- gnupg2-2.2.20/agent/gpg-agent-w32info.rc	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/agent/gpg-agent-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -48,3 +48,5 @@
       VALUE "Translation", 0x409, 0x4b0
     END
   END
+
+1 RT_MANIFEST "gpg-agent.w32-manifest"
diff -Nru gnupg2-2.2.20/agent/gpg-agent.w32-manifest.in gnupg2-2.2.27/agent/gpg-agent.w32-manifest.in
--- gnupg2-2.2.20/agent/gpg-agent.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/agent/gpg-agent.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Private key daemon)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpg-agent"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/agent/Makefile.am gnupg2-2.2.27/agent/Makefile.am
--- gnupg2-2.2.20/agent/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/agent/Makefile.am	2020-10-23 20:08:54.000000000 +0200
@@ -25,7 +25,9 @@
 endif
 noinst_PROGRAMS = $(TESTS)
 
-EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
+EXTRA_DIST = ChangeLog-2011 \
+             gpg-agent-w32info.rc gpg-agent.w32-manifest.in \
+             all-tests.scm
 
 
 AM_CPPFLAGS =
@@ -33,7 +35,10 @@
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-resource_objs += gpg-agent-w32info.o
+gpg_agent_robjs = $(resource_objs) gpg-agent-w32info.o
+gpg-agent-w32info.o : gpg-agent.w32-manifest
+else
+gpg_agent_robjs =
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
@@ -69,9 +74,9 @@
 gpg_agent_LDADD = $(commonpth_libs) \
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-		$(resource_objs)
+		$(gpg_agent_robjs)
 gpg_agent_LDFLAGS = $(extra_bin_ldflags)
-gpg_agent_DEPENDENCIES = $(resource_objs)
+gpg_agent_DEPENDENCIES = $(gpg_agent_robjs)
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
@@ -100,7 +105,11 @@
 #
 # Module tests
 #
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = t-protect
+endif
 
 t_common_ldadd = $(common_libs)  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 	          $(LIBINTL) $(LIBICONV) $(NETLIBS)
diff -Nru gnupg2-2.2.20/agent/Makefile.in gnupg2-2.2.27/agent/Makefile.in
--- gnupg2-2.2.20/agent/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/agent/Makefile.in	2021-01-11 18:46:54.000000000 +0100
@@ -145,8 +145,7 @@
 @GNUPG_DIRMNGR_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 @GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-@HAVE_W32_SYSTEM_TRUE@am__append_9 = gpg-agent-w32info.o
-TESTS = t-protect$(EXEEXT)
+@DISABLE_TESTS_FALSE@TESTS = t-protect$(EXEEXT)
 subdir = agent
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -168,12 +167,12 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = gpg-agent.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
 @HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 =  \
 @HAVE_W32CE_SYSTEM_FALSE@	gpg-preset-passphrase$(EXEEXT)
-am__EXEEXT_2 = t-protect$(EXEEXT)
+@DISABLE_TESTS_FALSE@am__EXEEXT_2 = t-protect$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am_gpg_agent_OBJECTS = gpg_agent-gpg-agent.$(OBJEXT) \
 	gpg_agent-command.$(OBJEXT) gpg_agent-command-ssh.$(OBJEXT) \
@@ -186,13 +185,15 @@
 	gpg_agent-learncard.$(OBJEXT)
 gpg_agent_OBJECTS = $(am_gpg_agent_OBJECTS)
 am__DEPENDENCIES_1 =
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpg-agent-w32info.o
 gpg_agent_LINK = $(CCLD) $(gpg_agent_CFLAGS) $(CFLAGS) \
 	$(gpg_agent_LDFLAGS) $(LDFLAGS) -o $@
 am_gpg_preset_passphrase_OBJECTS = preset-passphrase.$(OBJEXT)
 gpg_preset_passphrase_OBJECTS = $(am_gpg_preset_passphrase_OBJECTS)
-@HAVE_W32CE_SYSTEM_FALSE@am__DEPENDENCIES_2 =  \
+@HAVE_W32CE_SYSTEM_FALSE@am__DEPENDENCIES_3 =  \
 @HAVE_W32CE_SYSTEM_FALSE@	../common/libsimple-pwquery.a
-gpg_preset_passphrase_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+gpg_preset_passphrase_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(common_libs) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -208,10 +209,10 @@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_t_protect_OBJECTS = t-protect.$(OBJEXT) protect.$(OBJEXT)
 t_protect_OBJECTS = $(am_t_protect_OBJECTS)
-am__DEPENDENCIES_3 = $(common_libs) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_4 = $(common_libs) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-t_protect_DEPENDENCIES = $(am__DEPENDENCIES_3)
+t_protect_DEPENDENCIES = $(am__DEPENDENCIES_4)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -315,8 +316,9 @@
     std=''; \
   fi; \
 }
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/am/cmacros.am \
-	$(top_srcdir)/build-aux/depcomp \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/gpg-agent.w32-manifest.in \
+	$(top_srcdir)/am/cmacros.am $(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -327,6 +329,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -493,6 +496,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -501,7 +505,10 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
+EXTRA_DIST = ChangeLog-2011 \
+             gpg-agent-w32info.rc gpg-agent.w32-manifest.in \
+             all-tests.scm
+
 
 # NB: AM_CFLAGS may also be used by tools running on the build
 # platform to create source files.
@@ -518,13 +525,15 @@
 @HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
 @HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags = 
 @HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
-resource_objs = $(am__append_9)
+resource_objs = 
 
 # Convenience macros
 libcommon = ../common/libcommon.a
 libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
+@HAVE_W32_SYSTEM_FALSE@gpg_agent_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpg_agent_robjs = $(resource_objs) gpg-agent-w32info.o
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 gpg_agent_SOURCES = \
 	gpg-agent.c agent.h \
@@ -553,10 +562,10 @@
 gpg_agent_LDADD = $(commonpth_libs) \
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-		$(resource_objs)
+		$(gpg_agent_robjs)
 
 gpg_agent_LDFLAGS = $(extra_bin_ldflags)
-gpg_agent_DEPENDENCIES = $(resource_objs)
+gpg_agent_DEPENDENCIES = $(gpg_agent_robjs)
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
 	protect.c cvt-openpgp.c
@@ -615,6 +624,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+gpg-agent.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpg-agent.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1385,6 +1396,7 @@
 
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+@HAVE_W32_SYSTEM_TRUE@gpg-agent-w32info.o : gpg-agent.w32-manifest
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.
diff -Nru gnupg2-2.2.20/agent/pkdecrypt.c gnupg2-2.2.27/agent/pkdecrypt.c
--- gnupg2-2.2.20/agent/pkdecrypt.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/pkdecrypt.c	2020-11-13 15:56:53.000000000 +0100
@@ -64,8 +64,8 @@
 
   if (DBG_CRYPTO)
     {
-      log_printhex ("keygrip:", ctrl->keygrip, 20);
-      log_printhex ("cipher: ", ciphertext, ciphertextlen);
+      log_printhex (ctrl->keygrip, 20, "keygrip:");
+      log_printhex (ciphertext, ciphertextlen, "cipher: ");
     }
   rc = agent_key_from_file (ctrl, NULL, desc_text,
                             ctrl->keygrip, &shadow_info,
@@ -86,7 +86,8 @@
           goto leave;
         }
 
-      rc = divert_pkdecrypt (ctrl, desc_text, ciphertext, shadow_info,
+      rc = divert_pkdecrypt (ctrl, desc_text, ciphertext,
+                             ctrl->keygrip, shadow_info,
                              &buf, &len, r_padding);
       if (rc)
         {
diff -Nru gnupg2-2.2.20/agent/pksign.c gnupg2-2.2.27/agent/pksign.c
--- gnupg2-2.2.20/agent/pksign.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/pksign.c	2020-11-13 15:56:53.000000000 +0100
@@ -356,6 +356,7 @@
         err = divert_pksign (ctrl, desc2? desc2 : desc_text,
                              data, datalen,
                              ctrl->digest.algo,
+                             ctrl->keygrip,
                              shadow_info, &buf, &len);
         xfree (desc2);
       }
@@ -473,12 +474,6 @@
       if (err)
         goto leave;
 
-      if (dsaalgo == 0 && GCRYPT_VERSION_NUMBER < 0x010700)
-        {
-          /* It's RSA and Libgcrypt < 1.7 */
-          check_signature = 1;
-        }
-
       if (DBG_CRYPTO)
         {
           gcry_log_debugsxp ("skey", s_skey);
diff -Nru gnupg2-2.2.20/agent/preset-passphrase.c gnupg2-2.2.27/agent/preset-passphrase.c
--- gnupg2-2.2.20/agent/preset-passphrase.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/agent/preset-passphrase.c	2020-12-18 11:22:45.000000000 +0100
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -90,9 +91,11 @@
   const char *p;
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "gpg-preset-passphrase (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -218,8 +221,8 @@
 
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* (do not remove the args) */
-  while (arg_parse (&pargs, opts) )
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -233,6 +236,7 @@
         default : pargs.err = 2; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
   if (log_get_errorcount(0))
     exit(2);
 
diff -Nru gnupg2-2.2.20/agent/protect.c gnupg2-2.2.27/agent/protect.c
--- gnupg2-2.2.20/agent/protect.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/protect.c	2020-11-13 15:56:53.000000000 +0100
@@ -625,7 +625,7 @@
   int have_curve = 0;
 
   if (use_ocb == -1)
-    use_ocb = opt.enable_extended_key_format;
+    use_ocb = !!opt.enable_extended_key_format;
 
   /* Create an S-expression with the protected-at timestamp.  */
   memcpy (timestamp_exp, "(12:protected-at15:", 19);
@@ -1725,6 +1725,7 @@
         }
       memcpy (*r_idstr, s, n);
       (*r_idstr)[n] = 0;
+      trim_spaces (*r_idstr);
     }
 
   /* Parse the optional PINLEN.  */
diff -Nru gnupg2-2.2.20/agent/protect-tool.c gnupg2-2.2.27/agent/protect-tool.c
--- gnupg2-2.2.20/agent/protect-tool.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/agent/protect-tool.c	2020-12-18 11:22:45.000000000 +0100
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -145,9 +146,11 @@
   const char *p;
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "gpg-protect-tool (" GNUPG_NAME ")";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -275,7 +278,7 @@
     {
       struct stat st;
 
-      fp = fopen (fname, "rb");
+      fp = gnupg_fopen (fname, "rb");
       if (!fp)
         {
           log_error ("can't open '%s': %s\n", fname, strerror (errno));
@@ -316,6 +319,11 @@
   buf = read_file (fname, &buflen);
   if (!buf)
     return NULL;
+  if (buflen >= 4 && !memcmp (buf, "Key:", 4))
+    {
+      log_error ("Extended key format is not supported by this tool\n");
+      return NULL;
+    }
   key = make_canonical (fname, buf, buflen);
   xfree (buf);
   return key;
@@ -546,7 +554,6 @@
   putchar ('\n');
 }
 
-
 
 
 
@@ -572,8 +579,8 @@
 
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* (do not remove the args) */
-  while (arg_parse (&pargs, opts) )
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -603,6 +610,8 @@
         default: pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
   if (log_get_errorcount (0))
     exit (2);
 
@@ -800,12 +809,14 @@
  * to stdout. */
 int
 agent_write_private_key (const unsigned char *grip,
-                         const void *buffer, size_t length, int force)
+                         const void *buffer, size_t length, int force,
+                         time_t timestamp)
 {
   char hexgrip[40+4+1];
   char *p;
 
   (void)force;
+  (void)timestamp;
 
   bin2hex (grip, 20, hexgrip);
   strcpy (hexgrip+40, ".key");
diff -Nru gnupg2-2.2.20/agent/trustlist.c gnupg2-2.2.27/agent/trustlist.c
--- gnupg2-2.2.20/agent/trustlist.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/agent/trustlist.c	2020-10-23 20:08:54.000000000 +0200
@@ -186,6 +186,7 @@
         {
           char *etcname;
           gpg_error_t err2;
+          gpg_err_code_t ec;
 
           if (!allow_include)
             {
@@ -199,7 +200,7 @@
           if ( !strcmp (etcname, fname) ) /* Same file. */
             log_info (_("statement \"%s\" ignored in '%s', line %d\n"),
                       "include-default", fname, lnr);
-          else if ( access (etcname, F_OK) && errno == ENOENT )
+          else if ((ec=gnupg_access (etcname, F_OK)) && ec == GPG_ERR_ENOENT)
             {
               /* A non existent system trustlist is not an error.
                  Just print a note. */
@@ -337,6 +338,7 @@
   size_t tablesize;
   char *fname;
   int allow_include = 1;
+  gpg_err_code_t ec;
 
   tablesize = 20;
   table = xtrycalloc (tablesize, sizeof *table);
@@ -352,13 +354,13 @@
       return err;
     }
 
-  if ( access (fname, F_OK) )
+  if ((ec = gnupg_access (fname, F_OK)))
     {
-      if ( errno == ENOENT )
+      if ( ec == GPG_ERR_ENOENT )
         ; /* Silently ignore a non-existing trustfile.  */
       else
         {
-          err = gpg_error_from_syserror ();
+          err = gpg_error (ec);
           log_error (_("error opening '%s': %s\n"), fname, gpg_strerror (err));
         }
       xfree (fname);
@@ -602,6 +604,7 @@
 agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
 {
   gpg_error_t err = 0;
+  gpg_err_code_t ec;
   char *desc;
   char *fname;
   estream_t fp;
@@ -619,7 +622,7 @@
   if (!fname)
     return gpg_error_from_syserror ();
 
-  if ( access (fname, W_OK) && errno != ENOENT)
+  if ((ec = access (fname, W_OK)) && ec != GPG_ERR_ENOENT)
     {
       xfree (fname);
       return gpg_error (GPG_ERR_EPERM);
@@ -752,12 +755,12 @@
       xfree (nameformatted);
       return err;
     }
-  if ( access (fname, F_OK) && errno == ENOENT)
+  if ((ec = access (fname, F_OK)) && ec == GPG_ERR_ENOENT)
     {
       fp = es_fopen (fname, "wx,mode=-rw-r");
       if (!fp)
         {
-          err = gpg_error_from_syserror ();
+          err = gpg_error (ec);
           log_error ("can't create '%s': %s\n", fname, gpg_strerror (err));
           xfree (fname);
           unlock_trusttable ();
diff -Nru gnupg2-2.2.20/AUTHORS gnupg2-2.2.27/AUTHORS
--- gnupg2-2.2.20/AUTHORS	2020-03-18 16:24:40.000000000 +0100
+++ gnupg2-2.2.27/AUTHORS	2021-01-11 18:37:52.000000000 +0100
@@ -16,8 +16,8 @@
 =========================
 
   Copyright (C) 1997-2019 Werner Koch
-  Copyright (C) 1994-2020 Free Software Foundation, Inc.
-  Copyright (C) 2003-2020 g10 Code GmbH
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
+  Copyright (C) 2003-2021 g10 Code GmbH
   Copyright (C) 2002 Klarälvdalens Datakonsult AB
   Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper@gnu.ai.mit.edu>
   Copyright (C) 1994 X Consortium
@@ -70,6 +70,8 @@
 The test driver is based on TinySCHEME by Dimitrios Souflis and
 available under a permissive license; see COPYING.other.
 
+Regular expression implementation is taken from Jim Tcl, originally
+by Henry Spencer, and modified by others; see COPYING.other.
 
 License
 ========
diff -Nru gnupg2-2.2.20/build-aux/speedo/w32/inst.nsi gnupg2-2.2.27/build-aux/speedo/w32/inst.nsi
--- gnupg2-2.2.20/build-aux/speedo/w32/inst.nsi	2019-11-25 19:59:23.000000000 +0100
+++ gnupg2-2.2.27/build-aux/speedo/w32/inst.nsi	2020-11-04 18:15:01.000000000 +0100
@@ -627,6 +627,7 @@
   File "bin/gpgtar.exe"
   File "libexec/dirmngr_ldap.exe"
   File "libexec/gpg-preset-passphrase.exe"
+  File "libexec/gpg-check-pattern.exe"
   File "libexec/gpg-wks-client.exe"
 
   ClearErrors
@@ -657,6 +658,11 @@
   File "share/gnupg/distsigkey.gpg"
   File "share/gnupg/sks-keyservers.netCA.pem"
 
+  SetOutPath "$INSTDIR\share\doc\gnupg\examples"
+  File "share/doc/gnupg/examples/VS-NfD.prf"
+  File "share/doc/gnupg/examples/Automatic.prf"
+  File "share/doc/gnupg/examples/pwpattern.list"
+
   SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
   File share/locale/ca/LC_MESSAGES/gnupg2.mo
   SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
@@ -1315,8 +1321,14 @@
   Delete "$INSTDIR\bin\gpgtar.exe"
   Delete "$INSTDIR\bin\dirmngr_ldap.exe"
   Delete "$INSTDIR\bin\gpg-preset-passphrase.exe"
+  Delete "$INSTDIR\bin\gpg-check-pattern.exe"
   Delete "$INSTDIR\bin\gpg-wks-client.exe"
 
+  Delete "$INSTDIR\share\doc\gnupg\examples\VS-NfD.prf"
+  Delete "$INSTDIR\share\doc\gnupg\examples\Automatic.prf"
+  Delete "$INSTDIR\share\doc\gnupg\examples\pwpattern.list"
+  RMDir  "$INSTDIR\share\doc\gnupg\examples"
+
   Delete "$INSTDIR\share\gnupg\sks-keyservers.netCA.pem"
   Delete "$INSTDIR\share\gnupg\dirmngr-conf.skel"
   Delete "$INSTDIR\share\gnupg\distsigkey.gpg"
diff -Nru gnupg2-2.2.20/build-aux/speedo/w32/wixlib.wxs gnupg2-2.2.27/build-aux/speedo/w32/wixlib.wxs
--- gnupg2-2.2.20/build-aux/speedo/w32/wixlib.wxs	2019-12-23 12:43:39.000000000 +0100
+++ gnupg2-2.2.27/build-aux/speedo/w32/wixlib.wxs	2020-11-04 18:15:15.000000000 +0100
@@ -64,6 +64,9 @@
       <Component Id="cmp6C1FB70721B208E33DB24296B93AB93F" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="FE29D2AA-3151-4421-B8C0-355F69F267A1">
         <File Id="fil563D2C0464DCE7ECADE6E15C0FC65821" KeyPath="yes" Source="$(var.SourceDir)\libexec\gpg-preset-passphrase.exe"/>
       </Component>
+      <Component Id="cmp6C1FB70721B208E33DB24296B93AB940" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="FE29D2AA-3151-4421-B8C0-355F69F267A2">
+        <File Id="fil563D2C0464DCE7ECADE6E15C0FC65822" KeyPath="yes" Source="$(var.SourceDir)\libexec\gpg-check-pattern.exe"/>
+      </Component>
       <Component Id="cmpB87CCF9DDCB6D9B36B92B0F9FA24FDC9" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="9BB809F3-C09B-4A1E-B52D-B68CBE59AE3B">
         <File Id="fil8A3F9D3F6E36120B183DDF4981D84C1B" KeyPath="yes" Source="$(var.SourceDir)\libexec\gpg-wks-client.exe"/>
       </Component>
@@ -73,6 +76,9 @@
       <Component Id="cmpAF601EA2DF4EFD403CBF65A0D5162912" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="28A7D50E-4BC0-4A38-8420-52C5D1EB3F55">
         <File Id="fil00B1F6AD370147577D6F7C998ACE6121" KeyPath="yes" Source="$(var.SourceDir)\bin\gpgconf.exe"/>
       </Component>
+      <Component Id="cmpAF601EA2DF4EFD403CBF65A0D5162922" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="EEF227D9-1FA3-4A96-AF86-12D1FDC12925">
+        <File Id="fil00B1F6AD370147577D6F7C998ACE6122" KeyPath="yes" Source="$(var.SourceDir)\bin\gpgconf-w32.exe"/>
+      </Component>
       <Component Id="cmp3BA8A06E4085F542FDAA78BAFB507AD4" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="E026569F-F37A-49FC-A529-68BDE3097218">
         <File Id="fil1A596ECA8DC19F8EC626168033269CFE" KeyPath="yes" Source="$(var.SourceDir)\libexec\gpgme-w32spawn.exe"/>
       </Component>
@@ -152,7 +158,13 @@
         <File Id="fil0615847C26E386E0B892124531F2ABBC" KeyPath="yes" Source="$(var.SourceDir)\lib\libnpth.dll.a" Name="libnpth.imp"/>
       </Component>
       <Component Id="cmp909B0412FDFCFD5092D93932AF982A72" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F610">
-        <File Id="fil322067E40CE41C36574A7CC520D75876" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\vsnfd.prf" Name="VS-NfD.prf"/>
+        <File Id="fil322067E40CE41C36574A7CC520D75876" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\VS-NfD.prf" Name="VS-NfD.prf"/>
+      </Component>
+      <Component Id="cmp909B0412FDFCFD5092D93932AF982A73" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F611">
+        <File Id="fil322067E40CE41C36574A7CC520D75877" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\Automatic.prf" Name="Automatic.prf"/>
+      </Component>
+      <Component Id="cmp909B0412FDFCFD5092D93932AF982A74" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F612">
+        <File Id="fil322067E40CE41C36574A7CC520D75878" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\pwpattern.list" Name="pwpattern.list"/>
       </Component>
       <Component Id="cmp59D652F2B6BBFD90563BF58D6CE6BE7B" Directory="dirF4B1502A83344E3C92AB58989653B465" Guid="1C51D4AF-B308-40A3-B8D8-CEDA5AB2A383">
         <File Id="filCB1BD20C87EE88A17D7502E26268DA65" KeyPath="yes" Source="$(var.SourceDir)\share\gnupg\distsigkey.gpg"/>
diff -Nru gnupg2-2.2.20/build-aux/speedo.mk gnupg2-2.2.27/build-aux/speedo.mk
--- gnupg2-2.2.20/build-aux/speedo.mk	2020-03-20 16:33:54.000000000 +0100
+++ gnupg2-2.2.27/build-aux/speedo.mk	2021-01-08 20:10:15.000000000 +0100
@@ -41,6 +41,47 @@
 #
 # Lists packages and versions.
 #
+# The information reyured to sign the tarballs and binaries
+# are expected in the developer specific file ~/.gnupg-autogen.rc".
+# Here is an example:
+#--8<---------------cut here---------------start------------->8---
+# # Location of the released tarball archives.  Note that this is an
+# # internal archive and before uploading this to the public server,
+# # manual tests should be run and the git release tagged and pushed.
+# # This is greped by the Makefile.
+# RELEASE_ARCHIVE=foo@somehost:tarball-archive
+#
+# # The key used to sign the released sources.
+# # This is greped by the Makefile.
+# RELEASE_SIGNKEY=6DAA6E64A76D2840571B4902528897B826403ADA
+#
+# # For signing Windows binaries we need to employ a Windows machine.
+# # We connect to this machine via ssh and take the connection
+# # parameters via .ssh/config. For example a VM could be specified
+# # like this:
+# #
+# #   Host authenticode-signhost
+# #        HostName localhost
+# #        Port 27042
+# #        User gpgsign
+# #
+# # Depending on the used token it might be necessary to allow single
+# # signon and unlock the token before running the make.  The following
+# # variable references this entry.  This is greped by the Makefile.
+# AUTHENTICODE_SIGNHOST=authenticode-signhost
+#
+# # The name of the signtool as used on Windows.
+# # This is greped by the Makefile.
+# AUTHENTICODE_TOOL="C:\Program Files (x86)\Windows Kits\10\bin\signtool.exe"
+#
+# # To use osslsigncode the follwing entries are required and
+# # an empty string must be given for AUTHENTICODE_SIGNHOST.
+# # They are greped by the Makefile.
+# AUTHENTICODE_KEY=/home/foo/.gnupg/my-authenticode-key.p12
+# AUTHENTICODE_CERTS=/home/foo/.gnupg/my-authenticode-certs.pem
+#
+#--8<---------------cut here---------------end--------------->8---
+
 
 # We need to know our own name.
 SPEEDO_MK := $(realpath $(lastword $(MAKEFILE_LIST)))
@@ -69,7 +110,7 @@
 	@echo 'Use CUSTOM_SWDB=1 for an already downloaded swdb.lst.'
 	@echo 'Use WIXPREFIX to provide the WIX binaries for the MSI package.'
 	@echo '    Using WIX also requires wine with installed wine mono.'
-	@echo '    Seee help-wixlib for more information'
+	@echo '    See help-wixlib for more information'
 
 help-wixlib:
 	@echo 'The buildsystem can create a wixlib to build MSI packages.'
@@ -194,17 +235,17 @@
 # Set this to the location of wixtools
 WIXPREFIX=$(shell readlink -f ~/w32root/wixtools)
 
-# The Authenticode key and cert chain used to sign the Windows
-# installer If AUTHENTICODE_SIGNHOST is specified, signing is done on
-# that host using the Windows signtool.  The signhost is usually an
-# entry in .ssh/config.  Depending on the used token it might be
-# necessary to allow single signon and unlock the token before running
-# this makefile.  All files given in AUTHENTICODE_FILES are signed
-# before they are put into the installer.
-AUTHENTICODE_SIGNHOST=authenticode-signhost
-AUTHENTICODE_TOOL='"C:\Program Files (x86)\Windows Kits\10\bin\signtool.exe"'
-AUTHENTICODE_KEY=${HOME}/.gnupg/g10code-authenticode-key.p12
-AUTHENTICODE_CERTS=${HOME}/.gnupg/g10code-authenticode-certs.pem
+# Read signing information from ~/.gnupg-autogen.rc
+define READ_AUTOGEN_template
+$(1) = $$(shell grep '^$(1)=' $$$$HOME/.gnupg-autogen.rc|cut -d= -f2)
+endef
+$(eval $(call READ_AUTOGEN_template,AUTHENTICODE_SIGNHOST))
+$(eval $(call READ_AUTOGEN_template,AUTHENTICODE_TOOL))
+$(eval $(call READ_AUTOGEN_template,AUTHENTICODE_KEY))
+$(eval $(call READ_AUTOGEN_template,AUTHENTICODE_CERTS))
+
+# All files given in AUTHENTICODE_FILES are signed before
+# they are put into the installer.
 AUTHENTICODE_FILES= \
                     dirmngr.exe               \
                     dirmngr_ldap.exe          \
@@ -362,9 +403,9 @@
 npth_sha1 := $(shell awk '$$1=="npth_sha1" {print $$2}' swdb.lst)
 npth_sha2 := $(shell awk '$$1=="npth_sha2" {print $$2}' swdb.lst)
 
-libgcrypt_ver  := $(shell awk '$$1=="libgcrypt_ver" {print $$2}' swdb.lst)
-libgcrypt_sha1 := $(shell awk '$$1=="libgcrypt_sha1" {print $$2}' swdb.lst)
-libgcrypt_sha2 := $(shell awk '$$1=="libgcrypt_sha2" {print $$2}' swdb.lst)
+libgcrypt_ver  := $(shell awk '$$1=="libgcrypt18_ver" {print $$2}' swdb.lst)
+libgcrypt_sha1 := $(shell awk '$$1=="libgcrypt18_sha1" {print $$2}' swdb.lst)
+libgcrypt_sha2 := $(shell awk '$$1=="libgcrypt18_sha2" {print $$2}' swdb.lst)
 
 libassuan_ver  := $(shell awk '$$1=="libassuan_ver" {print $$2}' swdb.lst)
 libassuan_sha1 := $(shell awk '$$1=="libassuan_sha1" {print $$2}' swdb.lst)
@@ -569,8 +610,7 @@
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_gnupg_configure = \
-        --disable-g13 --enable-ntbtls \
-        --enable-build-timestamp
+        --disable-g13 --enable-ntbtls
 else
 speedo_pkg_gnupg_configure = --disable-g13 --enable-wks-tools
 endif
@@ -1385,7 +1425,7 @@
    if [ -n "$(AUTHENTICODE_SIGNHOST)" ]; then \
      echo "speedo: Signing via host $(AUTHENTICODE_SIGNHOST)";\
      scp $(1) "$(AUTHENTICODE_SIGNHOST):a.exe" ;\
-     ssh "$(AUTHENTICODE_SIGNHOST)" $(AUTHENTICODE_TOOL) sign \
+     ssh "$(AUTHENTICODE_SIGNHOST)" '$(AUTHENTICODE_TOOL)' sign \
         /n '"g10 Code GmbH"' \
         /tr 'http://rfc3161timestamp.globalsign.com/advanced' /td sha256 \
         /fd sha256 /du https://gnupg.org a.exe ;\
diff -Nru gnupg2-2.2.20/ChangeLog gnupg2-2.2.27/ChangeLog
--- gnupg2-2.2.20/ChangeLog	2020-03-20 16:38:31.000000000 +0100
+++ gnupg2-2.2.27/ChangeLog	2021-01-11 18:47:25.000000000 +0100
@@ -1,3 +1,1383 @@
+2021-01-11  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.27.
+	+ commit 0c103cde00098bdf1cec8f27e764300d192210e4
+
+
+	gpg,w32: Fix gnupg_remove.
+	+ commit 3901c1a8c59a436ea4509d5aaebbecc5a0268391
+	* common/sysutils.c (map_w32_to_errno): New.
+	(gnupg_w32_set_errno): New.
+	(gnupg_remove) [w32]: Set ERRNO
+
+2021-01-08  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix --gpgconf-list case with no conf files at all.
+	+ commit 9f37d3e6f307a9460c0a356afa1f8b991c527d6c
+	* g10/gpg.c (get_default_configname): Remove unused function.
+	(main): Provide a proper filename to gpgconf_list.
+
+2021-01-07  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Fix description of two new options.
+	+ commit ff30fcd3dc78c00ed87ce6bd3414b828bdf51e84
+	* tools/gpgconf-comp.c: Fix auto-key-import and include-key-block.
+
+2020-12-30  Werner Koch  <wk@gnupg.org>
+
+	wkd: Minor permission fix for created files.
+	+ commit fdc54850263b2b888398f95be7816134b45a60d3
+	* tools/wks-util.c (wks_cmd_install_key): Don't set u+x on the file.
+	(ensure_policy_file): No need to make the policy file group writable.
+
+2020-12-23  Werner Koch  <wk@gnupg.org>
+
+	gpg: Initialize a variable even in a never used code path.
+	+ commit 83e875a2d1e7560b9626266373c89e6e6eb7cb50
+	* g10/sign.c (write_signature_packets): Init ERR.
+
+2020-12-21  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.26.
+	+ commit c77bb1a750f0e2d6538d23fdc0af0e3ff3d56781
+
+
+	common: Remove superfluous debug output from dotlock.c.
+	+ commit 323a69ef65e0d48fb9d038ecca01a70688ad3325
+	* common/dotlock.c (dotlock_create_unix): Remove debug output.
+
+	doc: Explain LDAP keyserver parameters.
+	+ commit 261fb98c6f034f3f96abee79ea73febd115420ae
+
+
+	common: Fix the "ignore" meta command in argparse.c.
+	+ commit 09dc59f6d43f5e81781429913b8f377581825be0
+	* src/argparse.c (gnupg_argparse): Factor some code out to ...
+	(prepare_arg_return): new.
+	(gnupg_argparse): No missing arg error in ignore sections.
+	* common/sysutils.c: Include pwd.h.
+	(gnupg_getusername): New.
+
+2020-12-18  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix --trusted-key with fingerprint arg.
+	+ commit 8a2e5025eb0f9537a4e776cf2886771a507121f1
+	* g10/trustdb.c (tdb_register_trusted_key): Take care of that
+	other constant.
+
+	dirmngr: Do not block threads in LDAP keyserver calls.
+	+ commit 15bfd189c07ef0f1bb94db0aee9ad26441ddc494
+	* dirmngr/ks-engine-ldap.c: Wrap some ldap calls.
+
+	dirmngr: Fix backport of the new option parser from 2.3.
+	+ commit 9b886adba4f83ca462f8015060bcea8a7ceb6bb0
+	* dirmngr/dirmngr.c (main) <aGPGConfList>: Re-introduce
+	gpgconf-dirmngr.conf.
+
+2020-12-17  Werner Koch  <wk@gnupg.org>
+
+	gpg: New AKL method "ntds"
+	+ commit 559efd23e936536435a42646b62fe8c4f8585d38
+	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Change the new
+	support for KEYDB_SEARCH_MODE_MAIL.
+	(ks_ldap_get): Add a debug.
+	* g10/options.h (AKL_NTDS): New.
+	* g10/keyserver.c (keyserver_import_ntds): New.
+	(keyserver_get_chunk): Allow KEYDB_SEARCH_MODE_MAIL.
+	* g10/getkey.c (parse_auto_key_locate): Support "ntds".
+	(get_pubkey_byname): Ditto.
+
+	dirmngr: Support "ldap:///" for the current AD user.
+	+ commit 776bef74c778c6740a6aac8a05801a958868346d
+	* dirmngr/http.h (struct parsed_uri_s): Add field ad_current.
+	* dirmngr/ldap-parse-uri.c (ldap_parse_uri): Set it.
+	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Take care of ad_current.
+
+	dirmngr: Allow LDAP searches via fingerprint.
+	+ commit c75fd75532905a2922288e0e8ac01fcd0226fc52
+	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Add arg
+	serverinfo and allow searching by fingerprint.
+	(ks_ldap_get, ks_ldap_search): First connect then create teh filter.
+
+	dirmngr: Store all version 2 schema attributes.
+	+ commit c28cb5282b149f1e34df6f923e88e1998a60cc4a
+	* g10/call-dirmngr.c (ks_put_inq_cb): Emit "fpr" records.
+	* dirmngr/ks-engine-ldap.c (extract_attributes): Add args
+	extract-state and schemav2.  Add data for the new schema version.
+	remove the legacy code to handle UIDs in the "pub" line.
+	(ks_ldap_put): Set new attributes for NTDS use the fingerprint as CN.
+
+
+	This is a backport from 2.3
+
+	dirmngr: Support the new Active Directory schema.
+	+ commit ac8ece92662d83b79b03a369df07362d320fd118
+	* dirmngr/ks-engine-ldap.c (SERVERINFO_): New constants.
+	(my_ldap_connect): Relace args pgpkeyattrp and real_ldapp by a new
+	serverinfo arg.  Set the new info flags.
+	(ks_ldap_get): Adjust for change.
+	(ks_ldap_search): Ditto.
+	(ks_ldap_put): Ditto.  Replace xmalloc by xtrymalloc.  Change the DN
+	for use with NTDS (aka Active Directory).
+
+	dirmngr: Do not store the useless pgpSignerID in the LDAP.
+	+ commit 0e88c73bc94fbca224f06d95bb024030bb3a73bb
+	* dirmngr/ks-engine-ldap.c (extract_attributes): Do not store the
+	pgpSignerID.
+	* g10/call-dirmngr.c (ks_put_inq_cb): Do not emit sig records.
+
+	dirmngr: Fix adding keys to an LDAP server.
+	+ commit e47de853820000ddf383e7b790fbc435e3378d66
+	* dirmngr/ks-engine-ldap.c (ks_ldap_put): Extract attribites into
+	addlist.
+
+2020-12-16  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd:ccid: Call libusb_clear_halt in ccid_vendor_specific_setup.
+	+ commit 3c55e15cee4bfed6ef96fbc97a0d2f00afceebe3
+	* scd/ccid-driver.c (ccid_vendor_specific_setup): Only for SPR532,
+	call libusb_clear_halt.
+
+	scd:ccid: Revert the addition of libusb_clear_halt for EP_INTR.
+	+ commit 585cfca0a60bd910012a8a2218f74889840b2546
+	* scd/ccid-driver.c (ccid_setup_intr): Don't call libusb_clear_halt.
+
+2020-12-07  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd:openpgp: Fix writing ECC key to card.
+	+ commit 5a03bf61304d0c2c8b4df53a1a7680cd0eb91cb1
+	* scd/app-openpgp.c (build_privkey_template): Adding another argument
+	of ecc_d_fixed_len to handle variable-size MPI.
+
+2020-12-04  Werner Koch  <wk@gnupg.org>
+
+	Backport of the new option parser from 2.3.
+	+ commit a028f24136a062f55408a5fec84c6d31201b2143
+	* configure.ac (GPGRT_ENABLE_ARGPARSE_MACROS): Define.
+	* common/argparse.c, common/argparse.h: Rewrite.
+	* tests/gpgscm/main.c: Switch to the new option parser.
+
+	* g10/gpg.c: Switch to the new option parser and enable a global conf
+	file.
+	* g10/gpgv.c: Ditto.
+	* agent/gpg-agent.c: Ditto.
+	* agent/preset-passphrase.c: Ditto.
+	* agent/protect-tool.c: Ditto.
+	* scd/scdaemon.c: Ditto.
+	* dirmngr/dirmngr.c: Ditto.
+	* dirmngr/dirmngr_ldap.c: Ditto
+	* dirmngr/dirmngr-client.c: Ditto.
+	* kbx/kbxutil.c: Ditto.
+	* tools/gpg-card.c: Ditto.
+	* tools/gpg-check-pattern.c: Ditto.
+	* tools/gpg-connect-agent.c: Ditto.
+	* tools/gpg-pair-tool.c: Ditto.
+	* tools/gpg-wks-client.c: Ditto.
+	* tools/gpg-wks-server.c: Ditto.
+	* tools/gpgconf.c: Ditto.
+	* tools/gpgsplit.c: Ditto.
+	* tools/gpgtar.c: Ditto.
+	* g13/g13.c: Ditto.
+	* g13/g13-syshelp.c: Ditto.  Do not force verbose mode.
+	* sm/gpgsm.c: Ditto. Add option --no-options.
+
+2020-12-02  Werner Koch  <wk@gnupg.org>
+
+	kbx: Better error message in case of a crippled Libgcrypt.
+	+ commit acafa695e1e7998b892a6a621ef06d57bbc82722
+	* kbx/keybox-openpgp.c (keygrip_from_keyparm): Detect missing curve.
+
+2020-12-01  Jens Meißner  <meissner@b1-systems.de>
+
+	doc: Add parameters for batch generation of ECC keys.
+	+ commit a3f95a29b97d603c606936620e4638cc6db10ec9
+	* doc/gpg.texi: Add parameters for batch generation of ECC keys.
+
+2020-11-27  NIIBE Yutaka  <gniibe@fsij.org>
+
+	common: Fix fallback handling to utf-8.
+	+ commit 7d7a50ba7231bd4432b1254c7067a7f287890632
+	* common/utf8conv.c (handle_iconv_error): Set NO_TRANSLATION.
+
+2020-11-23  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.25.
+	+ commit 40f75823d25548abbc52dd6121963a55d99b1230
+
+
+2020-11-19  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Also print revision of libksba.
+	+ commit 6594dc31f58916b6f8b31de070e85d56221e3b94
+	* dirmngr/dirmngr.c (get_revision_from_blurb): Fix detection of empty
+	string.
+	(gpgconf_versions): Print ksba revision.
+
+2020-11-19  Jakub Bogusz  <qboosh@pld-linux.org>
+
+	po: Update Polish translation.
+	+ commit f7cbf68fdd1e42cdbabec7e06f2149f6b3f1d1dc
+
+
+2020-11-19  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd:openpgp: Public keys should be available for check_keyidstr.
+	+ commit 84020385be19556800b22cc5b0ce098acd424298
+	* scd/app-openpgp.c (check_keyidstr): Call get_public_key.
+
+2020-11-17  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.24.
+	+ commit 5751c48035764d938ae0459fcecd37194133bfb7
+
+
+2020-11-16  Werner Koch  <wk@gnupg.org>
+	    NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd:openpgp: Allow keygrip to be used to reference a key.
+	+ commit 1049f06c6d2e1a833af4c73ea67a05417bbd0967
+	* scd/app-openpgp.c (struct app_local_s): Add keygrip_str.
+	(store_keygrip): New.
+	(read_public_key): Store the keygrip.
+	(get_public_key): Sitto.
+	(send_keypair_info): USe the stored keygrip.
+	(check_keyidstr): New.  Factored out from other functions and
+	extended.
+	(do_sign): Use check_keyidstr.
+	(do_auth): Ditto.
+	(do_decipher): Ditto.
+	(do_check_pin): Ditto.
+
+2020-11-13  Werner Koch  <wk@gnupg.org>
+
+	gpg: Provide better diagnostic for replaced card keys.
+	+ commit 5d98f95aa90c290a88ce97525d9f98f0aaf9e5aa
+	* agent/divert-scd.c (divert_pksign): Add arg 'grip'.  Replace OPENPGP
+	key reference to keygrips.
+	(divert_pkdecrypt): Ditto.
+	* agent/protect.c (parse_shadow_info): Trim spaces.
+	* agent/pkdecrypt.c (agent_pkdecrypt): Pass the keygrip.
+	* agent/pksign.c (agent_pksign_do): Ditto.
+
+	* g10/mainproc.c (print_pkenc_list): Print extra info for an invalid
+	id error.
+	* g10/sign.c (do_sign): Ditto.
+
+	gpg: Fix the encrypt+sign hash algo preference selection for ECDSA.
+	+ commit aeed0b93ff660fe271d8f98f8d5ce60aa5bf3ebe
+	* g10/keydb.h (pref_hint): Change from union to struct and add field
+	'exact'.  Adjust callers.
+	* g10/pkclist.c (algo_available): Take care of the exact hint.
+	* g10/sign.c (sign_file): Fix indentation.  Rework the hash from
+	recipient prefs.
+
+2020-11-12  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Yet another fix for --apply-profile.
+	+ commit f400ff4e7dfb424fbfcf7dfc5f80d89757ece5ab
+	* tools/gpgconf.c (main): Use gnupg_homedir instead of
+	default_homedir.  Check for existance of the directory.
+
+	scd: Skip unknown options in command SERIALNO.
+	+ commit 7076f6cafbac0cfbb3ab11e0f27c5d04ca956e8f
+	* scd/command.c (cmd_serialno): Skip options.
+
+2020-11-11  Werner Koch  <wk@gnupg.org>
+
+	gpg: Support brainpool keygen with "key from card".
+	+ commit 966fe1e9d98a0345da9b506ce9be0ad398f12d43
+	* g10/keygen.c (ask_algo): Add brainpool hack in the same as for Nist
+	curves.
+
+2020-11-10  Werner Koch  <wk@gnupg.org>
+
+	w32: Support Unicode also for config files etc.
+	+ commit 163e4ff1959788781403ddf85f808054de414fd6
+	* common/sysutils.c (gnupg_fopen) [W32]: Use _wfopen if needed.   Use
+	new function in most places where fopen is used.
+
+	w32: Support utf8 for getcwd even if build with gpgrt < 1.40.
+	+ commit 9188a3c6b7eb871f711a0979620ca72f99522d53
+	* common/sysutils.c (gnupg_getcwd) [W32]: Use Unicode version.
+
+2020-11-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Internal CCID driver: Fix a race condition on close.
+	+ commit 8e206c1721564c91dd05ea46b5262670011155ab
+	* scd/ccid-driver.c (ccid_require_get_status): For VENDOR_SCM reader,
+	return 0 only at the initial call.
+	(bulk_in): Don't detect an error for VENDOR_SCM reader, just kicking
+	the loop, to invoke scd_update_reader_status_file, which calls
+	ccid_slot_status again.
+	(ccid_slot_status): Move the call of ccid_vendor_specific_setup to...
+	(ccid_get_atr): ... here.
+
+2020-11-09  Werner Koch  <wk@gnupg.org>
+
+	card: Run factory-reset in locked stated.
+	+ commit 7f765a98fd662f345baf30d93392103e5f85ace1
+	* scd/command.c (reset_notify): Add option --keep-lock.
+	(do_reset): Add arg keep_lock.
+	(cmd_lock): Send progress status.
+	* g10/call-agent.c (agent_scd_apdu): Add more pseudo APDUs.
+	* g10/card-util.c (send_apdu): Ditto.
+	(factory_reset): Use lock commands.
+
+	gpg: Fix recent commit for weak digest algos and smartcards.
+	+ commit 21d5323f5d029758fd55eae1dfdfb88b718ceada
+	* g10/sign.c (sign_file): Fix condition.
+
+	Require libksba 1.3.5.
+	+ commit 549dc8cfe9a44fe7eb8a6a90662d4cbb1958a556
+	* configure.ac (NEED_KSBA_VERSION): Set to 1.3.5.
+
+	Require Libgpg-error 1.27.
+	+ commit fc01ae50718b4030fbfdf3ca65ddb3e3107eacda
+	* configure.ac (NEED_GPG_ERROR_VERSION): Require 1.27
+	* common/util.h: Remove compatibility macros.
+
+	Require Libgcrypt 1.8.
+	+ commit 99ab3aed15c8a84347e39fbe49bd5748aeefe31a
+	* configure.ac (NEED_LIBGCRYPT_VERSION): Require 1.8.
+	* tools/gpgconf.c (show_version_libgcrypt): Remove conditional case
+	for Libgcrypt < 1.8.
+	* common/compliance.c (gnupg_rng_is_compliant): Ditto.
+	* agent/pksign.c: Ditto.
+	* agent/gpg-agent.c (thread_init_once): Ditto.
+	(agent_libgcrypt_progress_cb): Ditto.
+	* agent/command.c (cmd_getinfo): Ditto.
+
+2020-11-09  Ben Kibbey  <bjk@luxsci.net>
+
+	gpg: Add canceled status message.
+	+ commit f05d1772c47b71cf77f79519b8edbc682002d303
+	* common/status.h (STATUS_CANCELED_BY_USER): New.
+	* g10/passphrase.c (passphrase_to_dek): Send STATUS_CANCELED_BY_USER
+	instead of STATUS_MISSING_PASSPHRASE when canceled is set.
+
+2020-11-09  Werner Koch  <wk@gnupg.org>
+
+	gpg: Do not print rejected digest algo notes with --quiet.
+	+ commit c373735e79a1b6240e9eca972c2bbb0c9f3247c4
+	* g10/misc.c (print_digest_rejected_note): Do not print in quiet mode.
+	(print_sha1_keysig_rejected_note): Ditto.
+
+2020-11-04  Werner Koch  <wk@gnupg.org>
+
+	speedo,w32: Install gpg-check-pattern and example profiles.
+	+ commit a4fa4b5d4ba38e51436914505af1a8f3483ed945
+	* doc/examples/vsnfd.prf: Rename to VS-NfD.prf.
+	* doc/examples/Automatic.prf: New.
+	* doc/Makefile.am (examples): Adjust.
+	* build-aux/speedo/w32/inst.nsi: Install gpg-check-pattern.exe and 3
+	example files.
+	* build-aux/speedo/w32/wixlib.wxs: Add new files.
+
+	g13: Include a now missing header file.
+	+ commit d4089b04a5f15c1cc1a4809cb8f0d59fc1cdf564
+	* g13/create.c: Include sysutuls.h
+	* g13/sh-dmcrypt.c: Ditto.
+
+	gpgconf: Make sure the homedir exists for --apply-profile.
+	+ commit 1fbf085bc8b4a92772d1da8bfea507f4f97434b1
+	* tools/gpgconf.c (main) <aApplyDefaults, aApplyProfile>: Create the
+	standard home directory.
+
+	common: Fix duplicate implementation of try_make_homedir.
+	+ commit 6fe5c8c06e8cd162913ee5b0eb741eb4beebf44a
+	* g10/openfile.c (try_make_homedir): Move core of the code to ...
+	* common/homedir.c (gnupg_maybe_make_homedir): new.
+	* sm/keydb.c (try_make_homedir): Implement using new function.
+
+	* common/homedir.c: Include i18n.h.
+	* po/POTFILES.in: Add common/homedir.c.
+
+2020-11-04  Andre Heinecke  <aheinecke@gnupg.org>
+
+	w32: Add another pinentry search path.
+	+ commit b4cb91d5fbe2b8917d76d12eb72aaac0d97ed596
+	* common/homedir.c (get_default_pinentry_name): Try ../bin/pinentry.exe
+
+	w32: Add windows subsystem variant of gpgconf.
+	+ commit c366e04958481382c3f7b50f169120053186069b
+	* tools/Makefile.am (gpgconf-w32): New target. Builds gpgconf with
+	subsystem windows.
+	* build-aux/speedo/w32/wixlib.wxs: Package it.
+
+2020-11-03  Werner Koch  <wk@gnupg.org>
+
+	w32: Fix strftime problem on Windows.
+	+ commit d633e92233f4a4afc82d3d9282220f303974525b
+	* common/gettime.c: Include locale.h.
+	(asctimestamp): Increase buffer.  On Windows use setlocale.
+
+	gpg: Switch to AES256 for symmetric encryption in de-vs mode.
+	+ commit 166e779634ea5fe2a7beeb186807e3a81128c717
+	* g10/gpg.c (set_compliance_option): For AES256 and SHA256 in de-vs
+	mode.
+	* g10/encrypt.c (setup_symkey): Add extra compliance check.
+	(encrypt_simple): Avoid printing a second error oncplinace failure.
+
+2020-11-03  Andre Heinecke  <aheinecke@gnupg.org>
+
+	po: Major update of italian translation.
+	+ commit ccecdc1f34a973dcd8d00b6ee9c830e0ddc8d08b
+	* po/it.po: Update to a recent 2.2 version.
+
+2020-11-02  Werner Koch  <wk@gnupg.org>
+
+	gpg: Allow setting notations with the empty string as value.
+	+ commit f007d79533e638e395e1a3cf99233fd900cc805c
+	* g10/misc.c (pct_expando): Catch special case of the empty string.
+	Also map a NULL to the empty string.
+	* g10/photoid.c (show_photos): Make an empty string used as command
+	fail.
+
+	gpg: Do not use weak digest algos if selected by recipient prefs.
+	+ commit 4c181d51a6f1fd05b7f190a18769ba5e9f892f6a
+	* g10/misc.c (is_weak_digest): New.
+	(print_digest_algo_note): Use it here.
+	* g10/sig-check.c (check_signature_end_simple): Use it.
+	* g10/sign.c (hash_for): Do not use recipient_digest_algo if it is in
+	the least of weak digest algorithm.
+
+2020-10-30  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	gpg: Fix iteration over signatures.
+	+ commit 8a941428086bc173a65d4e8687308ca923394738
+	* g10/keyedit.c (keyedit_quick_revsig): Take signature of correct node
+
+2020-10-30  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Fix secret key import for Ed25519.
+	+ commit ba321b60bc3bfc29dfc6fa325dcabad4fac29f9c
+	* agent/cvt-openpgp.c (convert_secret_key): Avoid adding 0x00 at the
+	beginning of MPI.
+
+2020-10-28  Werner Koch  <wk@gnupg.org>
+
+	gpg: New command --quick-revoke-sig.
+	+ commit 7ec56b033647a1b14d56f771d51c563dbd25f1b7
+	* g10/gpg.c (enum cmd_and_opt_values): Add aQuickRevSig.
+	(opts): Add --quick-revoke-sig.
+	(main): Implement.
+	* g10/keyedit.c (quick_find_keyblock): Add arg 'want_secret' and
+	adjust all callers.
+	(keyedit_quick_revsig): new.
+	* g10/revoke.c (get_default_sig_revocation_reason): New.
+	* g10/keylist.c (cmp_signodes): New.
+
+2020-10-26  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Internal CCID driver thing only for SPR532.
+	+ commit 38040ffee81e3c7a6972c9eae42af44eaaeb6ce6
+	* scd/ccid-driver.c (ccid_vendor_specific_setup): New.  Limit
+	only for SPR532, excluding other readers by SCM.
+	(ccid_slot_status): Use ccid_vendor_specific_setup.
+
+	scd: Internal CCID driver limiting only for SPR532.
+	+ commit d1c9cc3ca03d2134a0feecab6db3c4af308c7fa7
+	* scd/ccid-driver.c (ccid_vendor_specific_init): Only do that for
+	SPR532.
+
+2020-10-23  Werner Koch  <wk@gnupg.org>
+
+	common: New functions gnupg_opendir et al.
+	+ commit 5f8123df7856b724a062177026fe669ae49be263
+	* common/sysutils.h (struct gnupg_dirent_s): New.
+	* common/sysutils.c: Include dirent.h.
+	(struct gnupg_dir_s): New.
+	(gnupg_opendir, gnupg_readdir, gnupg_closedir): New.  Change all
+	callers of opendir, readdir, and closedir to use these functions.
+
+	w32: Make gnupg_remove and gnupg_rename_file Unicode aware.
+	+ commit 4252cd7b18b41a0d91076e46df9ba857e743406b
+	* common/sysutils.c (w32_rename): New.
+	(gnupg_rename_file) [W32]: Support Unicode.
+	(gnupg_remove) [W32]: Support Unicode.  Drop Windows-CE support.
+
+	Replace all calls to stat by gnupg_stat.
+	+ commit 157030271f2d88d0756788a60c43e455870ec124
+	* common/sysutils.c (gnupg_stat): New.
+	* common/sysutils.h: Include sys/stat.h.
+
+	Replace most calls to open by a new wrapper.
+	+ commit 86e52e3c33843f67a7972181ccbf33b48a40e557
+	* common/sysutils.c (any8bitchar) [W32]: New.
+	(gnupg_open): New.  Replace most calls to open by this.
+	* common/iobuf.c (any8bitchar) [W32]: New.
+	(direct_open) [W32]: Use CreateFileW if needed.
+
+2020-10-21  Werner Koch  <wk@gnupg.org>
+
+	w32: Allow Unicode filenames for dotlock.
+	+ commit d65ea29683eeecfcf12e74744a490e8acfc1a5cf
+	* common/dotlock.c (any8bitchar) [W32]: New.
+	(dotlock_create_w32): Use strconcat and CreateFileW.
+
+	* common/t-dotlock.c: Source include dotlock.c and modify to allow
+	manual testing on Windows.
+
+	Replace all calls to access by gnupg_access.
+	+ commit dd5fd4a760b8cf6ae05ff878bcf36cf2465e744c
+	* common/sysutils.c (gnupg_access): New.  Replace all calls to access
+	by this wrapper.
+	* common/homedir.c (w32_shgetfolderpath): Change to return UTF-8
+	directory name.
+	(standard_homedir): Adjust for change.
+	(w32_commondir, gnupg_cachedir): Ditto.
+
+2020-10-06  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Add a workaround for Yubikey.
+	+ commit 25bec16d0bdcb9829a7b35c403cbb778b3b0c097
+	* scd/app-openpgp.c (get_public_key): Handle wrong code for Yubikey.
+
+	scd: Silence compiler warning.
+	+ commit 0f4c956a76614bebf0f86bef79eba0e850e23df4
+	* scd/app-openpgp.c (build_ecc_privkey_template): Fix allocation size.
+
+	scd: Report any error for LEARN command.
+	+ commit 7c8823bf82daade7417aeaebc34fefe3aa7c1856
+	* scd/app-openpgp.c (do_learn_status): Report any error.
+
+	scd: Internal CCID driver: More fix for SPR532.
+	+ commit 1f1b68eef72bed9bb7ac1eb8102f6f51d587dbc0
+	* scd/ccid-driver.c (bulk_in): Handle the case of missing intr_cb.
+
+	scd: Internal CCID driver fix.
+	+ commit 33a2d4bd7ffc6ad10d7ddb0f29fe4e21609806f7
+	* scd/ccid-driver.c (intr_cb): More useful debug output.
+	(ccid_slot_status): Remove redundant condition.
+
+	scd: Internal CCID driver: Call libusb_clear_halt at ccid_setup_intr.
+	+ commit 48565e7a08d64e3628da8baa80541841af0a6166
+	* scd/ccid-driver.c (ccid_setup_intr): Reset the endpoint.
+	(ccid_vendor_specific_init): Don't call libusb_clear_halt.
+
+	scd: Internal CCID driver: Fix a failure path.
+	+ commit 30693dfb6fe970dba195bf00a77d854e6fbc1ed0
+	* scd/ccid-driver.c (ccid_open_usb_reader): On error, call
+	libusb_release_interface.
+
+	scd: Internal CCID: Handle LIBUSB_ERROR_TIMEOUT at ccid_get_atr.
+	+ commit 498cd38019b8122824d69fd194675ab532501423
+	* scd/ccid-driver.c (ccid_slot_status): Handle LIBUSB_ERROR_TIMEOUT.
+
+	scd: Change handling of SPR532 card reader.
+	+ commit 7db836c0e9223a4d5f30636e35e18156a97e6b91
+	* scd/ccid-driver.c (ccid_vendor_specific_init): Put some workaround
+	for SPR532 initialization.
+	(ccid_slot_status): Send ESCape command after GetSlotStatus.
+
+	scd: For SPR532, submit the ESCape command at initialization.
+	+ commit 11d8d1e0505645f7d14bcc1c01d17a566e033705
+	* scd/ccid-driver.c (ccid_vendor_specific_init): Submit the ESC
+	command for VENDOR_SCM.
+	(ccid_transceive_secure): Don't submit the ESC command every time.
+
+	scd: Fix CCID internal driver for interrupt transfer.
+	+ commit dd7cc24d5f9274579f0966de3be7ae8b0c19bacd
+	* scd/ccid-driver.c (intr_cb): Handle the case of multiple messages.
+
+	scd: Better handling of timeout and time extension.
+	+ commit 186d11896ca2751eac8a7f54845ec71cc7f6fcc3
+	* scd/ccid-driver.c (CCID_CMD_TIMEOUT_LONGER): Remove.
+	(ccid_transceive): Don't use x4 blindly for bBWI, but use dynamically
+	determined value.  Use value from variable wait_more for bulk_in.
+	Set wait_more by the value of time extension request.
+
+	scd: Fix internal CCID driver, so that -DTEST works.
+	+ commit 60af035c22b9fbdc10c8c0a69399c46908801c66
+	* scd/ccid-driver.c: Support a test program by ccid-driver.
+
+	scd: ccid-driver: Initial getting ATR more robustly.
+	+ commit 165312dca90a198ebc0be4ed6b0791297c90b085
+	* scd/ccid-driver.c (send_power_off): New.
+	(do_close_reader): Use send_power_off.
+	(ccid_get_atr): Add error recovery.
+
+	scd: Clean up the structure for future fix of PC/SC.
+	+ commit 1efc01ff987dde4adf6777d4df44b5a00f6f0d8d
+	* scd/apdu.c (struct dev_list): Rename from ccid_table, with void*.
+	(open_ccid_reader): Follow the change.
+	(apdu_dev_list_start, apdu_dev_list_finish): Likewise.
+	(apdu_open_reader): Likewise.
+	* scd/ccid-driver.c (ccid_dev_scan): Use void *.
+	(ccid_dev_scan_finish, ccid_get_BAI, ccid_open_usb_reader): Likewise.
+	* scd/ccid-driver.h: Change the APIs.
+
+2020-10-06  Werner Koch  <wk@gnupg.org>
+
+	scd: Map some error codes from libusb to ccid-driver error codes.
+	+ commit 5b985b026418213a4c75291cb041ca8aa798cec3
+	* scd/ccid-driver.h (CCID_DRIVER_ERR_USB_*): New error codes.
+	* scd/apdu.h: New SW_HOST error codes.
+	* scd/apdu.c (host_sw_string): Print them
+	* scd/ccid-driver.c (map_libusb_error): New.
+	(ccid_open_usb_reader, bulk_in, abort_cmd): Map libusb error codes.
+	* scd/iso7816.c (map_sw): Map new codes to gpg-error.
+
+2020-10-06  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: internal driver: Submit SET_INTERFACE control transfer.
+	+ commit cccdca61a841228475da573aab8b57c659a9631a
+	* scd/ccid-driver.c (ccid_open_usb_reader): Alway submit SET_INTERFACE
+	control transfer.
+
+	scd: Internal CCID driver: Clean up backport from master.
+	+ commit 7b531fe5801b0ad47414c4a6ed961665ba5a2541
+	    * scd/ccid-driver.c (print_error) [TEST]: Add missing break.  Note
+	    that this is anyway an impossible case.
+
+2020-10-05  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Minor cleanup for better readability.
+	+ commit ffbef54d36d4c2c150b63a57c79872d2e1f2a68e
+	* dirmngr/ldap.c (start_default_fetch_ldap): Rename to
+	start_cacert_fetch_ldap and remove arg attr.  Instead use
+	"cACertificate" directly.
+	* dirmngr/crlfetch.c (ca_cert_fetch): Change the only caller.
+	(start_cert_fetch_ldap): Rename arg for clarity.
+
+2020-10-04  Werner Koch  <wk@gnupg.org>
+
+	build: Fix SENDMAIL define for a PATH with spaces.
+	+ commit 77e416741abb0a871733bd46cbc81329859de96e
+	* configure.ac: Fix use of $PATH
+
+2020-10-02  Werner Koch  <wk@gnupg.org>
+
+	gpgconf,w32: Add manifest so we get the correct windows version.
+	+ commit 239e60a37f63d3880d1107b6981a964f437761ae
+	* common/w32info-rc.h.in: Update copyright info.
+	* tools/gpg-connect-agent-w32info.rc: Tweak file info.
+	* tools/gpgconf-w32info.rc: New.
+	* tools/gpgconf.w32-manifest.in: New.
+	* configure.ac: Add new .in file.
+	* tools/Makefile.am (EXTRA_DIST): Add them.
+	(gpg_connect_agent_robjs, gpgconf_robjs): New.
+	(gpgconf_LDADD): Add resource file.
+	(gpg_connect_agent_LDADD): Change name of resource macro.
+
+	gpgconf: New option --show-versions.
+	+ commit a298ba02ee76a9291ef5cec1a3564d8e254b9ca7
+	* tools/gpgconf.c: Include exechelp.h.  New option --show-versions.
+	(get_revision_from_blurb): New.
+	(show_version_gnupg): New.
+	(show_version_libgcrypt): New.
+	(show_version_gpgrt): New.
+	(show_versions_via_dirmngr): New.
+	(show_versions): New.
+	* dirmngr/dirmngr.c (main): New internal option --gpgconf-versions.
+	(get_revision_from_blurb): New.
+	(gpgconf_versions): New.
+
+2020-10-01  Andre Heinecke  <aheinecke@gnupg.org>
+
+	doc: Remove enable-extended-key-format in vsnfd.
+	+ commit d833030f8cf646b5de83d01fc3e412ad77ec4b1c
+	* doc/examples/vsnfd.prf: Remove enable-extended-key-format
+
+2020-09-22  Werner Koch  <wk@gnupg.org>
+
+	kbx: Add bounds check to detect corrupt keyboxes.
+	+ commit be8b30f8ebf637a7e476ff8902349a56924bf20f
+	* kbx/keybox-dump.c (_keybox_dump_blob): Fix the fixmes.  Add support
+	for 32 byte fingerprints.
+
+2020-09-16  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix the use case of verify_chv2 by CHECKPIN.
+	+ commit 61aea64b3c1717a7e304c82cda92e08ce5a6c533
+	* scd/app-openpgp.c (verify_chv2): Call verify_a_chv with chvno=1
+	when needed.
+
+2020-09-10  Werner Koch  <wk@gnupg.org>
+
+	gpg-connect-agent: Catch signals so that SIGPIPE is ignored.
+	+ commit a084924d07be16dbbbf4b34d463c67c8d4c117be
+	* dirmngr/server.c (cmd_killdirmngr): Return 0.
+	* tools/gpg-connect-agent.c (main): Catch signals.
+
+	dirmngr: Fix the pool keyserver case for a single host in the pool.
+	+ commit 72e04b03b1a7aee5521156c6d549ca10a81ac529
+	* dirmngr/ks-engine-hkp.c (map_host): Set R_HOSTNAME also for
+	localhost and if there is no pool.
+
+	dirmngr: Align the gnutls use of CAs with the ntbtls code.
+	+ commit e4f3b74c91063d83395ba0bc37f67cb22d47ca8f
+	* dirmngr/http.c (http_session_new) <gnutls>: Use only the special
+	pool certificate for the default keyserver.
+
+	agent: Keep some permissions of private-keys-v1.d.
+	+ commit 7de9ed521e516879a72ec6ff6400aed4bdce5920
+	* common/sysutils.c (modestr_to_mode): Re-implement.
+	(gnupg_chmod): Support keeping of permissions.
+
+2020-09-04  Werner Koch  <wk@gnupg.org>
+
+	gpg: Initialize a parameter to silence valgrind.
+	+ commit 6ce8fdc4b2a05bb2c1cf2aa9faa76f1c7a4fdb28
+	* g10/keygen.c (read_parameter_file): Initialize nline.
+	* g10/textfilter.c (copy_clearsig_text): Initialize bufsize.
+
+2020-09-03  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.23.
+	+ commit e234d04c3c91cd4e84cb5790a131bf6a8b6733c4
+
+
+	gpg: Fix AEAD preference list overflow.
+	+ commit aeb8272ca8aad403a4baac33b8d5673719cfd8f0
+	* g10/getkey.c (fixup_uidnode): Increase size of prefs array.
+
+2020-09-02  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix segv importing certain keys.
+	+ commit 896c528ba0555443cca81b3f091f761e70c698cd
+	* g10/key-check.c (key_check_all_keysigs): Initialize issuer.
+
+2020-09-01  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix a regression for OpenPGP card.
+	+ commit 0a9665187a7cbf68933b7162fb5f974177684a50
+	* scd/app-openpgp.c (verify_chv2): Make sure loading keys.
+
+2020-08-28  Werner Koch  <wk@gnupg.org>
+
+	sm: Fix a bug in the rfc2253 parser.
+	+ commit d2fe2ffd753706d07b26fbe22b17a561a2e535fc
+	* sm/certdump.c (parse_dn_part): Fix parser flaw.
+
+2020-08-27  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.22.
+	+ commit f9c120a29986e82d1179b38167ef2696dd0cc10a
+
+
+	dirmngr: Print the last alert message returned by NTBTLS.
+	+ commit 45499b2ca3e8f3466e725dbc381757c89a7c39bf
+	* dirmngr/http.c (send_request): Print the last TLS alert.
+
+2020-08-27  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Add condition for VERIFY with 0x82.
+	+ commit d2f1a0a791db3eb03c003365cbcd010bd8066edb
+	* scd/app-openpgp.c (verify_chv2): Check availability of keys in
+	question.
+
+2020-08-26  Werner Koch  <wk@gnupg.org>
+
+	build: Silence gcc warning -Wformat-zero-length.
+	+ commit 0be5decc097286e3502b6a12e019d40b8caf27b4
+	* configure.ac: Avoid useless gcc warning.  We use an empty string
+	quite often, for example in log_printhex.
+
+2020-08-26  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Allow TERM="".
+	+ commit 4c8d5eb0bdd380c412c5f5fbc2b92fe6bcea825d
+	* agent/call-pinentry.c (start_pinentry): When TERM is none,
+	don't send OPTION ttytype to pinentry.
+
+2020-08-25  Ineiev  <ineiev@gnu.org>
+
+	po: Update Russian translation.
+	+ commit 00ac538e928076e1879366cdce0e57be41f6c8fb
+
+
+2020-08-25  Werner Koch  <wk@gnupg.org>
+
+	gpg: Set default keysize to rsa3072.
+	+ commit 60f08969e13b2bb7f194eff80c3a275d444dc6b7
+	* g10/keygen.c (DEFAULT_STD_KEY_PARAM): Change.
+	(gen_rsa): Set fallback to 3072.
+	(get_keysize_range): Set default to 3072.
+	* doc/examples/vsnfd.prf: No more need for default-new-key-algo.
+
+	sm: Do not require a default keyring for --gpgconf-list.
+	+ commit 0847133e4cafa214c8129c245194d97c1e192cd5
+	* sm/gpgsm.c (main): No default keyring for gpgconf mode.
+
+	agent: Allow using --gogconf-list even if HOME does not exist.
+	+ commit adea5ba7e75261705ba6e9c2456207e9455677f3
+	* agent/gpg-agent.c (main): Do not create directories in gpgconf mode.
+
+2020-08-23  Werner Koch  <wk@gnupg.org>
+
+	gpg,gpgsm: Record the creation time of a private key.
+	+ commit 5ac0cf1b8198dcaac7e7abaf05c28dd413f38cad
+	* sm/call-agent.c (gpgsm_agent_genkey): Pass --timestamp option.
+	(gpgsm_agent_import_key): Ditto.
+	* g10/call-agent.c (agent_genkey): Add arg timestamp and pass it on.
+	(agent_import_key): Ditto.
+	* g10/import.c (transfer_secret_keys): Pass the creation date to the
+	agent.
+	* g10/keygen.c (common_gen): Ditto.
+
+	agent: Allow to pass a timestamp to genkey and import.
+	+ commit 051830d7b4862b6eca6c18c9fd53b51fa1158c34
+	* agent/command.c (cmd_genkey): Add option --timestamp.
+	(cmd_import_key): Ditto.
+	* agent/genkey.c (store_key): Add arg timestamp and change callers.
+	(agent_genkey): Ditto.
+	* agent/findkey.c (write_extended_private_key): Add args timestamp and
+	newkey to write a Created line.
+	(agent_write_private_key): Add arg timestamp.
+	(agent_write_shadow_key): Ditto.
+	* agent/protect-tool.c (agent_write_private_key): Ditto as dummy arg.
+
+2020-08-22  Werner Koch  <wk@gnupg.org>
+
+	agent: Default to extended key format.
+	+ commit 5b927b7b27bddc8ee70176414690d8ca8d879b54
+	* agent/gpg-agent.c (oDisableExtendedKeyFormat, oNoop): New.
+	(opts): Make --enable-extended-key-format a dummy option.  Add
+	disable-extended-key-format.
+	(parse_rereadable_options): Implement oDisableExtendedKeyFormat.
+	* agent/protect.c (agent_protect): Be safe and set use_ocb either to
+	to 1 or 0.
+
+	gpgtar,w32: Handle Unicode file names.
+	+ commit 843890663b6c68b4361ccfbeb11a50b02d5cc13f
+	* tools/gpgtar.c (oUtf8Strings): New.
+	(opts): Add option --utf8-strings.
+	(parse_arguments): Set option.
+	* tools/gpgtar.h (opt): Add field utf8strings.
+	* tools/gpgtar-create.c (name_to_utf8): New.
+	(fillup_entry_w32): Use that.
+	(scan_directory): Ditto.
+	(scan_directory) [W32]: Convert file name to utf8.
+	(gpgtar_create): Convert pattern.
+
+	common: Use gpgrt functions for mkdir and chdir if available.
+	+ commit 364cef997c0ac5632152acfb7ab2330c4f289a9a
+	* common/sysutils.c (gnupg_mkdir): Divert to gpgrt_mkdir.
+	(gnupg_chdir): Divert to gpgrt_chdir
+
+	common,w32: Do not assume the ANSI codepage during string conversion.
+	+ commit bef68efd8da92115142005d22e9336ff798dcf4b
+	* common/utf8conv.c (get_w32_codepage): New.
+	(wchar_to_native): Use instead oc CP_ACP.
+	(native_to_wchar): Ditto.
+
+	common: Strip trailing CR,LF from w32_strerror.
+	+ commit 73b0fdabdb108880034b7730d04614d8a7cf943a
+	* common/stringhelp.c (w32_strerror): Strip trailing CR,LF.
+	* common/iobuf.c (iobuf_get_filelength): Use -1 and not 0 for the
+	arg to w32_strerror.
+
+2020-08-20  Werner Koch  <wk@gnupg.org>
+
+	gpgtar: Make --files-from and --null work as described.
+	+ commit 1efe99f3d9e3c6d5733cf512b7e494284a445bfa
+	* tools/gpgtar-create.c (gpgtar_create): Add args files_from and
+	null_names.  Improve reading from a file.
+	* tools/gpgtar.c: Make global vars static.
+	(main): Remove tests for --files-from and --null option combinations.
+	Pass option variables to gpgtar_create.
+
+	build: New configure option --disable-tests.
+	+ commit 829bc3bc60da134841705f7d701b0870e1629b38
+	* configure.ac: Add option --disable-tests.  Print warnings in the
+	summary.
+	(DISABLE_TESTS): New am_conditional.
+
+	gpg: Fix regression for non-default --passphrase-repeat option.
+	+ commit a4d73b1c8e2a312e78831843aa04364d7d3c8e6f
+	* agent/command.c (cmd_get_passphrase): Take care of --repeat with
+	--newsymkey.
+
+2020-08-13  Werner Koch  <wk@gnupg.org>
+
+	gpg: Ignore personal_digest_prefs for ECDSA keys.
+	+ commit f0f8b124f0d2332e1c0b496df5e5f9c4b3db6bc3
+	* g10/sign.c (hash_for): Simplify hash algo selection for ECDSA.
+
+2020-08-12  Werner Koch  <wk@gnupg.org>
+
+	common: Pass the WAYLAND_DISPLAY envvar along.
+	+ commit 3cf920a1e353ceec7a3d854d5b509be417e4c801
+	* common/session-env.c (stdenvnames): Add WAYLAND_DISPLAY.
+
+2020-08-04  Werner Koch  <wk@gnupg.org>
+
+	sm: Also show the SHA-256 fingerprint.
+	+ commit 9c57de75cf36cfcf408eda1b59a0362a061517ce
+	* sm/keylist.c (list_cert_colon): Emit a new "fp2" record.
+	(list_cert_raw): Print the SHA2 fingerprint.
+	(list_cert_std): Ditto.
+
+2020-07-30  NIIBE Yutaka  <gniibe@fsij.org>
+
+	w32: More adding NETLIBS.
+	+ commit 8d9ce32c30db2bba5736fff5f56b7c145aaec42c
+	* common/Makefile.am (t_common_ldadd): Add $(NETLIBS).
+
+	w32: Add link to $(NETLIB) for -lws2_32.
+	+ commit f95d923090e119a7a05eef13bbbc108ed98e513a
+	* dirmngr/Makefile.am (dirmngr_LDADD): Add $(NETLIBS).
+	* sm/Makefile.am (gpgsm_LDADD): Ditto.
+	* tools/Makefile.am (gpg_wks_client_LDADD): Ditto.
+
+2020-07-16  Werner Koch  <wk@gnupg.org>
+
+	gpg: Do not close stdout after --export-ssh-key.
+	+ commit 970e43130506186c82d528d0a4fe34725e3c8e6b
+	* g10/export.c (export_ssh_key): Do not close stdout.
+
+2020-07-15  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tools: Use internal regexp routines.
+	+ commit b4cbb5f58a00fa5ac9f1282664c0adb7ecfa9e57
+	* tools/gpg-check-pattern.c: Use jimregexp.h.
+
+	regexp: Import change from JimTcl.
+	+ commit 1d1f2aa94370dcb715f6ae02ea5e14eb7ec5fa98
+	* regexp/jimregexp.h, regexp/jimregexp.c: Fix from JimTcl.
+
+	regexp: Fix generation of _unicode_mapping.c.
+	+ commit 8904b18822fc2203ed667844cc3885dc459dbfef
+	* configure.ac (AWK_HEX_NUMBER_OPTION): Detect GNU Awk.
+	* regexp/Makefile.am: Use AWK_HEX_NUMBER_OPTION.
+	* regexp/parse-unidata.awk: Don't use strtonum.
+
+	gpg: Add regular expression support.
+	+ commit 199309190a0b9966445bc386747c433949d3b81e
+	* AUTHORS, COPYING.other: Update.
+	* Makefile.am (SUBDIRS): Add regexp sub directory.
+	* configure.ac (DISABLE_REGEX): Remove.
+	* g10/Makefile.am (needed_libs): Add libregexp.a.
+	* g10/trustdb.c: Remove DISABLE_REGEX support.
+	* regexp/LICENSE, regexp/jimregexp.c, regexp/jimregexp.h,
+	  regexp/utf8.c, regexp/utf8.h: New from Jim Tcl.
+	* regexp/UnicodeData.txt: New from Unicode.
+	* regexp/Makefile.am, regexp/parse-unidata.awk: New.
+	* tests/openpgp/Makefile.am: Remove DISABLE_REGEX support.
+	* tools/Makefile.am: Remove DISABLE_REGEX support.
+
+2020-07-13  Werner Koch  <wk@gnupg.org>
+
+	agent: Fix regression with --newsymkey in loopback mode.
+	+ commit d9ea47f702840c87431df984b9b3f7e60c9ea815
+	* agent/command.c (cmd_get_passphrase): Never repeat in loopback mode;
+	same as with !OPT_NEWSYMKEY.
+
+2020-07-13  NIIBE Yutaka  <gniibe@fsij.org>
+
+	dirmngr: Handle EAFNOSUPPORT at connect_server.
+	+ commit ce793fc2f838a97cb1e92b3060337b8052f3dc3a
+	* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT.
+
+2020-07-09  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.21.
+	+ commit be6fc39ed9b4ffd56d960e20499599c851c17b44
+
+
+2020-07-08  Werner Koch  <wk@gnupg.org>
+
+	Do not use the pinentry's qualitybar.
+	+ commit b451c4f5ea672c9915e28d8dde30abc675060f06
+	* agent/genkey.c (agent_ask_new_passphrase): No qualitybar.
+	* g10/call-agent.c (agent_get_passphrase): Ditto.
+	* sm/call-agent.c (gpgsm_agent_ask_passphrase): Ditto.
+
+	gpg: Use integrated passphrase repeat entry also for -c.
+	+ commit ae8b88c635424ef36f024d0016949d11187dc21e
+	* g10/call-agent.c (agent_get_passphrase): Add arg newsymkey.
+	* g10/passphrase.c (passphrase_get): Add arg newsymkey.
+	(passphrase_to_dek): Pass it on.
+
+	agent: New option --newsymkey for GET_PASSPHRASE.
+	+ commit d9e2dfa4c585de7c261fde13c18bd0f82415d6c3
+	* agent/call-pinentry.c (do_getpin): New.
+	(agent_askpin): Use do_getpin.
+	(agent_get_passphrase): Add arg pininfo.  Use do_getpin.
+	* agent/genkey.c (check_passphrase_constraints): New arg no_empty.
+	* agent/command.c (reenter_passphrase_cmp_cb): New.
+	(cmd_get_passphrase): Add option --newsymkey.
+
+2020-07-07  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix flaw in symmetric algorithm selection in mixed mode.
+	+ commit 7b6071a45fbf14219b6aca4fff8fa0eaf6c6dd8e
+	* g10/encrypt.c (setup_symkey): Use default_cipher_algo function
+	instead of the fallback s2k_cipher_algo.  Fix error code.
+	(encrypt_simple): Use setup_symkey.
+
+2020-07-03  Werner Koch  <wk@gnupg.org>
+
+	sm: Exclude rsaPSS from de-vs compliance mode.
+	+ commit 4a36adaa64311a42eb78d9e52390df489454cafb
+	* common/compliance.h (PK_ALGO_FLAG_RSAPSS): New.
+	* common/compliance.c (gnupg_pk_is_compliant): Add arg alog_flags and
+	test rsaPSS.  Adjust all callers.
+	* common/util.c (pubkey_algo_to_string): New.
+	(gnupg_pk_is_allowed): Ditto.
+	* sm/misc.c (gpgsm_ksba_cms_get_sig_val): New wrapper function.
+	(gpgsm_get_hash_algo_from_sigval): New.
+	* sm/certcheck.c (gpgsm_check_cms_signature): Change type of sigval
+	arg.  Add arg pkalgoflags.  Use the PK_ALGO_FLAG_RSAPSS.
+	* sm/verify.c (gpgsm_verify): Use the new wrapper and new fucntion to
+	also get the algo flags.  Pass algo flags along.  Change some of the
+	info output to be more like current master.
+
+2020-07-02  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Silence annoying warning for missing default ldap server file.
+	+ commit daca1a011b0e4ae888fd6b11253993cb3537990f
+	* dirmngr/dirmngr.c (parse_ldapserver_file): Add arg ignore_enoent.
+	(main): Use that arg for the default file.
+
+	dirmngr: Fix case handling of "ldapi" scheme.
+	+ commit 0795ab1c8f95831c15d4ae36d197805a26f8c899
+	* dirmngr/ldap-parse-uri.c (ldap_uri_p): s/'i'/'I'.
+
+2020-06-26  Werner Koch  <wk@gnupg.org>
+
+	sm: Print the serial number of a cert also in decimal.
+	+ commit ad6bf5d67f58dcdd76b621e77b81efa7b41ca885
+	* sm/certdump.c: Include membuf.h.
+	(gpgsm_print_serial_decimal): New.
+	* sm/keylist.c (list_cert_raw): Print s/n also in decimal
+	(list_cert_std): Ditto.
+
+2020-06-03  Werner Koch  <wk@gnupg.org>
+
+	doc: Minor enhancement for reproducibility.
+	+ commit 5ade2b68db231c78d8ecca0eb21db2153da958d2
+	* doc/Makefile.am (defsincdate): In no repo mode and with
+	SOURCE_DATE_EPOCH set, use that instead of blanking the date.
+
+	common: Add missing error code GPG_ERR_WRONG_NAME.
+	+ commit 381c54179c2adefd558035f573a2029de2e1a2f7
+	* configure.ac: Require libgpg-error 1.25.
+	* common/util.h: Define some extra error codes.
+
+2020-05-29  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix condition for C5 data object for newer Yubikey.
+	+ commit e285b1197b93e5114679b2ece9f10743abc715ef
+	* scd/app-openpgp.c (compare_fingerprint): Relax the condition.
+
+2020-05-21  NIIBE Yutaka  <gniibe@fsij.org>
+
+	dirmngr: dns: Fix allocation of string buffer in stack.
+	+ commit ab724d3206c8d3500ab2d982c98bad93ee550e42
+	* dirmngr/dns.h (dns_strsection, dns_strclass)
+	(dns_strtype): Change APIs.
+	* dirmngr/dns.c (dns_p_lines): Use __dst for dns_strsection.
+	(dns_rr_print): Use __dst for dns_strclass and dns_strtype.
+	(dns_trace_dump): Likewise.
+	(dns_ai_print): Use __dst for dns_strtype.
+	(dns_strsection): Add an argument __dst for storage.
+	(dns_strclass, dns_strtype): Likewise.
+	(parse_packet): Use __dst for dns_strsection.
+	(send_query): Use __dst for dns_strtype.
+	(isection): Use __dst for dns_strsection.
+	(iclass): Use __dst for dns_strclass.
+	(itype): Use __dst for dns_strtype.
+
+2020-05-12  Werner Koch  <wk@gnupg.org>
+
+	common: Change argument order of log_printhex.
+	+ commit c6324ee07a9ff2a626d6dfcc094a67b62628d42e
+	* common/logging.c (log_printhex): Chnage order of args.  Make it
+	printf alike.  Change all callers.
+	* configure.ac: Add -Wno-format-zero-length
+
+2020-04-16  Werner Koch  <wk@gnupg.org>
+
+	sm: Always allow authorityInfoAccess lookup if CRLs are also enabled.
+	+ commit aec7d136e4bdfd53709dc04e3e92f4c50135d368
+	* sm/certchain.c (find_up): Disable external lookups in offline mode.
+	Always allow AKI lookup if CRLs are also enabled.
+
+	sm: Lookup missing issuers first using authorityInfoAccess.
+	+ commit d57209553da7da85a369cd362aabeaef07e0bc26
+	* sm/call-dirmngr.c (gpgsm_dirmngr_lookup): Add optional arg URL and
+	adjust all callers.
+	* sm/certchain.c (oidstr_caIssuers): New.
+	(struct find_up_store_certs_s): Add additional fields.
+	(find_up_store_certs_cb): Store the fingerprint.
+	(find_up_via_auth_info_access): New.
+	(find_up): Try the AIA URI first.
+
+	dirmngr: Allow http URLs with "LOOKUP --url"
+	+ commit 3b27c26241ee25cf75555e11d9bb463faac8237d
+	* dirmngr/crlfetch.c (read_cert_via_http): New.
+	(fetch_cert_by_url): Implement http scheme.
+
+	gpg: Add missing options --no-include-key-block.
+	+ commit 7dbfd92b3e231cfe111c8832ff1048305c8d2d92
+	* g10/gpg.c (opts): Add it.
+
+	gpg: Make AEAD modes subject to compliance checks.
+	+ commit 37b116db20080f6e1c6ca1dec79014fecf2c3248
+	* g10/decrypt-data.c (decrypt_data): Move aead algo detection up.
+
+	gpg: Show AEAD preferences.
+	+ commit ab7a0b07024c432233e691b5e4be7e32baf8d80f
+	* g10/packet.h (preftype_t): Add PREFTYPE_AEAD.
+	* g10/keyedit.c (show_prefs): Print AEAD preferences.
+	* g10/getkey.c (fixup_uidnode): Set AEAD flags.
+	(merge_selfsigs): Ditto.
+
+	gpg: Support decryption of the new AEAD packet.
+	+ commit 1dfe71c62b184c84723c5f926f2596f46ee967cf
+	* common/openpgpdefs.h (aead_algo_t): New.
+	(pkttype_t): Add PKT_ENCRYPTED_AEAD.
+	* g10/decrypt-data.c (struct decode_filter_context_s): Add fields for
+	AEAD.
+	(aead_set_nonce_and_ad): New.
+	(aead_checktag): New.
+	(decrypt_data): Support AEAD.
+	(aead_underflow): New.
+	(aead_decode_filter): New.
+	* g10/dek.h (DEK): Add field use_aead.  Turn use_mdc,
+	algo_info_printed, and symmetric into bit flags.
+	* g10/mainproc.c (struct mainproc_context): Add field
+	seen_pkt_encrypted_aead.
+	(release_list): Clear it.
+	(have_seen_pkt_encrypted_aead): New.
+	(symkey_decrypt_seskey): Support AEAD.
+	(proc_symkey_enc): Ditto.
+	(proc_encrypted): Ditto.
+	(proc_plaintext): Ditto.
+	* g10/misc.c (MY_GCRY_CIPHER_MODE_EAX): New.
+	(openpgp_aead_test_algo): New.
+	(openpgp_aead_algo_name): New.
+	(openpgp_aead_algo_info): New.
+	* g10/packet.h (PKT_symkey_enc): Add field use_aead.
+	(PKT_user_id): Add field flags.aead
+	(PKT_public_key): Ditto.
+	(PKT_encrypted): Add fields for AEAD.
+	* g10/parse-packet.c (parse): Handle PKT_ENCRYPTED_AEAD.
+	(parse_symkeyenc): Support AEAD.
+	(parse_encrypted): Ditto.
+	(dump_sig_subpkt): Dump AEAD preference packet.
+	(parse_encrypted_aead): New.
+
+2020-04-15  Werner Koch  <wk@gnupg.org>
+
+	gpg: Improve symmetric decryption speed by about 25%
+	+ commit 144b95cc9d0f03a2fe5d91120f6b4b30f4bb8f71
+	* g10/decrypt-data.c (mdc_decode_filter, decode_filter): Fatcor buffer
+	filling code out to ...
+	(fill_buffer): new.
+
+	gpg: Reformat parts of decrypt-data.c.
+	+ commit 2f39e00b6b7d2aa57cd268c579127947042a0fcf
+	* g10/decrypt-data.c (struct decode_filter_context_s): Rename 'defer'
+	to 'holdback' and 'defer_filled' to 'holdbacklen'.  Increase size of
+	holdback to allow for future AEAD decryption.  Turn 'partial' and
+	'eof_seen' into bit fields.
+	(decrypt_data): Replace write_status_text by write_Status_printf.
+	Indent parts of the code.
+
+	sm,dirmngr: Restrict allowed parameters used with rsaPSS.
+	+ commit ddc74f50d42370421b4802dc13df88f0ca2fcee5
+	* sm/certcheck.c (extract_pss_params): Check the used PSS params.
+	* dirmngr/crlcache.c (finish_sig_check): Ditto.
+	* dirmngr/validate.c (check_cert_sig): Ditto.
+
+	sm: Support rsaPSS verification also for CMS signatures.
+	+ commit 24d563749f50f51841b3fd00eb615a871e45bb28
+	* sm/certcheck.c (gpgsm_check_cert_sig): Factor PSS parsing out to ...
+	(extract_pss_params): new.
+	(gpgsm_check_cms_signature): Implement PSS.
+
+	dirmngr: Support rsaPSS also in the general validate module.
+	+ commit 8bf17eb94d0d85f34477ec0c2c0514000b6aa045
+	* dirmngr/validate.c (hash_algo_from_buffer): New.
+	(uint_from_buffer): New.
+	(check_cert_sig): Support rsaPSS.
+	* sm/certcheck.c (gpgsm_check_cert_sig): Fix small memory leak on
+	error.
+
+	sm,dirmngr: Support rsaPSS signature verification.
+	+ commit 0626cc8fed340deb36f0c10e7a68afc287d0f626
+	* sm/certcheck.c (hash_algo_from_buffer): New.
+	(uint_from_buffer): New.
+	(gpgsm_check_cert_sig): Handle PSS.
+	* dirmngr/crlcache.c (hash_algo_from_buffer): New.
+	(uint_from_buffer): New.
+	(start_sig_check): Detect PSS and extract hash algo.  New arg to
+	return a PSS flag.
+	(finish_sig_check): New arg use_pss.  Extract PSS args and use them.
+	(crl_parse_insert): Pass use_pss flag along.
+
+	common: New function to map hash algo names.
+	+ commit 4d37cc72b83f601118c2c6c79d9d96c85e250f7e
+	* common/sexputil.c (hash_algo_to_string): New.
+
+	scd:p15: Return a display S/N via Assuan.
+	+ commit 39e2260d7e05ef2fd6ff94a1bc538cf0d640193c
+	* scd/app-p15.c (make_pin_prompt): Factor some code out to ...
+	(get_dispserialno): this.
+	(do_getattr): Use new fucntion for a $DISPSERIALNO.
+
+	scd:p15: Show a pretty PIN prompt.
+	+ commit beaa2cbb7f039c6ebfcfff483cfe6002a858993d
+	* scd/app-p15.c (struct prkdf_object_s): New fields common_name and
+	serial_number.
+	(release_prkdflist): Free them.
+	(keygrip_from_prkdf): Parse cert and set them.
+	(any_control_or_space): New.
+	(make_pin_prompt): New.
+	(verify_pin): Construct a pretty PIN prompt.
+	(do_sign): Remove debug output.
+
+	scd: Return GPG_ERR_BAD_PIN on 0x63Cn status word.
+	+ commit 9e6a3290dad1b19144a2b413902e9918094a2cea
+	* scd/iso7816.c (map_sw): Detect 0x63Cn status code.
+
+	scd: Factor common PIN status check out.
+	+ commit 9497d25c567d4fb8b6be603b102a149060e7aa56
+	* scd/iso7816.h (ISO7816_VERIFY_ERROR): New.
+	(ISO7816_VERIFY_NO_PIN): New.
+	(ISO7816_VERIFY_BLOCKED): New.
+	(ISO7816_VERIFY_NULLPIN): New.
+	(ISO7816_VERIFY_NOT_NEEDED): New.
+	* scd/iso7816.c (iso7816_verify_status): New.
+	* scd/app-nks.c (get_chv_status): Use new function.
+
+	scd:p15: Fix decrypt followed by sign problem for D-Trust cards.
+	+ commit 471b06e91b6ae47e1f71cd7a698763cd9d32ff12
+	* scd/iso7816.c (iso7816_select_mf): New.
+	* scd/app-p15.c (card_product_t): New.
+	(struct app_local_s): Add field 'card_product'.
+	(read_ef_tokeninfo): Detect D-Trust card.
+	(prepare_verify_pin): Switch to D-Trust AID.
+	(do_decipher): Restore a SE for D-TRust cards.  Change the padding
+	indicator to 0x81.
+
+	* common/percent.c (percent_data_escape): new.  Taken from master.
+
+	scd:p15: Emit MANUFACTURER, $ENCRKEYID, $SIGNKEYID.
+	+ commit 4148976841d154c94e6d1d4dcc1720908582086b
+	* scd/app-p15.c (read_ef_tokeninfo): Store manufacturer_id.
+	(do_getattr): Implement MANUFACTURER, $ENCRKEYID and $SIGNKEYID.
+	(send_keypairinfo): Also print usage flags.
+
+	gpg: Use the new MANUFACTURER attribute.
+	+ commit 88b456bdf4e4763e8f1b718f5597d4d075d989cd
+	* g10/call-agent.h (struct agent_card_info_s): Add manufacturer fields.
+	* g10/call-agent.c (agent_release_card_info): Release them.
+	(learn_status_cb): Parse MANUFACTURER attribute.
+	* g10/card-util.c (get_manufacturer): Remove.
+	(current_card_status): Use new attribute.
+
+	scd:openpgp: New attribute "MANUFACTURER".
+	+ commit 431b3e68e071d2bdc22b2c845ca929182830ddbd
+	* scd/app-openpgp.c (get_manufacturer): New..
+	(do_getattr): Add new attribute "MANUFACTURER".
+	(do_learn_status): Always print it.
+
+	scd:p15: Rename some variables and functions for clarity.
+	+ commit b0cb2c2ab8c71738167785564698c43b50c15fee
+	* scd/app-p15.c: Rename keyinfo to prkdf.
+
+
+	Backported from master.  Removed the do_with_keygrip related parts
+	because that function is not available.
+
+	scd:p15: Cache the PIN.
+	+ commit 133b6ff8cd0c938abbf55ba6dc50299240d247f6
+	* scd/app-p15.c (struct prkdf_object_s): Add flag pin_verified.
+	(verify_pin): Make use of it.
+
+2020-04-08  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: ECDH: Accept longer padding.
+	+ commit 2f08a4f25df7d1cbf037bdf0d7f5c1ef5859fa1e
+	* g10/pubkey-enc.c (get_it): Remove check which mandates shorter
+	padding.
+
+2020-04-01  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Add missing keygrip retrieval for decryption.
+	+ commit b95a0bfbba75025761aa163eca74c7653d76981a
+	* scd/app-p15.c (do_decipher): Get the keygrip.
+
+	scd:p15: Support decryption with CardOS 5 cards.
+	+ commit 4af38ea5e450b3eb79af98b9876b2b968110a459
+	* scd/app-p15.c (do_decipher): New.
+
+	scd:p15: Factor PIN verification out to a new function.
+	+ commit ce9406ca370b482c05c859d963949ae75c99cb6f
+	* scd/app-p15.c (do_sign): Factor code out to ...
+	(prepare_verify_pin, verify_pin): new functions.
+
+	scd:p15: Support signing with CardOS 5 cards.
+	+ commit e730444e7b7502b935bbe343935f68f764b95b96
+	* scd/app-help.c (app_help_get_keygrip_string_pk): Add optional arg
+	r_pkey and change all callers.
+	(app_help_get_keygrip_string): Ditto.
+	* scd/app-p15.c (struct cdf_object_s): Use bit flags
+	(struct aodf_object_s): Ditto.  Add field 'fid'.
+	(struct prkdf_object_s): Ditto.  Add fields keygrip, keyalgo, and
+	keynbits.
+	(parse_certid): Allow a keygrip instead of a certid aka keyref.
+	(read_ef_aodf): Store the FID.
+	(keygripstr_from_prkdf): Rename to ...
+	(keygrip_from_prkdf): this.  Remove arg r_gripstr and implement cache.
+	Change callers to directly use the values from the object.  Also store
+	the algo and length of the key ion the object.
+	(keyref_from_keyinfo): New. Factored out code.
+	(do_sign): Support SHA-256 and >2048 bit RSA keys.
+	common/scd:p15: Support signing with CardOS 5 cards.
+	* common/util.h (KEYGRIP_LEN): New.
+
+	scd:p15: Read certificates in extended mode.
+	+ commit 368f006a2840cd6b37caf7b4b98a16b818ac2289
+	* scd/app-p15.c (readcert_by_cdf): Allow reading in extended mode.
+	* scd/app-common.h (app_get_slot): New.
+
+	scd: Add function for binary read in extended mode.
+	+ commit 64142caafe5c89ad4db36b47c2dc917a9ac66a8e
+	* scd/iso7816.c (iso7816_read_binary): Factor code out to ...
+	(iso7816_read_binary_ext): new function.  Add arg extended_mode.
+
+	scd:p15: Detect CardOS 5 cards and print some basic infos.
+	+ commit 60b0aa7e57e787cbeca22adf77b330f753553d87
+	* scd/app-p15.c (read_ef_odf): Detect the home_DF on the fly.  Silence
+	the garbage warning for null bytes.
+	(print_tokeninfo_tokenflags): New.
+	(read_ef_tokeninfo): Print manufacturer, label, and flags.
+	(app_select_p15): No need to use the app_get_slot macro.
+	(CARD_TYPE_CARDOS_50): New const.
+	(card_atr_list): Detect CardOS 5.0
+
+2020-03-30  Werner Koch  <wk@gnupg.org>
+
+	wks: Take name of sendmail from configure.
+	+ commit 76d2a02dfe8f923c0d4d8ef86ca71a9ac47c243d
+	* configure.ac (NAME_OF_SENDMAIL): New ac_define.
+	* tools/send-mail.c (run_sendmail): Use it.
+
+	agent: Print an error if gpg-protect reads the extended key format.
+	+ commit 011a2f5fb77c7963f25550e423160507818f7a91
+	* agent/protect-tool.c (read_key): Detect simple extended key format.
+
+	sm: Fix possible NULL deref in error messages of --gen-key.
+	+ commit 2b4b0b1223aab955aafa2a150fe2dbc04c210bcd
+	* sm/certreqgen.c: Protect printing the line numbers in case of !R.
+
+2020-03-27  Werner Koch  <wk@gnupg.org>
+
+	sm: Consider certificates w/o CRL DP as valid.
+	+ commit 1424c12e4c7164990797a0a1daa3db6f3329aed4
+	* sm/certchain.c (is_cert_still_valid): Shortcut if tehre is no DP.
+	* common/audit.c (proc_type_verify): Print "n/a" if a cert has no
+	distribution point.
+	* sm/gpgsm.h (opt): Add field enable_issuer_based_crl_check.
+	* sm/gpgsm.c (oEnableIssuerBasedCRLCheck): New.
+	(opts): Add option --enable-issuer-based-crl-check.
+	(main): Set option.
+
 2020-03-20  Werner Koch  <wk@gnupg.org>
 
 	Release 2.2.20.
diff -Nru gnupg2-2.2.20/common/argparse.c gnupg2-2.2.27/common/argparse.c
--- gnupg2-2.2.20/common/argparse.c	2020-03-18 16:30:27.000000000 +0100
+++ gnupg2-2.2.27/common/argparse.c	2020-12-21 17:24:16.000000000 +0100
@@ -29,9 +29,8 @@
  * if not, see <https://gnu.org/licenses/>.
  */
 
-/* This file may be used as part of GnuPG or standalone.  A GnuPG
-   build is detected by the presence of the macro GNUPG_MAJOR_VERSION.
-   Some feature are only availalbe in the GnuPG build mode.
+/* This is a modified version of gpgrt/libgpg-error src/argparse.c.
+ * We use this to require a dependency on a newer gpgrt version.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -45,218 +44,115 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <errno.h>
+#include <unistd.h>
+#include <time.h>
 
-#ifdef GNUPG_MAJOR_VERSION
-# include "util.h"
-# include "common-defs.h"
-# include "i18n.h"
-# include "mischelp.h"
-# include "stringhelp.h"
-# include "logging.h"
-# include "utf8conv.h"
-#endif /*GNUPG_MAJOR_VERSION*/
-
+#include "util.h"
+#include "common-defs.h"
+#include "i18n.h"
+#include "mischelp.h"
+#include "stringhelp.h"
+#include "logging.h"
+#include "utf8conv.h"
+#include "sysutils.h"
 #include "argparse.h"
 
-/* GnuPG uses GPLv3+ but a standalone version of this defaults to
-   GPLv2+ because that is the license of this file.  Change this if
-   you include it in a program which uses GPLv3.  If you don't want to
-   set a copyright string for your usage() you may also hardcode it
-   here.  */
-#ifndef GNUPG_MAJOR_VERSION
-
-# define ARGPARSE_GPL_VERSION      2
-# define ARGPARSE_CRIGHT_STR "Copyright (C) YEAR NAME"
-
-#else /* Used by GnuPG  */
-
-# define ARGPARSE_GPL_VERSION      3
-# define ARGPARSE_CRIGHT_STR "Copyright (C) 2020 Free Software Foundation, Inc."
-
-#endif /*GNUPG_MAJOR_VERSION*/
-
-/* Replacements for standalone builds.  */
-#ifndef GNUPG_MAJOR_VERSION
-# ifndef _
-#  define _(a)  (a)
-# endif
-# ifndef DIM
-#  define DIM(v)           (sizeof(v)/sizeof((v)[0]))
-# endif
-# define xtrymalloc(a)    malloc ((a))
-# define xtryrealloc(a,b) realloc ((a), (b))
-# define xtrystrdup(a)    strdup ((a))
-# define xfree(a)         free ((a))
-# define log_error        my_log_error
-# define log_bug	  my_log_bug
-# define trim_spaces(a)   my_trim_spaces ((a))
-# define map_static_macro_string(a)  (a)
-#endif /*!GNUPG_MAJOR_VERSION*/
-
-
-#define ARGPARSE_STR(v) #v
-#define ARGPARSE_STR2(v) ARGPARSE_STR(v)
 
+/* Optional handler to write strings.  See gnupg_set_usage_outfnc.  */
+static int (*custom_outfnc) (int, const char *);
 
-/* Replacements for standalone builds.  */
-#ifndef GNUPG_MAJOR_VERSION
-static void
-my_log_error (const char *fmt, ...)
-{
-  va_list arg_ptr ;
-
-  va_start (arg_ptr, fmt);
-  fprintf (stderr, "%s: ", strusage (11));
-  vfprintf (stderr, fmt, arg_ptr);
-  va_end (arg_ptr);
-}
-
-static void
-my_log_bug (const char *fmt, ...)
-{
-  va_list arg_ptr ;
-
-  va_start (arg_ptr, fmt);
-  fprintf (stderr, "%s: Ohhhh jeeee: ", strusage (11));
-  vfprintf (stderr, fmt, arg_ptr);
-  va_end (arg_ptr);
-  abort ();
-}
 
-/* Return true if the native charset is utf-8.  */
-static int
-is_native_utf8 (void)
-{
-  return 1;
-}
+#if USE_INTERNAL_ARGPARSE
 
-static char *
-my_trim_spaces (char *str)
-{
-  char *string, *p, *mark;
+/* The almost always needed user handler for strusage.  */
+static const char *(*strusage_handler)( int ) = NULL;
+/* Optional handler to map strings.  See gnupg_set_fixed_string_mapper.  */
+static const char *(*fixed_string_mapper)(const char*);
 
-  string = str;
-  /* Find first non space character. */
-  for (p=string; *p && isspace (*(unsigned char*)p) ; p++)
-    ;
-  /* Move characters. */
-  for ((mark = NULL); (*string = *p); string++, p++)
-    if (isspace (*(unsigned char*)p))
-      {
-        if (!mark)
-          mark = string;
-      }
-    else
-      mark = NULL;
-  if (mark)
-    *mark = '\0' ;  /* Remove trailing spaces. */
 
-  return str ;
-}
+/* Hidden argparse flag used to mark the object as initialized.  */
+#define ARGPARSE_FLAG__INITIALIZED  (1u << ((8*4)-1))
 
-#endif /*!GNUPG_MAJOR_VERSION*/
+/* Special short options which are auto-inserterd.  Must fit into an
+ * unsigned short.  */
+#define ARGPARSE_SHORTOPT_HELP 32768
+#define ARGPARSE_SHORTOPT_VERSION 32769
+#define ARGPARSE_SHORTOPT_WARRANTY 32770
+#define ARGPARSE_SHORTOPT_DUMP_OPTIONS 32771
+#define ARGPARSE_SHORTOPT_DUMP_OPTTBL 32772
+
+
+/* The malloced configuration directories or NULL.  */
+static struct
+{
+  char *user;
+  char *sys;
+} confdir;
+
+
+/* The states for the gnupg_argparser machinery.  */
+enum argparser_states
+  {
+   STATE_init = 0,
+   STATE_open_sys,
+   STATE_open_user,
+   STATE_open_cmdline,
+   STATE_read_sys,
+   STATE_read_user,
+   STATE_read_cmdline,
+   STATE_finished
+  };
 
 
+/* An internal object used to store the user provided option table and
+ * some meta information.  */
+typedef struct
+{
+  unsigned short short_opt;
+  unsigned short ordinal;     /* (for --help)  */
+  unsigned int   flags;
+  const char    *long_opt;    /* Points into the user provided table. */
+  const char    *description; /* Points into the user provided table. */
+  unsigned int   forced:1;    /* Forced to use the sysconf value.  */
+  unsigned int   ignore:1;    /* Ignore this option everywhere but in
+                               * the sysconf file.  */
+  unsigned int   explicit_ignore:1; /* Ignore was explicitly set.  */
+} opttable_t;
+
+
+/* Internal object of the public gnupg_argparse_t object.  */
+struct _argparse_internal_s
+{
+  int idx;   /* Note that this is saved and restored in gnupg_argparser. */
+  int inarg;                       /* (index into args) */
+  unsigned int verbose:1;          /* Print diagnostics.                */
+  unsigned int stopped:1;          /* Option processing has stopped.    */
+  unsigned int in_sysconf:1;       /* Processing global config file.    */
+  unsigned int mark_forced:1;      /* Mark options as forced.           */
+  unsigned int mark_ignore:1;      /* Mark options as to be ignored.    */
+  unsigned int explicit_ignore:1;  /* Option has explicitly been set
+                                    * to ignore or unignore.  */
+  unsigned int ignore_all_seen:1;  /* [ignore-all] has been seen.       */
+  unsigned int user_seen:1;        /* A [user] has been seen.           */
+  unsigned int user_wildcard:1;    /* A [user *] has been seen.         */
+  unsigned int user_any_active:1;  /* Any user section was active.      */
+  unsigned int user_active:1;      /* User section active.              */
+  unsigned int explicit_confopt:1; /* A conffile option has been given. */
+  char *explicit_conffile;         /* Malloced name of an explicit
+                                    * conffile. */
+  char *username;                  /* Malloced current user name.       */
+  unsigned int opt_flags;          /* Current option flags.             */
+  enum argparser_states state;     /* State of the gnupg_argparser.     */
+  const char *last;
+  void *aliases;
+  const void *cur_alias;
+  void *iio_list;
+  estream_t conffp;
+  char *confname;
+  opttable_t *opts;            /* Malloced option table.  */
+  unsigned int nopts;          /* Number of items in OPTS.  */
+};
 
-/*********************************
- * @Summary arg_parse
- *  #include "argparse.h"
- *
- *  typedef struct {
- *	char *argc;		  pointer to argc (value subject to change)
- *	char ***argv;		  pointer to argv (value subject to change)
- *	unsigned flags; 	  Global flags (DO NOT CHANGE)
- *	int err;		  print error about last option
- *				  1 = warning, 2 = abort
- *	int r_opt;		  return option
- *	int r_type;		  type of return value (0 = no argument found)
- *	union {
- *	    int   ret_int;
- *	    long  ret_long
- *	    ulong ret_ulong;
- *	    char *ret_str;
- *	} r;			  Return values
- *	struct {
- *	    int idx;
- *	    const char *last;
- *	    void *aliases;
- *	} internal;		  DO NOT CHANGE
- *  } ARGPARSE_ARGS;
- *
- *  typedef struct {
- *	int	    short_opt;
- *	const char *long_opt;
- *	unsigned flags;
- *  } ARGPARSE_OPTS;
- *
- *  int arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts );
- *
- * @Description
- *  This is my replacement for getopt(). See the example for a typical usage.
- *  Global flags are:
- *     Bit 0 : Do not remove options form argv
- *     Bit 1 : Do not stop at last option but return other args
- *	       with r_opt set to -1.
- *     Bit 2 : Assume options and real args are mixed.
- *     Bit 3 : Do not use -- to stop option processing.
- *     Bit 4 : Do not skip the first arg.
- *     Bit 5 : allow usage of long option with only one dash
- *     Bit 6 : ignore --version
- *     all other bits must be set to zero, this value is modified by the
- *     function, so assume this is write only.
- *  Local flags (for each option):
- *     Bit 2-0 : 0 = does not take an argument
- *		 1 = takes int argument
- *		 2 = takes string argument
- *		 3 = takes long argument
- *		 4 = takes ulong argument
- *     Bit 3 : argument is optional (r_type will the be set to 0)
- *     Bit 4 : allow 0x etc. prefixed values.
- *     Bit 6 : Ignore this option
- *     Bit 7 : This is a command and not an option
- *  You stop the option processing by setting opts to NULL, the function will
- *  then return 0.
- * @Return Value
- *   Returns the args.r_opt or 0 if ready
- *   r_opt may be -2/-7 to indicate an unknown option/command.
- * @See Also
- *   ArgExpand
- * @Notes
- *  You do not need to process the options 'h', '--help' or '--version'
- *  because this function includes standard help processing; but if you
- *  specify '-h', '--help' or '--version' you have to do it yourself.
- *  The option '--' stops argument processing; if bit 1 is set the function
- *  continues to return normal arguments.
- *  To process float args or unsigned args you must use a string args and do
- *  the conversion yourself.
- * @Example
- *
- *     ARGPARSE_OPTS opts[] = {
- *     { 'v', "verbose",   0 },
- *     { 'd', "debug",     0 },
- *     { 'o', "output",    2 },
- *     { 'c', "cross-ref", 2|8 },
- *     { 'm', "my-option", 1|8 },
- *     { 300, "ignored-long-option, ARGPARSE_OP_IGNORE},
- *     { 500, "have-no-short-option-for-this-long-option", 0 },
- *     {0} };
- *     ARGPARSE_ARGS pargs = { &argc, &argv, 0 }
- *
- *     while( ArgParse( &pargs, &opts) ) {
- *	   switch( pargs.r_opt ) {
- *	     case 'v': opt.verbose++; break;
- *	     case 'd': opt.debug++; break;
- *	     case 'o': opt.outfile = pargs.r.ret_str; break;
- *	     case 'c': opt.crf = pargs.r_type? pargs.r.ret_str:"a.crf"; break;
- *	     case 'm': opt.myopt = pargs.r_type? pargs.r.ret_int : 1; break;
- *	     case 500: opt.a_long_one++;  break
- *	     default : pargs.err = 1; break; -- force warning output --
- *	   }
- *     }
- *     if( argc > 1 )
- *	   log_fatal( "Too many args");
- *
- */
 
 typedef struct alias_def_s *ALIAS_DEF;
 struct alias_def_s {
@@ -275,26 +171,103 @@
   char name[1];      /* String with the long option name.  */
 };
 
-static const char *(*strusage_handler)( int ) = NULL;
-static int (*custom_outfnc) (int, const char *);
 
-static int  set_opt_arg(ARGPARSE_ARGS *arg, unsigned flags, char *s);
-static void show_help(ARGPARSE_OPTS *opts, unsigned flags);
-static void show_version(void);
-static int writestrings (int is_error, const char *string, ...)
-#if __GNUC__ >= 4
-  __attribute__ ((sentinel(0)))
-#endif
-  ;
+static int  set_opt_arg (gnupg_argparse_t *arg, unsigned int flags, char *s);
+static void show_help (opttable_t *opts, unsigned int nopts,unsigned int flags);
+static void show_version (void);
+static void dump_option_table (gnupg_argparse_t *arg);
+static int writestrings (int is_error, const char *string,
+                         ...) GPGRT_ATTR_SENTINEL(0);
+
+static int arg_parse (gnupg_argparse_t *arg, gnupg_opt_t *opts, int no_init);
+
+
+
+/* Set a function to write strings which is then used instead of
+ * estream.  The first arg of that function is MODE and the second the
+ * STRING to write.  A mode of 1 is used for writing to stdout and a
+ * mode of 2 to write to stderr.  Other modes are reserved and should
+ * not output anything.  A NULL for STRING requests a flush.  */
+void
+gnupg_set_usage_outfnc (int (*f)(int, const char *))
+{
+  custom_outfnc = f;
+}
 
 
+/* Register function F as a string mapper which takes a string as
+ * argument, replaces known "@FOO@" style macros and returns a new
+ * fixed string.  Warning: The input STRING must have been allocated
+ * statically.  */
 void
-argparse_register_outfnc (int (*fnc)(int, const char *))
+gnupg_set_fixed_string_mapper (const char *(*f)(const char*))
 {
-  custom_outfnc = fnc;
+  fixed_string_mapper = f;
 }
 
 
+/* Register a configuration directory for use by the argparse
+ * functions.  The defined values for WHAT are:
+ *
+ *   GNUPG_CONFDIR_SYS   The systems's configuration dir.
+ *                       The default is /etc
+ *
+ *   GNUPG_CONFDIR_USER  The user's configuration directory.
+ *                       The default is $HOME.
+ *
+ * A trailing slash is ignored; to have the function lookup
+ * configuration files in the current directory, use ".".  There is no
+ * error return; more configuraion values may be added in future
+ * revisions of this library.
+ */
+void
+gnupg_set_confdir (int what, const char *name)
+{
+  char *buf, *p;
+
+  if (what == GNUPG_CONFDIR_SYS)
+    {
+      xfree (confdir.sys);
+      buf = confdir.sys = xtrystrdup (name);
+    }
+  else if (what == GNUPG_CONFDIR_USER)
+    {
+      xfree (confdir.user);
+      buf = confdir.user = xtrystrdup (name);
+    }
+  else
+    return;
+
+  if (!buf)
+    log_fatal ("out of core in %s\n", __func__);
+#ifdef HAVE_W32_SYSTEM
+  for (p=buf; *p; p++)
+    if (*p == '\\')
+      *p = '/';
+#endif
+  /* Strip trailing slashes unless buf is "/" or any other single char
+   * string.  */
+  if (*buf)
+    {
+      for (p=buf + strlen (buf)-1; p > buf; p--)
+        if (*p == '/')
+          *p = 0;
+        else
+          break;
+    }
+}
+
+
+
+static const char *
+map_fixed_string (const char *string)
+{
+  return fixed_string_mapper? fixed_string_mapper (string) : string;
+}
+
+#endif /* USE_INTERNAL_ARGPARSE */
+
+
 /* Write STRING and all following const char * arguments either to
    stdout or, if IS_ERROR is set, to stderr.  The list of strings must
    be terminated by a NULL.  */
@@ -310,7 +283,7 @@
       s = string;
       va_start (arg_ptr, string);
       do
-        {
+        {  /* Fixme: Swicth to estream?  */
           if (custom_outfnc)
             custom_outfnc (is_error? 2:1, s);
           else
@@ -334,32 +307,214 @@
 }
 
 
+#if USE_INTERNAL_ARGPARSE
+
 static void
-initialize( ARGPARSE_ARGS *arg, const char *filename, unsigned *lineno )
+deinitialize (gnupg_argparse_t *arg)
 {
-  if( !(arg->flags & (1<<15)) )
+  if (arg->internal)
     {
+      xfree (arg->internal->username);
+      xfree (arg->internal->explicit_conffile);
+      xfree (arg->internal->opts);
+      xfree (arg->internal);
+      arg->internal = NULL;
+    }
+
+  arg->flags &= ARGPARSE_FLAG__INITIALIZED;
+  arg->lineno = 0;
+  arg->err = 0;
+}
+
+/* Our own exit handler to clean up used memory.  */
+static void
+my_exit (gnupg_argparse_t *arg, int code)
+{
+  deinitialize (arg);
+  exit (code);
+}
+
+
+static gpg_err_code_t
+initialize (gnupg_argparse_t *arg, gnupg_opt_t *opts, estream_t fp)
+{
+  /* We use a dedicated flag to detect whether *ARG has been
+   * initialized.  This is because the old version of that struct, as
+   * used in GnuPG, had no requirement to zero out all fields of the
+   * object and existing code still sets only argc,argv and flags.  */
+  if (!(arg->flags & ARGPARSE_FLAG__INITIALIZED)
+      || (arg->flags & ARGPARSE_FLAG_RESET)
+      || !arg->internal)
+    {
+      /* Allocate internal data.  */
+      if (!(arg->flags & ARGPARSE_FLAG__INITIALIZED) || !arg->internal)
+        {
+          arg->internal = xtrymalloc (sizeof *arg->internal);
+          if (!arg->internal)
+            return gpg_err_code_from_syserror ();
+          arg->flags |= ARGPARSE_FLAG__INITIALIZED; /* Mark as initialized.  */
+        }
+      else if (arg->internal->opts)
+        xfree (arg->internal->opts);
+      arg->internal->opts = NULL;
+      arg->internal->nopts = 0;
+
       /* Initialize this instance. */
-      arg->internal.idx = 0;
-      arg->internal.last = NULL;
-      arg->internal.inarg = 0;
-      arg->internal.stopped = 0;
-      arg->internal.aliases = NULL;
-      arg->internal.cur_alias = NULL;
-      arg->internal.iio_list = NULL;
+      arg->internal->idx = 0;
+      arg->internal->last = NULL;
+      arg->internal->inarg = 0;
+      arg->internal->stopped = 0;
+      arg->internal->in_sysconf = 0;
+      arg->internal->user_seen = 0;
+      arg->internal->user_wildcard = 0;
+      arg->internal->user_any_active = 0;
+      arg->internal->user_active = 0;
+      arg->internal->username = NULL;
+      arg->internal->mark_forced = 0;
+      arg->internal->mark_ignore = 0;
+      arg->internal->explicit_ignore = 0;
+      arg->internal->ignore_all_seen = 0;
+      arg->internal->explicit_confopt = 0;
+      arg->internal->explicit_conffile = NULL;
+      arg->internal->opt_flags = 0;
+      arg->internal->state = STATE_init;
+      arg->internal->aliases = NULL;
+      arg->internal->cur_alias = NULL;
+      arg->internal->iio_list = NULL;
+      arg->internal->conffp = NULL;
+      arg->internal->confname = NULL;
+
+      /* Clear the copy of the option list.  */
+      /* Clear the error indicator.  */
       arg->err = 0;
-      arg->flags |= 1<<15; /* Mark as initialized.  */
+
+      /* Usually an option file will be parsed from the start.
+       * However, we do not open the stream and thus we have no way to
+       * know the current lineno.  Using this flag we can allow the
+       * user to provide a lineno which we don't reset.  */
+      if (fp || arg->internal->conffp || !(arg->flags & ARGPARSE_FLAG_NOLINENO))
+        arg->lineno = 0;
+
+      /* Need to clear the reset request.  */
+      arg->flags &= ~ARGPARSE_FLAG_RESET;
+
+      /* Check initial args.  */
       if ( *arg->argc < 0 )
-        log_bug ("invalid argument for arg_parse\n");
+        log_bug ("invalid argument passed to gnupg_argparse\n");
+
     }
 
+  /* Create an array with pointers to the provided list of options.
+   * Keeping a copy is useful to sort that array and thus do a binary
+   * search and to allow for extra space at the end to insert the
+   * hidden options.  An ARGPARSE_FLAG_RESET can be used to reinit
+   * this array.  */
+  if (!arg->internal->opts)
+    {
+      int seen_help = 0;
+      int seen_version = 0;
+      int seen_warranty = 0;
+      int seen_dump_options = 0;
+      int seen_dump_option_table = 0;
+      int i;
+
+      for (i=0; opts[i].short_opt; i++)
+        {
+          if (opts[i].long_opt)
+            {
+              if (!strcmp(opts[i].long_opt, "help"))
+                seen_help = 1;
+              else if (!strcmp(opts[i].long_opt, "version"))
+                seen_version = 1;
+              else if (!strcmp(opts[i].long_opt, "warranty"))
+                seen_warranty = 1;
+              else if (!strcmp(opts[i].long_opt, "dump-options"))
+                seen_dump_options = 1;
+              else if (!strcmp(opts[i].long_opt, "dump-option-table"))
+                seen_dump_option_table = 1;
+            }
+        }
+      i += 5; /* The number of the above internal options.  */
+      i++;    /* End of list marker.  */
+      arg->internal->opts = xtrycalloc (i, sizeof *arg->internal->opts);
+      if (!arg->internal->opts)
+        return gpg_err_code_from_syserror ();
+      for(i=0; opts[i].short_opt; i++)
+        {
+          arg->internal->opts[i].short_opt   = opts[i].short_opt;
+          arg->internal->opts[i].flags       = opts[i].flags;
+          arg->internal->opts[i].long_opt    = opts[i].long_opt;
+          arg->internal->opts[i].description = opts[i].description;
+          arg->internal->opts[i].ordinal = i;
+        }
+
+      if (!seen_help)
+        {
+          arg->internal->opts[i].short_opt   = ARGPARSE_SHORTOPT_HELP;
+          arg->internal->opts[i].flags       = ARGPARSE_TYPE_NONE;
+          arg->internal->opts[i].long_opt    = "help";
+          arg->internal->opts[i].description = "@";
+          arg->internal->opts[i].ordinal = i;
+          i++;
+        }
+      if (!seen_version)
+        {
+          arg->internal->opts[i].short_opt   = ARGPARSE_SHORTOPT_VERSION;
+          arg->internal->opts[i].flags       = ARGPARSE_TYPE_NONE;
+          arg->internal->opts[i].long_opt    = "version";
+          arg->internal->opts[i].description = "@";
+          arg->internal->opts[i].ordinal = i;
+          i++;
+        }
+
+      if (!seen_warranty)
+        {
+          arg->internal->opts[i].short_opt   = ARGPARSE_SHORTOPT_WARRANTY;
+          arg->internal->opts[i].flags       = ARGPARSE_TYPE_NONE;
+          arg->internal->opts[i].long_opt    = "warranty";
+          arg->internal->opts[i].description = "@";
+          arg->internal->opts[i].ordinal = i;
+          i++;
+        }
+
+      if (!seen_dump_option_table)
+        {
+          arg->internal->opts[i].short_opt   = ARGPARSE_SHORTOPT_DUMP_OPTTBL;
+          arg->internal->opts[i].flags       = ARGPARSE_TYPE_NONE;
+          arg->internal->opts[i].long_opt    = "dump-option-table";
+          arg->internal->opts[i].description = "@";
+          arg->internal->opts[i].ordinal = i;
+          i++;
+        }
+
+      if (!seen_dump_options)
+        {
+          arg->internal->opts[i].short_opt   = ARGPARSE_SHORTOPT_DUMP_OPTIONS;
+          arg->internal->opts[i].flags       = ARGPARSE_TYPE_NONE;
+          arg->internal->opts[i].long_opt    = "dump-options";
+          arg->internal->opts[i].description = "@";
+          arg->internal->opts[i].ordinal = i;
+          i++;
+        }
+      /* Take care: When adding new options remember to increase the
+       * size of the array.  */
+
+      arg->internal->opts[i].short_opt = 0;
+
+      /* Note that we do not count the end marker but keep it in the
+       * table anyway as an extra item.  */
+      arg->internal->nopts = i;
+    }
 
   if (arg->err)
     {
       /* Last option was erroneous.  */
       const char *s;
 
-      if (filename)
+      if (!fp && arg->internal->conffp)
+        fp = arg->internal->conffp;
+
+      if (fp)
         {
           if ( arg->r_opt == ARGPARSE_UNEXPECTED_ARG )
             s = _("argument not expected");
@@ -375,22 +530,35 @@
             s = _("invalid command");
           else if ( arg->r_opt == ARGPARSE_INVALID_ALIAS )
             s = _("invalid alias definition");
+          else if ( arg->r_opt == ARGPARSE_PERMISSION_ERROR )
+            s = _("permission error");
           else if ( arg->r_opt == ARGPARSE_OUT_OF_CORE )
             s = _("out of core");
+          else if ( arg->r_opt == ARGPARSE_NO_CONFFILE )
+            s = NULL;  /* Error has already been printed.  */
+          else if ( arg->r_opt == ARGPARSE_INVALID_META )
+            s = _("invalid meta command");
+          else if ( arg->r_opt == ARGPARSE_UNKNOWN_META )
+            s = _("unknown meta command");
+          else if ( arg->r_opt == ARGPARSE_UNEXPECTED_META )
+            s = _("unexpected meta command");
           else
             s = _("invalid option");
-          log_error ("%s:%u: %s\n", filename, *lineno, s);
+          if (s)
+            log_error ("%s:%u: %s\n",
+                              gpgrt_fname_get (fp), arg->lineno, s);
 	}
       else
         {
-          s = arg->internal.last? arg->internal.last:"[??]";
+          s = arg->internal->last? arg->internal->last:"[??]";
 
           if ( arg->r_opt == ARGPARSE_MISSING_ARG )
             log_error (_("missing argument for option \"%.50s\"\n"), s);
           else if ( arg->r_opt == ARGPARSE_INVALID_ARG )
             log_error (_("invalid argument for option \"%.50s\"\n"), s);
           else if ( arg->r_opt == ARGPARSE_UNEXPECTED_ARG )
-            log_error (_("option \"%.50s\" does not expect an argument\n"), s);
+            log_error (_("option \"%.50s\" does not expect "
+                                "an argument\n"), s);
           else if ( arg->r_opt == ARGPARSE_INVALID_COMMAND )
             log_error (_("invalid command \"%.50s\"\n"), s);
           else if ( arg->r_opt == ARGPARSE_AMBIGUOUS_OPTION )
@@ -398,18 +566,30 @@
           else if ( arg->r_opt == ARGPARSE_AMBIGUOUS_COMMAND )
             log_error (_("command \"%.50s\" is ambiguous\n"),s );
           else if ( arg->r_opt == ARGPARSE_OUT_OF_CORE )
-            log_error ("%s\n", _("out of core\n"));
+            log_error ("%s\n", _("out of core"));
+          else if ( arg->r_opt == ARGPARSE_PERMISSION_ERROR )
+            log_error ("%s\n", _("permission error"));
+          else if ( arg->r_opt == ARGPARSE_NO_CONFFILE)
+            ;  /* Error has already been printed.  */
+          else if ( arg->r_opt == ARGPARSE_INVALID_META )
+            log_error ("%s\n", _("invalid meta command"));
+          else if ( arg->r_opt == ARGPARSE_UNKNOWN_META )
+            log_error ("%s\n", _("unknown meta command"));
+          else if ( arg->r_opt == ARGPARSE_UNEXPECTED_META )
+            log_error ("%s\n",_("unexpected meta command"));
           else
             log_error (_("invalid option \"%.50s\"\n"), s);
 	}
       if (arg->err != ARGPARSE_PRINT_WARNING)
-        exit (2);
+        my_exit (arg, 2);
       arg->err = 0;
     }
 
   /* Zero out the return value union.  */
   arg->r.ret_str = NULL;
   arg->r.ret_long = 0;
+
+  return 0;
 }
 
 
@@ -437,7 +617,7 @@
 static int
 ignore_invalid_option_p (ARGPARSE_ARGS *arg, const char *keyword)
 {
-  IIO_ITEM_DEF item = arg->internal.iio_list;
+  IIO_ITEM_DEF item = arg->internal->iio_list;
 
   for (; item; item = item->next)
     if (!strcmp (item->name, keyword))
@@ -451,7 +631,7 @@
    character read wll be the first of a new line.  The function
    returns 0 on success or true on malloc failure.  */
 static int
-ignore_invalid_option_add (ARGPARSE_ARGS *arg, FILE *fp)
+ignore_invalid_option_add (ARGPARSE_ARGS *arg, estream_t fp)
 {
   IIO_ITEM_DEF item;
   int c;
@@ -462,7 +642,7 @@
 
   while (!ready)
     {
-      c = getc (fp);
+      c = gpgrt_getc (fp);
       if (c == '\n')
         ready = 1;
       else if (c == EOF)
@@ -510,8 +690,8 @@
               if (!item)
                 return 1;
               strcpy (item->name, name);
-              item->next = (IIO_ITEM_DEF)arg->internal.iio_list;
-              arg->internal.iio_list = item;
+              item->next = (IIO_ITEM_DEF)arg->internal->iio_list;
+              arg->internal->iio_list = item;
             }
           state = skipWS;
           goto again;
@@ -527,15 +707,289 @@
 {
   IIO_ITEM_DEF item, tmpitem;
 
-  for (item = arg->internal.iio_list; item; item = tmpitem)
+  for (item = arg->internal->iio_list; item; item = tmpitem)
     {
       tmpitem = item->next;
       xfree (item);
     }
-  arg->internal.iio_list = NULL;
+  arg->internal->iio_list = NULL;
+}
+
+
+/* Make sure the username field is filled.  Return 0 on success.  */
+static int
+assure_username (gnupg_argparse_t *arg)
+{
+  if (!arg->internal->username)
+    {
+      arg->internal->username = gnupg_getusername ();
+      if (!arg->internal->username)
+        {
+          log_error ("%s:%u: error getting current user's name: %s\n",
+                            arg->internal->confname, arg->lineno,
+                            gpg_strerror (gpg_error_from_syserror ()));
+          /* Not necessary the correct error code but given that we
+           * either have a malloc error or some internal system error,
+           * it is the best we can do.  */
+          return ARGPARSE_PERMISSION_ERROR;
+        }
+    }
+  return 0;
+}
+
+
+/* Implementation of the "user" command.  ARG is the context.  ARGS is
+ * a non-empty string which this function is allowed to modify.  */
+static int
+handle_meta_user (gnupg_argparse_t *arg, unsigned int alternate, char *args)
+{
+  int rc;
+
+  (void)alternate;
+
+  rc = assure_username (arg);
+  if (rc)
+    return rc;
+
+  arg->internal->user_seen = 1;
+  if (*args == '*' && !args[1])
+    {
+      arg->internal->user_wildcard = 1;
+      arg->internal->user_active = !arg->internal->user_any_active;
+    }
+  else if (arg->internal->user_wildcard)
+    {
+      /* All other user statements are ignored after a wildcard.  */
+      arg->internal->user_active = 0;
+    }
+  else if (!strcasecmp (args, arg->internal->username))
+    {
+      arg->internal->user_any_active = 1;
+      arg->internal->user_active = 1;
+    }
+  else
+    {
+      arg->internal->user_active = 0;
+    }
+
+  return 0;
+}
+
+
+/* Implementation of the "force" command.  ARG is the context.  A
+ * value of 0 for ALTERNATE is "force", a value of 1 requests an
+ * unforce".  ARGS is the empty string and not used.  */
+static int
+handle_meta_force (gnupg_argparse_t *arg, unsigned int alternate, char *args)
+{
+  (void)args;
+
+  arg->internal->mark_forced = alternate? 0 : 1;
+
+  return 0;
+}
+
+
+/* Implementation of the "ignore" command.  ARG is the context.  A
+ * value of 0 for ALTERNATE is a plain "ignore", a value of 1 request
+ * an "unignore, a value of 2 requests an "ignore-all".  ARGS is the
+ * empty string and not used.  */
+static int
+handle_meta_ignore (gnupg_argparse_t *arg, unsigned int alternate, char *args)
+{
+  (void)args;
+
+  if (!alternate)
+    {
+      arg->internal->mark_ignore = 1;
+      arg->internal->explicit_ignore = 1;
+    }
+  else if (alternate == 1)
+    {
+      arg->internal->mark_ignore = 0;
+      arg->internal->explicit_ignore = 1;
+    }
+  else
+    arg->internal->ignore_all_seen = 1;
+
+  return 0;
 }
 
 
+/* Implementation of the "echo" command.  ARG is the context.  If
+ * ALTERNATE is true the filename is not printed.  ARGS is the string
+ * to log.  */
+static int
+handle_meta_echo (gnupg_argparse_t *arg, unsigned int alternate, char *args)
+{
+  int rc = 0;
+  char *p, *pend;
+
+  if (alternate)
+    log_info ("%s", "");
+  else
+    log_info ("%s:%u: ", arg->internal->confname, arg->lineno);
+
+  while (*args)
+    {
+      p = strchr (args, '$');
+      if (!p)
+        {
+          log_printf ("%s", args);
+          break;
+        }
+      *p = 0;
+      log_printf ("%s", args);
+      if (p[1] == '$')
+        {
+          log_printf ("$");
+          args = p+2;
+          continue;
+        }
+      if (p[1] != '{')
+        {
+          log_printf ("$");
+          args = p+1;
+          continue;
+        }
+      pend = strchr (p+2, '}');
+      if (!pend)  /* No closing brace.  */
+        {
+          log_printf ("$");
+          args = p+1;
+          continue;
+        }
+      p += 2;
+      *pend = 0;
+      args = pend+1;
+      if (!strcmp (p, "user"))
+        {
+          rc = assure_username (arg);
+          if (rc)
+            goto leave;
+          log_printf ("%s", arg->internal->username);
+        }
+      else if (!strcmp (p, "file"))
+        log_printf ("%s", arg->internal->confname);
+      else if (!strcmp (p, "line"))
+        log_printf ("%u", arg->lineno);
+      else if (!strcmp (p, "epoch"))
+        log_printf ("%lu",  (unsigned long)time (NULL));
+    }
+
+ leave:
+  log_printf ("\n");
+  return rc;
+}
+
+
+/* Implementation of the "verbose" command.  ARG is the context.  If
+ * ALTERNATE is true the verbosity is disabled.  ARGS is not used.  */
+static int
+handle_meta_verbose (gnupg_argparse_t *arg, unsigned int alternate, char *args)
+{
+  (void)args;
+
+  if (alternate)
+    arg->internal->verbose = 0;
+  else
+    arg->internal->verbose = 1;
+  return 0;
+}
+
+/* Handle a meta command.  KEYWORD has the content inside the brackets
+ * with leading and trailing spaces removed.  The function may modify
+ * KEYWORD.  On success 0 is returned, on error an ARGPARSE_ error
+ * code is returned.  */
+static int
+handle_metacmd (gnupg_argparse_t *arg, char *keyword)
+{
+  static struct {
+    const char *name;          /* Name of the command.                   */
+    unsigned short alternate;  /* Use alternate version of the command.  */
+    unsigned short needarg:1;  /* Command requires an argument.          */
+    unsigned short always:1;   /* Command allowed in all conf files.     */
+    unsigned short noskip:1;   /* Even done in non-active [user] mode.   */
+    int (*func)(gnupg_argparse_t *arg,
+                unsigned int alternate, char *args); /*handler*/
+  } cmds[] =
+      {{ "user",        0, 1, 0, 1, handle_meta_user },
+       { "force",       0, 0, 0, 0, handle_meta_force },
+       { "+force",      0, 0, 0, 0, handle_meta_force },
+       { "-force",      1, 0, 0, 0, handle_meta_force },
+       { "ignore",      0, 0, 0, 0, handle_meta_ignore },
+       { "+ignore",     0, 0, 0, 0, handle_meta_ignore },
+       { "-ignore",     1, 0, 0, 0, handle_meta_ignore },
+       { "ignore-all",  2, 0, 0, 0, handle_meta_ignore },
+       { "+ignore-all", 2, 0, 0, 0, handle_meta_ignore },
+       { "verbose",     0, 0, 1, 1, handle_meta_verbose },
+       { "+verbose",    0, 0, 1, 1, handle_meta_verbose },
+       { "-verbose",    1, 0, 1, 1, handle_meta_verbose },
+       { "echo",        0, 1, 1, 1, handle_meta_echo },
+       { "-echo",       1, 1, 1, 1, handle_meta_echo },
+       { "info",        0, 1, 1, 0, handle_meta_echo },
+       { "-info",       1, 1, 1, 0, handle_meta_echo }
+      };
+  char *rest;
+  int i;
+
+  for (rest = keyword; *rest && !(isascii (*rest) && isspace (*rest)); rest++)
+    ;
+  if (*rest)
+    {
+      *rest++ = 0;
+      trim_spaces (rest);
+    }
+
+  for (i=0; i < DIM (cmds); i++)
+    if (!strcmp (cmds[i].name, keyword))
+      break;
+  if (!(i < DIM (cmds)))
+    return ARGPARSE_UNKNOWN_META;
+  if (cmds[i].needarg && !*rest)
+    return ARGPARSE_MISSING_ARG;
+  if (!cmds[i].needarg && *rest)
+    return ARGPARSE_UNEXPECTED_ARG;
+  if (!arg->internal->in_sysconf && !cmds[i].always)
+    return ARGPARSE_UNEXPECTED_META;
+
+  if (!cmds[i].noskip
+      && arg->internal->in_sysconf
+      && arg->internal->user_seen
+      && !arg->internal->user_active)
+    return 0; /* Skip this meta command.  */
+
+  return cmds[i].func (arg, cmds[i].alternate, rest);
+}
+
+
+/* Helper for gnupg_argparse.  */
+static void
+prepare_arg_return (gnupg_argparse_t *arg, opttable_t *opts,
+                    int idx, int in_alias, int set_ignore)
+{
+  /* No argument found at the end of the line.  */
+  if (in_alias)
+    arg->r_opt = ARGPARSE_MISSING_ARG;
+  else if (!(opts[idx].flags & ARGPARSE_TYPE_MASK))
+    arg->r_type = ARGPARSE_TYPE_NONE; /* Does not take an arg. */
+  else if ((opts[idx].flags & ARGPARSE_OPT_OPTIONAL))
+    arg->r_type = ARGPARSE_TYPE_NONE; /* No optional argument. */
+  else if (!(opts[idx].ignore && !opts[idx].forced) && !set_ignore)
+    arg->r_opt = ARGPARSE_MISSING_ARG;
+
+  /* If the caller wants us to return the attributes or
+   * ignored options, or these flags in.  */
+  if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
+    {
+      if (opts[idx].ignore)
+        arg->r_type |= ARGPARSE_ATTR_IGNORE;
+      if (opts[idx].forced)
+        arg->r_type |= ARGPARSE_ATTR_FORCE;
+      if (set_ignore)
+        arg->r_type |= ARGPARSE_OPT_IGNORE;
+    }
+}
 
 /****************
  * Get options from a file.
@@ -559,109 +1013,280 @@
  * Note: Abbreviation of options is here not allowed.
  */
 int
-optfile_parse (FILE *fp, const char *filename, unsigned *lineno,
-	       ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
+gnupg_argparse (estream_t fp, gnupg_argparse_t *arg, gnupg_opt_t *opts_orig)
 {
-  int state, i, c;
-  int idx=0;
+  enum { Ainit,
+         Acomment,     /* In a comment line.           */
+         Acopykeyword, /* Collecting a keyword.        */
+         Awaitarg,     /* Wait for an argument.        */
+         Acopyarg,     /* Copy the argument.           */
+         Akeyword_eol, /* Got keyword at end of line.  */
+         Akeyword_spc, /* Got keyword at space.        */
+         Acopymetacmd, /* Copy a meta command.         */
+         Askipmetacmd, /* Skip spaces after metacmd.   */
+         Askipmetacmd2,/* Skip comment after metacmd.  */
+         Ametacmd,     /* Process the metacmd.         */
+         Askipandleave /* Skip the rest of the line and then leave.  */
+  } state;
+  opttable_t *opts;
+  unsigned int nopts;
+  int i, c;
+  int idx = 0;
   char keyword[100];
   char *buffer = NULL;
   size_t buflen = 0;
   int in_alias=0;
+  int set_ignore = 0;
   int unread_buf[3];  /* We use an int so that we can store EOF.  */
   int unread_buf_count = 0;
 
+  if (arg && !opts_orig)
+    {
+      deinitialize (arg);
+      return 0;
+    }
+
   if (!fp) /* Divert to arg_parse() in this case.  */
-    return arg_parse (arg, opts);
+    return arg_parse (arg, opts_orig, 0);
 
-  initialize (arg, filename, lineno);
+  if (initialize (arg, opts_orig, fp))
+    return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+
+  opts = arg->internal->opts;
+  nopts = arg->internal->nopts;
 
   /* If the LINENO is zero we assume that we are at the start of a
    * file and we skip over a possible Byte Order Mark.  */
-  if (!*lineno)
+  if (!arg->lineno)
     {
-      unread_buf[0] = getc (fp);
-      unread_buf[1] = getc (fp);
-      unread_buf[2] = getc (fp);
+      unread_buf[0] = gpgrt_fgetc (fp);
+      unread_buf[1] = gpgrt_fgetc (fp);
+      unread_buf[2] = gpgrt_fgetc (fp);
       if (unread_buf[0] != 0xef
           || unread_buf[1] != 0xbb
           || unread_buf[2] != 0xbf)
         unread_buf_count = 3;
     }
 
+  arg->internal->opt_flags = 0;
+
   /* Find the next keyword.  */
-  state = i = 0;
+  state = Ainit;
+  i = 0;
   for (;;)
     {
-      if (unread_buf_count)
-        c = unread_buf[3 - unread_buf_count--];
-      else
-        c = getc (fp);
-      if (c == '\n' || c== EOF )
-        {
-          if ( c != EOF )
-            ++*lineno;
-          if (state == -1)
-            break;
-          else if (state == 2)
+    nextstate:
+      /* Before scanning the next char handle the keyword seen states.  */
+      if (state == Akeyword_eol || state == Akeyword_spc)
+        {
+          /* We are either at the end of a line or right after a
+           * keyword.  In the latter case we need to find the keyword
+           * so that we can decide whether an argument is required.  */
+
+          /* Check the keyword.  */
+          for (idx=0; idx < nopts; idx++ )
             {
-              keyword[i] = 0;
-              for (i=0; opts[i].short_opt; i++ )
+              if (opts[idx].long_opt && !strcmp (opts[idx].long_opt, keyword))
+                break;
+            }
+          arg->r_opt = opts[idx].short_opt;
+          if (!(idx < nopts))
+            {
+              /* The option (keyword) is not known - check for
+               * internal keywords before returning an error.  */
+              if (state == Akeyword_spc && !strcmp (keyword, "alias"))
                 {
-                  if (opts[i].long_opt && !strcmp (opts[i].long_opt, keyword))
-                    break;
+                  in_alias = 1;
+                  state = Awaitarg;
+                }
+              else if (!strcmp (keyword, "ignore-invalid-option"))
+                {
+                  /* We might have keywords as argument - add them to
+                   * the list of ignored keywords.  Note that we
+                   * ignore empty argument lists and thus do not to
+                   * call the function in the Akeyword_eol state. */
+                  if (state == Akeyword_spc)
+                    {
+                      if (ignore_invalid_option_add (arg, fp))
+                        {
+                          arg->r_opt = ARGPARSE_OUT_OF_CORE;
+                          goto leave;
+                        }
+                      arg->lineno++;
+                    }
+                  state = Ainit;
+                  i = 0;
                 }
-              idx = i;
-              arg->r_opt = opts[idx].short_opt;
-              if ((opts[idx].flags & ARGPARSE_OPT_IGNORE))
+              else if (ignore_invalid_option_p (arg, keyword))
                 {
-                  state = i = 0;
-                  continue;
+                  /* This invalid option is already in the iio list.  */
+                  state = state == Akeyword_eol? Ainit : Acomment;
+                  i = 0;
                 }
-              else if (!opts[idx].short_opt )
+              else
                 {
-                  if (!strcmp (keyword, "ignore-invalid-option"))
+                  arg->r_opt = ((opts[idx].flags & ARGPARSE_OPT_COMMAND)
+                                ? ARGPARSE_INVALID_COMMAND
+                                : ARGPARSE_INVALID_OPTION);
+                  if (state == Akeyword_spc)
+                    state = Askipandleave;
+                  else
+                    goto leave;
+                }
+            }
+          else if (state != Akeyword_spc
+                   && arg->internal->in_sysconf
+                   && arg->internal->user_seen
+                   && !arg->internal->user_active)
+            {
+              /* We are in a [user] meta command and it is not active.
+               * Skip the command.  */
+              state = state == Akeyword_eol? Ainit : Acomment;
+              i = 0;
+            }
+          else if (state != Akeyword_spc
+                   && (opts[idx].flags & ARGPARSE_OPT_IGNORE))
+            {
+              /* Known option is configured to be ignored.  Start from
+               * scratch (new line) or process like a comment.  */
+              state = state == Akeyword_eol? Ainit : Acomment;
+              i = 0;
+            }
+          else /* Known option */
+            {
+              set_ignore = 0;
+
+              if (arg->internal->in_sysconf)
+                {
+                  /* Set the current forced and ignored attributes.  */
+                  if (arg->internal->mark_forced)
+                    opts[idx].forced = 1;
+                  if (arg->internal->mark_ignore)
+                    opts[idx].ignore = 1;
+                  if (arg->internal->explicit_ignore)
+                    opts[idx].explicit_ignore = 1;
+
+                  if (opts[idx].ignore && !opts[idx].forced)
                     {
-                      /* No argument - ignore this meta option.  */
-                      state = i = 0;
-                      continue;
+                      if (arg->internal->verbose)
+                        log_info ("%s:%u: ignoring option \"--%s\"\n",
+                                  arg->internal->confname,
+                                  arg->lineno,
+                                  opts[idx].long_opt);
+                      if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
+                        set_ignore = 1;
+                      else
+                        {
+                          state = state == Akeyword_eol? Ainit : Acomment;
+                          i = 0;
+                          goto nextstate;  /* Ignore this one.  */
+                        }
                     }
-                  else if (ignore_invalid_option_p (arg, keyword))
+                }
+              else /* Non-sysconf file  */
+                {  /* Act upon the forced and ignored attributes.  */
+                  if (opts[idx].ignore || opts[idx].forced)
                     {
-                      /* This invalid option is in the iio list.  */
-                      state = i = 0;
-                      continue;
+                      if (arg->internal->verbose)
+                        log_info ("%s:%u: ignoring option \"--%s\""
+                                         " due to attributes:%s%s\n",
+                                         arg->internal->confname,
+                                         arg->lineno,
+                                         opts[idx].long_opt,
+                                         opts[idx].forced? " forced":"",
+                                         opts[idx].ignore? " ignore":"");
+                      if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
+                        set_ignore = 1;
+                      else
+                        {
+                          state = state == Akeyword_eol? Ainit : Acomment;
+                          i = 0;
+                          goto nextstate;  /* Ignore this one.  */
+                        }
                     }
-                  arg->r_opt = ((opts[idx].flags & ARGPARSE_OPT_COMMAND)
-                                ? ARGPARSE_INVALID_COMMAND
-                                : ARGPARSE_INVALID_OPTION);
                 }
-              else if (!(opts[idx].flags & ARGPARSE_TYPE_MASK))
-                arg->r_type = 0; /* Does not take an arg. */
-              else if ((opts[idx].flags & ARGPARSE_OPT_OPTIONAL) )
-                arg->r_type = 0; /* Arg is optional.  */
+
+              if (state == Akeyword_spc)
+                {
+                  /* If we shall ignore but not set the option we skip
+                   * the argument.  Otherwise we would need to use a
+                   * made-up but not used args in the conf file. */
+                  if (set_ignore || (opts[idx].ignore && !opts[idx].forced))
+                    {
+                      prepare_arg_return (arg, opts, idx, 0, set_ignore);
+                      set_ignore = 0;
+                      state = Askipandleave;
+                    }
+                  else
+                    state = Awaitarg;
+                }
               else
-                arg->r_opt = ARGPARSE_MISSING_ARG;
+                {
+                  prepare_arg_return (arg, opts, idx, 0, set_ignore);
+                  set_ignore = 0;
+                  goto leave;
+                }
 
-              break;
-	    }
-          else if (state == 3)
+            }
+        } /* (end state Akeyword_eol/Akeyword_spc) */
+      else if (state == Ametacmd)
+        {
+          /* We are at the end of a line.  */
+          log_assert (*keyword == '[');
+          trim_spaces (keyword+1);
+          if (!keyword[1])
             {
-              /* No argument found.  */
-              if (in_alias)
-                arg->r_opt = ARGPARSE_MISSING_ARG;
-              else if (!(opts[idx].flags & ARGPARSE_TYPE_MASK))
-                arg->r_type = 0; /* Does not take an arg. */
-              else if ((opts[idx].flags & ARGPARSE_OPT_OPTIONAL))
-                arg->r_type = 0; /* No optional argument. */
-              else
-                arg->r_opt = ARGPARSE_MISSING_ARG;
+              arg->r_opt = ARGPARSE_INVALID_META; /* Empty.  */
+              goto leave;
+            }
+          c = handle_metacmd (arg, keyword+1);
+          if (c)
+            {
+              arg->r_opt = c;   /* Return error.  */
+              goto leave;
+            }
+          state = Ainit;
+          i = 0;
+        }
 
-              break;
+      /* Get the next character from the line.  */
+      if (unread_buf_count)
+        c = unread_buf[3 - unread_buf_count--];
+      else
+        c = gpgrt_fgetc (fp);
+
+      if (c == '\n' || c== EOF )
+        { /* Handle end of line.  */
+          if ( c != EOF )
+            arg->lineno++;
+          if (state == Askipandleave)
+            goto leave;
+          else if (state == Acopykeyword)
+            {
+              keyword[i] = 0;
+              state = Akeyword_eol;
+              goto nextstate;
 	    }
-          else if (state == 4)
+          else if (state == Acopymetacmd)
             {
-              /* Has an argument. */
+              arg->r_opt = ARGPARSE_INVALID_META;  /* "]" missing */
+              goto leave;
+	    }
+          else if (state == Askipmetacmd || state == Askipmetacmd2)
+            {
+              state = Ametacmd;
+              goto nextstate;
+            }
+          else if (state == Awaitarg)
+            {
+              /* No argument found at the end of the line.  */
+              prepare_arg_return (arg, opts, idx, in_alias, set_ignore);
+              set_ignore = 0;
+              goto leave;
+	    }
+          else if (state == Acopyarg)
+            {
+              /* Has an argument at the end of a line. */
               if (in_alias)
                 {
                   if (!buffer)
@@ -721,82 +1346,61 @@
                         gpgrt_annotate_leaked_object (buffer);
                     }
                 }
-              break;
+              goto leave;
             }
           else if (c == EOF)
             {
               ignore_invalid_option_clear (arg);
-              if (ferror (fp))
+              if (gpgrt_ferror (fp))
                 arg->r_opt = ARGPARSE_READ_ERROR;
               else
                 arg->r_opt = 0; /* EOF. */
-              break;
+              goto leave;
             }
-          state = 0;
+          state = Ainit;
           i = 0;
-        }
-      else if (state == -1)
+        } /* (end handle end of line) */
+      else if (state == Askipandleave)
         ; /* Skip. */
-      else if (state == 0 && isascii (c) && isspace(c))
+      else if (state == Ainit && isascii (c) && isspace(c))
         ; /* Skip leading white space.  */
-      else if (state == 0 && c == '#' )
-        state = 1;	/* Start of a comment.  */
-      else if (state == 1)
+      else if (state == Ainit && c == '#' )
+        state = Acomment;	/* Start of a comment.  */
+      else if (state == Acomment || state == Askipmetacmd2)
         ; /* Skip comments. */
-      else if (state == 2 && isascii (c) && isspace(c))
+      else if (state == Askipmetacmd)
         {
-          /* Check keyword.  */
-          keyword[i] = 0;
-          for (i=0; opts[i].short_opt; i++ )
-            if (opts[i].long_opt && !strcmp (opts[i].long_opt, keyword))
-              break;
-          idx = i;
-          arg->r_opt = opts[idx].short_opt;
-          if ((opts[idx].flags & ARGPARSE_OPT_IGNORE))
+          if (c == '#')
+            state = Askipmetacmd2;
+          else if (!(isascii (c) && isspace(c)))
             {
-              state = 1; /* Process like a comment.  */
+              arg->r_opt = ARGPARSE_INVALID_META;
+              state = Askipandleave;
             }
-          else if (!opts[idx].short_opt)
-            {
-              if (!strcmp (keyword, "alias"))
-                {
-                  in_alias = 1;
-                  state = 3;
-                }
-              else if (!strcmp (keyword, "ignore-invalid-option"))
-                {
-                  if (ignore_invalid_option_add (arg, fp))
-                    {
-                      arg->r_opt = ARGPARSE_OUT_OF_CORE;
-                      break;
-                    }
-                  state = i = 0;
-                  ++*lineno;
-                }
-              else if (ignore_invalid_option_p (arg, keyword))
-                state = 1; /* Process like a comment.  */
-              else
-                {
-                  arg->r_opt = ((opts[idx].flags & ARGPARSE_OPT_COMMAND)
-                                ? ARGPARSE_INVALID_COMMAND
-                                : ARGPARSE_INVALID_OPTION);
-                  state = -1; /* Skip rest of line and leave.  */
-                }
-            }
-          else
-            state = 3;
         }
-      else if (state == 3)
+      else if (state == Acopykeyword && isascii (c) && isspace(c))
+        {
+          keyword[i] = 0;
+          state = Akeyword_spc;
+          goto nextstate;
+        }
+      else if (state == Acopymetacmd && c == ']')
+        {
+          keyword[i] = 0;
+          state = Askipmetacmd;
+          goto nextstate;
+        }
+      else if (state == Awaitarg)
         {
           /* Skip leading spaces of the argument.  */
           if (!isascii (c) || !isspace(c))
             {
               i = 0;
               keyword[i++] = c;
-              state = 4;
+              state = Acopyarg;
             }
         }
-      else if (state == 4)
+      else if (state == Acopyarg)
         {
           /* Collect the argument. */
           if (buffer)
@@ -819,7 +1423,7 @@
                     {
                       xfree (buffer);
                       arg->r_opt = ARGPARSE_OUT_OF_CORE;
-                      break;
+                      goto leave;
                     }
                 }
             }
@@ -838,130 +1442,554 @@
               else
                 {
                   arg->r_opt = ARGPARSE_OUT_OF_CORE;
-                  break;
+                  goto leave;
                 }
             }
         }
       else if (i >= DIM(keyword)-1)
         {
           arg->r_opt = ARGPARSE_KEYWORD_TOO_LONG;
-          state = -1; /* Skip rest of line and leave.  */
+          state = Askipandleave; /* Skip rest of line and leave.  */
+        }
+      else if (!i)
+        {
+          state = c == '[' ? Acopymetacmd : Acopykeyword;
+          keyword[i++] = c;
         }
       else
         {
           keyword[i++] = c;
-          state = 2;
         }
     }
 
+ leave:
   return arg->r_opt;
 }
 
 
+/* Return true if the list of options OPTS has any option marked with
+ * ARGPARSE_OPT_CONFFILE.  */
+static int
+any_opt_conffile (opttable_t *opts, unsigned int nopts)
+{
+  int i;
+
+  for (i=0; i < nopts; i++ )
+    if ((opts[i].flags & ARGPARSE_OPT_CONFFILE))
+      return 1;
+  return 0;
+}
+
 
+/* Return true if FNAME is an absolute filename.  */
 static int
-find_long_option( ARGPARSE_ARGS *arg,
-		  ARGPARSE_OPTS *opts, const char *keyword )
+is_absfname (const char *fname)
 {
-    int i;
-    size_t n;
+  const char *s;
 
-    (void)arg;
+#ifdef HAVE_W32_SYSTEM
+  s = strchr (fname, ':');
+  if (s)
+    s++;
+  else
+    s = fname;
+#else
+  s = fname;
+#endif
 
-    /* Would be better if we can do a binary search, but it is not
-       possible to reorder our option table because we would mess
-       up our help strings - What we can do is: Build a nice option
-       lookup table when this function is first invoked */
-    if( !*keyword )
-	return -1;
-    for(i=0; opts[i].short_opt; i++ )
-	if( opts[i].long_opt && !strcmp( opts[i].long_opt, keyword) )
-	    return i;
-#if 0
+  return (*s == '/'
+#ifdef HAVE_W32_SYSTEM
+          || *s == DIRSEP_C
+#endif
+          );
+}
+
+
+/* If FNAME specifies two files of the form
+ *   NAME1:/NAME2    (Unix)
+ * or
+ *   NAME1;[x:]/NAME2  (Windows)
+ * return a pointer to the delimiter or NULL if there is none.
+ */
+static const char *
+is_twopartfname (const char *fname)
+{
+  const char *s;
+
+  if ((s = strchr (fname, PATHSEP_C)) && is_absfname (s+1) && s != fname)
+    return s;
+  return NULL;
+}
+
+
+/* Try to use a version-ed config file name.  A version-ed config file
+ * name is one which has the packages version number appended.  For
+ * example if the standard config file name is "foo.conf" and the
+ * version of the foo program is 1.2.3-beta1 the following config
+ * files are tried in order until one is readable:
+ *
+ *   foo.conf-1.2.3-beta1
+ *   foo.conf-1.2.3
+ *   foo.conf-1.2
+ *   foo.conf-1
+ *   foo.conf
+ *
+ * The argument CONFIGNAME should already be expanded.  On success a
+ * newly allocated file name is returned.  On error NULL is returned.
+ */
+static char *
+try_versioned_conffile (const char *configname)
+{
+  const char *version = strusage (13);
+  char *name;
+  char *dash, *endp;
+
+  if (!version || !*version)
+    return NULL; /* No program version known. */
+
+  name = strconcat (configname, "-", version, NULL);
+  if (!name)
+    return NULL;  /* Oops: Out of core - ignore.  */
+  dash = name + strlen (configname);
+
+  endp = dash + strlen (dash) - 1;
+  while (endp > dash)
     {
-	ALIAS_DEF a;
-	/* see whether it is an alias */
-	for( a = args->internal.aliases; a; a = a->next ) {
-	    if( !strcmp( a->name, keyword) ) {
-		/* todo: must parse the alias here */
-		args->internal.cur_alias = a;
-		return -3; /* alias available */
-	    }
-	}
+      if (!gnupg_access (name, R_OK))
+        {
+          return name;
+        }
+      for (; endp > dash; endp--)
+        {
+          if (*endp == '-' || *endp == '.')
+            {
+              *endp = 0;
+              break;
+            }
+        }
     }
-#endif
-    /* not found, see whether it is an abbreviation */
-    /* aliases may not be abbreviated */
-    n = strlen( keyword );
-    for(i=0; opts[i].short_opt; i++ ) {
-	if( opts[i].long_opt && !strncmp( opts[i].long_opt, keyword, n ) ) {
-	    int j;
-	    for(j=i+1; opts[j].short_opt; j++ ) {
-		if( opts[j].long_opt
-		    && !strncmp( opts[j].long_opt, keyword, n )
-                    && !(opts[j].short_opt == opts[i].short_opt
-                         && opts[j].flags == opts[i].flags ) )
-		    return -2;	/* abbreviation is ambiguous */
+
+  xfree (name);
+  return NULL;
+}
+
+
+/* This function is called after a sysconf file has been read.  */
+static void
+finish_read_sys (gnupg_argparse_t *arg)
+{
+  opttable_t *opts = arg->internal->opts;
+  unsigned int nopts = arg->internal->nopts;
+  int i;
+
+  if (arg->internal->ignore_all_seen)
+    {
+      /* [ignore-all] was used: Set all options which have not
+       * explictly been set as ignore or not ignore to ignore.  */
+      for (i = 0; i < nopts; i++)
+        {
+          if (!opts[i].explicit_ignore)
+            opts[i].ignore = 1;
+        }
+    }
+
+  /* Reset all flags which pertain only to sysconf files.  */
+  arg->internal->in_sysconf = 0;
+  arg->internal->user_active = 0;
+  arg->internal->mark_forced = 0;
+  arg->internal->mark_ignore = 0;
+  arg->internal->explicit_ignore = 0;
+  arg->internal->ignore_all_seen = 0;
+}
+
+/* The full arg parser which handles option files and command line
+ * arguments.  The behaviour depends on the combinations of CONFNAME
+ * and the ARGPARSE_FLAG_xxx values:
+ *
+ * | CONFNAME | SYS | USER | Action             |
+ * |----------+-----+------+--------------------|
+ * | NULL     |   - |    - | cmdline            |
+ * | string   |   0 |    1 | user, cmdline      |
+ * | string   |   1 |    0 | sys, cmdline       |
+ * | string   |   1 |    1 | sys, user, cmdline |
+ *
+ * Note that if an option has been flagged with ARGPARSE_OPT_CONFFILE
+ * and a type of ARGPARSE_TYPE_STRING that option is not returned but
+ * the specified configuration file is processed directly; if
+ * ARGPARSE_TYPE_NONE is used no user configuration files are
+ * processed and from the system configuration files only those which
+ * are immutable are processed.  The string values for CONFNAME shall
+ * not include a directory part because that is taken from the values
+ * set by gnupg_set_confdir.  However, if CONFNAME is a twopart
+ * filename delimited by a colon (semicolon on Windows) with the
+ * second part being an absolute filename, the first part is used for
+ * the SYS file and the the entire second part for the USER file.
+ */
+int
+gnupg_argparser (gnupg_argparse_t *arg, gnupg_opt_t *opts,
+                 const char *confname)
+{
+  /* First check whether releasing the resources has been requested.  */
+  if (arg && !opts)
+    {
+      deinitialize (arg);
+      return 0;
+    }
+
+  /* Make sure that the internal data object is ready and also print
+   * warnings or errors from the last iteration.  */
+  if (initialize (arg, opts, NULL))
+    return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+
+ next_state:
+  switch (arg->internal->state)
+    {
+    case STATE_init:
+      if (arg->argc && arg->argv && *arg->argc
+          && any_opt_conffile (arg->internal->opts, arg->internal->nopts))
+        {
+          /* The list of option allow for conf files
+           * (e.g. gpg's "--option FILE" and "--no-options")
+           * Now check whether one was really given on the command
+           * line.  Note that we don't need to run this code if no
+           * argument array was provided. */
+          int  save_argc = *arg->argc;
+          char **save_argv = *arg->argv;
+          unsigned int save_flags = arg->flags;
+          int save_idx = arg->internal->idx;
+          int any_no_conffile = 0;
+
+          arg->flags = (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION
+                        | ARGPARSE_FLAG__INITIALIZED);
+          while (arg_parse (arg, opts, 1))
+            {
+              if ((arg->internal->opt_flags & ARGPARSE_OPT_CONFFILE))
+                {
+                  arg->internal->explicit_confopt = 1;
+                  if ((arg->r_type & ARGPARSE_TYPE_MASK) == ARGPARSE_TYPE_STRING
+                      && !arg->internal->explicit_conffile)
+                    {
+                      /* Store the first conffile name.  All further
+                       * conf file options are not handled.  */
+                      arg->internal->explicit_conffile
+                        = xtrystrdup (arg->r.ret_str);
+                      if (!arg->internal->explicit_conffile)
+                        return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+
+                    }
+                  else if ((arg->r_type & ARGPARSE_TYPE_MASK)
+                            == ARGPARSE_TYPE_NONE)
+                    any_no_conffile = 1;
+                }
+            }
+          if (any_no_conffile)
+            {
+              /* A NoConffile option overrides any other conf file option.  */
+              xfree (arg->internal->explicit_conffile);
+              arg->internal->explicit_conffile = NULL;
+            }
+          /* Restore parser.  */
+          *arg->argc = save_argc;
+          *arg->argv = save_argv;
+          arg->flags = save_flags;
+          arg->internal->idx = save_idx;
+        }
+
+      if (confname && *confname)
+        {
+          if ((arg->flags & ARGPARSE_FLAG_SYS))
+            arg->internal->state = STATE_open_sys;
+          else if ((arg->flags & ARGPARSE_FLAG_USER))
+            arg->internal->state = STATE_open_user;
+          else
+            return (arg->r_opt = ARGPARSE_INVALID_ARG);
+        }
+      else
+        arg->internal->state = STATE_open_cmdline;
+      goto next_state;
+
+    case STATE_open_sys:
+      {
+        /* If it is a two part name take the first part.  */
+        const char *s;
+        char *tmpname = NULL;
+
+        if ((s = is_twopartfname (confname)))
+          {
+            tmpname = xtrymalloc (s - confname + 1);
+            if (!tmpname)
+              return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+            memcpy (tmpname, confname, s-confname);
+            tmpname[s-confname] = 0;
+            s = tmpname;
+          }
+        else
+          s = confname;
+        xfree (arg->internal->confname);
+        arg->internal->confname = make_filename_try
+          (confdir.sys? confdir.sys : "/etc", s, NULL);
+        xfree (tmpname);
+        if (!arg->internal->confname)
+          return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+      }
+      arg->lineno = 0;
+      arg->internal->idx = 0;
+      arg->internal->verbose = 0;
+      arg->internal->stopped = 0;
+      arg->internal->inarg = 0;
+      gpgrt_fclose (arg->internal->conffp);
+      arg->internal->conffp = gpgrt_fopen (arg->internal->confname, "r");
+      if (!arg->internal->conffp)
+        {
+          if ((arg->flags & ARGPARSE_FLAG_VERBOSE) || arg->internal->verbose)
+            log_info (_("Note: no default option file '%s'\n"),
+                             arg->internal->confname);
+          if ((arg->flags & ARGPARSE_FLAG_USER))
+            arg->internal->state = STATE_open_user;
+          else
+            arg->internal->state = STATE_open_cmdline;
+          goto next_state;
+        }
+
+      if ((arg->flags & ARGPARSE_FLAG_VERBOSE) || arg->internal->verbose)
+        log_info (_("reading options from '%s'\n"),
+                         arg->internal->confname);
+      arg->internal->state = STATE_read_sys;
+      arg->internal->in_sysconf = 1;
+      arg->r.ret_str = xtrystrdup (arg->internal->confname);
+      if (!arg->r.ret_str)
+        arg->r_opt = ARGPARSE_OUT_OF_CORE;
+      else
+        {
+          gpgrt_annotate_leaked_object (arg->r.ret_str);
+          arg->r_opt = ARGPARSE_CONFFILE;
+          arg->r_type = ARGPARSE_TYPE_STRING;
+        }
+      break;
+
+    case STATE_open_user:
+      if (arg->internal->explicit_confopt
+          && arg->internal->explicit_conffile)
+        {
+          /* An explict option to use a specific configuration file
+           * has been given - use that one.  */
+          xfree (arg->internal->confname);
+          arg->internal->confname
+            = xtrystrdup (arg->internal->explicit_conffile);
+          if (!arg->internal->confname)
+            return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+        }
+      else if (arg->internal->explicit_confopt)
+        {
+          /* An explict option not to use a configuration file has
+           * been given - leap direct to command line reading.  */
+          arg->internal->state = STATE_open_cmdline;
+          goto next_state;
+        }
+      else
+        {
+          /* Use the standard configure file.  If it is a two part
+           * name take the second part.  If it is the standard name
+           * and ARGPARSE_FLAG_USERVERS is set try versioned config
+           * files. */
+          const char *s;
+          char *nconf;
+
+          xfree (arg->internal->confname);
+          if ((s = is_twopartfname (confname)))
+            {
+              arg->internal->confname = make_filename_try (s + 1, NULL);
+              if (!arg->internal->confname)
+                return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+            }
+          else
+            {
+              arg->internal->confname = make_filename_try
+                (confdir.user? confdir.user : "~/.config", confname, NULL);
+              if (!arg->internal->confname)
+                return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
+              if ((arg->flags & ARGPARSE_FLAG_USERVERS)
+                  && (nconf = try_versioned_conffile (arg->internal->confname)))
+                {
+                  xfree (arg->internal->confname);
+                  arg->internal->confname = nconf;
+                }
+            }
+        }
+      arg->lineno = 0;
+      arg->internal->idx = 0;
+      arg->internal->verbose = 0;
+      arg->internal->stopped = 0;
+      arg->internal->inarg = 0;
+      arg->internal->in_sysconf = 0;
+      gpgrt_fclose (arg->internal->conffp);
+      arg->internal->conffp = gpgrt_fopen (arg->internal->confname, "r");
+      if (!arg->internal->conffp)
+        {
+          arg->internal->state = STATE_open_cmdline;
+          if (arg->internal->explicit_confopt)
+            {
+              log_error (_("option file '%s': %s\n"),
+                                arg->internal->confname, strerror (errno));
+              return (arg->r_opt = ARGPARSE_NO_CONFFILE);
+            }
+          else
+            {
+              if ((arg->flags & ARGPARSE_FLAG_VERBOSE)
+                  || arg->internal->verbose)
+                log_info (_("Note: no default option file '%s'\n"),
+                                 arg->internal->confname);
+              goto next_state;
+            }
+        }
+
+      if ((arg->flags & ARGPARSE_FLAG_VERBOSE) || arg->internal->verbose)
+        log_info (_("reading options from '%s'\n"),
+                         arg->internal->confname);
+      arg->internal->state = STATE_read_user;
+      arg->r.ret_str = xtrystrdup (arg->internal->confname);
+      if (!arg->r.ret_str)
+        arg->r_opt = ARGPARSE_OUT_OF_CORE;
+      else
+        {
+          gpgrt_annotate_leaked_object (arg->r.ret_str);
+          arg->r_opt = ARGPARSE_CONFFILE;
+          arg->r_type = ARGPARSE_TYPE_STRING;
+        }
+      break;
+
+    case STATE_open_cmdline:
+      gpgrt_fclose (arg->internal->conffp);
+      arg->internal->conffp = NULL;
+      xfree (arg->internal->confname);
+      arg->internal->confname = NULL;
+      arg->internal->idx = 0;
+      arg->internal->verbose = 0;
+      arg->internal->stopped = 0;
+      arg->internal->inarg = 0;
+      arg->internal->in_sysconf = 0;
+      if (!arg->argc || !arg->argv || !*arg->argv)
+        {
+          /* No or empty argument vector - don't bother to parse things.  */
+          arg->internal->state = STATE_finished;
+          goto next_state;
+        }
+      arg->r_opt = ARGPARSE_CONFFILE;
+      arg->r_type = ARGPARSE_TYPE_NONE;
+      arg->r.ret_str = NULL;
+      arg->internal->state = STATE_read_cmdline;
+      break;
+
+    case STATE_read_sys:
+     arg->r_opt = gnupg_argparse (arg->internal->conffp, arg, opts);
+      if (!arg->r_opt)
+        {
+          finish_read_sys (arg);
+          arg->internal->state = STATE_open_user;
+          goto next_state;
+        }
+      if ((arg->internal->opt_flags & ARGPARSE_OPT_CONFFILE))
+        goto next_state;  /* Already handled - again.  */
+      break;
+
+    case STATE_read_user:
+      arg->r_opt = gnupg_argparse (arg->internal->conffp, arg, opts);
+      if (!arg->r_opt)
+        {
+          arg->internal->state = STATE_open_cmdline;
+          goto next_state;
+        }
+      if ((arg->internal->opt_flags & ARGPARSE_OPT_CONFFILE))
+        goto next_state;  /* Already handled - again.  */
+      break;
+
+    case STATE_read_cmdline:
+      arg->r_opt = arg_parse (arg, opts, 1);
+      if (!arg->r_opt)
+        {
+          arg->internal->state = STATE_finished;
+          goto next_state;
+        }
+      if ((arg->internal->opt_flags & ARGPARSE_OPT_CONFFILE))
+        goto next_state;  /* Already handled - again.  */
+      break;
+
+    case STATE_finished:
+      arg->r_opt = 0;
+      break;
+    }
+
+  return arg->r_opt;
+}
+
+
+
+/* Given the list of options in ARG and a keyword, return the index of
+ * the long option matching KEYWORD.  On error -1 is returned for not
+ * found or -2 for ambigious keyword.  */
+static int
+find_long_option (gnupg_argparse_t *arg, const char *keyword)
+{
+  int i;
+  size_t n;
+  opttable_t *opts   = arg->internal->opts;
+  unsigned int nopts = arg->internal->nopts;
+
+  /* Would be better if we can do a binary search, but it is not
+   * possible to reorder our option table because we would mess up our
+   * help strings.  What we can do is: Build an option lookup table
+   * when this function is first invoked.  The latter has already been
+   * done. */
+  if (!*keyword)
+    return -1;
+  for (i=0; i < nopts; i++ )
+    if (opts[i].long_opt && !strcmp (opts[i].long_opt, keyword))
+      return i;
+  /* Not found.  See whether it is an abbreviation.  Aliases may not
+   * be abbreviated, though. */
+  n = strlen (keyword);
+  for (i=0; i < nopts; i++)
+    {
+      if (opts[i].long_opt && !strncmp (opts[i].long_opt, keyword, n))
+        {
+          int j;
+          for (j=i+1; j < nopts; j++)
+            {
+              if (opts[j].long_opt
+                  && !strncmp (opts[j].long_opt, keyword, n)
+                  && !(opts[j].short_opt == opts[i].short_opt
+                       && opts[j].flags == opts[i].flags ) )
+                return -2;  /* Abbreviation is ambiguous.  */
 	    }
-	    return i;
+          return i;
 	}
     }
-    return -1;  /* Not found.  */
+  return -1;  /* Not found.  */
 }
 
-int
-arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
+
+/* The option parser for command line options.  */
+static int
+arg_parse (gnupg_argparse_t *arg, gnupg_opt_t *opts_orig, int no_init)
 {
   int idx;
+  opttable_t *opts;
+  unsigned int nopts;
   int argc;
   char **argv;
   char *s, *s2;
   int i;
 
-  /* Fill in missing standard options: help, version, warranty and
-   * dump-options.  */
-  ARGPARSE_OPTS help_opt
-    = ARGPARSE_s_n (ARGPARSE_SHORTOPT_HELP, "help", "@");
-  ARGPARSE_OPTS version_opt
-    = ARGPARSE_s_n (ARGPARSE_SHORTOPT_VERSION, "version", "@");
-  ARGPARSE_OPTS warranty_opt
-    = ARGPARSE_s_n (ARGPARSE_SHORTOPT_WARRANTY, "warranty", "@");
-  ARGPARSE_OPTS dump_options_opt
-    = ARGPARSE_s_n(ARGPARSE_SHORTOPT_DUMP_OPTIONS, "dump-options", "@");
-  int seen_help = 0;
-  int seen_version = 0;
-  int seen_warranty = 0;
-  int seen_dump_options = 0;
-
-  i = 0;
-  while (opts[i].short_opt)
-    {
-      if (opts[i].long_opt)
-	{
-	  if (!strcmp(opts[i].long_opt, help_opt.long_opt))
-	    seen_help = 1;
-	  else if (!strcmp(opts[i].long_opt, version_opt.long_opt))
-	    seen_version = 1;
-	  else if (!strcmp(opts[i].long_opt, warranty_opt.long_opt))
-	    seen_warranty = 1;
-	  else if (!strcmp(opts[i].long_opt, dump_options_opt.long_opt))
-	    seen_dump_options = 1;
-	}
-      i++;
-    }
-  if (! seen_help)
-    opts[i++] = help_opt;
-  if (! seen_version)
-    opts[i++] = version_opt;
-  if (! seen_warranty)
-    opts[i++] = warranty_opt;
-  if (! seen_dump_options)
-    opts[i++] = dump_options_opt;
+  if (no_init)
+    ;
+  else if (initialize (arg, opts_orig, NULL))
+    return (arg->r_opt = ARGPARSE_OUT_OF_CORE);
 
-  initialize( arg, NULL, NULL );
+  opts = arg->internal->opts;
+  nopts = arg->internal->nopts;
   argc = *arg->argc;
   argv = *arg->argv;
-  idx = arg->internal.idx;
+  idx = arg->internal->idx;
 
   if (!idx && argc && !(arg->flags & ARGPARSE_FLAG_ARG0))
     {
@@ -970,24 +1998,24 @@
     }
 
  next_one:
-  if (!argc)
+  if (!argc || (s = *argv) == NULL)
     {
       /* No more args.  */
       arg->r_opt = 0;
       goto leave; /* Ready. */
     }
 
-  s = *argv;
-  arg->internal.last = s;
+  arg->internal->last = s;
+  arg->internal->opt_flags = 0;
 
-  if (arg->internal.stopped && (arg->flags & ARGPARSE_FLAG_ALL))
+  if (arg->internal->stopped && (arg->flags & ARGPARSE_FLAG_ALL))
     {
       arg->r_opt = ARGPARSE_IS_ARG;  /* Not an option but an argument.  */
-      arg->r_type = 2;
+      arg->r_type = ARGPARSE_TYPE_STRING;
       arg->r.ret_str = s;
       argc--; argv++; idx++; /* set to next one */
     }
-  else if( arg->internal.stopped )
+  else if (arg->internal->stopped)
     {
       arg->r_opt = 0;
       goto leave; /* Ready.  */
@@ -997,11 +2025,11 @@
       /* Long option.  */
       char *argpos;
 
-      arg->internal.inarg = 0;
+      arg->internal->inarg = 0;
       if (!s[2] && !(arg->flags & ARGPARSE_FLAG_NOSTOP))
         {
           /* Stop option processing.  */
-          arg->internal.stopped = 1;
+          arg->internal->stopped = 1;
           arg->flags |= ARGPARSE_FLAG_STOP_SEEN;
           argc--; argv++; idx++;
           goto next_one;
@@ -1010,33 +2038,38 @@
       argpos = strchr( s+2, '=' );
       if ( argpos )
         *argpos = 0;
-      i = find_long_option ( arg, opts, s+2 );
+      i = find_long_option (arg, s+2);
       if ( argpos )
         *argpos = '=';
 
       if (i > 0 && opts[i].short_opt == ARGPARSE_SHORTOPT_HELP)
-        show_help (opts, arg->flags);
+        {
+          show_help (opts, nopts, arg->flags);
+          my_exit (arg, 0);
+        }
       else if (i > 0 && opts[i].short_opt == ARGPARSE_SHORTOPT_VERSION)
         {
           if (!(arg->flags & ARGPARSE_FLAG_NOVERSION))
             {
               show_version ();
-              exit(0);
+              my_exit (arg, 0);
             }
 	}
       else if (i > 0 && opts[i].short_opt == ARGPARSE_SHORTOPT_WARRANTY)
         {
           writestrings (0, strusage (16), "\n", NULL);
-          exit (0);
+          my_exit (arg, 0);
 	}
+      else if (i > 0 && opts[i].short_opt == ARGPARSE_SHORTOPT_DUMP_OPTTBL)
+        dump_option_table (arg);
       else if (i > 0 && opts[i].short_opt == ARGPARSE_SHORTOPT_DUMP_OPTIONS)
         {
-          for (i=0; opts[i].short_opt; i++ )
+          for (i=0; i < nopts; i++ )
             {
               if (opts[i].long_opt && !(opts[i].flags & ARGPARSE_OPT_IGNORE))
                 writestrings (0, "--", opts[i].long_opt, "\n", NULL);
 	    }
-          exit (0);
+          my_exit (arg, 0);
 	}
 
       if ( i == -2 )
@@ -1048,6 +2081,7 @@
 	}
       else
         arg->r_opt = opts[i].short_opt;
+
       if ( i < 0 )
         ;
       else if ( (opts[i].flags & ARGPARSE_TYPE_MASK) )
@@ -1060,6 +2094,7 @@
 	    }
           else
             s2 = argv[1];
+
           if ( !s2 && (opts[i].flags & ARGPARSE_OPT_OPTIONAL) )
             {
               arg->r_type = ARGPARSE_TYPE_NONE; /* Argument is optional.  */
@@ -1091,125 +2126,157 @@
           if ( argpos )
             arg->r_type = ARGPARSE_UNEXPECTED_ARG;
           else
-            arg->r_type = 0;
+            {
+              arg->internal->opt_flags = opts[i].flags;
+              arg->r_type = ARGPARSE_TYPE_NONE;
+            }
 	}
       argc--; argv++; idx++; /* Set to next one.  */
     }
-    else if ( (*s == '-' && s[1]) || arg->internal.inarg )
-      {
-        /* Short option.  */
-	int dash_kludge = 0;
+  else if ( (*s == '-' && s[1]) || arg->internal->inarg )
+    {
+      /* Short option.  */
+      int dash_kludge = 0;
 
-	i = 0;
-	if ( !arg->internal.inarg )
-          {
-	    arg->internal.inarg++;
-	    if ( (arg->flags & ARGPARSE_FLAG_ONEDASH) )
-              {
-                for (i=0; opts[i].short_opt; i++ )
-                  if ( opts[i].long_opt && !strcmp (opts[i].long_opt, s+1))
-                    {
-                      dash_kludge = 1;
-                      break;
-		    }
-              }
-          }
-	s += arg->internal.inarg;
+      i = 0;
+      if ( !arg->internal->inarg )
+        {
+          arg->internal->inarg++;
+          if ( (arg->flags & ARGPARSE_FLAG_ONEDASH) )
+            {
+              for (i=0; i < nopts; i++ )
+                if ( opts[i].long_opt && !strcmp (opts[i].long_opt, s+1))
+                  {
+                    dash_kludge = 1;
+                    break;
+                  }
+            }
+        }
+      s += arg->internal->inarg;
 
-	if (!dash_kludge )
-          {
-	    for (i=0; opts[i].short_opt; i++ )
-              if ( opts[i].short_opt == *s )
-                break;
-          }
+      if (!dash_kludge )
+        {
+          for (i=0; i < nopts; i++ )
+            if ( opts[i].short_opt == *s )
+              break;
+        }
 
-	if ( !opts[i].short_opt && ( *s == 'h' || *s == '?' ) )
-          show_help (opts, arg->flags);
+      if ( !opts[i].short_opt && ( *s == 'h' || *s == '?' ) )
+        {
+          show_help (opts, nopts, arg->flags);
+          my_exit (arg, 0);
+        }
 
-	arg->r_opt = opts[i].short_opt;
-	if (!opts[i].short_opt )
-          {
-	    arg->r_opt = (opts[i].flags & ARGPARSE_OPT_COMMAND)?
-              ARGPARSE_INVALID_COMMAND:ARGPARSE_INVALID_OPTION;
-	    arg->internal.inarg++; /* Point to the next arg.  */
-	    arg->r.ret_str = s;
-          }
-	else if ( (opts[i].flags & ARGPARSE_TYPE_MASK) )
-          {
-	    if ( s[1] && !dash_kludge )
-              {
-		s2 = s+1;
-		set_opt_arg (arg, opts[i].flags, s2);
-              }
-	    else
-              {
-		s2 = argv[1];
-		if ( !s2 && (opts[i].flags & ARGPARSE_OPT_OPTIONAL) )
-                  {
-		    arg->r_type = ARGPARSE_TYPE_NONE;
-                  }
-		else if ( !s2 )
-                  {
-		    arg->r_opt = ARGPARSE_MISSING_ARG;
-                  }
-		else if ( *s2 == '-' && s2[1]
-                          && (opts[i].flags & ARGPARSE_OPT_OPTIONAL) )
-                  {
-		    /* The argument is optional and the next seems to
-	               be an option.  We do not check this possible
-	               option but assume no argument.  */
-		    arg->r_type = ARGPARSE_TYPE_NONE;
-                  }
-		else
-                  {
-		    set_opt_arg (arg, opts[i].flags, s2);
-		    argc--; argv++; idx++; /* Skip one.  */
-                  }
-              }
-	    s = "x"; /* This is so that !s[1] yields false.  */
-          }
-	else
-          {
-            /* Does not take an argument.  */
-	    arg->r_type = ARGPARSE_TYPE_NONE;
-	    arg->internal.inarg++; /* Point to the next arg.  */
-          }
-	if ( !s[1] || dash_kludge )
-          {
-            /* No more concatenated short options.  */
-	    arg->internal.inarg = 0;
-	    argc--; argv++; idx++;
-          }
-      }
+      arg->r_opt = opts[i].short_opt;
+      if (!opts[i].short_opt )
+        {
+          arg->r_opt = (opts[i].flags & ARGPARSE_OPT_COMMAND)?
+            ARGPARSE_INVALID_COMMAND:ARGPARSE_INVALID_OPTION;
+          arg->internal->inarg++; /* Point to the next arg.  */
+          arg->r.ret_str = s;
+        }
+      else if ( (opts[i].flags & ARGPARSE_TYPE_MASK) )
+        {
+          if ( s[1] && !dash_kludge )
+            {
+              s2 = s+1;
+              set_opt_arg (arg, opts[i].flags, s2);
+            }
+          else
+            {
+              s2 = argv[1];
+              if ( !s2 && (opts[i].flags & ARGPARSE_OPT_OPTIONAL) )
+                {
+                  arg->r_type = ARGPARSE_TYPE_NONE;
+                  arg->internal->opt_flags = opts[i].flags;
+                }
+              else if ( !s2 )
+                {
+                  arg->r_opt = ARGPARSE_MISSING_ARG;
+                }
+              else if ( *s2 == '-' && s2[1]
+                        && (opts[i].flags & ARGPARSE_OPT_OPTIONAL) )
+                {
+                  /* The argument is optional and the next seems to
+                     be an option.  We do not check this possible
+                     option but assume no argument.  */
+                  arg->r_type = ARGPARSE_TYPE_NONE;
+                  arg->internal->opt_flags = opts[i].flags;
+                }
+              else
+                {
+                  set_opt_arg (arg, opts[i].flags, s2);
+                  argc--; argv++; idx++; /* Skip one.  */
+                }
+            }
+          s = "x"; /* This is so that !s[1] yields false.  */
+        }
+      else
+        {
+          /* Does not take an argument.  */
+          arg->r_type = ARGPARSE_TYPE_NONE;
+          arg->internal->opt_flags = opts[i].flags;
+          arg->internal->inarg++; /* Point to the next arg.  */
+        }
+      if ( !s[1] || dash_kludge )
+        {
+          /* No more concatenated short options.  */
+          arg->internal->inarg = 0;
+          argc--; argv++; idx++;
+        }
+    }
   else if ( arg->flags & ARGPARSE_FLAG_MIXED )
     {
       arg->r_opt = ARGPARSE_IS_ARG;
-      arg->r_type = 2;
+      arg->r_type = ARGPARSE_TYPE_STRING;
       arg->r.ret_str = s;
       argc--; argv++; idx++; /* Set to next one.  */
     }
   else
     {
-      arg->internal.stopped = 1; /* Stop option processing.  */
+      arg->internal->stopped = 1; /* Stop option processing.  */
       goto next_one;
     }
 
+  if (arg->r_opt > 0 && i >= 0 && i < nopts
+      && ((opts[i].ignore && opts[i].explicit_ignore) || opts[i].forced))
+    {
+
+      if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
+        {
+          if (opts[i].ignore)
+            arg->r_type |= ARGPARSE_ATTR_IGNORE;
+          if (opts[i].forced)
+            arg->r_type |= ARGPARSE_ATTR_FORCE;
+          arg->r_type |= ARGPARSE_OPT_IGNORE;
+        }
+      else
+        {
+          log_info (_("Note: ignoring option \"--%s\""
+                             " due to global config\n"),
+                           opts[i].long_opt);
+          goto next_one;  /* Skip ignored/forced option.  */
+        }
+    }
+
  leave:
   *arg->argc = argc;
   *arg->argv = argv;
-  arg->internal.idx = idx;
+  arg->internal->idx = idx;
   return arg->r_opt;
 }
 
 
+
 /* Returns: -1 on error, 0 for an integer type and 1 for a non integer
    type argument.  */
 static int
-set_opt_arg (ARGPARSE_ARGS *arg, unsigned flags, char *s)
+set_opt_arg (gnupg_argparse_t *arg, unsigned flags, char *s)
 {
   int base = (flags & ARGPARSE_OPT_PREFIX)? 0 : 10;
   long l;
 
+  arg->internal->opt_flags = flags;
   switch ( (arg->r_type = (flags & ARGPARSE_TYPE_MASK)) )
     {
     case ARGPARSE_TYPE_LONG:
@@ -1258,8 +2325,10 @@
 }
 
 
+/* Return the length of the option O.  This needs to consider the
+ * description as well as the option name.  */
 static size_t
-long_opt_strlen( ARGPARSE_OPTS *o )
+long_opt_strlen (opttable_t *o)
 {
   size_t n = strlen (o->long_opt);
 
@@ -1272,8 +2341,8 @@
       if ( *s != '=' )
         n++;
       /* For a (mostly) correct length calculation we exclude
-         continuation bytes (10xxxxxx) if we are on a native utf8
-         terminal. */
+       * continuation bytes (10xxxxxx) if we are on a native utf8
+       * terminal. */
       for (; *s && *s != '|'; s++ )
         if ( is_utf8 && (*s&0xc0) != 0x80 )
           n++;
@@ -1282,22 +2351,35 @@
 }
 
 
+/* Qsort compare for show_help.  */
+static int
+cmp_ordtbl (const void *a_v, const void *b_v)
+{
+  const unsigned short *a = a_v;
+  const unsigned short *b = b_v;
+
+  return *a - *b;
+}
+
+
 /****************
  * Print formatted help. The description string has some special
  * meanings:
  *  - A description string which is "@" suppresses help output for
  *    this option
- *  - a description,ine which starts with a '@' and is followed by
+ *  - a description which starts with a '@' and is followed by
  *    any other characters is printed as is; this may be used for examples
- *    ans such.
+ *    and such.  This is a legacy methiod, moder codes uses the flags
+ *    ARGPARSE_OPT_VERBATIM or ARGPARSE_OPT_HEADER.
  *  - A description which starts with a '|' outputs the string between this
  *    bar and the next one as arguments of the long option.
  */
 static void
-show_help (ARGPARSE_OPTS *opts, unsigned int flags)
+show_help (opttable_t *opts, unsigned int nopts, unsigned int flags)
 {
   const char *s;
   char tmp[2];
+  unsigned int *ordtbl = NULL;
 
   show_version ();
   writestrings (0, "\n", NULL);
@@ -1311,30 +2393,68 @@
     }
   s = strusage(41);
   writestrings (0, s, "\n", NULL);
-  if ( opts[0].description )
+  if ( nopts )
     {
       /* Auto format the option description.  */
-      int i,j, indent;
+      int i,j,indent;
+      const char *last_header = NULL;
+
+      ordtbl = xtrycalloc (nopts, sizeof *ordtbl);
+      if (!ordtbl)
+        {
+          writestrings (1, "\nOoops: Out of memory whilst printing the help.\n",
+                        NULL);
+          goto leave;
+        }
 
       /* Get max. length of long options.  */
-      for (i=indent=0; opts[i].short_opt; i++ )
+      for (i=indent=0; i < nopts; i++ )
         {
           if ( opts[i].long_opt )
             if ( !opts[i].description || *opts[i].description != '@' )
               if ( (j=long_opt_strlen(opts+i)) > indent && j < 35 )
                 indent = j;
+          ordtbl[i] = opts[i].ordinal;
 	}
 
+      qsort (ordtbl, nopts, sizeof *ordtbl, cmp_ordtbl);
+
+      /* The first option needs to have a description; if not do not
+       * print the help at all.  */
+      if (!opts[ordtbl[0]].description)
+        goto leave;
+
       /* Example: " -v, --verbose   Viele Sachen ausgeben" */
       indent += 10;
-      if ( *opts[0].description != '@' )
+      if ( *opts[ordtbl[0]].description != '@'
+           && !(opts[ordtbl[0]].flags
+                & (ARGPARSE_OPT_VERBATIM|ARGPARSE_OPT_HEADER)))
         writestrings (0, "Options:", "\n", NULL);
-      for (i=0; opts[i].short_opt; i++ )
+      for (i=0; i < nopts; i++ )
         {
-          s = map_static_macro_string (_( opts[i].description ));
+          s = map_fixed_string (_( opts[ordtbl[i]].description ));
           if ( s && *s== '@' && !s[1] ) /* Hide this line.  */
             continue;
-          if ( s && *s == '@' )  /* Unindented comment only line.  */
+          if ( s && (opts[ordtbl[i]].flags & ARGPARSE_OPT_HEADER))
+            {
+              /* We delay printing until we have found one real output
+               * line.  This avoids having a header above an empty
+               * section.  */
+              last_header = s;
+              continue;
+	    }
+          if (last_header)
+            {
+              if (*last_header)
+                writestrings (0, "\n", last_header, ":\n", NULL);
+              last_header = NULL;
+            }
+          if ( s && (opts[ordtbl[i]].flags & ARGPARSE_OPT_VERBATIM))
+            {
+              writestrings (0, s, NULL);
+              continue;
+	    }
+          if ( s && *s == '@' )  /* Unindented legacy comment only line.  */
             {
               for (s++; *s; s++ )
                 {
@@ -1355,12 +2475,12 @@
 	    }
 
           j = 3;
-          if ( opts[i].short_opt < 256 )
+          if ( opts[ordtbl[i]].short_opt < 256 )
             {
-              tmp[0] = opts[i].short_opt;
+              tmp[0] = opts[ordtbl[i]].short_opt;
               tmp[1] = 0;
               writestrings (0, " -", tmp, NULL );
-              if ( !opts[i].long_opt )
+              if ( !opts[ordtbl[i]].long_opt )
                 {
                   if (s && *s == '|' )
                     {
@@ -1378,11 +2498,11 @@
 	    }
           else
             writestrings (0, "   ", NULL);
-          if ( opts[i].long_opt )
+          if ( opts[ordtbl[i]].long_opt )
             {
-              tmp[0] = opts[i].short_opt < 256?',':' ';
+              tmp[0] = opts[ordtbl[i]].short_opt < 256?',':' ';
               tmp[1] = 0;
-              j += writestrings (0, tmp, " --", opts[i].long_opt, NULL);
+              j += writestrings (0, tmp, " --", opts[ordtbl[i]].long_opt, NULL);
               if (s && *s == '|' )
                 {
                   if ( *++s != '=' )
@@ -1442,10 +2562,13 @@
       writestrings (0, "\n", NULL);
       writestrings (0, s, NULL);
     }
+
+ leave:
   flushstrings (0);
-  exit(0);
+  xfree (ordtbl);
 }
 
+
 static void
 show_version ()
 {
@@ -1481,44 +2604,73 @@
 }
 
 
-void
-usage (int level)
+/* Print the table of options with flags etc.  */
+static void
+dump_option_table (gnupg_argparse_t *arg)
 {
-  const char *p;
+  opttable_t *opts;
+  unsigned int nopts;
+  const char *s;
+  char tmp[50];
+  unsigned int *ordtbl = NULL;
+  int i;
 
-  if (!level)
+  opts = arg->internal->opts;
+  nopts = arg->internal->nopts;
+  if (!nopts)
+    return;
+
+  ordtbl = xtrycalloc (nopts, sizeof *ordtbl);
+  if (!ordtbl)
     {
-      writestrings (1, strusage(11), " ", strusage(13), "; ",
-                    strusage (14), "\n", NULL);
+      writestrings (1, "\nOoops: Out of memory whilst dumping the table.\n",
+                    NULL);
       flushstrings (1);
+      my_exit (arg, 2);
     }
-  else if (level == 1)
-    {
-      p = strusage (40);
-      writestrings (1, p, NULL);
-      if (*p && p[strlen(p)] != '\n')
-        writestrings (1, "\n", NULL);
-      exit (2);
-    }
-  else if (level == 2)
-    {
-      p = strusage (42);
-      if (p && *p == '1')
+  for (i=0; i < nopts; i++ )
+    ordtbl[i] = opts[i].ordinal;
+  qsort (ordtbl, nopts, sizeof *ordtbl, cmp_ordtbl);
+  for (i=0; i < nopts; i++ )
+    {
+      if (!opts[ordtbl[i]].long_opt)
+        continue;
+      writestrings (0, opts[ordtbl[i]].long_opt, ":", NULL);
+      snprintf (tmp, sizeof tmp, "%u:%u:",
+                opts[ordtbl[i]].short_opt,
+                opts[ordtbl[i]].flags);
+      writestrings (0, tmp, NULL);
+      s = opts[ordtbl[i]].description;
+      if (s)
         {
-          p = strusage (40);
-          writestrings (1, p, NULL);
-          if (*p && p[strlen(p)] != '\n')
-            writestrings (1, "\n", NULL);
+          for (; *s; s++)
+            {
+              if (*s == '%' || *s == ':' || *s == '\n')
+                snprintf (tmp, sizeof tmp, "%%%02X", *s);
+              else
+                {
+                  tmp[0] = *s;
+                  tmp[1] = 0;
+                }
+              writestrings (0, tmp, NULL);
+            }
         }
-      writestrings (0, strusage(41), "\n", NULL);
-      exit (0);
+      writestrings (0, ":\n", NULL);
     }
+
+  flushstrings (0);
+  xfree (ordtbl);
+  my_exit (arg, 0);
 }
 
+
+
 /* Level
  *     0: Print copyright string to stderr
  *     1: Print a short usage hint to stderr and terminate
  *     2: Print a long usage hint to stdout and terminate
+ *     8: Return NULL for UTF-8 or string with the native charset.
+ *     9: Return the SPDX License tag.
  *    10: Return license info string
  *    11: Return the name of the program
  *    12: Return optional name of package which includes this program.
@@ -1542,6 +2694,7 @@
 strusage( int level )
 {
   const char *p = strusage_handler? strusage_handler(level) : NULL;
+  const char *tmp;
 
   if ( p )
     return map_static_macro_string (p);
@@ -1549,28 +2702,41 @@
   switch ( level )
     {
 
+    case 8: break; /* Default to utf-8.  */
+    case 9: p = "GPL-3.0-or-later"; break;
     case 10:
-#if ARGPARSE_GPL_VERSION == 3
-      p = ("License GPLv3+: GNU GPL version 3 or later "
-           "<https://gnu.org/licenses/gpl.html>");
-#else
-      p = ("License GPLv2+: GNU GPL version 2 or later "
-           "<https://gnu.org/licenses/>");
-#endif
+      tmp = strusage (9);
+      if (tmp && !strcmp (tmp, "LGPL-2.1-or-later"))
+        p = ("License GNU LGPL-2.1-or-later <https://gnu.org/licenses/>");
+      else /* Default to GPLv3+.  */
+        p =("License GNU GPL-3.0-or-later <https://gnu.org/licenses/gpl.html>");
       break;
     case 11: p = "foo"; break;
     case 13: p = "0.0"; break;
-    case 14: p = ARGPARSE_CRIGHT_STR; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 15: p =
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n";
       break;
-    case 16: p =
+    case 16:
+      tmp = strusage (9);
+      if (tmp && !strcmp (tmp, "LGPL-2.1-or-later"))
+        p =
+"This is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU Lesser General Public License as\n"
+"published by the Free Software Foundation; either version 2.1 of\n"
+"the License, or (at your option) any later version.\n\n"
+"It is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU Lesser General Public License for more details.\n\n"
+"You should have received a copy of the GNU Lesser General Public License\n"
+"along with this software.  If not, see <https://gnu.org/licenses/>.\n";
+      else /* Default */
+        p =
 "This is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version "
-ARGPARSE_STR2(ARGPARSE_GPL_VERSION)
-" of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n\n"
 "It is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1594,76 +2760,39 @@
   strusage_handler = f;
 }
 
+#endif /* USE_INTERNAL_ARGPARSE */
 
-#ifdef TEST
-static struct {
-    int verbose;
-    int debug;
-    char *outfile;
-    char *crf;
-    int myopt;
-    int echo;
-    int a_long_one;
-} opt;
 
-int
-main(int argc, char **argv)
+void
+usage (int level)
 {
-  ARGPARSE_OPTS opts[] = {
-    ARGPARSE_x('v', "verbose", NONE, 0, "Laut sein"),
-    ARGPARSE_s_n('e', "echo"   , ("Zeile ausgeben, damit wir sehen, "
-                                  "was wir eingegeben haben")),
-    ARGPARSE_s_n('d', "debug", "Debug\nfalls mal etwas\nschief geht"),
-    ARGPARSE_s_s('o', "output", 0 ),
-    ARGPARSE_o_s('c', "cross-ref", "cross-reference erzeugen\n" ),
-    /* Note that on a non-utf8 terminal the ß might garble the output. */
-    ARGPARSE_s_n('s', "street","|Straße|set the name of the street to Straße"),
-    ARGPARSE_o_i('m', "my-option", 0),
-    ARGPARSE_s_n(500, "a-long-option", 0 ),
-    ARGPARSE_end()
-  };
-  ARGPARSE_ARGS pargs = { &argc, &argv, (ARGPARSE_FLAG_ALL
-                                         | ARGPARSE_FLAG_MIXED
-                                         | ARGPARSE_FLAG_ONEDASH) };
-  int i;
+  const char *p;
 
-  while (arg_parse  (&pargs, opts))
+  if (!level)
+    {
+      writestrings (1, strusage(11), " ", strusage(13), "; ",
+                    strusage (14), "\n", NULL);
+      flushstrings (1);
+    }
+  else if (level == 1)
     {
-      switch (pargs.r_opt)
+      p = strusage (40);
+      writestrings (1, p, NULL);
+      if (*p && p[strlen(p)] != '\n')
+        writestrings (1, "\n", NULL);
+      exit (2);
+    }
+  else if (level == 2)
+    {
+      p = strusage (42);
+      if (p && *p == '1')
         {
-        case ARGPARSE_IS_ARG :
-          printf ("arg='%s'\n", pargs.r.ret_str);
-          break;
-        case 'v': opt.verbose++; break;
-        case 'e': opt.echo++; break;
-        case 'd': opt.debug++; break;
-        case 'o': opt.outfile = pargs.r.ret_str; break;
-        case 'c': opt.crf = pargs.r_type? pargs.r.ret_str:"a.crf"; break;
-        case 'm': opt.myopt = pargs.r_type? pargs.r.ret_int : 1; break;
-        case 500: opt.a_long_one++;  break;
-        default : pargs.err = ARGPARSE_PRINT_WARNING; break;
-	}
+          p = strusage (40);
+          writestrings (1, p, NULL);
+          if (*p && p[strlen(p)] != '\n')
+            writestrings (1, "\n", NULL);
+        }
+      writestrings (0, strusage(41), "\n", NULL);
+      exit (0);
     }
-  for (i=0; i < argc; i++ )
-    printf ("%3d -> (%s)\n", i, argv[i] );
-  puts ("Options:");
-  if (opt.verbose)
-    printf ("  verbose=%d\n", opt.verbose );
-  if (opt.debug)
-    printf ("  debug=%d\n", opt.debug );
-  if (opt.outfile)
-    printf ("  outfile='%s'\n", opt.outfile );
-  if (opt.crf)
-    printf ("  crffile='%s'\n", opt.crf );
-  if (opt.myopt)
-    printf ("  myopt=%d\n", opt.myopt );
-  if (opt.a_long_one)
-    printf ("  a-long-one=%d\n", opt.a_long_one );
-  if (opt.echo)
-    printf ("  echo=%d\n", opt.echo );
-
-  return 0;
 }
-#endif /*TEST*/
-
-/**** bottom of file ****/
diff -Nru gnupg2-2.2.20/common/argparse.h gnupg2-2.2.27/common/argparse.h
--- gnupg2-2.2.20/common/argparse.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/argparse.h	2020-12-18 11:22:45.000000000 +0100
@@ -32,7 +32,15 @@
 #define GNUPG_COMMON_ARGPARSE_H
 
 #include <stdio.h>
+#include <gpg-error.h>
 
+#if GPGRT_VERSION_NUMBER < 0x012600 /* 1.38 */
+
+#define USE_INTERNAL_ARGPARSE 1
+
+/* We use a copy of the code from the new gpgrt parser.  */
+
+struct _argparse_internal_s;
 typedef struct
 {
   int  *argc;	      /* Pointer to ARGC (value subject to change). */
@@ -42,7 +50,7 @@
   int err;            /* Print error description for last option.
                          Either 0,  ARGPARSE_PRINT_WARNING or
                          ARGPARSE_PRINT_ERROR.  */
-
+  unsigned int lineno;/* The current line number.  */
   int r_opt; 	      /* Returns option code. */
   int r_type;	      /* Returns type of option value.  */
   union {
@@ -52,16 +60,9 @@
     char *ret_str;
   } r;		      /* Return values */
 
-  struct {
-    int idx;
-    int inarg;
-    int stopped;
-    const char *last;
-    void *aliases;
-    const void *cur_alias;
-    void *iio_list;
-  } internal;	    /* Private - do not change. */
-} ARGPARSE_ARGS;
+  struct _argparse_internal_s *internal;
+} gnupg_argparse_t;
+
 
 typedef struct
 {
@@ -69,7 +70,11 @@
   const char  *long_opt;
   unsigned int flags;
   const char  *description; /* Optional option description. */
-} ARGPARSE_OPTS;
+} gnupg_opt_t;
+
+
+typedef gnupg_argparse_t ARGPARSE_ARGS;
+typedef gnupg_opt_t      ARGPARSE_OPTS;
 
 /* Short options.  */
 #define ARGPARSE_SHORTOPT_HELP 32768
@@ -87,8 +92,14 @@
 #define ARGPARSE_FLAG_ARG0      16   /* Do not skip the first arg.           */
 #define ARGPARSE_FLAG_ONEDASH   32   /* Allow long options with one dash.    */
 #define ARGPARSE_FLAG_NOVERSION 64   /* No output for "--version".           */
-
+#define ARGPARSE_FLAG_RESET     128  /* Request to reset the internal state. */
 #define ARGPARSE_FLAG_STOP_SEEN 256  /* Set to true if a "--" has been seen. */
+#define ARGPARSE_FLAG_NOLINENO  512  /* Do not zero the lineno field.        */
+#define ARGPARSE_FLAG_SYS      1024  /* Use system config file.              */
+#define ARGPARSE_FLAG_USER     2048  /* Use user config file.                */
+#define ARGPARSE_FLAG_VERBOSE  4096  /* Print additional argparser info.     */
+#define ARGPARSE_FLAG_USERVERS 8192  /* Try version-ed user config files.    */
+#define ARGPARSE_FLAG_WITHATTR 16384 /* Return attribute bits.               */
 
 /* Flags for each option (ARGPARSE_OPTS).  The type code may be
    ORed with the OPT flags.  */
@@ -101,6 +112,11 @@
 #define ARGPARSE_OPT_PREFIX   (1<<4) /* Allow 0x etc. prefixed values.    */
 #define ARGPARSE_OPT_IGNORE   (1<<6) /* Ignore command or option.         */
 #define ARGPARSE_OPT_COMMAND  (1<<7) /* The argument is a command.        */
+#define ARGPARSE_OPT_CONFFILE (1<<8) /* The value is a conffile.          */
+#define ARGPARSE_OPT_HEADER   (1<<9) /* The value is printed as a header. */
+#define ARGPARSE_OPT_VERBATIM (1<<10)/* The value is printed verbatim.    */
+#define ARGPARSE_ATTR_FORCE   (1<<14)/* Attribute force is set.           */
+#define ARGPARSE_ATTR_IGNORE  (1<<15)/* Attribute ignore is set.          */
 
 #define ARGPARSE_TYPE_MASK  7  /* Mask for the type values (internal).  */
 
@@ -169,19 +185,32 @@
 #define ARGPARSE_c(s,l,d) \
      { (s), (l), (ARGPARSE_TYPE_NONE | ARGPARSE_OPT_COMMAND), (d) }
 
+#define ARGPARSE_conffile(s,l,d) \
+  { (s), (l), (ARGPARSE_TYPE_STRING|ARGPARSE_OPT_CONFFILE), (d) }
+
+#define ARGPARSE_noconffile(s,l,d) \
+  { (s), (l), (ARGPARSE_TYPE_NONE|ARGPARSE_OPT_CONFFILE), (d) }
+
 #define ARGPARSE_ignore(s,l) \
      { (s), (l), (ARGPARSE_OPT_IGNORE), "@" }
 
 #define ARGPARSE_group(s,d) \
      { (s), NULL, 0, (d) }
 
-/* Placeholder options for help, version, warranty and dump-options.  See arg_parse(). */
+/* Verbatim print the string D in the help output.  It does not make
+ * use of the "@" hack as ARGPARSE_group does.  */
+#define ARGPARSE_verbatim(d) \
+  { 1, NULL, (ARGPARSE_OPT_VERBATIM), (d) }
+
+/* Same as ARGPARSE_verbatim but also print a colon and a LF.  N can
+ * be used give a symbolic name to the header.  Nothing is printed if
+ * D is the empty string.  */
+#define ARGPARSE_header(n,d) \
+  { 1, (n), (ARGPARSE_OPT_HEADER), (d) }
+
+/* Mark the end of the list (mandatory).  */
 #define ARGPARSE_end() \
-     { 0, NULL, 0, NULL }, \
-     { 0, NULL, 0, NULL }, \
-     { 0, NULL, 0, NULL }, \
-     { 0, NULL, 0, NULL }, \
-     { 0, NULL, 0, NULL }
+  { 0, NULL, 0, NULL }
 
 
 /* Other constants.  */
@@ -202,14 +231,51 @@
 #define ARGPARSE_INVALID_ALIAS     (-10)
 #define ARGPARSE_OUT_OF_CORE       (-11)
 #define ARGPARSE_INVALID_ARG       (-12)
+#define ARGPARSE_PERMISSION_ERROR  (-13)
+#define ARGPARSE_NO_CONFFILE       (-14)
+#define ARGPARSE_CONFFILE          (-15)
+#define ARGPARSE_INVALID_META      (-16)
+#define ARGPARSE_UNKNOWN_META      (-17)
+#define ARGPARSE_UNEXPECTED_META   (-18)
+
+/* Values used for gnupg_set_confdir.  */
+#define GNUPG_CONFDIR_USER 1   /* The user's configuration dir.    */
+#define GNUPG_CONFDIR_SYS  2   /* The systems's configuration dir. */
+
+/* Take care: gpgrt_argparse keeps state in ARG and requires that
+ * either ARGPARSE_FLAG_RESET is used after OPTS has been changed or
+ * gpgrt_argparse (NULL, ARG, NULL) is called first.  */
+int gnupg_argparse (gpgrt_stream_t fp,
+                    gnupg_argparse_t *arg, gnupg_opt_t *opts);
+int gnupg_argparser (gnupg_argparse_t *arg, gnupg_opt_t *opts,
+                     const char *confname);
 
-
-int arg_parse (ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
-int optfile_parse (FILE *fp, const char *filename, unsigned *lineno,
-		   ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
-void usage (int level);
 const char *strusage (int level);
 void set_strusage (const char *(*f)( int ));
-void argparse_register_outfnc (int (*fnc)(int, const char *));
+void gnupg_set_usage_outfnc (int (*f)(int, const char *));
+void gnupg_set_fixed_string_mapper (const char *(*f)(const char*));
+void gnupg_set_confdir (int what, const char *name);
+
+#else /* !USE_INTERNAL_ARGPARSE */
+
+#define GNUPG_CONFDIR_USER GPGRT_CONFDIR_USER
+#define GNUPG_CONFDIR_SYS  GPGRT_CONFDIR_SYS
+
+typedef gpgrt_argparse_t gnupg_argparse_t;
+typedef gpgrt_opt_t      gnupg_opt_t;
+typedef gpgrt_argparse_t ARGPARSE_ARGS;
+typedef gpgrt_opt_t      ARGPARSE_OPTS;
+
+#define gnupg_argparse(a,b,c)            gpgrt_argparse ((a),(b),(c))
+#define gnupg_argparser(a,b,c)           gpgrt_argparser ((a),(b),(c))
+#define strusage(a)                      gpgrt_strusage (a)
+#define set_strusage(a)                  gpgrt_set_strusage (a)
+#define gnupg_set_usage_outfnc(a)        gpgrt_set_usage_outfnc ((a))
+#define gnupg_set_fixed_string_mapper(a) gpgrt_set_fixed_string_mapper ((a))
+#define gnupg_set_confdir(a,b)           gpgrt_set_confdir ((a),(b))
+
+#endif /* !USE_INTERNAL_ARGPARSE */
+
+void usage (int level);
 
 #endif /*GNUPG_COMMON_ARGPARSE_H*/
diff -Nru gnupg2-2.2.20/common/audit.c gnupg2-2.2.27/common/audit.c
--- gnupg2-2.2.20/common/audit.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/audit.c	2020-03-27 21:17:59.000000000 +0100
@@ -1105,6 +1105,7 @@
           switch (gpg_err_code (item->err))
             {
             case 0:                    ok = "good"; break;
+            case GPG_ERR_TRUE:         ok = "n/a";  break;
             case GPG_ERR_CERT_REVOKED: ok = "bad"; break;
             case GPG_ERR_NOT_ENABLED:  ok = "disabled"; break;
             case GPG_ERR_NO_CRL_KNOWN:
diff -Nru gnupg2-2.2.20/common/compliance.c gnupg2-2.2.27/common/compliance.c
--- gnupg2-2.2.20/common/compliance.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/compliance.c	2020-11-09 11:58:30.000000000 +0100
@@ -96,6 +96,7 @@
  * both are compatible from the point of view of this function.  */
 int
 gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo,
+                       unsigned int algo_flags,
 		       gcry_mpi_t key[], unsigned int keylength,
                        const char *curvename)
 {
@@ -148,6 +149,9 @@
           result = (keylength == 2048
                     || keylength == 3072
                     || keylength == 4096);
+          /* Although rsaPSS was not part of the original evaluation
+           * we got word that we can claim compliance.  */
+          (void)algo_flags;
           break;
 
 	case is_dsa:
@@ -197,7 +201,8 @@
  * they produce, and liberal in what they accept.  */
 int
 gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance,
-		     enum pk_use_case use, int algo, gcry_mpi_t key[],
+		     enum pk_use_case use, int algo,
+                     unsigned int algo_flags, gcry_mpi_t key[],
 		     unsigned int keylength, const char *curvename)
 {
   int result = 0;
@@ -228,6 +233,7 @@
 	    default:
 	      log_assert (!"reached");
 	    }
+          (void)algo_flags;
 	  break;
 
 	case PUBKEY_ALGO_DSA:
@@ -493,7 +499,6 @@
       /* In DE_VS mode under Windows we require that the JENT RNG
        * is active.  */
 #ifdef HAVE_W32_SYSTEM
-# if GCRYPT_VERSION_NUMBER >= 0x010800
       char *buf;
       char *fields[5];
 
@@ -505,9 +510,6 @@
       else
         result = 0;
       gcry_free (buf);
-# else
-      result = 0;  /* No JENT - can't be compliant.  */
-# endif
 #else /*!HAVE_W32_SYSTEM*/
       result = 1;  /* Not Windows - RNG is good.  */
 #endif /*!HAVE_W32_SYSTEM*/
diff -Nru gnupg2-2.2.20/common/compliance.h gnupg2-2.2.27/common/compliance.h
--- gnupg2-2.2.20/common/compliance.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/compliance.h	2020-07-13 14:22:17.000000000 +0200
@@ -48,11 +48,17 @@
     PK_USE_SIGNING, PK_USE_VERIFICATION,
   };
 
+/* Flags to distinguish public key algorithm variants.  */
+#define PK_ALGO_FLAG_RSAPSS 1    /* Use rsaPSS padding. */
+
+
 int gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo,
+                           unsigned int algo_flags,
                            gcry_mpi_t key[], unsigned int keylength,
                            const char *curvename);
 int gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance,
-                         enum pk_use_case use, int algo, gcry_mpi_t key[],
+                         enum pk_use_case use, int algo,
+                         unsigned int algo_flags, gcry_mpi_t key[],
                          unsigned int keylength, const char *curvename);
 int gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance,
                                cipher_algo_t cipher,
diff -Nru gnupg2-2.2.20/common/dotlock.c gnupg2-2.2.27/common/dotlock.c
--- gnupg2-2.2.20/common/dotlock.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/dotlock.c	2021-01-11 14:26:27.000000000 +0100
@@ -437,6 +437,8 @@
 
 
 #ifdef HAVE_DOSISH_SYSTEM
+/* FIXME: For use in GnuPG this can be replaced by
+ *        gnupg_w32_set_errno.  */
 static int
 map_w32_to_errno (DWORD w32_err)
 {
@@ -471,6 +473,21 @@
 }
 #endif /*HAVE_DOSISH_SYSTEM*/
 
+
+#ifdef HAVE_W32_SYSTEM
+static int
+any8bitchar (const char *string)
+{
+  if (string)
+    for ( ; *string; string++)
+      if ((*string & 0x80))
+        return 1;
+  return 0;
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
+
 
 /* Entirely disable all locking.  This function should be called
    before any locking is done.  It may be called right at startup of
@@ -758,8 +775,6 @@
     }
   strcpy (stpcpy (h->lockname, file_to_lock), EXTSEP_S "lock");
   UNLOCK_all_lockfiles ();
-  if (h->use_o_excl)
-    my_debug_1 ("locking for '%s' done via O_EXCL\n", h->lockname);
 
   return h;
 
@@ -794,7 +809,7 @@
   h->next = all_lockfiles;
   all_lockfiles = h;
 
-  h->lockname = xtrymalloc ( strlen (file_to_lock) + 6 );
+  h->lockname = strconcat (file_to_lock, EXTSEP_S "lock", NULL);
   if (!h->lockname)
     {
       all_lockfiles = h->next;
@@ -802,7 +817,6 @@
       xfree (h);
       return NULL;
     }
-  strcpy (stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock");
 
   /* If would be nice if we would use the FILE_FLAG_DELETE_ON_CLOSE
      along with FILE_SHARE_DELETE but that does not work due to a race
@@ -812,25 +826,24 @@
      reasons why a lock file can't be created and thus the process
      would not stop as expected but spin until Windows crashes.  Our
      solution is to keep the lock file open; that does not harm. */
-  {
-#ifdef HAVE_W32CE_SYSTEM
-    wchar_t *wname = utf8_to_wchar (h->lockname);
+  if (any8bitchar (h->lockname))
+    {
+      wchar_t *wname = utf8_to_wchar (h->lockname);
 
-    if (wname)
-      h->lockhd = CreateFile (wname,
-                              GENERIC_READ|GENERIC_WRITE,
-                              FILE_SHARE_READ|FILE_SHARE_WRITE,
-                              NULL, OPEN_ALWAYS, 0, NULL);
-    else
-      h->lockhd = INVALID_HANDLE_VALUE;
-    xfree (wname);
-#else
-    h->lockhd = CreateFile (h->lockname,
-                            GENERIC_READ|GENERIC_WRITE,
-                            FILE_SHARE_READ|FILE_SHARE_WRITE,
-                            NULL, OPEN_ALWAYS, 0, NULL);
-#endif
-  }
+      if (wname)
+        h->lockhd = CreateFileW (wname,
+                                 GENERIC_READ|GENERIC_WRITE,
+                                 FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                 NULL, OPEN_ALWAYS, 0, NULL);
+      else
+        h->lockhd = INVALID_HANDLE_VALUE;
+      xfree (wname);
+    }
+  else
+    h->lockhd = CreateFileA (h->lockname,
+                             GENERIC_READ|GENERIC_WRITE,
+                             FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             NULL, OPEN_ALWAYS, 0, NULL);
   if (h->lockhd == INVALID_HANDLE_VALUE)
     {
       int saveerrno = map_w32_to_errno (GetLastError ());
diff -Nru gnupg2-2.2.20/common/exechelp-posix.c gnupg2-2.2.27/common/exechelp-posix.c
--- gnupg2-2.2.20/common/exechelp-posix.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/exechelp-posix.c	2020-10-23 20:08:54.000000000 +0200
@@ -835,14 +835,15 @@
 gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
                               const char *envp[] )
 {
+  gpg_err_code_t ec;
   pid_t pid;
   int i;
 
   if (getuid() != geteuid())
     return my_error (GPG_ERR_BUG);
 
-  if (access (pgmname, X_OK))
-    return my_error_from_syserror ();
+  if ((ec = gnupg_access (pgmname, X_OK)))
+    return gpg_err_make (default_errsource, ec);
 
   pid = fork ();
   if (pid == (pid_t)(-1))
diff -Nru gnupg2-2.2.20/common/exechelp-w32.c gnupg2-2.2.27/common/exechelp-w32.c
--- gnupg2-2.2.20/common/exechelp-w32.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/exechelp-w32.c	2020-10-23 20:08:54.000000000 +0200
@@ -855,13 +855,13 @@
   STARTUPINFO si;
   int cr_flags;
   char *cmdline;
-
+  gpg_err_code_t ec;
 
   /* We don't use ENVP.  */
   (void)envp;
 
-  if (access (pgmname, X_OK))
-    return my_error_from_syserror ();
+  if ((ec = gnupg_access (pgmname, X_OK)))
+    return gpg_err_make (default_errsource, ec);
 
   /* Prepare security attributes.  */
   memset (&sec_attr, 0, sizeof sec_attr );
diff -Nru gnupg2-2.2.20/common/gettime.c gnupg2-2.2.27/common/gettime.c
--- gnupg2-2.2.20/common/gettime.c	2017-11-01 18:35:29.000000000 +0100
+++ gnupg2-2.2.27/common/gettime.c	2020-11-03 19:28:05.000000000 +0100
@@ -31,6 +31,9 @@
 #include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
@@ -679,9 +682,9 @@
 const char *
 asctimestamp (u32 stamp)
 {
-  static char buffer[50];
+  static char buffer[80];
 #if defined (HAVE_STRFTIME) && defined (HAVE_NL_LANGINFO)
-  static char fmt[50];
+  static char fmt[80];
 #endif
   struct tm *tp;
   time_t atime = stamp;
@@ -707,6 +710,32 @@
      zone at all.  */
   strftime (buffer, DIM(buffer)-1, "%c", tp);
 # else
+#  if HAVE_W32_SYSTEM
+  {
+    static int done;
+
+    if (!done)
+      {
+        /* The locale names as used by Windows are in the form
+         * "German_Germany.1252" or "German_Austria.1252" with
+         * alternate names similar to Unix, e.g. "de-DE".  However
+         * that is the theory.  On current Windows and Mingw the
+         * alternate names do not work.  We would need a table to map
+         * them from the short names as provided by gpgrt to the long
+         * names and append some code page.  For now we use "" and
+         * take the locale from the user's system settings.  Thus the
+         * standard Unix envvars don't work for time and may mismatch
+         * with the string translations.  The new UCRT available since
+         * 2018 has a lot of additional support but that will for sure
+         * break other things.  We should move to ISO strings to get
+         * rid of such problems.  */
+        setlocale (LC_TIME, "");
+        done = 1;
+        /* log_debug ("LC_ALL  now '%s'\n", setlocale (LC_ALL, NULL)); */
+        /* log_debug ("LC_TIME now '%s'\n", setlocale (LC_TIME, NULL)); */
+      }
+  }
+#  endif
    /* FIXME: we should check whether the locale appends a " %Z" These
     * locales from glibc don't put the " %Z": fi_FI hr_HR ja_JP lt_LT
     * lv_LV POSIX ru_RU ru_SU sv_FI sv_SE zh_CN.  */
diff -Nru gnupg2-2.2.20/common/helpfile.c gnupg2-2.2.27/common/helpfile.c
--- gnupg2-2.2.20/common/helpfile.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/helpfile.c	2020-10-23 20:08:54.000000000 +0200
@@ -41,14 +41,14 @@
 findkey_fname (const char *key, const char *fname)
 {
   gpg_error_t err = 0;
-  FILE *fp;
+  estream_t fp;
   int lnr = 0;
   int c;
   char *p, line[256];
   int in_item = 0;
   membuf_t mb = MEMBUF_ZERO;
 
-  fp = fopen (fname, "r");
+  fp = es_fopen (fname, "r");
   if (!fp)
     {
       if (errno != ENOENT)
@@ -59,14 +59,14 @@
       return NULL;
     }
 
-  while (fgets (line, DIM(line)-1, fp))
+  while (es_fgets (line, DIM(line)-1, fp))
     {
       lnr++;
 
       if (!*line || line[strlen(line)-1] != '\n')
         {
           /* Eat until end of line. */
-          while ( (c=getc (fp)) != EOF && c != '\n')
+          while ((c = es_getc (fp)) != EOF && c != '\n')
             ;
           err = gpg_error (*line? GPG_ERR_LINE_TOO_LONG
                            : GPG_ERR_INCOMPLETE_LINE);
@@ -130,14 +130,14 @@
         }
 
     }
-  if ( !err && ferror (fp) )
+  if ( !err && es_ferror (fp) )
     {
       err = gpg_error_from_syserror ();
       log_error (_("error reading '%s', line %d: %s\n"),
                  fname, lnr, gpg_strerror (err));
     }
 
-  fclose (fp);
+  es_fclose (fp);
   if (is_membuf_ready (&mb))
     {
       /* We have collected something.  */
diff -Nru gnupg2-2.2.20/common/homedir.c gnupg2-2.2.27/common/homedir.c
--- gnupg2-2.2.20/common/homedir.c	2020-01-17 14:28:13.000000000 +0100
+++ gnupg2-2.2.27/common/homedir.c	2020-11-04 16:25:57.000000000 +0100
@@ -61,6 +61,7 @@
 
 #include "util.h"
 #include "sysutils.h"
+#include "i18n.h"
 #include "zb32.h"
 
 /* The GnuPG homedir.  This is only accessed by the functions
@@ -117,14 +118,16 @@
 #endif
 
 
-/* This is a helper function to load a Windows function from either of
-   one DLLs. */
+/* This is a helper function to load and call a Windows function from
+ * either of one DLLs.  On success an UTF-8 file name is returned.
+ * ERRNO is _not_ set on error.  */
 #ifdef HAVE_W32_SYSTEM
-static HRESULT
-w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
+static char *
+w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d)
 {
   static int initialized;
-  static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR);
+  static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPWSTR);
+  wchar_t wfname[MAX_PATH];
 
   if (!initialized)
     {
@@ -139,7 +142,7 @@
           handle = dlopen (dllnames[i], RTLD_LAZY);
           if (handle)
             {
-              func = dlsym (handle, "SHGetFolderPathA");
+              func = dlsym (handle, "SHGetFolderPathW");
               if (!func)
                 {
                   dlclose (handle);
@@ -149,10 +152,10 @@
         }
     }
 
-  if (func)
-    return func (a,b,c,d,e);
+  if (func && func (a,b,c,d,wfname) >= 0)
+    return wchar_to_utf8 (wfname);
   else
-    return -1;
+    return NULL;
 }
 #endif /*HAVE_W32_SYSTEM*/
 
@@ -248,25 +251,17 @@
         }
       else
         {
-          char path[MAX_PATH];
+          char *path;
 
-          /* It might be better to use LOCAL_APPDATA because this is
-             defined as "non roaming" and thus more likely to be kept
-             locally.  For private keys this is desired.  However,
-             given that many users copy private keys anyway forth and
-             back, using a system roaming services might be better
-             than to let them do it manually.  A security conscious
-             user will anyway use the registry entry to have better
-             control.  */
-          if (w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
-                                   NULL, 0, path) >= 0)
+          path = w32_shgetfolderpath (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
+                                      NULL, 0);
+          if (path)
             {
-              char *tmp = xmalloc (strlen (path) + 6 +1);
-              strcpy (stpcpy (tmp, path), "\\gnupg");
-              dir = tmp;
+              dir = xstrconcat (path, "\\gnupg", NULL);
+              xfree (path);
 
               /* Try to create the directory if it does not yet exists.  */
-              if (access (dir, F_OK))
+              if (gnupg_access (dir, F_OK))
                 w32_try_mkdir (dir);
             }
           else
@@ -360,10 +355,10 @@
   char *fname;
 
   fname = xstrconcat (dir, DIRSEP_S "gpgconf.exe", NULL);
-  if (!access (fname, F_OK))
+  if (!gnupg_access (fname, F_OK))
     {
       strcpy (fname + strlen (fname) - 3, "ctl");
-      if (!access (fname, F_OK))
+      if (!gnupg_access (fname, F_OK))
         {
           /* gpgconf.ctl file found.  Record this fact.  */
           w32_portable_app = 1;
@@ -440,7 +435,7 @@
   if (!dir)
     {
       const char *rdir;
-      char path[MAX_PATH];
+      char *path;
 
       /* Make sure that w32_rootdir has been called so that we are
          able to check the portable application flag.  The common dir
@@ -450,19 +445,17 @@
       if (w32_portable_app)
         return rdir;
 
-      if (w32_shgetfolderpath (NULL, CSIDL_COMMON_APPDATA,
-                               NULL, 0, path) >= 0)
+      path = w32_shgetfolderpath (NULL, CSIDL_COMMON_APPDATA, NULL, 0);
+      if (path)
         {
-          char *tmp = xmalloc (strlen (path) + 4 +1);
-          strcpy (stpcpy (tmp, path), "\\GNU");
-          dir = tmp;
+          dir = xstrconcat (path, "\\GNU", NULL);
           /* No auto create of the directory.  Either the installer or
-             the admin has to create these directories.  */
+           * the admin has to create these directories.  */
         }
       else
         {
-          /* Ooops: Not defined - probably an old Windows version.
-             Use the installation directory instead.  */
+          /* Folder not found or defined - probably an old Windows
+           * version.  Use the installation directory instead.  */
           dir = xstrdup (rdir);
         }
     }
@@ -497,6 +490,38 @@
 }
 
 
+/* Create the homedir directory only if the supplied directory name is
+ * the same as the default one.  This way we avoid to create arbitrary
+ * directories when a non-default home directory is used.  To cope
+ * with HOME, we do compare only the suffix if we see that the default
+ * homedir does start with a tilde.  If the mkdir fails the function
+ * terminates the process.  If QUIET is set not diagnostic is printed
+ * on homedir creation.  */
+void
+gnupg_maybe_make_homedir (const char *fname, int quiet)
+{
+  const char *defhome = standard_homedir ();
+
+  if (
+#ifdef HAVE_W32_SYSTEM
+      ( !compare_filenames (fname, defhome) )
+#else
+      ( *defhome == '~'
+        && (strlen(fname) >= strlen (defhome+1)
+            && !strcmp(fname+strlen(fname)-strlen(defhome+1), defhome+1 ) ))
+      || (*defhome != '~'  && !compare_filenames( fname, defhome ) )
+#endif
+      )
+    {
+      if (gnupg_mkdir (fname, "-rwx"))
+        log_fatal ( _("can't create directory '%s': %s\n"),
+                    fname, strerror(errno) );
+      else if (!quiet )
+        log_info ( _("directory '%s' created\n"), fname );
+    }
+}
+
+
 /* Return the homedir.  The returned string is valid until another
  * gnupg-set-homedir call.  This is always an absolute directory name.
  * The function replaces the former global var opt.homedir.  */
@@ -903,7 +928,7 @@
         }
       else
         {
-          char path[MAX_PATH];
+          char *path;
           const char *s1[] = { "GNU", "cache", "gnupg", NULL };
           int s1_len;
           const char **comp;
@@ -912,8 +937,10 @@
           for (comp = s1; *comp; comp++)
             s1_len += 1 + strlen (*comp);
 
-          if (w32_shgetfolderpath (NULL, CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
-                                   NULL, 0, path) >= 0)
+          path = w32_shgetfolderpath (NULL,
+                                      CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
+                                      NULL, 0);
+          if (path)
             {
               char *tmp = xmalloc (strlen (path) + s1_len + 1);
               char *p;
@@ -924,11 +951,12 @@
                   p = stpcpy (p, "\\");
                   p = stpcpy (p, *comp);
 
-                  if (access (tmp, F_OK))
+                  if (gnupg_access (tmp, F_OK))
                     w32_try_mkdir (tmp);
                 }
 
               dir = tmp;
+              xfree (path);
             }
           else
             {
@@ -976,6 +1004,8 @@
     /* Try Gpg4win directory (with bin and without.) */
     { w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" },
     { w32_rootdir, "\\..\\Gpg4win\\pinentry.exe" },
+    /* Try a pinentry in a dir above us */
+    { w32_rootdir, "\\..\\bin\\pinentry.exe" },
     /* Try old Gpgwin directory.  */
     { w32_rootdir, "\\..\\GNU\\GnuPG\\pinentry.exe" },
     /* Try a Pinentry from the common GNU dir.  */
@@ -1002,7 +1032,7 @@
           char *name2;
 
           name2 = xstrconcat (names[i].rfnc (), names[i].name, NULL);
-          if (!access (name2, F_OK))
+          if (!gnupg_access (name2, F_OK))
             {
               /* Use that pinentry.  */
               xfree (name);
diff -Nru gnupg2-2.2.20/common/init.c gnupg2-2.2.27/common/init.c
--- gnupg2-2.2.20/common/init.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/init.c	2020-12-18 11:22:45.000000000 +0100
@@ -210,7 +210,10 @@
   }
 
   /* --version et al shall use estream as well.  */
-  argparse_register_outfnc (writestring_via_estream);
+  gnupg_set_usage_outfnc (writestring_via_estream);
+
+  /* Register our string mapper with gpgrt.  */
+  gnupg_set_fixed_string_mapper (map_static_macro_string);
 
   /* Logging shall use the standard socket directory as fallback.  */
   log_set_socket_dir_cb (gnupg_socketdir);
diff -Nru gnupg2-2.2.20/common/iobuf.c gnupg2-2.2.27/common/iobuf.c
--- gnupg2-2.2.20/common/iobuf.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/common/iobuf.c	2020-10-23 20:08:54.000000000 +0200
@@ -193,6 +193,19 @@
 #endif
 }
 
+
+#ifdef HAVE_W32_SYSTEM
+static int
+any8bitchar (const char *string)
+{
+  if (string)
+    for ( ; *string; string++)
+      if ((*string & 0x80))
+        return 1;
+  return 0;
+}
+#endif /*HAVE_W32_SYSTEM*/
+
 /*
  * Invalidate (i.e. close) a cached iobuf
  */
@@ -294,21 +307,23 @@
       sm = FILE_SHARE_READ;
     }
 
-#ifdef HAVE_W32CE_SYSTEM
-  {
-    wchar_t *wfname = utf8_to_wchar (fname);
-    if (wfname)
-      {
-        hfile = CreateFile (wfname, da, sm, NULL, cd,
-                            FILE_ATTRIBUTE_NORMAL, NULL);
-        xfree (wfname);
-      }
-    else
-      hfile = INVALID_HANDLE_VALUE;
-  }
-#else
-  hfile = CreateFile (fname, da, sm, NULL, cd, FILE_ATTRIBUTE_NORMAL, NULL);
-#endif
+  /* We use the Unicode version of the function only if needed to
+   * avoid an extra conversion step.  */
+  if (any8bitchar (fname))
+    {
+      wchar_t *wfname = utf8_to_wchar (fname);
+      if (wfname)
+        {
+          hfile = CreateFileW (wfname, da, sm, NULL, cd,
+                               FILE_ATTRIBUTE_NORMAL, NULL);
+          xfree (wfname);
+        }
+      else
+        hfile = INVALID_HANDLE_VALUE;
+    }
+  else
+    hfile = CreateFileA (fname, da, sm, NULL, cd, FILE_ATTRIBUTE_NORMAL, NULL);
+
   return hfile;
 
 #else /*!HAVE_W32_SYSTEM*/
@@ -2335,7 +2350,7 @@
 	  return size;
       }
     log_error ("GetFileSize for handle %p failed: %s\n",
-	       fp, w32_strerror (0));
+	       fp, w32_strerror (-1));
 #else /*!HAVE_W32_SYSTEM*/
     {
       struct stat st;
diff -Nru gnupg2-2.2.20/common/logging.c gnupg2-2.2.27/common/logging.c
--- gnupg2-2.2.20/common/logging.c	2020-02-10 14:51:42.000000000 +0100
+++ gnupg2-2.2.27/common/logging.c	2020-05-12 18:43:59.000000000 +0200
@@ -1011,10 +1011,17 @@
    dump, with TEXT just an empty string, print a trailing linefeed,
    otherwise print an entire debug line. */
 void
-log_printhex (const char *text, const void *buffer, size_t length)
+log_printhex (const void *buffer, size_t length, const char *fmt, ...)
 {
-  if (text && *text)
-    log_debug ("%s ", text);
+  if (fmt && *fmt)
+    {
+      va_list arg_ptr ;
+
+      va_start (arg_ptr, fmt);
+      do_logv (GPGRT_LOG_DEBUG, 0, NULL, NULL, fmt, arg_ptr);
+      va_end (arg_ptr);
+      log_printf (" ");
+    }
   if (length)
     {
       const unsigned char *p = buffer;
@@ -1022,7 +1029,7 @@
       for (length--, p++; length--; p++)
         log_printf (" %02X", *p);
     }
-  if (text)
+  if (fmt)
     log_printf ("\n");
 }
 
diff -Nru gnupg2-2.2.20/common/logging.h gnupg2-2.2.27/common/logging.h
--- gnupg2-2.2.20/common/logging.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/logging.h	2020-05-12 18:43:39.000000000 +0200
@@ -103,11 +103,12 @@
 void log_printf (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
 void log_flush (void);
 
-/* Print a hexdump of BUFFER.  With TEXT passes as NULL print just the
-   raw dump, with TEXT being an empty string, print a trailing
-   linefeed, otherwise print an entire debug line with TEXT followed
-   by the hexdump and a final LF.  */
-void log_printhex (const char *text, const void *buffer, size_t length);
+/* Print a hexdump of BUFFER.  With FMT passed as NULL print just the
+ * raw dump, with FMT being an empty string, print a trailing
+ * linefeed, otherwise print an entire debug line with expanded FMT
+ * followed by the hexdump and a final LF.  */
+void log_printhex (const void *buffer, size_t length,
+                   const char *fmt, ...) GPGRT_ATTR_PRINTF(3,4);
 
 void log_clock (const char *string);
 
diff -Nru gnupg2-2.2.20/common/Makefile.am gnupg2-2.2.27/common/Makefile.am
--- gnupg2-2.2.20/common/Makefile.am	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/Makefile.am	2020-08-20 10:55:36.000000000 +0200
@@ -28,7 +28,11 @@
 noinst_LIBRARIES += libsimple-pwquery.a
 endif
 noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = $(module_tests)
+endif
 
 BUILT_SOURCES = audit-events.h status-codes.h
 
@@ -184,7 +188,7 @@
                   $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 t_common_ldadd = libcommon.a \
                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-	         $(LIBINTL) $(LIBICONV)
+	         $(LIBINTL) $(LIBICONV) $(NETLIBS)
 
 
 # Common tests
diff -Nru gnupg2-2.2.20/common/Makefile.in gnupg2-2.2.27/common/Makefile.in
--- gnupg2-2.2.20/common/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/common/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -127,7 +127,7 @@
 host_triplet = @host@
 @HAVE_W32CE_SYSTEM_FALSE@am__append_1 = libsimple-pwquery.a
 noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
-TESTS = $(am__EXEEXT_3)
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_3)
 @HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\""            \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""    \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\""  \
@@ -348,7 +348,8 @@
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = libcommon.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 t_b64_DEPENDENCIES = $(am__DEPENDENCIES_2)
 t_ccparray_SOURCES = t-ccparray.c
 t_ccparray_OBJECTS = t-ccparray.$(OBJEXT)
@@ -647,6 +648,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -813,6 +815,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -910,7 +913,7 @@
 
 t_common_ldadd = libcommon.a \
                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-	         $(LIBINTL) $(LIBICONV)
+	         $(LIBINTL) $(LIBICONV) $(NETLIBS)
 
 
 # Common tests
diff -Nru gnupg2-2.2.20/common/mkdir_p.c gnupg2-2.2.27/common/mkdir_p.c
--- gnupg2-2.2.20/common/mkdir_p.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/mkdir_p.c	2020-10-23 20:08:54.000000000 +0200
@@ -78,7 +78,7 @@
 
       /* log_debug ("%s: stat(%s)\n", __func__, dirs[i]); */
 
-      if (!stat (dirs[i], &s))
+      if (!gnupg_stat (dirs[i], &s))
         {
           if ( ! S_ISDIR (s.st_mode))
             {
diff -Nru gnupg2-2.2.20/common/openpgpdefs.h gnupg2-2.2.27/common/openpgpdefs.h
--- gnupg2-2.2.20/common/openpgpdefs.h	2020-03-14 19:19:26.000000000 +0100
+++ gnupg2-2.2.27/common/openpgpdefs.h	2020-04-15 21:06:50.000000000 +0200
@@ -51,6 +51,7 @@
     PKT_ATTRIBUTE     = 17, /* PGP's attribute packet. */
     PKT_ENCRYPTED_MDC = 18, /* Integrity protected encrypted data. */
     PKT_MDC 	      = 19, /* Manipulation detection code packet. */
+    PKT_ENCRYPTED_AEAD= 20, /* AEAD encrypted data packet. */
     PKT_COMMENT	      = 61, /* new comment packet (GnuPG specific). */
     PKT_GPG_CONTROL   = 63  /* internal control packet (GnuPG specific). */
   }
@@ -125,6 +126,16 @@
 sigsubpkttype_t;
 
 
+/* Note that we encode the AEAD algo in a 3 bit field at some places.  */
+typedef enum
+  {
+    AEAD_ALGO_NONE	    =  0,
+    AEAD_ALGO_EAX	    =  1,
+    AEAD_ALGO_OCB	    =  2
+  }
+aead_algo_t;
+
+
 typedef enum
   {
     CIPHER_ALGO_NONE	    =  0,
diff -Nru gnupg2-2.2.20/common/percent.c gnupg2-2.2.27/common/percent.c
--- gnupg2-2.2.20/common/percent.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/percent.c	2020-04-15 15:26:28.000000000 +0200
@@ -87,6 +87,89 @@
 }
 
 
+/* Create a newly malloced string from (DATA,DATALEN) with embedded
+ * nuls quoted as %00.  The standard percent unescaping can be used to
+ * reverse this encoding.  With PLUS_ESCAPE set plus-escaping (spaces
+ * are replaced by a '+') and escaping of characters with values less
+ * than 0x20 is used.  If PREFIX is not NULL it will be prepended to
+ * the output in standard escape format; that is PLUS_ESCAPING is
+ * ignored for PREFIX. */
+char *
+percent_data_escape (int plus_escape, const char *prefix,
+                     const void *data, size_t datalen)
+{
+  char *buffer, *p;
+  const unsigned char *s;
+  size_t n;
+  size_t length = 1;
+
+  if (prefix)
+    {
+      for (s = prefix; *s; s++)
+        {
+          if (*s == '%' || *s < 0x20)
+            length += 3;
+          else
+            length++;
+        }
+    }
+
+  for (s=data, n=datalen; n; s++, n--)
+    {
+      if (!*s || *s == '%' || (plus_escape && (*s < ' ' || *s == '+')))
+        length += 3;
+      else
+        length++;
+    }
+
+  buffer = p = xtrymalloc (length);
+  if (!buffer)
+    return NULL;
+
+  if (prefix)
+    {
+      for (s = prefix; *s; s++)
+        {
+          if (*s == '%' || *s < 0x20)
+            {
+              snprintf (p, 4, "%%%02X", *s);
+              p += 3;
+            }
+          else
+            *p++ = *s;
+        }
+    }
+
+  for (s=data, n=datalen; n; s++, n--)
+    {
+      if (!*s)
+        {
+          memcpy (p, "%00", 3);
+          p += 3;
+        }
+      else if (*s == '%')
+        {
+          memcpy (p, "%25", 3);
+          p += 3;
+        }
+      else if (plus_escape && *s == ' ')
+        {
+          *p++ = '+';
+        }
+      else if (plus_escape && (*s < ' ' || *s == '+'))
+        {
+          snprintf (p, 4, "%%%02X", *s);
+          p += 3;
+        }
+      else
+        *p++ = *s;
+    }
+  *p = 0;
+
+  return buffer;
+}
+
+
 /* Do the percent and plus/space unescaping from STRING to BUFFER and
    return the length of the valid buffer.  Plus unescaping is only
    done if WITHPLUS is true.  An escaped Nul character will be
diff -Nru gnupg2-2.2.20/common/session-env.c gnupg2-2.2.27/common/session-env.c
--- gnupg2-2.2.20/common/session-env.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/session-env.c	2020-08-12 09:28:20.000000000 +0200
@@ -70,6 +70,7 @@
   { "XAUTHORITY","xauthority"},  /* Xlib Authentication.  */
   { "XMODIFIERS" },              /* Used by Xlib to select X input
                                       modules (eg "@im=SCIM").  */
+  { "WAYLAND_DISPLAY" },         /* For the Wayland display engine.  */
   { "GTK_IM_MODULE" },           /* Used by gtk to select gtk input
                                     modules (eg "scim-bridge").  */
   { "DBUS_SESSION_BUS_ADDRESS" },/* Used by GNOME3 to talk to gcr over
diff -Nru gnupg2-2.2.20/common/sexputil.c gnupg2-2.2.27/common/sexputil.c
--- gnupg2-2.2.20/common/sexputil.c	2019-08-21 14:01:03.000000000 +0200
+++ gnupg2-2.2.27/common/sexputil.c	2020-07-13 14:22:17.000000000 +0200
@@ -640,3 +640,61 @@
   xfree (algoname);
   return result;
 }
+
+
+/* Map a pubkey algo id from gcrypt to a string.  This is the same as
+ * gcry_pk_algo_name but makes sure that the ECC algo identifiers are
+ * not all mapped to "ECC".  */
+const char *
+pubkey_algo_to_string (int algo)
+{
+  if (algo == GCRY_PK_ECDSA)
+    return "ECDSA";
+  else if (algo == GCRY_PK_ECDH)
+    return "ECDH";
+  else if (algo == GCRY_PK_EDDSA)
+    return "EdDSA";
+  else
+    return gcry_pk_algo_name (algo);
+}
+
+
+/* Map a hash algo id from gcrypt to a string.  This is the same as
+ * gcry_md_algo_name but the returned string is lower case, as
+ * expected by libksba and it avoids some overhead.  */
+const char *
+hash_algo_to_string (int algo)
+{
+  static const struct
+  {
+    const char *name;
+    int algo;
+  } hashnames[] =
+      {
+       { "sha256",    GCRY_MD_SHA256 },
+       { "sha512",    GCRY_MD_SHA512 },
+       { "sha1",      GCRY_MD_SHA1 },
+       { "sha384",    GCRY_MD_SHA384 },
+       { "sha224",    GCRY_MD_SHA224 },
+       { "sha3-224",  GCRY_MD_SHA3_224 },
+       { "sha3-256",  GCRY_MD_SHA3_256 },
+       { "sha3-384",  GCRY_MD_SHA3_384 },
+       { "sha3-512",  GCRY_MD_SHA3_512 },
+       { "ripemd160", GCRY_MD_RMD160 },
+       { "rmd160",    GCRY_MD_RMD160 },
+       { "md2",       GCRY_MD_MD2 },
+       { "md4",       GCRY_MD_MD4 },
+       { "tiger",     GCRY_MD_TIGER },
+       { "haval",     GCRY_MD_HAVAL },
+#if GCRYPT_VERSION_NUMBER >= 0x010900
+       { "sm3",       GCRY_MD_SM3 },
+#endif
+       { "md5",       GCRY_MD_MD5 }
+      };
+  int i;
+
+  for (i=0; i < DIM (hashnames); i++)
+    if (algo == hashnames[i].algo)
+      return hashnames[i].name;
+  return "?";
+}
diff -Nru gnupg2-2.2.20/common/status-codes.h gnupg2-2.2.27/common/status-codes.h
--- gnupg2-2.2.20/common/status-codes.h	2019-07-09 11:17:42.000000000 +0200
+++ gnupg2-2.2.27/common/status-codes.h	2020-11-09 12:17:58.000000000 +0100
@@ -36,6 +36,7 @@
   "ENTER" "\0"
   "LEAVE" "\0"
   "ABORT" "\0"
+  "CANCELED_BY_USER" "\0"
   "GOODSIG" "\0"
   "BADSIG" "\0"
   "ERRSIG" "\0"
@@ -141,106 +142,107 @@
     6,
     12,
     18,
-    26,
-    33,
-    40,
-    49,
-    65,
-    77,
-    92,
-    104,
-    119,
-    135,
-    144,
-    151,
-    158,
-    165,
-    180,
-    190,
-    200,
-    220,
-    235,
-    251,
-    269,
-    285,
-    304,
-    320,
-    328,
-    335,
-    342,
-    351,
-    361,
-    376,
-    387,
-    400,
-    409,
-    420,
-    431,
-    441,
-    452,
+    35,
+    43,
+    50,
+    57,
+    66,
+    82,
+    94,
+    109,
+    121,
+    136,
+    152,
+    161,
+    168,
+    175,
+    182,
+    197,
+    207,
+    217,
+    237,
+    252,
+    268,
+    286,
+    302,
+    321,
+    337,
+    345,
+    352,
+    359,
+    368,
+    378,
+    393,
+    404,
+    417,
+    426,
+    437,
+    448,
+    458,
     469,
-    484,
+    486,
     501,
-    516,
-    530,
-    545,
-    554,
-    563,
-    574,
-    581,
-    590,
-    602,
-    614,
-    628,
-    643,
-    657,
-    668,
-    680,
-    692,
-    703,
-    712,
-    721,
+    518,
+    533,
+    547,
+    562,
+    571,
+    580,
+    591,
+    598,
+    607,
+    619,
+    631,
+    645,
+    660,
+    674,
+    685,
+    697,
+    709,
+    720,
     729,
-    737,
-    752,
-    767,
-    778,
-    789,
-    796,
+    738,
+    746,
+    754,
+    769,
+    784,
+    795,
     806,
-    816,
-    826,
+    813,
+    823,
     833,
-    847,
-    857,
+    843,
+    850,
+    864,
     874,
-    890,
-    910,
-    919,
-    933,
-    947,
-    966,
-    980,
-    995,
-    1005,
-    1016,
+    891,
+    907,
+    927,
+    936,
+    950,
+    964,
+    983,
+    997,
+    1012,
+    1022,
     1033,
-    1049,
-    1076,
-    1103,
-    1132,
-    1142,
-    1153,
-    1162,
-    1180,
-    1198,
-    1204,
-    1212,
-    1220,
-    1228,
+    1050,
+    1066,
+    1093,
+    1120,
+    1149,
+    1159,
+    1170,
+    1179,
+    1197,
+    1215,
+    1221,
+    1229,
+    1237,
+    1245,
     
   };
 
 #define statusstr_msgidxof(code) (0 ? -1 \
-  : ((code >= 0) && (code <= 100)) ? (code - 0) \
+  : ((code >= 0) && (code <= 101)) ? (code - 0) \
   : -1)
diff -Nru gnupg2-2.2.20/common/status.h gnupg2-2.2.27/common/status.h
--- gnupg2-2.2.20/common/status.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/status.h	2020-11-09 11:53:33.000000000 +0100
@@ -35,6 +35,7 @@
     STATUS_ENTER,
     STATUS_LEAVE,
     STATUS_ABORT,
+    STATUS_CANCELED_BY_USER,
 
     STATUS_GOODSIG,
     STATUS_BADSIG,
diff -Nru gnupg2-2.2.20/common/stringhelp.c gnupg2-2.2.27/common/stringhelp.c
--- gnupg2-2.2.20/common/stringhelp.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/stringhelp.c	2020-08-22 14:22:01.000000000 +0200
@@ -213,6 +213,36 @@
     return str ;
 }
 
+
+/* Same as trim_spaces but only condider, space, tab, cr and lf as space.  */
+char *
+ascii_trim_spaces (char *str)
+{
+  char *string, *p, *mark;
+
+  string = str;
+
+  /* Find first non-ascii space character.  */
+  for (p=string; *p && ascii_isspace (*p); p++)
+    ;
+  /* Move characters.  */
+  for (mark=NULL; (*string = *p); string++, p++ )
+    {
+      if (ascii_isspace (*p))
+        {
+          if (!mark)
+            mark = string;
+        }
+      else
+        mark = NULL ;
+    }
+  if (mark)
+    *mark = '\0' ;  /* Remove trailing spaces. */
+
+  return str ;
+}
+
+
 /****************
  * remove trailing white spaces
  */
@@ -759,6 +789,12 @@
   FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, ec,
                  MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
                  strerr, DIM (strerr)-1, NULL);
+  {
+    /* Strip the CR,LF - we want just the string.  */
+    size_t n = strlen (strerr);
+    if (n > 2 && strerr[n-2] == '\r' && strerr[n-1] == '\n' )
+      strerr[n-2] = 0;
+  }
 #endif
   return strerr;
 }
diff -Nru gnupg2-2.2.20/common/stringhelp.h gnupg2-2.2.27/common/stringhelp.h
--- gnupg2-2.2.20/common/stringhelp.h	2019-02-11 10:59:34.000000000 +0100
+++ gnupg2-2.2.27/common/stringhelp.h	2020-08-20 15:51:51.000000000 +0200
@@ -42,6 +42,7 @@
 const char *memistr (const void *buf, size_t buflen, const char *sub);
 char *mem2str( char *, const void *, size_t);
 char *trim_spaces( char *string );
+char *ascii_trim_spaces (char *string);
 char *trim_trailing_spaces( char *string );
 unsigned int trim_trailing_chars( unsigned char *line, unsigned len,
 					      const char *trimchars);
diff -Nru gnupg2-2.2.20/common/sysutils.c gnupg2-2.2.27/common/sysutils.c
--- gnupg2-2.2.20/common/sysutils.c	2018-10-22 19:26:18.000000000 +0200
+++ gnupg2-2.2.27/common/sysutils.c	2021-01-11 14:26:27.000000000 +0100
@@ -40,6 +40,9 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
 #include <unistd.h>
 #include <errno.h>
 #ifdef HAVE_STAT
@@ -73,6 +76,7 @@
 # include <npth.h>
 #endif
 #include <fcntl.h>
+#include <dirent.h>
 
 #include <assuan.h>
 
@@ -83,6 +87,22 @@
 
 #define tohex(n) ((n) < 10 ? ((n) + '0') : (((n) - 10) + 'A'))
 
+
+/* The object used with our opendir functions.  We need to define our
+ * own so that we can properly handle Unicode on Windows.  */
+struct gnupg_dir_s
+{
+#ifdef HAVE_W32_SYSTEM
+  _WDIR *dir;                    /* The system's DIR pointer.  */
+#else
+  DIR *dir;                      /* The system's DIR pointer.  */
+#endif
+  struct gnupg_dirent_s dirent;  /* The current dirent.  */
+  size_t namesize;  /* If not 0 the allocated size of dirent.d_name.  */
+  char name[256];   /* Only used if NAMESIZE is 0.  */
+};
+
+
 /* Flag to tell whether special file names are enabled.  See gpg.c for
  * an explanation of these file names.  */
 static int allow_special_filenames;
@@ -171,6 +191,144 @@
 #endif
 }
 
+#ifdef HAVE_W32_SYSTEM
+static int
+any8bitchar (const char *string)
+{
+  if (string)
+    for ( ; *string; string++)
+      if ((*string & 0x80))
+        return 1;
+  return 0;
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
+/* Helper for gnupg_w32_set_errno.  */
+#ifdef HAVE_W32_SYSTEM
+static int
+map_w32_to_errno (DWORD w32_err)
+{
+  switch (w32_err)
+    {
+    case 0:
+      return 0;
+
+    case ERROR_FILE_NOT_FOUND:
+      return ENOENT;
+
+    case ERROR_PATH_NOT_FOUND:
+      return ENOENT;
+
+    case ERROR_ACCESS_DENIED:
+      return EPERM;  /* ReactOS uses EACCES ("Permission denied") and
+                      * is likely right because they used an
+                      * undocumented function to associate the error
+                      * codes.  However we have always used EPERM
+                      * ("Operation not permitted", e.g. function is
+                      * required to be called by root) and we better
+                      * stick to that to avoid surprising bugs. */
+
+    case ERROR_INVALID_HANDLE:
+      return EBADF;
+
+    case ERROR_INVALID_BLOCK:
+      return ENOMEM;
+
+    case ERROR_NOT_ENOUGH_MEMORY:
+      return ENOMEM;
+
+    case ERROR_NO_DATA:
+      return EPIPE;
+
+    case ERROR_ALREADY_EXISTS:
+      return EEXIST;
+
+      /* This mapping has been taken from reactOS.  */
+    case ERROR_TOO_MANY_OPEN_FILES: return EMFILE;
+    case ERROR_ARENA_TRASHED: return ENOMEM;
+    case ERROR_BAD_ENVIRONMENT: return E2BIG;
+    case ERROR_BAD_FORMAT: return ENOEXEC;
+    case ERROR_INVALID_DRIVE: return ENOENT;
+    case ERROR_CURRENT_DIRECTORY: return EACCES;
+    case ERROR_NOT_SAME_DEVICE: return EXDEV;
+    case ERROR_NO_MORE_FILES: return ENOENT;
+    case ERROR_WRITE_PROTECT: return EACCES;
+    case ERROR_BAD_UNIT: return EACCES;
+    case ERROR_NOT_READY: return EACCES;
+    case ERROR_BAD_COMMAND: return EACCES;
+    case ERROR_CRC: return EACCES;
+    case ERROR_BAD_LENGTH: return EACCES;
+    case ERROR_SEEK: return EACCES;
+    case ERROR_NOT_DOS_DISK: return EACCES;
+    case ERROR_SECTOR_NOT_FOUND: return EACCES;
+    case ERROR_OUT_OF_PAPER: return EACCES;
+    case ERROR_WRITE_FAULT: return EACCES;
+    case ERROR_READ_FAULT: return EACCES;
+    case ERROR_GEN_FAILURE: return EACCES;
+    case ERROR_SHARING_VIOLATION: return EACCES;
+    case ERROR_LOCK_VIOLATION: return EACCES;
+    case ERROR_WRONG_DISK: return EACCES;
+    case ERROR_SHARING_BUFFER_EXCEEDED: return EACCES;
+    case ERROR_BAD_NETPATH: return ENOENT;
+    case ERROR_NETWORK_ACCESS_DENIED: return EACCES;
+    case ERROR_BAD_NET_NAME: return ENOENT;
+    case ERROR_FILE_EXISTS: return EEXIST;
+    case ERROR_CANNOT_MAKE: return EACCES;
+    case ERROR_FAIL_I24: return EACCES;
+    case ERROR_NO_PROC_SLOTS: return EAGAIN;
+    case ERROR_DRIVE_LOCKED: return EACCES;
+    case ERROR_BROKEN_PIPE: return EPIPE;
+    case ERROR_DISK_FULL: return ENOSPC;
+    case ERROR_INVALID_TARGET_HANDLE: return EBADF;
+    case ERROR_WAIT_NO_CHILDREN: return ECHILD;
+    case ERROR_CHILD_NOT_COMPLETE: return ECHILD;
+    case ERROR_DIRECT_ACCESS_HANDLE: return EBADF;
+    case ERROR_SEEK_ON_DEVICE: return EACCES;
+    case ERROR_DIR_NOT_EMPTY: return ENOTEMPTY;
+    case ERROR_NOT_LOCKED: return EACCES;
+    case ERROR_BAD_PATHNAME: return ENOENT;
+    case ERROR_MAX_THRDS_REACHED: return EAGAIN;
+    case ERROR_LOCK_FAILED: return EACCES;
+    case ERROR_INVALID_STARTING_CODESEG: return ENOEXEC;
+    case ERROR_INVALID_STACKSEG: return ENOEXEC;
+    case ERROR_INVALID_MODULETYPE: return ENOEXEC;
+    case ERROR_INVALID_EXE_SIGNATURE: return ENOEXEC;
+    case ERROR_EXE_MARKED_INVALID: return ENOEXEC;
+    case ERROR_BAD_EXE_FORMAT: return ENOEXEC;
+    case ERROR_ITERATED_DATA_EXCEEDS_64k: return ENOEXEC;
+    case ERROR_INVALID_MINALLOCSIZE: return ENOEXEC;
+    case ERROR_DYNLINK_FROM_INVALID_RING: return ENOEXEC;
+    case ERROR_IOPL_NOT_ENABLED: return ENOEXEC;
+    case ERROR_INVALID_SEGDPL: return ENOEXEC;
+    case ERROR_AUTODATASEG_EXCEEDS_64k: return ENOEXEC;
+    case ERROR_RING2SEG_MUST_BE_MOVABLE: return ENOEXEC;
+    case ERROR_RELOC_CHAIN_XEEDS_SEGLIM: return ENOEXEC;
+    case ERROR_INFLOOP_IN_RELOC_CHAIN: return ENOEXEC;
+    case ERROR_FILENAME_EXCED_RANGE: return ENOENT;
+    case ERROR_NESTING_NOT_ALLOWED: return EAGAIN;
+    case ERROR_NOT_ENOUGH_QUOTA: return ENOMEM;
+
+    default:
+      return EIO;
+    }
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
+/* Set ERRNO from the Windows error.  EC may be -1 to use the last error.  */
+#ifdef HAVE_W32_SYSTEM
+void
+gnupg_w32_set_errno (int ec)
+{
+  /* FIXME: Replace by gpgrt_w32_set_errno.  */
+  if (ec == -1)
+    ec = GetLastError ();
+  _set_errno (map_w32_to_errno (ec));
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
 
 /* Allow the use of special "-&nnn" style file names.  */
 void
@@ -629,7 +787,7 @@
 int
 gnupg_remove (const char *fname)
 {
-#ifdef HAVE_W32CE_SYSTEM
+#ifdef HAVE_W32_SYSTEM
   int rc;
   wchar_t *wfname;
 
@@ -638,11 +796,13 @@
     rc = 0;
   else
     {
-      rc = DeleteFile (wfname);
+      rc = DeleteFileW (wfname);
+      if (!rc)
+        gnupg_w32_set_errno (-1);
       xfree (wfname);
     }
   if (!rc)
-    return -1; /* ERRNO is automagically provided by gpg-error.h.  */
+    return -1;
   return 0;
 #else
   return remove (fname);
@@ -650,6 +810,36 @@
 }
 
 
+/* Helper for gnupg_rename_file.  */
+#ifdef HAVE_W32_SYSTEM
+static int
+w32_rename (const char *oldname, const char *newname)
+{
+  if (any8bitchar (oldname) || any8bitchar (newname))
+    {
+      wchar_t *woldname, *wnewname;
+      int ret;
+
+      woldname = utf8_to_wchar (oldname);
+      if (!woldname)
+        return -1;
+      wnewname = utf8_to_wchar (newname);
+      if (!wnewname)
+        {
+          xfree (wnewname);
+          return -1;
+        }
+      ret = _wrename (woldname, wnewname);
+      xfree (wnewname);
+      xfree (woldname);
+      return ret;
+    }
+  else
+    return rename (oldname, newname);
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
 /* Wrapper for rename(2) to handle Windows peculiarities.  If
  * BLOCK_SIGNALS is not NULL and points to a variable set to true, all
  * signals will be blocked by calling gnupg_block_all_signals; the
@@ -669,7 +859,7 @@
 
     gnupg_remove (newname);
   again:
-    if (rename (oldname, newname))
+    if (w32_rename (oldname, newname))
       {
         if (GetLastError () == ERROR_SHARING_VIOLATION)
           {
@@ -722,33 +912,38 @@
 
 #ifndef HAVE_W32_SYSTEM
 static mode_t
-modestr_to_mode (const char *modestr)
+modestr_to_mode (const char *modestr, mode_t oldmode)
 {
+  static struct {
+    char letter;
+    mode_t value;
+  } table[] = { { '-', 0 },
+                { 'r', S_IRUSR }, { 'w', S_IWUSR }, { 'x', S_IXUSR },
+                { 'r', S_IRGRP }, { 'w', S_IWGRP }, { 'x', S_IXGRP },
+                { 'r', S_IROTH }, { 'w', S_IWOTH }, { 'x', S_IXOTH } };
+  int idx;
   mode_t mode = 0;
 
-  if (modestr && *modestr)
-    {
-      modestr++;
-      if (*modestr && *modestr++ == 'r')
-        mode |= S_IRUSR;
-      if (*modestr && *modestr++ == 'w')
-        mode |= S_IWUSR;
-      if (*modestr && *modestr++ == 'x')
-        mode |= S_IXUSR;
-      if (*modestr && *modestr++ == 'r')
-        mode |= S_IRGRP;
-      if (*modestr && *modestr++ == 'w')
-        mode |= S_IWGRP;
-      if (*modestr && *modestr++ == 'x')
-        mode |= S_IXGRP;
-      if (*modestr && *modestr++ == 'r')
-        mode |= S_IROTH;
-      if (*modestr && *modestr++ == 'w')
-        mode |= S_IWOTH;
-      if (*modestr && *modestr++ == 'x')
-        mode |= S_IXOTH;
+  /* For now we only support a string as used by ls(1) and no octal
+   * numbers.  The first character must be a dash.  */
+  for (idx=0; idx < 10 && *modestr; idx++, modestr++)
+    {
+      if (*modestr == table[idx].letter)
+        mode |= table[idx].value;
+      else if (*modestr == '.')
+        {
+          if (!idx)
+            ;  /* Skip the dummy.  */
+          else if ((oldmode & table[idx].value))
+            mode |= (oldmode & table[idx].value);
+          else
+            mode &= ~(oldmode & table[idx].value);
+        }
+      else if (*modestr != '-')
+        break;
     }
 
+
   return mode;
 }
 #endif
@@ -768,7 +963,8 @@
 int
 gnupg_mkdir (const char *name, const char *modestr)
 {
-#ifdef HAVE_W32CE_SYSTEM
+#if GPG_ERROR_VERSION_NUMBER < 0x011c00 /* 1.28 */
+ #ifdef HAVE_W32CE_SYSTEM
   wchar_t *wname;
   (void)modestr;
 
@@ -782,14 +978,19 @@
     }
   xfree (wname);
   return 0;
-#elif MKDIR_TAKES_ONE_ARG
+ #elif MKDIR_TAKES_ONE_ARG
   (void)modestr;
   /* Note: In the case of W32 we better use CreateDirectory and try to
      set appropriate permissions.  However using mkdir is easier
      because this sets ERRNO.  */
   return mkdir (name);
+ #else
+  return mkdir (name, modestr_to_mode (modestr, 0));
+ #endif
 #else
-  return mkdir (name, modestr_to_mode (modestr));
+  /* Note that gpgrt_mkdir also sets ERRNO in addition to returing an
+   * gpg-error style error code.  */
+  return gpgrt_mkdir (name, modestr);
 #endif
 }
 
@@ -799,14 +1000,21 @@
 int
 gnupg_chdir (const char *name)
 {
+#if GPG_ERROR_VERSION_NUMBER < 0x011c00 /* 1.28 */
   return chdir (name);
+#else /* Use the improved version from libgpg_error.  */
+  /* Note that gpgrt_chdir also sets ERRNO in addition to returning a
+   * gpg-error style error code.  */
+  return gpgrt_chdir (name);
+#endif
 }
 
 
 /* A wrapper around chmod which takes a string for the mode argument.
    This makes it easier to handle the mode argument which is not
    defined on all systems.  The format of the modestring is the same
-   as for gnupg_mkdir.  */
+   as for gnupg_mkdir with extra feature that a '.' keeps the original
+   mode bit.  */
 int
 gnupg_chmod (const char *name, const char *modestr)
 {
@@ -815,7 +1023,19 @@
   (void)modestr;
   return 0;
 #else
-  return chmod (name, modestr_to_mode (modestr));
+  mode_t oldmode;
+  if (strchr (modestr, '.'))
+    {
+      /* Get the old mode so that a '.' can copy that bit.  */
+      struct stat st;
+
+      if (stat (name, &st))
+        return -1;
+      oldmode = st.st_mode;
+    }
+  else
+    oldmode = 0;
+  return chmod (name, modestr_to_mode (modestr, oldmode));
 #endif
 }
 
@@ -1006,10 +1226,38 @@
 
 
 /* Return the current working directory as a malloced string.  Return
-   NULL and sets ERRNo on error.  */
+   NULL and sets ERRNO on error.  */
 char *
 gnupg_getcwd (void)
 {
+#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.40 */
+# ifdef HAVE_W32_SYSTEM
+  wchar_t wbuffer[MAX_PATH + sizeof(wchar_t)];
+  DWORD wlen;
+  char *buf, *p;
+
+  wlen = GetCurrentDirectoryW (MAX_PATH, wbuffer);
+  if (!wlen)
+    {
+      gpg_err_set_errno (EINVAL);
+      return NULL;
+
+    }
+  else if (wlen > MAX_PATH)
+    {
+      gpg_err_set_errno (ENAMETOOLONG);
+      return NULL;
+    }
+  buf = wchar_to_utf8 (wbuffer);
+  if (buf)
+    {
+      for (p=buf; *p; p++)
+        if (*p == '\\')
+          *p = '/';
+    }
+  return buf;
+
+# else /*Unix*/
   char *buffer;
   size_t size = 100;
 
@@ -1018,18 +1266,306 @@
       buffer = xtrymalloc (size+1);
       if (!buffer)
         return NULL;
-#ifdef HAVE_W32CE_SYSTEM
-      strcpy (buffer, "/");  /* Always "/".  */
-      return buffer;
-#else
       if (getcwd (buffer, size) == buffer)
         return buffer;
       xfree (buffer);
       if (errno != ERANGE)
         return NULL;
       size *= 2;
+    }
+# endif /*Unix*/
+#else
+  return gpgrt_getcwd ();
 #endif
+}
+
+
+/* A simple wrapper around access.  NAME is expected to be utf8
+ * encoded.  This function returns an error code and sets ERRNO. */
+gpg_err_code_t
+gnupg_access (const char *name, int mode)
+{
+#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.40 */
+# ifdef HAVE_W32_SYSTEM
+  wchar_t *wfname;
+  gpg_err_code_t ec;
+
+  wfname = utf8_to_wchar (name);
+  if (!wfname)
+    ec = gpg_err_code_from_syserror ();
+  else
+    {
+      ec = _waccess (wfname, mode)? gpg_err_code_from_syserror () : 0;
+      xfree (wfname);
     }
+  return ec;
+# else
+  return access (name, mode)? gpg_err_code_from_syserror () : 0;
+# endif
+#else /* gpgrt 1.40 or newer.  */
+  return gpgrt_access (name, mode);
+#endif
+}
+
+
+/* A wrapper around stat to handle Unicode file names under Windows.  */
+#ifdef HAVE_STAT
+int
+gnupg_stat (const char *name, struct stat *statbuf)
+{
+# ifdef HAVE_W32_SYSTEM
+  if (any8bitchar (name))
+    {
+      wchar_t *wname;
+      struct _stat32 st32;
+      int ret;
+
+      wname = utf8_to_wchar (name);
+      if (!wname)
+        return -1;
+      ret = _wstat (wname, &st32);
+      xfree (wname);
+      if (!ret)
+        {
+          statbuf->st_dev   = st32.st_dev;
+          statbuf->st_ino   = st32.st_ino;
+          statbuf->st_mode  = st32.st_mode;
+          statbuf->st_nlink = st32.st_nlink;
+          statbuf->st_uid   = st32.st_uid;
+          statbuf->st_gid   = st32.st_gid;
+          statbuf->st_rdev  = st32.st_rdev;
+          statbuf->st_size  = st32.st_size;
+          statbuf->st_atime = st32.st_atime;
+          statbuf->st_mtime = st32.st_mtime;
+          statbuf->st_ctime = st32.st_ctime;
+        }
+      return ret;
+    }
+  else
+    return stat (name, statbuf);
+# else
+  return stat (name, statbuf);
+# endif
+}
+#endif /*HAVE_STAT*/
+
+
+/* Wrapper around fopen for the cases where we have not yet switched
+ * to es_fopen.  Note that for convenience the prototype is in util.h */
+FILE *
+gnupg_fopen (const char *fname, const char *mode)
+{
+#ifdef HAVE_W32_SYSTEM
+  if (any8bitchar (fname))
+    {
+      wchar_t *wfname;
+      const wchar_t *wmode;
+      wchar_t *wmodebuf = NULL;
+      FILE *ret;
+
+      wfname = utf8_to_wchar (fname);
+      if (!wfname)
+        return NULL;
+      if (!strcmp (mode, "r"))
+        wmode = L"r";
+      else if (!strcmp (mode, "rb"))
+        wmode = L"rb";
+      else if (!strcmp (mode, "w"))
+        wmode = L"w";
+      else if (!strcmp (mode, "wb"))
+        wmode = L"wb";
+      else
+        {
+          wmodebuf = utf8_to_wchar (mode);
+          if (!wmodebuf)
+            {
+              xfree (wfname);
+              return NULL;
+            }
+          wmode = wmodebuf;
+        }
+      ret = _wfopen (wfname, wmode);
+      xfree (wfname);
+      xfree (wmodebuf);
+      return ret;
+    }
+  else
+    return fopen (fname, mode);
+
+#else /*Unix*/
+  return fopen (fname, mode);
+#endif /*Unix*/
+}
+
+
+
+/* A wrapper around open to handle Unicode file names under Windows.  */
+int
+gnupg_open (const char *name, int flags, unsigned int mode)
+{
+#ifdef HAVE_W32_SYSTEM
+  if (any8bitchar (name))
+    {
+      wchar_t *wname;
+      int ret;
+
+      wname = utf8_to_wchar (name);
+      if (!wname)
+        return -1;
+      ret = _wopen (wname, flags, mode);
+      xfree (wname);
+      return ret;
+    }
+  else
+    return open (name, flags, mode);
+#else
+  return open (name, flags, mode);
+#endif
+}
+
+
+/* A wrapper around opendir to handle Unicode file names under
+ * Windows.  This assumes the mingw toolchain.  */
+gnupg_dir_t
+gnupg_opendir (const char *name)
+{
+#ifdef HAVE_W32_SYSTEM
+  _WDIR *dir;
+  wchar_t *wname;
+#else
+  DIR *dir;
+#endif
+  gnupg_dir_t gdir;
+
+#ifdef HAVE_W32_SYSTEM
+  /* Note: See gpgtar-create for an alternative implementation which
+   * could be used here to avoid a mingw dependency.  */
+  wname = utf8_to_wchar (name);
+  if (!wname)
+    return NULL;
+  dir = _wopendir (wname);
+  xfree (wname);
+#else
+  dir = opendir (name);
+#endif
+
+  if (!dir)
+    return NULL;
+
+  gdir = xtrymalloc (sizeof *gdir);
+  if (!gdir)
+    {
+      int save_errno = errno;
+#ifdef HAVE_W32_SYSTEM
+      _wclosedir (dir);
+#else
+      closedir (dir);
+#endif
+      gpg_err_set_errno (save_errno);
+      return NULL;
+    }
+  gdir->dir = dir;
+  gdir->namesize = 0;
+  gdir->dirent.d_name = gdir->name;
+
+  return gdir;
+}
+
+
+gnupg_dirent_t
+gnupg_readdir (gnupg_dir_t gdir)
+{
+#ifdef HAVE_W32_SYSTEM
+  char *namebuffer = NULL;
+  struct _wdirent *de;
+#else
+  struct dirent *de;
+#endif
+  size_t n;
+  gnupg_dirent_t gde;
+  const char *name;
+
+  if (!gdir)
+    {
+      gpg_err_set_errno (EINVAL);
+      return 0;
+    }
+
+#ifdef HAVE_W32_SYSTEM
+  de = _wreaddir (gdir->dir);
+  if (!de)
+    return NULL;
+  namebuffer = wchar_to_utf8 (de->d_name);
+  if (!namebuffer)
+    return NULL;
+  name = namebuffer;
+#else
+  de = readdir (gdir->dir);
+  if (!de)
+    return NULL;
+  name = de->d_name;
+#endif
+
+  gde = &gdir->dirent;
+  n = strlen (name);
+  if (gdir->namesize)
+    {
+      /* Use allocated buffer.  */
+      if (n+1 >= gdir->namesize || !gde->d_name)
+        {
+          gdir->namesize = n + 256;
+          xfree (gde->d_name);
+          gde->d_name = xtrymalloc (gdir->namesize);
+          if (!gde->d_name)
+            return NULL;  /* ERRNO is already set.  */
+        }
+      strcpy (gde->d_name, name);
+    }
+  else if (n+1 >= sizeof (gdir->name))
+    {
+      /* Switch to allocated buffer.  */
+      gdir->namesize = n + 256;
+      gde->d_name = xtrymalloc (gdir->namesize);
+      if (!gde->d_name)
+        return NULL;  /* ERRNO is already set.  */
+      strcpy (gde->d_name, name);
+    }
+  else
+    {
+      /* Use static buffer.  */
+      gde->d_name = gdir->name;
+      strcpy (gde->d_name, name);
+    }
+
+#ifdef HAVE_W32_SYSTEM
+  xfree (namebuffer);
+#endif
+
+  return gde;
+}
+
+
+int
+gnupg_closedir (gnupg_dir_t gdir)
+{
+#ifdef HAVE_W32_SYSTEM
+  _WDIR *dir;
+#else
+  DIR *dir;
+#endif
+
+  if (!gdir)
+    return 0;
+  dir = gdir->dir;
+  if (gdir->namesize)
+    xfree (gdir->dirent.d_name);
+  xfree (gdir);
+
+#ifdef HAVE_W32_SYSTEM
+  return _wclosedir (dir);
+#else
+  return closedir (dir);
+#endif
 }
 
 
@@ -1336,3 +1872,49 @@
   close (d);
   return 1;
 }
+
+
+/* Return a malloced copy of the current user's account name; this may
+ * return NULL on memory failure.  Note that this should eventually be
+ * replaced by a gpgrt function. */
+char *
+gnupg_getusername (void)
+{
+  char *result = NULL;
+
+#ifdef HAVE_W32_SYSTEM
+  wchar_t wtmp[1];
+  wchar_t *wbuf;
+  DWORD wsize = 1;
+
+  GetUserNameW (wtmp, &wsize);
+  wbuf = xtrymalloc (wsize * sizeof *wbuf);
+  if (!wbuf)
+    {
+      gpg_err_set_errno (ENOMEM);
+      return NULL;
+    }
+  if (!GetUserNameW (wbuf, &wsize))
+    {
+      gpg_err_set_errno (EINVAL);
+      xfree (wbuf);
+      return NULL;
+    }
+  result= wchar_to_utf8 (wbuf);
+  xfree (wbuf);
+
+#else /* !HAVE_W32_SYSTEM */
+
+# if defined(HAVE_PWD_H) && defined(HAVE_GETPWUID)
+  struct passwd *pwd;
+
+  pwd = getpwuid (getuid());
+  if (pwd)
+    result = xtrystrdup (pwd->pw_name);
+
+# endif /*HAVE_PWD_H*/
+
+#endif /* !HAVE_W32_SYSTEM */
+
+  return result;
+}
diff -Nru gnupg2-2.2.20/common/sysutils.h gnupg2-2.2.27/common/sysutils.h
--- gnupg2-2.2.20/common/sysutils.h	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/sysutils.h	2021-01-11 14:26:27.000000000 +0100
@@ -46,6 +46,22 @@
 #define FD2INT(h) (h)
 #endif
 
+#ifdef HAVE_STAT
+# include <sys/stat.h>
+#endif
+
+struct gnupg_dir_s;
+typedef struct gnupg_dir_s *gnupg_dir_t;
+struct gnupg_dirent_s
+{
+  /* We don't have a d_ino because that can't be used on Windows
+   * anyway.  D_NAME is a pointer into the gnupg_dir_s which has a
+   * static buffer or allocates sufficient space as needed.  This is
+   * only valid after gnupg_readdir. */
+  char *d_name;
+};
+typedef struct gnupg_dirent_s *gnupg_dirent_t;
+
 
 void trap_unaligned (void);
 int  disable_core_dumps (void);
@@ -72,8 +88,17 @@
 int  gnupg_setenv (const char *name, const char *value, int overwrite);
 int  gnupg_unsetenv (const char *name);
 char *gnupg_getcwd (void);
+gpg_err_code_t gnupg_access (const char *name, int mode);
+#ifdef HAVE_STAT
+int gnupg_stat (const char *name, struct stat *statbuf);
+#endif /*HAVE_STAT*/
+int gnupg_open (const char *name, int flags, unsigned int mode);
+gnupg_dir_t gnupg_opendir (const char *name);
+gnupg_dirent_t gnupg_readdir (gnupg_dir_t gdir);
+int gnupg_closedir (gnupg_dir_t gdir);
 char *gnupg_get_socket_name (int fd);
 int gnupg_fd_valid (int fd);
+char *gnupg_getusername (void);
 
 gpg_error_t gnupg_inotify_watch_delete_self (int *r_fd, const char *fname);
 gpg_error_t gnupg_inotify_watch_socket (int *r_fd, const char *socket_name);
@@ -81,6 +106,7 @@
 
 
 #ifdef HAVE_W32_SYSTEM
+void gnupg_w32_set_errno (int ec);
 void *w32_get_user_sid (void);
 
 #include "../common/w32help.h"
diff -Nru gnupg2-2.2.20/common/t-exectool.c gnupg2-2.2.27/common/t-exectool.c
--- gnupg2-2.2.20/common/t-exectool.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/t-exectool.c	2020-10-23 20:08:54.000000000 +0200
@@ -45,6 +45,7 @@
   char *result;
   size_t len;
 
+  /* Fixme: We should use gpgrt_access here.  */
   if (access (pgmname, X_OK))
     {
       if (access (alt_pgmname, X_OK))
diff -Nru gnupg2-2.2.20/common/utf8conv.c gnupg2-2.2.27/common/utf8conv.c
--- gnupg2-2.2.20/common/utf8conv.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/common/utf8conv.c	2020-11-27 17:43:32.000000000 +0100
@@ -138,7 +138,7 @@
          native encoding.  Nowadays this seems to be the best bet in
          case of errors from iconv or nl_langinfo.  */
       active_charset_name = "utf-8";
-      no_translation = 0;
+      no_translation = 1;
       use_iconv = 0;
     }
 }
@@ -792,6 +792,25 @@
 }
 
 
+/* Get the current codepage as used by wchar_to_native and
+ * native_to_char.  Note that these functions intentionally do not use
+ * iconv based conversion machinery.  */
+static unsigned int
+get_w32_codepage (void)
+{
+  static unsigned int cp;
+
+  if (!cp)
+    {
+#ifndef HAVE_W32CE_SYSTEM
+      cp = GetConsoleOutputCP ();
+      if (!cp)
+#endif
+        cp = GetACP ();
+    }
+  return cp;
+}
+
 /* Return a malloced string encoded in the active code page from the
  * wide char input string STRING.  Caller must free this value.
  * Returns NULL and sets ERRNO on failure.  Calling this function with
@@ -799,18 +818,18 @@
 char *
 wchar_to_native (const wchar_t *string)
 {
-  return wchar_to_cp (string, CP_ACP);
+  return wchar_to_cp (string, get_w32_codepage ());
 }
 
 
-/* Return a malloced wide char string from an UTF-8 encoded input
+/* Return a malloced wide char string from native encoded input
  * string STRING.  Caller must free this value.  Returns NULL and sets
  * ERRNO on failure.  Calling this function with STRING set to NULL is
  * not defined.  */
 wchar_t *
 native_to_wchar (const char *string)
 {
-  return cp_to_wchar (string, CP_ACP);
+  return cp_to_wchar (string, get_w32_codepage ());
 }
 
 
diff -Nru gnupg2-2.2.20/common/util.h gnupg2-2.2.27/common/util.h
--- gnupg2-2.2.20/common/util.h	2020-02-10 16:16:36.000000000 +0100
+++ gnupg2-2.2.27/common/util.h	2020-11-10 11:33:34.000000000 +0100
@@ -35,24 +35,13 @@
 #include <errno.h>  /* We need errno.  */
 #include <gpg-error.h> /* We need gpg_error_t and estream. */
 
-/* These error codes are used but not defined in the required
+/* These error codes might be used but not defined in the required
  * libgpg-error version.  Define them here.
  * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21)
  */
-#if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */
-# define GPG_ERR_UNKNOWN_FLAG     309
-# define GPG_ERR_INV_ORDER	  310
-# define GPG_ERR_ALREADY_FETCHED  311
-# define GPG_ERR_TRY_LATER        312
-# define GPG_ERR_SYSTEM_BUG	  666
-# define GPG_ERR_DNS_UNKNOWN	  711
-# define GPG_ERR_DNS_SECTION	  712
-# define GPG_ERR_DNS_ADDRESS	  713
-# define GPG_ERR_DNS_NO_QUERY	  714
-# define GPG_ERR_DNS_NO_ANSWER	  715
-# define GPG_ERR_DNS_CLOSED	  716
-# define GPG_ERR_DNS_VERIFY	  717
-# define GPG_ERR_DNS_TIMEOUT	  718
+#if GPG_ERROR_VERSION_NUMBER < 0x012400 /* 1.36 */
+# define GPG_ERR_NO_AUTH          314
+# define GPG_ERR_BAD_AUTH         315
 #endif
 
 #ifndef EXTERN_UNLESS_MAIN_MODULE
@@ -66,6 +55,11 @@
 /* Hash function used with libksba. */
 #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
 
+/* The length of the keygrip.  This is a SHA-1 hash of the key
+ * parameters as generated by gcry_pk_get_keygrip.  */
+#define KEYGRIP_LEN 20
+
+
 /* Get all the stuff from jnlib. */
 #include "../common/logging.h"
 #include "../common/argparse.h"
@@ -148,7 +142,6 @@
                    char **addr_of_buffer, size_t *length_of_buffer,
                    size_t *max_length);
 
-
 /*-- b64enc.c and b64dec.c --*/
 struct b64state
 {
@@ -207,6 +200,8 @@
 int get_pk_algo_from_canon_sexp (const unsigned char *keydata,
                                  size_t keydatalen);
 char *pubkey_algo_string (gcry_sexp_t s_pkey, enum gcry_pk_algos *r_algoid);
+const char *pubkey_algo_to_string (int algo);
+const char *hash_algo_to_string (int algo);
 
 /*-- convert.c --*/
 int hex2bin (const char *string, void *buffer, size_t length);
@@ -219,6 +214,8 @@
 
 /*-- percent.c --*/
 char *percent_plus_escape (const char *string);
+char *percent_data_escape (int plus_escape, const char *prefix,
+                           const void *data, size_t datalen);
 char *percent_plus_unescape (const char *string, int nulrepl);
 char *percent_unescape (const char *string, int nulrepl);
 
@@ -244,6 +241,7 @@
 const char *standard_homedir (void);
 const char *default_homedir (void);
 void gnupg_set_homedir (const char *newdir);
+void gnupg_maybe_make_homedir (const char *fname, int quiet);
 const char *gnupg_homedir (void);
 int gnupg_default_homedir_p (void);
 const char *gnupg_daemon_rootdir (void);
@@ -288,6 +286,9 @@
 /*-- localename.c --*/
 const char *gnupg_messages_locale_name (void);
 
+/*-- sysutils.c --*/
+FILE *gnupg_fopen (const char *fname, const char *mode);
+
 /*-- miscellaneous.c --*/
 
 /* This function is called at startup to tell libgcrypt to use our own
diff -Nru gnupg2-2.2.20/common/w32info-rc.h.in gnupg2-2.2.27/common/w32info-rc.h.in
--- gnupg2-2.2.20/common/w32info-rc.h.in	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/common/w32info-rc.h.in	2021-01-11 18:38:11.000000000 +0100
@@ -17,7 +17,7 @@
 GNU General Public License as published by the Free Software Foundation; \
 either version 3 of the License, or (at your option) any later version.\0"
 
-#define W32INFO_COMPANYNAME "The GnuPG Project\0"
+#define W32INFO_COMPANYNAME "g10 Code GmbH\0"
 
 #define W32INFO_VI_FILEVERSION    @BUILD_FILEVERSION@
 #define W32INFO_VI_PRODUCTVERSION @BUILD_FILEVERSION@
@@ -29,4 +29,4 @@
 #define W32INFO_PRODUCTVERSION "@VERSION@\0"
 
 #define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \
-2019 Free Software Foundation, Inc.\0"
+2021 g10 Code GmbH\0"
diff -Nru gnupg2-2.2.20/config.h.in gnupg2-2.2.27/config.h.in
--- gnupg2-2.2.20/config.h.in	2020-03-19 12:53:45.000000000 +0100
+++ gnupg2-2.2.27/config.h.in	2021-01-11 18:45:41.000000000 +0100
@@ -59,9 +59,6 @@
 /* define to disable photo viewing */
 #undef DISABLE_PHOTO_VIEWER
 
-/* Define to disable regular expression support */
-#undef DISABLE_REGEX
-
 /* Define to include smartcard support */
 #undef ENABLE_CARD_SUPPORT
 
@@ -648,6 +645,9 @@
 /* Defined if mkdir() does not take permission flags */
 #undef MKDIR_TAKES_ONE_ARG
 
+/* Tool with sendmail -t interface */
+#undef NAME_OF_SENDMAIL
+
 /* Required version of Libksba */
 #undef NEED_KSBA_VERSION
 
@@ -903,6 +903,22 @@
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 
+/* GnuPG has always been a part of the GNU project and thus we have
+ * shown the FSF as holder of the copyright.  We continue to do so for
+ * the reason that without the FSF the free software used all over the
+ * world would not have come into existence.  However, under Windows
+ * we print a different copyright string with --version because the
+ * copyright assignments of g10 Code and Werner Koch were terminated
+ * many years ago, g10 Code is still the major contributor to the
+ * code, and Windows is not an FSF endorsed platform.  Note that the
+ * actual list of copyright holders can be found in the AUTHORS file.  */
+#ifdef HAVE_W32_SYSTEM
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 g10 Code GmbH"
+#else
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 Free Software Foundation, Inc."
+#endif
+
+
 /* For some systems (DOS currently), we hardcode the path here.  For
    POSIX systems the values are constructed by the Makefiles, so that
    the values may be overridden by the make invocations; this is to
@@ -956,6 +972,9 @@
 /* Provide the es_ macro for estream.  */
 #define GPGRT_ENABLE_ES_MACROS 1
 
+/* We want the argparse macros from gpgrt.  */
+#define GPGRT_ENABLE_ARGPARSE_MACROS 1
+
 /* Tell libgcrypt not to use its own libgpg-error implementation. */
 #define USE_LIBGPG_ERROR 1
 
diff -Nru gnupg2-2.2.20/configure gnupg2-2.2.27/configure
--- gnupg2-2.2.20/configure	2020-03-20 16:38:01.000000000 +0100
+++ gnupg2-2.2.27/configure	2021-01-11 18:46:56.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnupg 2.2.20.
+# Generated by GNU Autoconf 2.69 for gnupg 2.2.27.
 #
 # Report bugs to <https://bugs.gnupg.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnupg'
 PACKAGE_TARNAME='gnupg'
-PACKAGE_VERSION='2.2.20'
-PACKAGE_STRING='gnupg 2.2.20'
+PACKAGE_VERSION='2.2.27'
+PACKAGE_STRING='gnupg 2.2.27'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -639,12 +639,12 @@
 NO_TRUST_MODELS_TRUE
 ENABLE_CARD_SUPPORT_FALSE
 ENABLE_CARD_SUPPORT_TRUE
+DISABLE_TESTS_FALSE
+DISABLE_TESTS_TRUE
 BUILD_WKS_TOOLS_FALSE
 BUILD_WKS_TOOLS_TRUE
 BUILD_GPGTAR_FALSE
 BUILD_GPGTAR_TRUE
-BUILD_SYMCRYPTRUN_FALSE
-BUILD_SYMCRYPTRUN_TRUE
 BUILD_DOC_FALSE
 BUILD_DOC_TRUE
 BUILD_DIRMNGR_FALSE
@@ -668,8 +668,6 @@
 ZLIBS
 ENABLE_BZIP2_SUPPORT_FALSE
 ENABLE_BZIP2_SUPPORT_TRUE
-DISABLE_REGEX_FALSE
-DISABLE_REGEX_TRUE
 SYS_SOCKET_H
 BUILD_INCLUDED_LIBINTL
 USE_INCLUDED_LIBINTL
@@ -747,6 +745,7 @@
 PKG_CONFIG_PATH
 PKG_CONFIG
 CC_FOR_BUILD
+AWK_HEX_NUMBER_OPTION
 HAVE_USTAR_FALSE
 HAVE_USTAR_TRUE
 TAR
@@ -858,6 +857,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -889,7 +889,6 @@
 enable_g13
 enable_dirmngr
 enable_doc
-enable_symcryptrun
 enable_gpgtar
 enable_wks_tools
 with_agent_pgm
@@ -958,14 +957,13 @@
 enable_nls
 with_libintl_prefix
 enable_endian_check
-enable_regex
-with_regex
 with_zlib
 with_bzip2
 with_readline
 enable_optimization
 enable_werror
 enable_all_tests
+enable_tests
 enable_gnupg_builddir_envvar
 enable_run_gnupg_user_socket
 enable_build_timestamp
@@ -1027,6 +1025,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1279,6 +1278,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1416,7 +1424,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1529,7 +1537,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnupg 2.2.20 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.2.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1569,6 +1577,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1599,7 +1608,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnupg 2.2.20:";;
+     short | recursive ) echo "Configuration of gnupg 2.2.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1619,7 +1628,6 @@
   --enable-g13            build the g13 program
   --disable-dirmngr       do not build the dirmngr program
   --disable-doc           do not build the doc program
-  --enable-symcryptrun    build the symcryptrun program
   --disable-gpgtar        do not build the gpgtar program
   --disable-wks-tools     do not build the wks-tools program
   --enable-gpg-is-gpg2    Set installed name of gpg to gpg2
@@ -1673,11 +1681,10 @@
   --disable-nls           do not use Native Language Support
   --disable-endian-check  disable the endian check and trust the OS provided
                           macros
-  --disable-regex         do not handle regular expressions in trust
-                          signatures
   --disable-optimization  disable compiler optimization
   --enable-werror         append -Werror to CFLAGS
   --enable-all-tests      let "make check" run all tests
+  --disable-tests         do not run any tests
 
   --enable-run-gnupg-user-socket
                           try /run/gnupg/user for sockets prior to /run/user
@@ -1720,7 +1727,6 @@
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-regex=DIR        look for regex in DIR
   --with-zlib=DIR         use libz in DIR
   --with-bzip2=DIR        look for bzip2 in DIR
   --with-readline=DIR     look for the readline library in DIR
@@ -1818,7 +1824,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnupg configure 2.2.20
+gnupg configure 2.2.27
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2527,7 +2533,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnupg $as_me 2.2.20, which was
+It was created by gnupg $as_me 2.2.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2886,16 +2892,16 @@
 _ACEOF
 
 
-NEED_GPG_ERROR_VERSION=1.24
+NEED_GPG_ERROR_VERSION=1.27
 
 NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.7.0
+NEED_LIBGCRYPT_VERSION=1.8.0
 
 NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.5.0
 
 NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.3.4
+NEED_KSBA_VERSION=1.3.5
 
 NEED_NTBTLS_API=1
 NEED_NTBTLS_VERSION=0.1.0
@@ -3431,7 +3437,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnupg'
- VERSION='2.2.20'
+ VERSION='2.2.27'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5268,26 +5274,6 @@
    esac
 
 
-
-   build_symcryptrun=no
-
-      # Check whether --enable-symcryptrun was given.
-if test "${enable_symcryptrun+set}" = set; then :
-  enableval=$enable_symcryptrun; build_symcryptrun=$enableval
-else
-  build_symcryptrun=no
-fi
-
-
-   case "$build_symcryptrun" in
-         no|yes)
-           ;;
-         *)
-           as_fn_error $? "only yes or no allowed for feature --enable-symcryptrun" "$LINENO" 5
-           ;;
-   esac
-
-
 # We use gpgtar to unpack test data, hence we always build it.  If the
 # user opts out, we simply don't install it.
 
@@ -7968,6 +7954,18 @@
 
 
 
+# GNU AWK requires -n option to interpret "0xHH" as a number
+if $AWK 'BEGIN { if (PROCINFO["version"]) exit 1 }'; then
+  AWK_HEX_NUMBER_OPTION=''
+  { $as_echo "$as_me:${as_lineno-$LINENO}: awk with no option for hexadecimal" >&5
+$as_echo "$as_me: awk with no option for hexadecimal" >&6;}
+else
+  AWK_HEX_NUMBER_OPTION='-n'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: awk with an option -n for hexadecimal" >&5
+$as_echo "$as_me: awk with an option -n for hexadecimal" >&6;}
+fi
+
+
 # We need to compile and run a program on the build machine.  A
 # comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
 # the AC archive is broken for autoconf 2.57.  Given that there is no
@@ -9352,7 +9350,7 @@
 
 
 #
-# Checks for symcryptrun:
+# Checks formerly used for symcryptrun.
 #
 
 # libutil has openpty() and login_tty().
@@ -10896,7 +10894,7 @@
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/sbin:/usr/libexec:/usr/lib"
+as_dummy=""$PATH":/usr/sbin:/usr/libexec:/usr/lib"
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
@@ -10933,6 +10931,11 @@
 $as_echo "$with_mailprog" >&6; }
 fi
 
+cat >>confdefs.h <<_ACEOF
+#define NAME_OF_SENDMAIL "$SENDMAIL"
+_ACEOF
+
+
 
 #
 # Construct a printable name of the OS
@@ -15107,164 +15110,6 @@
 fi
 
 
-#
-# Sanity check regex.  Tests adapted from mutt.
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether regular expression support is requested" >&5
-$as_echo_n "checking whether regular expression support is requested... " >&6; }
-# Check whether --enable-regex was given.
-if test "${enable_regex+set}" = set; then :
-  enableval=$enable_regex; use_regex=$enableval
-else
-  use_regex=yes
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_regex" >&5
-$as_echo "$use_regex" >&6; }
-
-if test "$use_regex" = yes ; then
-  _cppflags="${CPPFLAGS}"
-  _ldflags="${LDFLAGS}"
-
-# Check whether --with-regex was given.
-if test "${with_regex+set}" = set; then :
-  withval=$with_regex;
-      if test -d "$withval" ; then
-        CPPFLAGS="${CPPFLAGS} -I$withval/include"
-        LDFLAGS="${LDFLAGS} -L$withval/lib"
-      fi
-
-else
-  withval=""
-fi
-
-
-  # Does the system have regex functions at all?
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
-$as_echo_n "checking for library containing regcomp... " >&6; }
-if ${ac_cv_search_regcomp+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char regcomp ();
-int
-main ()
-{
-return regcomp ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' regex; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_regcomp=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_regcomp+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_regcomp+:} false; then :
-
-else
-  ac_cv_search_regcomp=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
-$as_echo "$ac_cv_search_regcomp" >&6; }
-ac_res=$ac_cv_search_regcomp
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-  ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp"
-if test "x$ac_cv_func_regcomp" = xyes; then :
-  gnupg_cv_have_regex=yes
-else
-  gnupg_cv_have_regex=no
-fi
-
-
-  if test $gnupg_cv_have_regex = no; then
-    use_regex=no
-  else
-    if test x"$cross_compiling" = xyes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling; assuming regexp libray is not broken" >&5
-$as_echo "$as_me: WARNING: cross compiling; assuming regexp libray is not broken" >&2;}
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system's regexp library is broken" >&5
-$as_echo_n "checking whether your system's regexp library is broken... " >&6; }
-if ${gnupg_cv_regex_broken+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  gnupg_cv_regex_broken=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <unistd.h>
-#include <regex.h>
-main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gnupg_cv_regex_broken=no
-else
-  gnupg_cv_regex_broken=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_regex_broken" >&5
-$as_echo "$gnupg_cv_regex_broken" >&6; }
-
-      if test $gnupg_cv_regex_broken = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your regex is broken - disabling regex use" >&5
-$as_echo "$as_me: WARNING: your regex is broken - disabling regex use" >&2;}
-        use_regex=no
-      fi
-    fi
-  fi
-  CPPFLAGS="${_cppflags}"
-  LDFLAGS="${_ldflags}"
-fi
-
-if test "$use_regex" != yes ; then
-
-$as_echo "#define DISABLE_REGEX 1" >>confdefs.h
-
-fi
- if test x"$use_regex" != xyes; then
-  DISABLE_REGEX_TRUE=
-  DISABLE_REGEX_FALSE='#'
-else
-  DISABLE_REGEX_TRUE='#'
-  DISABLE_REGEX_FALSE=
-fi
-
-
-
 
 #
 # Do we have zlib? Must do it here because Solaris failed
@@ -15645,8 +15490,9 @@
 $as_echo "$_gcc_wopt" >&6; }
         fi
         if test x"$_gcc_wopt" = xyes ; then
-          mycflags="$mycflags -W -Wno-sign-compare"
+          mycflags="$mycflags -W -Wno-sign-compare -Wno-format-zero-length"
           mycflags="$mycflags -Wno-missing-field-initializers"
+          mycflags="$mycflags -Wno-format-zero-length"
         fi
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wdeclaration-after-statement" >&5
@@ -15842,6 +15688,21 @@
 fi
 
 #
+# Configure option --disable-tests
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tests should be run" >&5
+$as_echo_n "checking whether tests should be run... " >&6; }
+# Check whether --enable-tests was given.
+if test "${enable_tests+set}" = set; then :
+  enableval=$enable_tests; run_tests=$enableval
+else
+  run_tests=yes
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $run_tests" >&5
+$as_echo "$run_tests" >&6; }
+
+#
 # We do not want support for the GNUPG_BUILDDIR environment variable
 # in a released version.  However, our regression tests suite requires
 # this and thus we build with support for it during "make distcheck".
@@ -15952,14 +15813,6 @@
   BUILD_DOC_FALSE=
 fi
 
- if test "$build_symcryptrun" = "yes"; then
-  BUILD_SYMCRYPTRUN_TRUE=
-  BUILD_SYMCRYPTRUN_FALSE='#'
-else
-  BUILD_SYMCRYPTRUN_TRUE='#'
-  BUILD_SYMCRYPTRUN_FALSE=
-fi
-
  if test "$build_gpgtar" = "yes"; then
   BUILD_GPGTAR_TRUE=
   BUILD_GPGTAR_FALSE='#'
@@ -15977,6 +15830,14 @@
 fi
 
 
+ if test "$run_tests" != yes; then
+  DISABLE_TESTS_TRUE=
+  DISABLE_TESTS_FALSE='#'
+else
+  DISABLE_TESTS_TRUE='#'
+  DISABLE_TESTS_FALSE=
+fi
+
  if test "$card_support" = yes; then
   ENABLE_CARD_SUPPORT_TRUE=
   ENABLE_CARD_SUPPORT_FALSE='#'
@@ -16188,7 +16049,7 @@
 #
 # Provide information about the build.
 #
-BUILD_REVISION="5094bb08e"
+BUILD_REVISION="0c103cde0"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16197,7 +16058,7 @@
 
 
 BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}20628"
+BUILD_VERSION="${BUILD_VERSION}3088"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -16379,7 +16240,7 @@
 
 
 
-ac_config_files="$ac_config_files m4/Makefile Makefile po/Makefile.in common/Makefile common/w32info-rc.h kbx/Makefile g10/Makefile sm/Makefile agent/Makefile scd/Makefile g13/Makefile dirmngr/Makefile tools/gpg-zip tools/Makefile doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile tests/migrations/Makefile tests/gpgsm/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest"
+ac_config_files="$ac_config_files m4/Makefile Makefile po/Makefile.in common/Makefile common/w32info-rc.h regexp/Makefile kbx/Makefile g10/Makefile sm/Makefile agent/Makefile scd/Makefile g13/Makefile dirmngr/Makefile tools/gpg-zip tools/Makefile doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile tests/migrations/Makefile tests/gpgsm/Makefile tests/gpgme/Makefile tests/pkits/Makefile agent/gpg-agent.w32-manifest g10/gpg.w32-manifest g10/gpgv.w32-manifest sm/gpgsm.w32-manifest scd/scdaemon.w32-manifest dirmngr/dirmngr.w32-manifest tools/gpgconf.w32-manifest tools/gpgtar.w32-manifest tools/gpg-connect-agent.w32-manifest tools/gpg-check-pattern.w32-manifest tools/gpg-wks-client.w32-manifest"
 
 
 
@@ -16604,10 +16465,6 @@
   as_fn_error $? "conditional \"USE_LDAPWRAPPER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DISABLE_REGEX_TRUE}" && test -z "${DISABLE_REGEX_FALSE}"; then
-  as_fn_error $? "conditional \"DISABLE_REGEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_BZIP2_SUPPORT_TRUE}" && test -z "${ENABLE_BZIP2_SUPPORT_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_BZIP2_SUPPORT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16644,10 +16501,6 @@
   as_fn_error $? "conditional \"BUILD_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_SYMCRYPTRUN_TRUE}" && test -z "${BUILD_SYMCRYPTRUN_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SYMCRYPTRUN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${BUILD_GPGTAR_TRUE}" && test -z "${BUILD_GPGTAR_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_GPGTAR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16656,6 +16509,10 @@
   as_fn_error $? "conditional \"BUILD_WKS_TOOLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${DISABLE_TESTS_TRUE}" && test -z "${DISABLE_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"DISABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_CARD_SUPPORT_TRUE}" && test -z "${ENABLE_CARD_SUPPORT_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_CARD_SUPPORT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17065,7 +16922,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnupg $as_me 2.2.20, which was
+This file was extended by gnupg $as_me 2.2.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17131,7 +16988,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnupg config.status 2.2.20
+gnupg config.status 2.2.27
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17275,6 +17132,7 @@
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
     "common/w32info-rc.h") CONFIG_FILES="$CONFIG_FILES common/w32info-rc.h" ;;
+    "regexp/Makefile") CONFIG_FILES="$CONFIG_FILES regexp/Makefile" ;;
     "kbx/Makefile") CONFIG_FILES="$CONFIG_FILES kbx/Makefile" ;;
     "g10/Makefile") CONFIG_FILES="$CONFIG_FILES g10/Makefile" ;;
     "sm/Makefile") CONFIG_FILES="$CONFIG_FILES sm/Makefile" ;;
@@ -17292,7 +17150,17 @@
     "tests/gpgsm/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgsm/Makefile" ;;
     "tests/gpgme/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgme/Makefile" ;;
     "tests/pkits/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pkits/Makefile" ;;
+    "agent/gpg-agent.w32-manifest") CONFIG_FILES="$CONFIG_FILES agent/gpg-agent.w32-manifest" ;;
     "g10/gpg.w32-manifest") CONFIG_FILES="$CONFIG_FILES g10/gpg.w32-manifest" ;;
+    "g10/gpgv.w32-manifest") CONFIG_FILES="$CONFIG_FILES g10/gpgv.w32-manifest" ;;
+    "sm/gpgsm.w32-manifest") CONFIG_FILES="$CONFIG_FILES sm/gpgsm.w32-manifest" ;;
+    "scd/scdaemon.w32-manifest") CONFIG_FILES="$CONFIG_FILES scd/scdaemon.w32-manifest" ;;
+    "dirmngr/dirmngr.w32-manifest") CONFIG_FILES="$CONFIG_FILES dirmngr/dirmngr.w32-manifest" ;;
+    "tools/gpgconf.w32-manifest") CONFIG_FILES="$CONFIG_FILES tools/gpgconf.w32-manifest" ;;
+    "tools/gpgtar.w32-manifest") CONFIG_FILES="$CONFIG_FILES tools/gpgtar.w32-manifest" ;;
+    "tools/gpg-connect-agent.w32-manifest") CONFIG_FILES="$CONFIG_FILES tools/gpg-connect-agent.w32-manifest" ;;
+    "tools/gpg-check-pattern.w32-manifest") CONFIG_FILES="$CONFIG_FILES tools/gpg-check-pattern.w32-manifest" ;;
+    "tools/gpg-wks-client.w32-manifest") CONFIG_FILES="$CONFIG_FILES tools/gpg-wks-client.w32-manifest" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18138,7 +18006,7 @@
 echo "
         GnuPG v${VERSION} has been configured as follows:
 
-        Revision:  5094bb08e  (20628)
+        Revision:  0c103cde0  (3088)
         Platform:  $PRINTABLE_OS_NAME ($host)
 
         OpenPGP:   $build_gpg
@@ -18164,13 +18032,6 @@
         TOFU support:        $use_tofu
         Tor support:         $show_tor_support
 "
-if test x"$use_regex" != xyes ; then
-echo "
-        Warning: No regular expression support available.
-                 OpenPGP trust signatures won't work.
-                 gpg-check-pattern will not be built.
-"
-fi
 if test "x${gpg_config_script_warn}" != x; then
 cat <<G10EOF
         Warning: Mismatches between the target platform and the
@@ -18180,3 +18041,18 @@
 
 G10EOF
 fi
+if test "${build_gpg}" != "yes"; then
+cat <<G10EOF
+        Warning: The component "gpg" is used by other components as
+                 well as for the test suite.  You have disabled
+                 this component and thus other things won't work.
+
+G10EOF
+fi
+if test "${run_tests}" != "yes"; then
+cat <<G10EOF
+        Warning: The use of the test suite has been disabled!
+                 This is in almost all cases a bad idea.  Take care.
+
+G10EOF
+fi
diff -Nru gnupg2-2.2.20/configure.ac gnupg2-2.2.27/configure.ac
--- gnupg2-2.2.20/configure.ac	2020-03-18 16:30:02.000000000 +0100
+++ gnupg2-2.2.27/configure.ac	2021-01-11 18:37:39.000000000 +0100
@@ -1,7 +1,7 @@
 # configure.ac - for GnuPG 2.2
 # Copyright (C) 1998-2019 Free Software Foundation, Inc.
 # Copyright (C) 1998-2019 Werner Koch
-# Copyright (C) 2003-2020 g10 Code GmbH
+# Copyright (C) 2003-2021 g10 Code GmbH
 #
 # This file is part of GnuPG.
 #
@@ -29,7 +29,7 @@
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [20])
+m4_define([mym4_micro], [27])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release
@@ -54,16 +54,16 @@
 # build-aux/speedo.mk and Makefile.am
 AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch])
 
-NEED_GPG_ERROR_VERSION=1.24
+NEED_GPG_ERROR_VERSION=1.27
 
 NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.7.0
+NEED_LIBGCRYPT_VERSION=1.8.0
 
 NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.5.0
 
 NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.3.4
+NEED_KSBA_VERSION=1.3.5
 
 NEED_NTBTLS_API=1
 NEED_NTBTLS_VERSION=0.1.0
@@ -125,7 +125,6 @@
 GNUPG_BUILD_PROGRAM(g13, no)
 GNUPG_BUILD_PROGRAM(dirmngr, yes)
 GNUPG_BUILD_PROGRAM(doc, yes)
-GNUPG_BUILD_PROGRAM(symcryptrun, no)
 # We use gpgtar to unpack test data, hence we always build it.  If the
 # user opts out, we simply don't install it.
 GNUPG_BUILD_PROGRAM(gpgtar, yes)
@@ -510,6 +509,22 @@
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 
+/* GnuPG has always been a part of the GNU project and thus we have
+ * shown the FSF as holder of the copyright.  We continue to do so for
+ * the reason that without the FSF the free software used all over the
+ * world would not have come into existence.  However, under Windows
+ * we print a different copyright string with --version because the
+ * copyright assignments of g10 Code and Werner Koch were terminated
+ * many years ago, g10 Code is still the major contributor to the
+ * code, and Windows is not an FSF endorsed platform.  Note that the
+ * actual list of copyright holders can be found in the AUTHORS file.  */
+#ifdef HAVE_W32_SYSTEM
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 g10 Code GmbH"
+#else
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 Free Software Foundation, Inc."
+#endif
+
+
 /* For some systems (DOS currently), we hardcode the path here.  For
    POSIX systems the values are constructed by the Makefiles, so that
    the values may be overridden by the make invocations; this is to
@@ -563,6 +578,9 @@
 /* Provide the es_ macro for estream.  */
 #define GPGRT_ENABLE_ES_MACROS 1
 
+/* We want the argparse macros from gpgrt.  */
+#define GPGRT_ENABLE_ARGPARSE_MACROS 1
+
 /* Tell libgcrypt not to use its own libgpg-error implementation. */
 #define USE_LIBGPG_ERROR 1
 
@@ -622,6 +640,16 @@
 GNUPG_CHECK_USTAR
 
 
+# GNU AWK requires -n option to interpret "0xHH" as a number
+if $AWK 'BEGIN { if (PROCINFO@<:@"version"@:>@) exit 1 }'; then
+  AWK_HEX_NUMBER_OPTION=''
+  AC_MSG_NOTICE([awk with no option for hexadecimal])
+else
+  AWK_HEX_NUMBER_OPTION='-n'
+  AC_MSG_NOTICE([awk with an option -n for hexadecimal])
+fi
+AC_SUBST(AWK_HEX_NUMBER_OPTION)
+
 # We need to compile and run a program on the build machine.  A
 # comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
 # the AC archive is broken for autoconf 2.57.  Given that there is no
@@ -946,7 +974,7 @@
 
 
 #
-# Checks for symcryptrun:
+# Checks formerly used for symcryptrun.
 #
 
 # libutil has openpty() and login_tty().
@@ -1214,12 +1242,14 @@
                      [use "NAME -t" for mail transport]),
              ,with_mailprog=yes)
 if test x"$with_mailprog" = xyes ; then
-    AC_PATH_PROG(SENDMAIL,sendmail,,$PATH:/usr/sbin:/usr/libexec:/usr/lib)
+    AC_PATH_PROG(SENDMAIL,sendmail,,"$PATH":/usr/sbin:/usr/libexec:/usr/lib)
 elif test x"$with_mailprog" != xno ; then
     AC_MSG_CHECKING([for a mail transport program])
     AC_SUBST(SENDMAIL,$with_mailprog)
     AC_MSG_RESULT($with_mailprog)
 fi
+AC_DEFINE_UNQUOTED(NAME_OF_SENDMAIL,"$SENDMAIL",
+                   [Tool with sendmail -t interface])
 
 
 #
@@ -1450,62 +1480,6 @@
 #
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
 
-#
-# Sanity check regex.  Tests adapted from mutt.
-#
-AC_MSG_CHECKING([whether regular expression support is requested])
-AC_ARG_ENABLE(regex,
-  AC_HELP_STRING([--disable-regex],
-    [do not handle regular expressions in trust signatures]),
-  use_regex=$enableval, use_regex=yes)
-AC_MSG_RESULT($use_regex)
-
-if test "$use_regex" = yes ; then
-  _cppflags="${CPPFLAGS}"
-  _ldflags="${LDFLAGS}"
-  AC_ARG_WITH(regex,
-     AC_HELP_STRING([--with-regex=DIR],[look for regex in DIR]),
-      [
-      if test -d "$withval" ; then
-        CPPFLAGS="${CPPFLAGS} -I$withval/include"
-        LDFLAGS="${LDFLAGS} -L$withval/lib"
-      fi
-      ],withval="")
-
-  # Does the system have regex functions at all?
-  AC_SEARCH_LIBS([regcomp], [regex])
-  AC_CHECK_FUNC(regcomp, gnupg_cv_have_regex=yes, gnupg_cv_have_regex=no)
-
-  if test $gnupg_cv_have_regex = no; then
-    use_regex=no
-  else
-    if test x"$cross_compiling" = xyes; then
-      AC_MSG_WARN([cross compiling; assuming regexp libray is not broken])
-    else
-      AC_CACHE_CHECK([whether your system's regexp library is broken],
-       [gnupg_cv_regex_broken],
-       AC_TRY_RUN([
-#include <unistd.h>
-#include <regex.h>
-main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
-       gnupg_cv_regex_broken=no, gnupg_cv_regex_broken=yes, gnupg_cv_regex_broken=yes))
-
-      if test $gnupg_cv_regex_broken = yes; then
-        AC_MSG_WARN([your regex is broken - disabling regex use])
-        use_regex=no
-      fi
-    fi
-  fi
-  CPPFLAGS="${_cppflags}"
-  LDFLAGS="${_ldflags}"
-fi
-
-if test "$use_regex" != yes ; then
-  AC_DEFINE(DISABLE_REGEX,1, [Define to disable regular expression support])
-fi
-AM_CONDITIONAL(DISABLE_REGEX, test x"$use_regex" != xyes)
-
-
 
 #
 # Do we have zlib? Must do it here because Solaris failed
@@ -1638,8 +1612,9 @@
           AC_MSG_RESULT($_gcc_wopt)
         fi
         if test x"$_gcc_wopt" = xyes ; then
-          mycflags="$mycflags -W -Wno-sign-compare"
+          mycflags="$mycflags -W -Wno-sign-compare -Wno-format-zero-length"
           mycflags="$mycflags -Wno-missing-field-initializers"
+          mycflags="$mycflags -Wno-format-zero-length"
         fi
 
         AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
@@ -1738,6 +1713,16 @@
 fi
 
 #
+# Configure option --disable-tests
+#
+AC_MSG_CHECKING([whether tests should be run])
+AC_ARG_ENABLE(tests,
+              AC_HELP_STRING([--disable-tests],
+                             [do not run any tests]),
+              run_tests=$enableval, run_tests=yes)
+AC_MSG_RESULT($run_tests)
+
+#
 # We do not want support for the GNUPG_BUILDDIR environment variable
 # in a released version.  However, our regression tests suite requires
 # this and thus we build with support for it during "make distcheck".
@@ -1793,10 +1778,10 @@
 AM_CONDITIONAL(BUILD_G13,         test "$build_g13" = "yes")
 AM_CONDITIONAL(BUILD_DIRMNGR,     test "$build_dirmngr" = "yes")
 AM_CONDITIONAL(BUILD_DOC,         test "$build_doc" = "yes")
-AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
 AM_CONDITIONAL(BUILD_GPGTAR,      test "$build_gpgtar" = "yes")
 AM_CONDITIONAL(BUILD_WKS_TOOLS,   test "$build_wks_tools" = "yes")
 
+AM_CONDITIONAL(DISABLE_TESTS,       test "$run_tests" != yes)
 AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
 AM_CONDITIONAL(NO_TRUST_MODELS,     test "$use_trust_models" = no)
 AM_CONDITIONAL(USE_TOFU,            test "$use_tofu" = yes)
@@ -2022,6 +2007,7 @@
 po/Makefile.in
 common/Makefile
 common/w32info-rc.h
+regexp/Makefile
 kbx/Makefile
 g10/Makefile
 sm/Makefile
@@ -2039,7 +2025,17 @@
 tests/gpgsm/Makefile
 tests/gpgme/Makefile
 tests/pkits/Makefile
+agent/gpg-agent.w32-manifest
 g10/gpg.w32-manifest
+g10/gpgv.w32-manifest
+sm/gpgsm.w32-manifest
+scd/scdaemon.w32-manifest
+dirmngr/dirmngr.w32-manifest
+tools/gpgconf.w32-manifest
+tools/gpgtar.w32-manifest
+tools/gpg-connect-agent.w32-manifest
+tools/gpg-check-pattern.w32-manifest
+tools/gpg-wks-client.w32-manifest
 ])
 
 
@@ -2075,13 +2071,6 @@
         TOFU support:        $use_tofu
         Tor support:         $show_tor_support
 "
-if test x"$use_regex" != xyes ; then
-echo "
-        Warning: No regular expression support available.
-                 OpenPGP trust signatures won't work.
-                 gpg-check-pattern will not be built.
-"
-fi
 if test "x${gpg_config_script_warn}" != x; then
 cat <<G10EOF
         Warning: Mismatches between the target platform and the
@@ -2091,3 +2080,18 @@
 
 G10EOF
 fi
+if test "${build_gpg}" != "yes"; then
+cat <<G10EOF
+        Warning: The component "gpg" is used by other components as
+                 well as for the test suite.  You have disabled
+                 this component and thus other things won't work.
+
+G10EOF
+fi
+if test "${run_tests}" != "yes"; then
+cat <<G10EOF
+        Warning: The use of the test suite has been disabled!
+                 This is in almost all cases a bad idea.  Take care.
+
+G10EOF
+fi
diff -Nru gnupg2-2.2.20/COPYING.other gnupg2-2.2.27/COPYING.other
--- gnupg2-2.2.20/COPYING.other	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/COPYING.other	2020-07-16 11:35:25.000000000 +0200
@@ -58,3 +58,103 @@
   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+* Regular expression support
+
+  regexp/jimregexp.[ch]:
+
+  Originally:
+
+    Copyright (c) 1986 by University of Toronto.
+    Written by Henry Spencer.  Not derived from licensed software.
+
+  Subsequently modified by:
+
+    1986 John Gilmore hoptoad!gnu
+    1987 James A. Woods ames!jaw
+    1993 Christopher Seiwald seiwald@vix.com
+    2000, 2002 Christopher Seiwald <seiwald@perforce.com>
+    2010 Steve Bennett <steveb@workware.net.au>
+    2020 NIIBE Yutaka <gniibe@fsij.org>
+
+  Permission is granted to anyone to use this software for any
+  purpose on any computer system, and to redistribute it freely,
+  subject to the following restrictions:
+
+  1. The author is not responsible for the consequences of use of
+     this software, no matter how awful, even if they arise
+     from defects in it.
+
+  2. The origin of this software must not be misrepresented, either
+     by explicit claim or by omission.
+
+  3. Altered versions must be plainly marked as such, and must not
+     be misrepresented as being the original software.
+
+
+  regexp/utf8.[ch] (see regexp/LICENSE):
+
+  (c) 2010-2016 Steve Bennett <steveb@workware.net.au>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials
+     provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY
+  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  JIM TCL PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  The views and conclusions contained in the software and documentation
+  are those of the authors and should not be interpreted as representing
+  official policies, either expressed or implied, of the Jim Tcl Project.
+
+
+  UnicodeData.txt:
+
+  Copyright © 1991-2020 Unicode, Inc. All rights reserved.
+  Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of the Unicode data files and any associated documentation
+  (the "Data Files") or Unicode software and any associated documentation
+  (the "Software") to deal in the Data Files or Software
+  without restriction, including without limitation the rights to use,
+  copy, modify, merge, publish, distribute, and/or sell copies of
+  the Data Files or Software, and to permit persons to whom the Data Files
+  or Software are furnished to do so, provided that either
+  (a) this copyright and permission notice appear with all copies
+  of the Data Files or Software, or
+  (b) this copyright and permission notice appear in associated
+  Documentation.
+
+  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+  ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+  WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+  NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+  DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+  Except as contained in this notice, the name of a copyright holder
+  shall not be used in advertising or otherwise to promote the sale,
+  use or other dealings in these Data Files or Software without prior
+  written authorization of the copyright holder.
diff -Nru gnupg2-2.2.20/debian/changelog gnupg2-2.2.27/debian/changelog
--- gnupg2-2.2.20/debian/changelog	2021-06-21 23:48:27.000000000 +0200
+++ gnupg2-2.2.27/debian/changelog	2021-08-11 15:17:54.000000000 +0200
@@ -1,3 +1,66 @@
+gnupg2 (2.2.27-2ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable (LP: #1939567). Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+  * Dropped changes as obsolete:
+    - Fix IPv6 connectivity for dirmngr
+      (d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch)
+
+ -- Simon Chopin <simon.chopin@canonical.com>  Wed, 11 Aug 2021 15:17:54 +0200
+
+gnupg2 (2.2.27-2) unstable; urgency=medium
+
+  * Add a NEWS entry about the end of support for ~/.gnupg/options.
+    Closes: #985158
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Thu, 22 Apr 2021 20:40:36 +0200
+
+gnupg2 (2.2.27-1) unstable; urgency=medium
+
+  [ NIIBE Yutaka ]
+  * New upstream release.
+
+  [ Christoph Biedl ]
+  * Tighten libgcrypt and libksba dependency
+
+  [ Daniel Kahn Gillmor ]
+  * change debian packaging branch name to debian/main
+  * refresh patches using gbp pq
+  * point to upstream commit used to improve spawning reliability
+  * Refresh 3072-bit default patch
+  * standards-version: bump to 4.5.1 (no changes needed)
+  * dh: bump to dh 13
+  * clean up lintian overrides
+  * fully drop symcryptrun
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Mon, 08 Feb 2021 17:57:00 -0500
+
+gnupg2 (2.2.26-1) UNRELEASED; urgency=medium
+
+  [ Jeremiah C. Foster ]
+  * debian/scdaemon.udev: Add an entry for Librem Key.
+
+  [ NIIBE Yutaka ]
+  * New upstream release.
+  * refresh patches.
+  * debian/rules: Add build for regexp.
+  * debian/gnupg-utils.install: Remove /usr/bin/symcryptrun.
+    Fix for gpgsplit, which is changed in upstream from 'noinst'.
+  * debian/patches/gpg-change-agent-spawn-2019-07-24-v2.patch: New patch to
+    fix a race condition, backported from master (Closes: #868550, #972525).
+  * debian/scdaemon.udev: Add a generic entry for "Gnuk Token" and another
+    for GnuPG e.V.
+  * org.gnupg.scdaemon.metainfo.xml: Add an entry for GnuPG e.V.
+
+ -- NIIBE Yutaka <gniibe@fsij.org>  Thu, 07 Jan 2021 09:07:21 +0900
+
 gnupg2 (2.2.20-1ubuntu4) impish; urgency=medium
 
   * No-change rebuild due to OpenLDAP soname bump.
diff -Nru gnupg2-2.2.20/debian/control gnupg2-2.2.27/debian/control
--- gnupg2-2.2.20/debian/control	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/control	2021-07-16 07:17:04.000000000 +0200
@@ -6,11 +6,12 @@
 Uploaders:
  Eric Dorland <eric@debian.org>,
  Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
-Standards-Version: 4.5.0
+ Christoph Biedl <debian.axhn@manchmal.in-ulm.de>,
+Standards-Version: 4.5.1
 Build-Depends:
  automake,
  autopoint,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  file,
  gettext,
  ghostscript,
@@ -19,10 +20,10 @@
  libassuan-dev (>= 2.5.0),
  libbz2-dev,
  libcurl4-gnutls-dev,
- libgcrypt20-dev (>= 1.7.0),
+ libgcrypt20-dev (>= 1.8.0),
  libgnutls28-dev (>= 3.0),
  libgpg-error-dev (>= 1.35),
- libksba-dev (>= 1.3.4),
+ libksba-dev (>= 1.3.5),
  libldap2-dev,
  libnpth0-dev (>= 1.2),
  libreadline-dev,
@@ -37,13 +38,13 @@
 Build-Depends-Indep:
  binutils-multiarch [!amd64 !i386],
  libassuan-mingw-w64-dev (>= 2.5.0),
- libgcrypt-mingw-w64-dev (>= 1.7.0),
+ libgcrypt-mingw-w64-dev (>= 1.8.0),
  libgpg-error-mingw-w64-dev (>= 1.26-2~),
- libksba-mingw-w64-dev (>= 1.3.4),
+ libksba-mingw-w64-dev (>= 1.3.5),
  libnpth-mingw-w64-dev (>= 1.2),
  libz-mingw-w64-dev,
  mingw-w64,
-Vcs-Git: https://salsa.debian.org/debian/gnupg2.git -b debian/master
+Vcs-Git: https://salsa.debian.org/debian/gnupg2.git -b debian/main
 Vcs-Browser: https://salsa.debian.org/debian/gnupg2
 Homepage: https://www.gnupg.org/
 Rules-Requires-Root: no
diff -Nru gnupg2-2.2.20/debian/gbp.conf gnupg2-2.2.27/debian/gbp.conf
--- gnupg2-2.2.20/debian/gbp.conf	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/gbp.conf	2021-07-16 07:17:04.000000000 +0200
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/master
+debian-branch = debian/main
 pristine-tar = True
 upstream-vcs-tag = gnupg-%(version)s
 
diff -Nru gnupg2-2.2.20/debian/gnupg-l10n.lintian-overrides gnupg2-2.2.27/debian/gnupg-l10n.lintian-overrides
--- gnupg2-2.2.20/debian/gnupg-l10n.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/debian/gnupg-l10n.lintian-overrides	2021-02-08 23:56:55.000000000 +0100
@@ -0,0 +1,2 @@
+# these files are how GnuPG distributes localized help text
+gnupg-l10n: package-contains-documentation-outside-usr-share-doc usr/share/gnupg/help.*txt
diff -Nru gnupg2-2.2.20/debian/gnupg-utils.install gnupg2-2.2.27/debian/gnupg-utils.install
--- gnupg2-2.2.20/debian/gnupg-utils.install	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/gnupg-utils.install	2021-07-16 07:17:05.000000000 +0200
@@ -1,11 +1,10 @@
 build-maintainer/g10/gpgcompose usr/bin
 build/tools/gpg-zip usr/bin
-build/tools/gpgsplit usr/bin
 debian/migrate-pubring-from-classic-gpg usr/bin
 debian/tmp/usr/bin/gpgparsemail
 debian/tmp/usr/bin/gpgtar
+debian/tmp/usr/bin/gpgsplit
 debian/tmp/usr/bin/kbxutil
-debian/tmp/usr/bin/symcryptrun
 debian/tmp/usr/bin/watchgnupg
 debian/tmp/usr/sbin/addgnupghome
 debian/tmp/usr/sbin/applygnupgdefaults
diff -Nru gnupg2-2.2.20/debian/gnupg-utils.manpages gnupg2-2.2.27/debian/gnupg-utils.manpages
--- gnupg2-2.2.20/debian/gnupg-utils.manpages	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/gnupg-utils.manpages	2021-07-16 07:17:04.000000000 +0200
@@ -6,7 +6,6 @@
 debian/migrate-pubring-from-classic-gpg.1
 debian/tmp/usr/share/man/man1/gpgparsemail.1
 debian/tmp/usr/share/man/man1/gpgtar.1
-debian/tmp/usr/share/man/man1/symcryptrun.1
 debian/tmp/usr/share/man/man1/watchgnupg.1
 debian/tmp/usr/share/man/man8/addgnupghome.8
 debian/tmp/usr/share/man/man8/applygnupgdefaults.8
diff -Nru gnupg2-2.2.20/debian/gpg-agent.lintian-overrides gnupg2-2.2.27/debian/gpg-agent.lintian-overrides
--- gnupg2-2.2.20/debian/gpg-agent.lintian-overrides	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/gpg-agent.lintian-overrides	2021-07-16 07:17:04.000000000 +0200
@@ -1,3 +1,3 @@
 # these binaries are stored in /usr/lib/gnupg, as recommended by upstream:
-gpg-agent: manpage-without-executable usr/share/man/man1/gpg-check-pattern.1.gz
-gpg-agent: manpage-without-executable usr/share/man/man1/gpg-preset-passphrase.1.gz
+gpg-agent: spare-manual-page usr/share/man/man1/gpg-check-pattern.1.gz
+gpg-agent: spare-manual-page usr/share/man/man1/gpg-preset-passphrase.1.gz
diff -Nru gnupg2-2.2.20/debian/gpg-wks-client.lintian-overrides gnupg2-2.2.27/debian/gpg-wks-client.lintian-overrides
--- gnupg2-2.2.20/debian/gpg-wks-client.lintian-overrides	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/gpg-wks-client.lintian-overrides	2021-07-16 07:17:04.000000000 +0200
@@ -1,2 +1,2 @@
 # these binaries are stored in /usr/lib/gnupg, as recommended by upstream:
-gpg-wks-client: manpage-without-executable usr/share/man/man1/gpg-wks-client.1.gz
+gpg-wks-client: spare-manual-page usr/share/man/man1/gpg-wks-client.1.gz
diff -Nru gnupg2-2.2.20/debian/NEWS gnupg2-2.2.27/debian/NEWS
--- gnupg2-2.2.20/debian/NEWS	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/NEWS	2021-07-16 07:17:04.000000000 +0200
@@ -1,3 +1,12 @@
+gnupg2 (2.2.27-2) unstable; urgency=medium
+
+  Starting with version 2.2.27-1, per-user configuration of the GnuPG
+  suite has completely moved to ~/.gnupg/gpg.conf, and ~/.gnupg/options
+  is no longer in use.  Please rename the file if necessary, or move
+  its contents to the new location.
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Thu, 22 Apr 2021 20:37:45 +0200
+
 gnupg2 (2.2.17-1) unstable; urgency=medium
 
   Upstream GnuPG now defaults to not accepting third-party certifications
diff -Nru gnupg2-2.2.20/debian/not-installed gnupg2-2.2.27/debian/not-installed
--- gnupg2-2.2.20/debian/not-installed	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/not-installed	2021-07-16 07:17:04.000000000 +0200
@@ -1 +1,2 @@
 usr/bin/gpgscm
+usr/share/man/man1/symcryptrun.1
diff -Nru gnupg2-2.2.20/debian/org.gnupg.scdaemon.metainfo.xml gnupg2-2.2.27/debian/org.gnupg.scdaemon.metainfo.xml
--- gnupg2-2.2.20/debian/org.gnupg.scdaemon.metainfo.xml	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/org.gnupg.scdaemon.metainfo.xml	2021-07-16 07:17:04.000000000 +0200
@@ -48,5 +48,6 @@
     <modalias>usb:v20A0p4211d*</modalias>
     <modalias>usb:v234Bp0000d*</modalias>
     <modalias>usb:v316Dp4C4Bd*</modalias>
+    <modalias>usb:v1209p2440d*</modalias>
   </provides>
 </component>
diff -Nru gnupg2-2.2.20/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch gnupg2-2.2.27/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch
--- gnupg2-2.2.20/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch	2021-07-16 07:17:05.000000000 +0200
@@ -22,10 +22,10 @@
  3 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 27cb70c..1c9f68f 100644
+index b167c34..5afcf11 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
-@@ -48,6 +48,9 @@
+@@ -50,6 +50,9 @@
  # include <signal.h>
  #endif
  #include <npth.h>
@@ -35,7 +35,7 @@
  
  #define INCLUDED_BY_MAIN_MODULE 1
  #define GNUPG_COMMON_NEED_AFLOCAL
-@@ -1014,6 +1017,11 @@ main (int argc, char **argv )
+@@ -1030,6 +1033,11 @@ main (int argc, char **argv )
  
    early_system_init ();
  
@@ -48,10 +48,10 @@
       file descriptors and the signal mask.  This info is required to
       do the exec call properly.  We don't need it on Windows.  */
 diff --git a/configure.ac b/configure.ac
-index f3c9863..c5f402d 100644
+index 7a2d410..2d8b050 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1396,7 +1396,7 @@ AC_CHECK_FUNCS([atexit canonicalize_file_name clock_gettime ctermid  \
+@@ -1426,7 +1426,7 @@ AC_CHECK_FUNCS([atexit canonicalize_file_name clock_gettime ctermid  \
                  ftruncate funlockfile getaddrinfo getenv getpagesize \
                  getpwnam getpwuid getrlimit getrusage gettimeofday   \
                  gmtime_r inet_ntop inet_pton isascii lstat memicmp   \
@@ -61,10 +61,10 @@
                  stat stpcpy strcasecmp strerror strftime stricmp     \
                  strlwr strncasecmp strpbrk strsep strtol strtoul     \
 diff --git a/scd/scdaemon.c b/scd/scdaemon.c
-index ab3e1d9..9865664 100644
+index 5c519f8..cab66a0 100644
 --- a/scd/scdaemon.c
 +++ b/scd/scdaemon.c
-@@ -36,6 +36,9 @@
+@@ -37,6 +37,9 @@
  #include <unistd.h>
  #include <signal.h>
  #include <npth.h>
@@ -74,7 +74,7 @@
  
  #define INCLUDED_BY_MAIN_MODULE 1
  #define GNUPG_COMMON_NEED_AFLOCAL
-@@ -444,6 +447,12 @@ main (int argc, char **argv )
+@@ -446,6 +449,12 @@ main (int argc, char **argv )
    npth_t pipecon_handler;
  
    early_system_init ();
diff -Nru gnupg2-2.2.20/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch gnupg2-2.2.27/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch
--- gnupg2-2.2.20/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch	2021-07-16 07:17:05.000000000 +0200
@@ -14,14 +14,14 @@
 expect after they're applied by dpkg or quilt or whatever, which makes
 the datestamp unreproducible.
 ---
- doc/Makefile.am | 7 -------
- 1 file changed, 7 deletions(-)
+ doc/Makefile.am | 9 ---------
+ 1 file changed, 9 deletions(-)
 
 diff --git a/doc/Makefile.am b/doc/Makefile.am
-index d47d83e..c0a81b0 100644
+index 2b882c3..6be571b 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -177,13 +177,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+@@ -178,15 +178,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
  
  dist-hook: defsincdate
  
@@ -30,6 +30,8 @@
 -	if test -e $(top_srcdir)/.git; then \
 -	  (cd $(srcdir) && git log -1 --format='%ct' \
 -               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+-        elif test x"$$SOURCE_DATE_EPOCH" != x; then   \
+-	   echo "$$SOURCE_DATE_EPOCH" >>defsincdate ; \
 -	fi
 -
  defs.inc : defsincdate Makefile mkdefsinc
diff -Nru gnupg2-2.2.20/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch gnupg2-2.2.27/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch
--- gnupg2-2.2.20/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From ca937cf390662b830d4fc5d295e69b24b1778050 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 13 Jul 2020 10:00:58 +0900
-Subject: [PATCH] dirmngr: Handle EAFNOSUPPORT at connect_server.
-
-* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT.
-
---
-
-GnuPG-bug-id: 4977
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-
-Origin: backport, https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=109d16e8f644
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1910432
----
- dirmngr/http.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: gnupg2/dirmngr/http.c
-===================================================================
---- gnupg2.orig/dirmngr/http.c
-+++ gnupg2/dirmngr/http.c
-@@ -3005,6 +3005,15 @@ connect_server (const char *server, unsi
-           sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol);
-           if (sock == ASSUAN_INVALID_FD)
-             {
-+              if (errno == EAFNOSUPPORT)
-+                {
-+                  if (ai->family == AF_INET)
-+                    v4_valid = 0;
-+                  if (ai->family == AF_INET6)
-+                    v6_valid = 0;
-+                  continue;
-+                }
-+
-               err = gpg_err_make (default_errsource,
-                                   gpg_err_code_from_syserror ());
-               log_error ("error creating socket: %s\n", gpg_strerror (err));
diff -Nru gnupg2-2.2.20/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch gnupg2-2.2.27/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch
--- gnupg2-2.2.20/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch	2021-07-16 07:17:05.000000000 +0200
@@ -15,10 +15,10 @@
  2 files changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 23ee557..291827b 100644
+index 89eea4e..f26ed63 100644
 --- a/dirmngr/dirmngr.c
 +++ b/dirmngr/dirmngr.c
-@@ -1959,8 +1959,6 @@ housekeeping_thread (void *arg)
+@@ -1955,8 +1955,6 @@ housekeeping_thread (void *arg)
    if (network_activity_seen)
      {
        network_activity_seen = 0;
@@ -28,7 +28,7 @@
      }
    else
 diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index ba4f159..3c5c47b 100644
+index 843fdbf..84a8d28 100644
 --- a/doc/dirmngr.texi
 +++ b/doc/dirmngr.texi
 @@ -291,9 +291,10 @@ Set the size of the queue for pending connections.  The default is 64.
diff -Nru gnupg2-2.2.20/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch gnupg2-2.2.27/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch
--- gnupg2-2.2.20/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch	2021-07-16 07:17:05.000000000 +0200
@@ -30,10 +30,10 @@
  3 files changed, 35 insertions(+), 41 deletions(-)
 
 diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 3ec6139..23ee557 100644
+index ae967dd..89eea4e 100644
 --- a/dirmngr/dirmngr.c
 +++ b/dirmngr/dirmngr.c
-@@ -1939,12 +1939,10 @@ static void *
+@@ -1935,12 +1935,10 @@ static void *
  housekeeping_thread (void *arg)
  {
    static int sentinel;
@@ -46,7 +46,7 @@
    if (sentinel)
      {
        log_info ("housekeeping is already going on\n");
-@@ -1958,7 +1956,6 @@ housekeeping_thread (void *arg)
+@@ -1954,7 +1952,6 @@ housekeeping_thread (void *arg)
    dirmngr_init_default_ctrl (&ctrlbuf);
  
    dns_stuff_housekeeping ();
@@ -67,7 +67,7 @@
  
  
 diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 6b509c6..7b7e7d4 100644
+index d425363..c50681d 100644
 --- a/dirmngr/ks-engine-hkp.c
 +++ b/dirmngr/ks-engine-hkp.c
 @@ -218,6 +218,24 @@ host_in_pool_p (hostinfo_t hi, int tblidx)
@@ -120,7 +120,7 @@
  
    *r_host = NULL;
    if (r_httpflags)
-@@ -488,6 +509,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -501,6 +522,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
      }
    else
      hi = hosttable[idx];
@@ -128,7 +128,7 @@
  
    is_pool = hi->pool != NULL;
  
-@@ -594,7 +616,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -607,7 +629,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
        if (force_reselect)
          hi->poolidx = -1;
        else if (hi->poolidx >= 0 && hi->poolidx < hosttable_size
@@ -137,8 +137,8 @@
          hi->poolidx = -1;
  
        /* Select a host if needed.  */
-@@ -646,7 +668,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
-       free_dns_addrinfo (aibuf);
+@@ -665,7 +687,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+         return gpg_error_from_syserror ();
      }
  
 -  if (hi->dead)
@@ -146,7 +146,7 @@
      {
        log_error ("host '%s' marked as dead\n", hi->name);
        if (r_httphost)
-@@ -751,7 +773,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -770,7 +792,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
  {
    gpg_error_t err = 0;
    hostinfo_t hi, hi2;
@@ -156,7 +156,7 @@
  
    if (!name || !*name || !strcmp (name, "localhost"))
      return 0;
-@@ -760,13 +783,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -779,13 +802,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
    if (idx == -1)
      return gpg_error (GPG_ERR_NOT_FOUND);
  
@@ -174,7 +174,7 @@
      {
        hi->dead = 1;
        hi->died_at = 0; /* Manually set dead.  */
-@@ -800,14 +825,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -819,14 +844,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
  
            hi2 = hosttable[n];
            if (!hi2)
@@ -193,7 +193,7 @@
              {
                hi2->dead = 1;
                hi2->died_at = 0; /* Manually set dead. */
-@@ -1093,34 +1119,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
+@@ -1112,34 +1138,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
  }
  
  
diff -Nru gnupg2-2.2.20/debian/patches/dirmngr-idling/dirmngr-hkp-Avoid-potential-race-condition-when-some.patch gnupg2-2.2.27/debian/patches/dirmngr-idling/dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
--- gnupg2-2.2.20/debian/patches/dirmngr-idling/dirmngr-hkp-Avoid-potential-race-condition-when-some.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/dirmngr-idling/dirmngr-hkp-Avoid-potential-race-condition-when-some.patch	2021-07-16 07:17:05.000000000 +0200
@@ -36,7 +36,7 @@
  1 file changed, 10 insertions(+), 13 deletions(-)
 
 diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index fef752c..6b509c6 100644
+index 14859c7..d425363 100644
 --- a/dirmngr/ks-engine-hkp.c
 +++ b/dirmngr/ks-engine-hkp.c
 @@ -225,29 +225,26 @@ host_in_pool_p (hostinfo_t hi, int tblidx)
diff -Nru gnupg2-2.2.20/debian/patches/dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch gnupg2-2.2.27/debian/patches/dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
--- gnupg2-2.2.20/debian/patches/dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch	2021-07-16 07:17:05.000000000 +0200
@@ -15,7 +15,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dirmngr/http.c b/dirmngr/http.c
-index 4a47c98..c735785 100644
+index 5e3f17c..40160e0 100644
 --- a/dirmngr/http.c
 +++ b/dirmngr/http.c
 @@ -768,7 +768,7 @@ http_session_new (http_session_t *r_session,
@@ -25,5 +25,5 @@
 -                                          get_default_keyserver (1)));
 +                                          "hkps.pool.sks-keyservers.net"));
  
-     /* If the user has not specified a CA list, and they are looking
-      * for the hkps pool from sks-keyservers.net, then default to
+     /* If we are looking for the hkps pool from sks-keyservers.net,
+      * then forcefully use its dedicated certificate authority.  */
diff -Nru gnupg2-2.2.20/debian/patches/from-master/gpg-change-agent-spawn-2019-07-24-v2.patch gnupg2-2.2.27/debian/patches/from-master/gpg-change-agent-spawn-2019-07-24-v2.patch
--- gnupg2-2.2.20/debian/patches/from-master/gpg-change-agent-spawn-2019-07-24-v2.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/from-master/gpg-change-agent-spawn-2019-07-24-v2.patch	2021-02-08 23:56:55.000000000 +0100
@@ -0,0 +1,50 @@
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Thu, 22 Oct 2020 11:32:00 +0900
+Subject: buildd: sbuild randomly fails to sign changes file despite valid
+ signature keys
+Forwarded: https://dev.gnupg.org/rGb1c56cf9e2bb51abfd47747128bd2a6285ed1623
+
+---
+ common/asshelp.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/common/asshelp.c b/common/asshelp.c
+index d87017e..9f269ab 100644
+--- a/common/asshelp.c
++++ b/common/asshelp.c
+@@ -477,8 +477,18 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
+       if (!(err = lock_spawning (&lock, gnupg_homedir (), "agent", verbose))
+           && assuan_socket_connect (ctx, sockname, 0, 0))
+         {
++#ifdef HAVE_W32_SYSTEM
+           err = gnupg_spawn_process_detached (program? program : agent_program,
+                                               argv, NULL);
++#else
++          pid_t pid;
++
++          err = gnupg_spawn_process_fd (program? program : agent_program,
++                                        argv, -1, -1, -1, &pid);
++          if (!err)
++            err = gnupg_wait_process (program? program : agent_program,
++                                      pid, 1, NULL);
++#endif
+           if (err)
+             log_error ("failed to start agent '%s': %s\n",
+                        agent_program, gpg_strerror (err));
+@@ -612,7 +622,16 @@ start_new_dirmngr (assuan_context_t *r_ctx,
+       if (!(err = lock_spawning (&lock, gnupg_homedir (), "dirmngr", verbose))
+           && assuan_socket_connect (ctx, sockname, 0, 0))
+         {
++#ifdef HAVE_W32_SYSTEM
+           err = gnupg_spawn_process_detached (dirmngr_program, argv, NULL);
++#else
++          pid_t pid;
++
++          err = gnupg_spawn_process_fd (dirmngr_program, argv,
++                                        -1, -1, -1, &pid);
++          if (!err)
++            err = gnupg_wait_process (dirmngr_program, pid, 1, NULL);
++#endif
+           if (err)
+             log_error ("failed to start the dirmngr '%s': %s\n",
+                        dirmngr_program, gpg_strerror (err));
diff -Nru gnupg2-2.2.20/debian/patches/from-master/gpg-default-to-3072-bit-keys.patch gnupg2-2.2.27/debian/patches/from-master/gpg-default-to-3072-bit-keys.patch
--- gnupg2-2.2.20/debian/patches/from-master/gpg-default-to-3072-bit-keys.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/from-master/gpg-default-to-3072-bit-keys.patch	2021-02-08 23:56:55.000000000 +0100
@@ -0,0 +1,91 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Thu, 7 Sep 2017 18:41:10 -0400
+Subject: gpg: default to 3072-bit keys.
+
+* agent/command.c (hlp_genkey): update help text to suggest the use of
+3072 bits.
+* doc/wks.texi: Make example match default generation.
+* g10/keygen.c (gen_elg): update default from 2048 to 3072.
+* g10/keyid.c (pubkey_string): update comment so that first example
+is the default 3072-bit RSA.
+
+--
+
+3072-bit RSA is widely considered to be 128-bit-equivalent security.
+This is a sensible default in 2017.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+
+(cherry picked from commit 909fbca19678e6e36968607e8a2348381da39d8c)
+---
+ agent/command.c | 2 +-
+ doc/wks.texi    | 4 ++--
+ g10/keygen.c    | 2 +-
+ g10/keyid.c     | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/agent/command.c b/agent/command.c
+index 8642498..f94e770 100644
+--- a/agent/command.c
++++ b/agent/command.c
+@@ -843,7 +843,7 @@ static const char hlp_genkey[] =
+   "\n"
+   "  C: GENKEY\n"
+   "  S: INQUIRE KEYPARAM\n"
+-  "  C: D (genkey (rsa (nbits  2048)))\n"
++  "  C: D (genkey (rsa (nbits 3072)))\n"
+   "  C: END\n"
+   "  S: D (public-key\n"
+   "  S: D   (rsa (n 326487324683264) (e 10001)))\n"
+diff --git a/doc/wks.texi b/doc/wks.texi
+index 119e31c..ae6c310 100644
+--- a/doc/wks.texi
++++ b/doc/wks.texi
+@@ -412,10 +412,10 @@ the submission address:
+ The output of the last command looks similar to this:
+ 
+ @example
+-  sec   rsa2048 2016-08-30 [SC]
++  sec   rsa3072 2016-08-30 [SC]
+         C0FCF8642D830C53246211400346653590B3795B
+   uid           [ultimate] key-submission@@example.net
+-  ssb   rsa2048 2016-08-30 [E]
++  ssb   rsa3072 2016-08-30 [E]
+ @end example
+ 
+ Take the fingerprint from that output and manually publish the key:
+diff --git a/g10/keygen.c b/g10/keygen.c
+index d50acf8..79d4579 100644
+--- a/g10/keygen.c
++++ b/g10/keygen.c
+@@ -1436,7 +1436,7 @@ gen_elg (int algo, unsigned int nbits, KBNODE pub_root,
+ 
+   if (nbits < 1024)
+     {
+-      nbits = 2048;
++      nbits = 3072;
+       log_info (_("keysize invalid; using %u bits\n"), nbits );
+     }
+   else if (nbits > 4096)
+diff --git a/g10/keyid.c b/g10/keyid.c
+index 69d85da..2987287 100644
+--- a/g10/keyid.c
++++ b/g10/keyid.c
+@@ -73,7 +73,7 @@ pubkey_letter( int algo )
+    is copied to the supplied buffer up a length of BUFSIZE-1.
+    Examples for the output are:
+ 
+-   "rsa2048"  - RSA with 2048 bit
++   "rsa3072"  - RSA with 3072 bit
+    "elg1024"  - Elgamal with 1024 bit
+    "ed25519"  - ECC using the curve Ed25519.
+    "E_1.2.3.4"  - ECC using the unsupported curve with OID "1.2.3.4".
+@@ -83,7 +83,7 @@ pubkey_letter( int algo )
+    If the option --legacy-list-mode is active, the output use the
+    legacy format:
+ 
+-   "2048R" - RSA with 2048 bit
++   "3072R" - RSA with 3072 bit
+    "1024g" - Elgamal with 1024 bit
+    "256E"  - ECDSA using a curve with 256 bit
+ 
diff -Nru gnupg2-2.2.20/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch gnupg2-2.2.27/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch
--- gnupg2-2.2.20/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Thu, 7 Sep 2017 18:41:10 -0400
-Subject: gpg: default to 3072-bit RSA keys.
-
-* agent/command.c (hlp_genkey): update help text to suggest the use of
-3072 bits.
-* doc/wks.texi: Make example match default generation.
-* g10/keygen.c (DEFAULT_STD_KEY_PARAM): update to
-rsa3072/cert,sign+rsa3072/encr, and fix neighboring comment,
-(gen_rsa, get_keysize_range): update default from 2048 to 3072).
-* g10/keyid.c (pubkey_string): update comment so that first example
-is the default 3072-bit RSA.
-
---
-
-3072-bit RSA is widely considered to be 128-bit-equivalent security.
-This is a sensible default in 2017.
-
-Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-(cherry picked from commit 909fbca19678e6e36968607e8a2348381da39d8c)
----
- agent/command.c | 2 +-
- doc/wks.texi    | 4 ++--
- g10/keygen.c    | 9 ++++-----
- g10/keyid.c     | 4 ++--
- 4 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/agent/command.c b/agent/command.c
-index c24fc80..72b5973 100644
---- a/agent/command.c
-+++ b/agent/command.c
-@@ -843,7 +843,7 @@ static const char hlp_genkey[] =
-   "\n"
-   "  C: GENKEY\n"
-   "  S: INQUIRE KEYPARAM\n"
--  "  C: D (genkey (rsa (nbits  2048)))\n"
-+  "  C: D (genkey (rsa (nbits 3072)))\n"
-   "  C: END\n"
-   "  S: D (public-key\n"
-   "  S: D   (rsa (n 326487324683264) (e 10001)))\n"
-diff --git a/doc/wks.texi b/doc/wks.texi
-index 119e31c..ae6c310 100644
---- a/doc/wks.texi
-+++ b/doc/wks.texi
-@@ -412,10 +412,10 @@ the submission address:
- The output of the last command looks similar to this:
- 
- @example
--  sec   rsa2048 2016-08-30 [SC]
-+  sec   rsa3072 2016-08-30 [SC]
-         C0FCF8642D830C53246211400346653590B3795B
-   uid           [ultimate] key-submission@@example.net
--  ssb   rsa2048 2016-08-30 [E]
-+  ssb   rsa3072 2016-08-30 [E]
- @end example
- 
- Take the fingerprint from that output and manually publish the key:
-diff --git a/g10/keygen.c b/g10/keygen.c
-index c4cfe00..fdc5f93 100644
---- a/g10/keygen.c
-+++ b/g10/keygen.c
-@@ -46,11 +46,10 @@
- #include "../common/mbox-util.h"
- 
- 
--/* The default algorithms.  If you change them remember to change them
--   also in gpg.c:gpgconf_list.  You should also check that the value
-+/* The default algorithms.  If you change them, you should ensure the value
-    is inside the bounds enforced by ask_keysize and gen_xxx.  See also
-    get_keysize_range which encodes the allowed ranges.  */
--#define DEFAULT_STD_KEY_PARAM  "rsa2048/cert,sign+rsa2048/encr"
-+#define DEFAULT_STD_KEY_PARAM  "rsa3072/cert,sign+rsa3072/encr"
- #define FUTURE_STD_KEY_PARAM   "ed25519/cert,sign+cv25519/encr"
- 
- /* When generating keys using the streamlined key generation dialog,
-@@ -1653,7 +1652,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
- 
-   if (nbits < 1024)
-     {
--      nbits = 2048;
-+      nbits = 3072;
-       log_info (_("keysize invalid; using %u bits\n"), nbits );
-     }
-   else if (nbits > maxsize)
-@@ -2264,7 +2263,7 @@ get_keysize_range (int algo, unsigned int *min, unsigned int *max)
-     default:
-       *min = opt.compliance == CO_DE_VS ? 2048: 1024;
-       *max = 4096;
--      def = 2048;
-+      def = 3072;
-       break;
-     }
- 
-diff --git a/g10/keyid.c b/g10/keyid.c
-index 5b868cd..af9be07 100644
---- a/g10/keyid.c
-+++ b/g10/keyid.c
-@@ -73,7 +73,7 @@ pubkey_letter( int algo )
-    is copied to the supplied buffer up a length of BUFSIZE-1.
-    Examples for the output are:
- 
--   "rsa2048"  - RSA with 2048 bit
-+   "rsa3072"  - RSA with 3072 bit
-    "elg1024"  - Elgamal with 1024 bit
-    "ed25519"  - ECC using the curve Ed25519.
-    "E_1.2.3.4"  - ECC using the unsupported curve with OID "1.2.3.4".
-@@ -83,7 +83,7 @@ pubkey_letter( int algo )
-    If the option --legacy-list-mode is active, the output use the
-    legacy format:
- 
--   "2048R" - RSA with 2048 bit
-+   "3072R" - RSA with 3072 bit
-    "1024g" - Elgamal with 1024 bit
-    "256E"  - ECDSA using a curve with 256 bit
- 
diff -Nru gnupg2-2.2.20/debian/patches/from-master/gpg-default-to-AES-256.patch gnupg2-2.2.27/debian/patches/from-master/gpg-default-to-AES-256.patch
--- gnupg2-2.2.20/debian/patches/from-master/gpg-default-to-AES-256.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/from-master/gpg-default-to-AES-256.patch	2021-07-16 07:17:05.000000000 +0200
@@ -19,7 +19,7 @@
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/g10/main.h b/g10/main.h
-index 250467a..b694ae0 100644
+index 68360e2..1983e42 100644
 --- a/g10/main.h
 +++ b/g10/main.h
 @@ -31,7 +31,9 @@
diff -Nru gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
--- gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch	2021-07-16 07:17:05.000000000 +0200
@@ -21,10 +21,10 @@
  2 files changed, 17 insertions(+)
 
 diff --git a/agent/agent.h b/agent/agent.h
-index e10e02b..4ae1673 100644
+index fb46412..4abc6ed 100644
 --- a/agent/agent.h
 +++ b/agent/agent.h
-@@ -371,6 +371,7 @@ void *get_agent_scd_notify_event (void);
+@@ -375,6 +375,7 @@ void *get_agent_scd_notify_event (void);
  #endif
  void agent_sighup_action (void);
  int map_pk_openpgp_to_gcry (int openpgp_algo);
@@ -33,10 +33,10 @@
  /*-- command.c --*/
  gpg_error_t agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid,
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index c29bb08..74aec29 100644
+index 69705ed..752552c 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
-@@ -418,6 +418,9 @@ static int have_homedir_inotify;
+@@ -430,6 +430,9 @@ static int have_homedir_inotify;
   * works reliable.  */
  static int reliable_homedir_inotify;
  
@@ -46,7 +46,7 @@
  /* Number of active connections.  */
  static int active_connections;
  
-@@ -2473,6 +2476,10 @@ handle_signal (int signo)
+@@ -2458,6 +2461,10 @@ handle_signal (int signo)
        agent_sigusr2_action ();
        break;
  
@@ -57,7 +57,7 @@
      case SIGTERM:
        if (!shutdown_pending)
          log_info ("SIGTERM received - shutting down ...\n");
-@@ -2811,6 +2818,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2796,6 +2803,13 @@ start_connection_thread_ssh (void *arg)
  }
  
  
@@ -71,7 +71,7 @@
  /* helper function for readability: test whether a given struct
     timespec is set to all-zeros */
  static inline int
-@@ -2880,8 +2894,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2865,8 +2879,10 @@ handle_connections (gnupg_fd_t listen_fd,
    npth_sigev_add (SIGUSR1);
    npth_sigev_add (SIGUSR2);
    npth_sigev_add (SIGINT);
diff -Nru gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
--- gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch	2021-07-16 07:17:05.000000000 +0200
@@ -12,10 +12,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 33039f2..eed83b9 100644
+index eff82ca..3ae77c6 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
-@@ -3047,6 +3047,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3032,6 +3032,8 @@ handle_connections (gnupg_fd_t listen_fd,
  
        /* avoid a fine-grained timer if we don't need one: */
        timertbl[0].interval.tv_sec = need_tick () ? TIMERTICK_INTERVAL : 0;
diff -Nru gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch
--- gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch	2021-07-16 07:17:05.000000000 +0200
@@ -39,10 +39,10 @@
   leave:
    xfree (abs_homedir);
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 74aec29..33039f2 100644
+index 752552c..eff82ca 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
-@@ -2377,6 +2377,26 @@ create_directories (void)
+@@ -2362,6 +2362,26 @@ create_directories (void)
  }
  
  
@@ -69,7 +69,7 @@
  
  /* This is the worker for the ticker.  It is called every few seconds
     and may only do fast operations. */
-@@ -2733,7 +2753,8 @@ do_start_connection_thread (ctrl_t ctrl)
+@@ -2718,7 +2738,8 @@ do_start_connection_thread (ctrl_t ctrl)
  
    agent_deinit_default_ctrl (ctrl);
    xfree (ctrl);
@@ -79,7 +79,7 @@
    return NULL;
  }
  
-@@ -2813,7 +2834,8 @@ start_connection_thread_ssh (void *arg)
+@@ -2798,7 +2819,8 @@ start_connection_thread_ssh (void *arg)
  
    agent_deinit_default_ctrl (ctrl);
    xfree (ctrl);
@@ -89,7 +89,7 @@
    return NULL;
  }
  
-@@ -3023,6 +3045,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3008,6 +3030,9 @@ handle_connections (gnupg_fd_t listen_fd,
           thus a simple assignment is fine to copy the entire set.  */
        read_fdset = fdset;
  
diff -Nru gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch
--- gnupg2-2.2.20/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch	2021-07-16 07:17:05.000000000 +0200
@@ -31,10 +31,10 @@
  1 file changed, 57 insertions(+), 27 deletions(-)
 
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 1c9f68f..c29bb08 100644
+index 5afcf11..69705ed 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
-@@ -2380,12 +2380,8 @@ create_directories (void)
+@@ -2365,12 +2365,8 @@ create_directories (void)
  static void
  handle_tick (void)
  {
@@ -47,7 +47,7 @@
    /* Check whether the scdaemon has died and cleanup in this case. */
    agent_scd_check_aliveness ();
  
-@@ -2405,15 +2401,6 @@ handle_tick (void)
+@@ -2390,15 +2386,6 @@ handle_tick (void)
      }
  #endif /*HAVE_W32_SYSTEM*/
  
@@ -63,7 +63,7 @@
    /* Need to check for expired cache entries.  */
    agent_cache_housekeeping ();
  
-@@ -2824,6 +2811,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2809,6 +2796,15 @@ start_connection_thread_ssh (void *arg)
  }
  
  
@@ -79,7 +79,7 @@
  /* Connection handler loop.  Wait for connection requests and spawn a
     thread after accepting a connection.  */
  static void
-@@ -2841,9 +2837,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2826,9 +2822,11 @@ handle_connections (gnupg_fd_t listen_fd,
    gnupg_fd_t fd;
    int nfd;
    int saved_errno;
@@ -91,7 +91,7 @@
  #ifdef HAVE_W32_SYSTEM
    HANDLE events[2];
    unsigned int events_set;
-@@ -2860,6 +2858,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2845,6 +2843,14 @@ handle_connections (gnupg_fd_t listen_fd,
      { "browser", start_connection_thread_browser },
      { "ssh",    start_connection_thread_ssh   }
    };
@@ -106,7 +106,7 @@
  
  
    ret = npth_attr_init(&tattr);
-@@ -2967,9 +2973,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2952,9 +2958,6 @@ handle_connections (gnupg_fd_t listen_fd,
    listentbl[2].l_fd = listen_fd_browser;
    listentbl[3].l_fd = listen_fd_ssh;
  
@@ -116,7 +116,7 @@
    for (;;)
      {
        /* Shutdown test.  */
-@@ -3004,18 +3007,46 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2989,18 +2992,46 @@ handle_connections (gnupg_fd_t listen_fd,
           thus a simple assignment is fine to copy the entire set.  */
        read_fdset = fdset;
  
@@ -172,7 +172,7 @@
                            npth_sigev_sigmask ());
        saved_errno = errno;
  
-@@ -3025,7 +3056,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3010,7 +3041,7 @@ handle_connections (gnupg_fd_t listen_fd,
            handle_signal (signo);
        }
  #else
@@ -181,7 +181,7 @@
                            events, &events_set);
        saved_errno = errno;
  
-@@ -3070,7 +3101,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3055,7 +3086,6 @@ handle_connections (gnupg_fd_t listen_fd,
  
        if (!shutdown_pending)
          {
diff -Nru gnupg2-2.2.20/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch gnupg2-2.2.27/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch
--- gnupg2-2.2.20/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch	2021-07-16 07:17:05.000000000 +0200
@@ -21,10 +21,10 @@
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/doc/gpg.texi b/doc/gpg.texi
-index 4870441..551459a 100644
+index 7b603d7..104318a 100644
 --- a/doc/gpg.texi
 +++ b/doc/gpg.texi
-@@ -1963,7 +1963,7 @@ are available for all keyserver types, some common options are:
+@@ -1982,7 +1982,7 @@ are available for all keyserver types, some common options are:
  
  @end table
  
@@ -34,10 +34,10 @@
  honor-pka-record".
  
 diff --git a/g10/gpg.c b/g10/gpg.c
-index 68cc220..fa2bcfa 100644
+index 6b44cfb..caa0487 100644
 --- a/g10/gpg.c
 +++ b/g10/gpg.c
-@@ -2397,8 +2397,7 @@ main (int argc, char **argv)
+@@ -2348,8 +2348,7 @@ main (int argc, char **argv)
      opt.export_options = EXPORT_ATTRIBUTES;
      opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS
  					    | IMPORT_REPAIR_PKS_SUBKEY_BUG
diff -Nru gnupg2-2.2.20/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch gnupg2-2.2.27/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
--- gnupg2-2.2.20/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch	2021-07-16 07:17:05.000000000 +0200
@@ -19,10 +19,10 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/g10/import.c b/g10/import.c
-index a277eb6..de7b55f 100644
+index 79104dc..20f4af5 100644
 --- a/g10/import.c
 +++ b/g10/import.c
-@@ -3664,6 +3664,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
+@@ -3665,6 +3665,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
                    /* It's valid, so is it newer? */
                    if (sig->timestamp >= rsdate)
                      {
diff -Nru gnupg2-2.2.20/debian/patches/import-merge-without-userid/gpg-allow-import-of-previously-known-keys-even-without-UI.patch gnupg2-2.2.27/debian/patches/import-merge-without-userid/gpg-allow-import-of-previously-known-keys-even-without-UI.patch
--- gnupg2-2.2.20/debian/patches/import-merge-without-userid/gpg-allow-import-of-previously-known-keys-even-without-UI.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/import-merge-without-userid/gpg-allow-import-of-previously-known-keys-even-without-UI.patch	2021-07-16 07:17:05.000000000 +0200
@@ -17,7 +17,7 @@
  1 file changed, 11 insertions(+), 33 deletions(-)
 
 diff --git a/g10/import.c b/g10/import.c
-index 7097f75..a277eb6 100644
+index c8692e2..79104dc 100644
 --- a/g10/import.c
 +++ b/g10/import.c
 @@ -1843,7 +1843,6 @@ import_one_real (ctrl_t ctrl,
diff -Nru gnupg2-2.2.20/debian/patches/import-merge-without-userid/tests-add-test-cases-for-import-without-uid.patch gnupg2-2.2.27/debian/patches/import-merge-without-userid/tests-add-test-cases-for-import-without-uid.patch
--- gnupg2-2.2.20/debian/patches/import-merge-without-userid/tests-add-test-cases-for-import-without-uid.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/import-merge-without-userid/tests-add-test-cases-for-import-without-uid.patch	2021-07-16 07:17:05.000000000 +0200
@@ -35,7 +35,7 @@
  create mode 100644 tests/openpgp/import-incomplete/primary+uid.asc
 
 diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
-index f6014c9..6423da1 100644
+index 59f39e2..3b8b699 100644
 --- a/tests/openpgp/Makefile.am
 +++ b/tests/openpgp/Makefile.am
 @@ -78,6 +78,7 @@ XTESTS = \
diff -Nru gnupg2-2.2.20/debian/patches/series gnupg2-2.2.27/debian/patches/series
--- gnupg2-2.2.20/debian/patches/series	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/series	2021-08-11 14:40:08.000000000 +0200
@@ -8,7 +8,7 @@
 gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
 gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch
 gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
-from-master/gpg-default-to-3072-bit-RSA-keys.patch
+from-master/gpg-default-to-3072-bit-keys.patch
 from-master/gpg-default-to-AES-256.patch
 update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
 update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch
@@ -19,5 +19,5 @@
 Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch
 Make-gpg-zip-use-tar-from-PATH.patch
 gpg-drop-import-clean-from-default-keyserver-import-optio.patch
+from-master/gpg-change-agent-spawn-2019-07-24-v2.patch
 dirmngr-honor-http-proxy.patch
-dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch
diff -Nru gnupg2-2.2.20/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch gnupg2-2.2.27/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
--- gnupg2-2.2.20/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch	2021-07-16 07:17:05.000000000 +0200
@@ -20,10 +20,10 @@
  3 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c5f402d..6ce8bd5 100644
+index 2d8b050..4b9d908 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -318,7 +318,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
+@@ -317,7 +317,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
  GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
  # SHA256 is a MUST algorithm for GnuPG.
  GNUPG_GPG_DISABLE_ALGO([sha384],[SHA-384 hash])
@@ -33,7 +33,7 @@
  
  # Allow disabling of zip support.
 diff --git a/g10/main.h b/g10/main.h
-index b694ae0..89181a7 100644
+index 1983e42..388eae3 100644
 --- a/g10/main.h
 +++ b/g10/main.h
 @@ -41,7 +41,7 @@
@@ -46,10 +46,10 @@
  #ifdef HAVE_ZIP
  # define DEFAULT_COMPRESS_ALGO   COMPRESS_ALGO_ZIP
 diff --git a/g10/misc.c b/g10/misc.c
-index 291d36f..be3404b 100644
+index 634d303..6fc2d58 100644
 --- a/g10/misc.c
 +++ b/g10/misc.c
-@@ -769,11 +769,8 @@ map_md_openpgp_to_gcry (digest_algo_t algo)
+@@ -849,11 +849,8 @@ map_md_openpgp_to_gcry (digest_algo_t algo)
      case DIGEST_ALGO_SHA384: return 0;
  #endif
  
diff -Nru gnupg2-2.2.20/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch gnupg2-2.2.27/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch
--- gnupg2-2.2.20/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch	2021-07-16 07:17:05.000000000 +0200
@@ -19,7 +19,7 @@
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/g10/keygen.c b/g10/keygen.c
-index fdc5f93..49498f7 100644
+index 79d4579..cb92468 100644
 --- a/g10/keygen.c
 +++ b/g10/keygen.c
 @@ -391,16 +391,16 @@ keygen_set_std_prefs (const char *string,int personal)
diff -Nru gnupg2-2.2.20/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch gnupg2-2.2.27/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch
--- gnupg2-2.2.20/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/patches/Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch	2021-07-16 07:17:05.000000000 +0200
@@ -40,10 +40,10 @@
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6ce8bd5..bfe4561 100644
+index 4b9d908..47eb11c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1871,7 +1871,7 @@ AC_DEFINE_UNQUOTED(SCDAEMON_SOCK_NAME, "S.scdaemon",
+@@ -1856,7 +1856,7 @@ AC_DEFINE_UNQUOTED(SCDAEMON_SOCK_NAME, "S.scdaemon",
  AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr",
                     [The name of the dirmngr socket])
  AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER,
@@ -53,19 +53,19 @@
  
  AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])
 diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index 3c5c47b..99ae817 100644
+index 84a8d28..603a11a 100644
 --- a/doc/dirmngr.texi
 +++ b/doc/dirmngr.texi
 @@ -329,7 +329,11 @@ whether Tor is locally running or not.  The check for a running Tor is
  done for each new connection.
  
  If no keyserver is explicitly configured, dirmngr will use the
--built-in default of hkps://hkps.pool.sks-keyservers.net.
-+built-in default of hkps://keys.openpgp.org.
+-built-in default of @code{hkps://hkps.pool.sks-keyservers.net}.
++built-in default of @code{hkps://keys.openpgp.org}.
 +
 +Note that the above default is a Debian-specific choice.  Upstream
-+GnuPG prefers hkps://hkps.pool.sks-keyservers.net.  See
++GnuPG prefers @code{hkps://hkps.pool.sks-keyservers.net}.  See
 +/usr/share/doc/gpgconf/NEWS.Debian.gz for more details.
  
- @item --nameserver @var{ipaddr}
- @opindex nameserver
+ Windows users with a keyserver running on their Active Directory
+ should use @code{ldap:///} for @var{name} to access this directory.
diff -Nru gnupg2-2.2.20/debian/rules gnupg2-2.2.27/debian/rules
--- gnupg2-2.2.20/debian/rules	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/rules	2021-07-16 07:17:04.000000000 +0200
@@ -48,7 +48,7 @@
 		--enable-wks-tools \
 		--enable-all-tests \
 		--with-agent-s2k-calibration=300 \
-		--enable-symcryptrun --enable-large-secmem
+		--enable-large-secmem
 
 override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=build-gpgv-udeb
@@ -72,6 +72,7 @@
 	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
 	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
 	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
+	cd build-gpgv-win32/regexp && $(WIN32_FLAGS) $(MAKE) libregexp.a
 	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
 	strip build-gpgv-win32/g10/gpgv.exe
 
diff -Nru gnupg2-2.2.20/debian/scdaemon.lintian-overrides gnupg2-2.2.27/debian/scdaemon.lintian-overrides
--- gnupg2-2.2.20/debian/scdaemon.lintian-overrides	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/scdaemon.lintian-overrides	2021-07-16 07:17:04.000000000 +0200
@@ -1,2 +1,2 @@
 # these binaries are stored in /usr/lib/gnupg, as recommended by upstream:
-scdaemon: manpage-without-executable usr/share/man/man1/scdaemon.1.gz
+scdaemon: spare-manual-page usr/share/man/man1/scdaemon.1.gz
diff -Nru gnupg2-2.2.20/debian/scdaemon.udev gnupg2-2.2.27/debian/scdaemon.udev
--- gnupg2-2.2.20/debian/scdaemon.udev	2021-01-16 15:53:14.000000000 +0100
+++ gnupg2-2.2.27/debian/scdaemon.udev	2021-07-16 07:17:04.000000000 +0200
@@ -39,7 +39,9 @@
 ## Librem Key
 SUBSYSTEM=="usb", ATTR{idVendor}=="316d", ATTR{idProduct}=="4c4b", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg"
 ## Gnuk Token
+SUBSYSTEM=="usb", ATTR{product}=="Gnuk Token", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg"
 SUBSYSTEM=="usb", ATTR{idVendor}=="234b", ATTR{idProduct}=="0000", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="2440", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg"
 ## Alcor Micro Corp cardreader (in ThinkPad X250)
 SUBSYSTEM=="usb", ATTR{idVendor}=="058f", ATTR{idProduct}=="9540", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg"
 ## Fujitsu Siemens
diff -Nru gnupg2-2.2.20/dirmngr/certcache.c gnupg2-2.2.27/dirmngr/certcache.c
--- gnupg2-2.2.20/dirmngr/certcache.c	2020-03-18 14:10:23.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/certcache.c	2020-10-23 20:08:54.000000000 +0200
@@ -364,8 +364,8 @@
 load_certs_from_dir (const char *dirname, unsigned int trustclass)
 {
   gpg_error_t err;
-  DIR *dir;
-  struct dirent *ep;
+  gnupg_dir_t dir;
+  gnupg_dirent_t ep;
   char *p;
   size_t n;
   estream_t fp;
@@ -373,13 +373,13 @@
   ksba_cert_t cert;
   char *fname = NULL;
 
-  dir = opendir (dirname);
+  dir = gnupg_opendir (dirname);
   if (!dir)
     {
       return 0; /* We do not consider this a severe error.  */
     }
 
-  while ( (ep=readdir (dir)) )
+  while ( (ep = gnupg_readdir (dir)) )
     {
       p = ep->d_name;
       if (*p == '.' || !*p)
@@ -447,7 +447,7 @@
     }
 
   xfree (fname);
-  closedir (dir);
+  gnupg_closedir (dir);
   return 0;
 }
 
@@ -685,7 +685,7 @@
   gpg_error_t err = 0;
 
   for (idx=0; idx < DIM (table); idx++)
-    if (!access (table[idx].name, F_OK))
+    if (!gnupg_access (table[idx].name, F_OK))
       {
         /* Take the first available bundle.  */
         err = load_certs_from_file (table[idx].name, CERTTRUST_CLASS_SYSTEM, 0);
@@ -721,6 +721,9 @@
     load_certs_from_dir (fname, 0);
   xfree (fname);
 
+  /* Put the special pool certificate into our store.  This is
+   * currently only used with ntbtls.  For GnuTLS http_session_new
+   * unfortunately loads that certificate directly from the file.  */
   fname = make_filename_try (gnupg_datadir (),
                              "sks-keyservers.netCA.pem", NULL);
   if (fname)
diff -Nru gnupg2-2.2.20/dirmngr/crlcache.c gnupg2-2.2.27/dirmngr/crlcache.c
--- gnupg2-2.2.20/dirmngr/crlcache.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/crlcache.c	2020-10-23 20:08:54.000000000 +0200
@@ -101,10 +101,6 @@
 #ifndef HAVE_W32_SYSTEM
 #include <sys/utsname.h>
 #endif
-#ifdef MKDIR_TAKES_ONE_ARG
-#undef mkdir
-#define mkdir(a,b) mkdir(a)
-#endif
 
 #include "dirmngr.h"
 #include "validate.h"
@@ -206,15 +202,15 @@
 static int
 create_directory_if_needed (const char *name)
 {
-  DIR *dir;
+  gnupg_dir_t dir;
   char *fname;
 
   fname = make_filename (opt.homedir_cache, name, NULL);
-  dir = opendir (fname);
+  dir = gnupg_opendir (fname);
   if (!dir)
     {
       log_info (_("creating directory '%s'\n"), fname);
-      if (mkdir (fname, S_IRUSR|S_IWUSR|S_IXUSR) )
+      if (gnupg_mkdir (fname, "-rwx"))
         {
           int save_errno = errno;
           log_error (_("error creating directory '%s': %s\n"),
@@ -225,7 +221,7 @@
         }
     }
   else
-    closedir (dir);
+    gnupg_closedir (dir);
   xfree (fname);
   return 0;
 }
@@ -237,8 +233,8 @@
 cleanup_cache_dir (int force)
 {
   char *dname = make_filename (opt.homedir_cache, DBDIR_D, NULL);
-  DIR *dir;
-  struct dirent *de;
+  gnupg_dir_t dir;
+  gnupg_dirent_t de;
   int problem = 0;
 
   if (!force)
@@ -251,7 +247,7 @@
         }
     }
 
-  dir = opendir (dname);
+  dir = gnupg_opendir (dname);
   if (!dir)
     {
       log_error (_("error reading directory '%s': %s\n"),
@@ -260,7 +256,7 @@
       return -1;
     }
 
-  while ((de = readdir (dir)))
+  while ((de = gnupg_readdir (dir)))
     {
       if (strcmp (de->d_name, "." ) && strcmp (de->d_name, ".."))
         {
@@ -271,7 +267,7 @@
           if (force)
             okay = 1;
           else
-            okay = (!stat (cdbname, &sbuf) && S_ISREG (sbuf.st_mode));
+            okay = (!gnupg_stat (cdbname, &sbuf) && S_ISREG (sbuf.st_mode));
 
           if (okay)
             {
@@ -289,7 +285,7 @@
         }
     }
   xfree (dname);
-  closedir (dir);
+  gnupg_closedir (dir);
   return problem;
 }
 
@@ -1142,7 +1138,7 @@
       xfree (fname);
       return NULL;
     }
-  fd = open (fname, O_RDONLY | O_BINARY);
+  fd = gnupg_open (fname, O_RDONLY | O_BINARY, 0);
   if (fd == -1)
     {
       log_error (_("error opening cache file '%s': %s\n"),
@@ -1351,7 +1347,7 @@
         {
           log_error (_("WARNING: invalid cache record length for S/N "));
           log_printf ("0x");
-          log_printhex ("", sn, snlen);
+          log_printhex (sn, snlen, "");
         }
       else if (opt.verbose)
         {
@@ -1531,17 +1527,104 @@
 }
 
 
+/* Return the hash algorithm's algo id from its name given in the
+ * non-null termnated string in (buffer,buflen).  Returns 0 on failure
+ * or if the algo is not known.  */
+static int
+hash_algo_from_buffer (const void *buffer, size_t buflen)
+{
+  char *string;
+  int algo;
+
+  string = xtrymalloc (buflen + 1);
+  if (!string)
+    {
+      log_error (_("out of core\n"));
+      return 0;
+    }
+  memcpy (string, buffer, buflen);
+  string[buflen] = 0;
+  algo = gcry_md_map_name (string);
+  if (!algo)
+    log_error ("unknown digest algorithm '%s' used in certificate\n", string);
+  xfree (string);
+  return algo;
+}
+
+
+/* Return an unsigned integer from the non-null termnated string
+ * (buffer,buflen).  Returns 0 on failure.  */
+static unsigned int
+uint_from_buffer (const void *buffer, size_t buflen)
+{
+  char *string;
+  unsigned int val;
+
+  string = xtrymalloc (buflen + 1);
+  if (!string)
+    {
+      log_error (_("out of core\n"));
+      return 0;
+    }
+  memcpy (string, buffer, buflen);
+  string[buflen] = 0;
+  val = strtoul (string, NULL, 10);
+  xfree (string);
+  return val;
+}
+
+
 /* Prepare a hash context for the signature verification.  Input is
    the CRL and the output is the hash context MD as well as the uses
    algorithm identifier ALGO. */
 static gpg_error_t
-start_sig_check (ksba_crl_t crl, gcry_md_hd_t *md, int *algo)
+start_sig_check (ksba_crl_t crl, gcry_md_hd_t *md, int *algo, int *use_pss)
 {
   gpg_error_t err;
   const char *algoid;
 
+  *use_pss = 0;
   algoid = ksba_crl_get_digest_algo (crl);
-  *algo = gcry_md_map_name (algoid);
+  if (algoid && !strcmp (algoid, "1.2.840.113549.1.1.10"))
+    {
+      /* Parse rsaPSS parameter.  */
+      gcry_buffer_t ioarray[1] = { {0} };
+      ksba_sexp_t pssparam;
+      size_t n;
+      gcry_sexp_t psssexp;
+
+      pssparam = ksba_crl_get_sig_val (crl);
+      n = gcry_sexp_canon_len (pssparam, 0, NULL, NULL);
+      if (!n)
+        {
+          ksba_free (pssparam);
+          log_error (_("got an invalid S-expression from libksba\n"));
+          return gpg_error (GPG_ERR_INV_SEXP);
+        }
+      err = gcry_sexp_sscan (&psssexp, NULL, pssparam, n);
+      ksba_free (pssparam);
+      if (err)
+        {
+          log_error (_("converting S-expression failed: %s\n"),
+                     gcry_strerror (err));
+          return err;
+        }
+
+      err = gcry_sexp_extract_param (psssexp, "sig-val",
+                                    "&'hash-algo'", ioarray, NULL);
+      gcry_sexp_release (psssexp);
+      if (err)
+        {
+          log_error ("extracting params from PSS failed: %s\n",
+                     gpg_strerror (err));
+          return err;
+        }
+      *algo = hash_algo_from_buffer (ioarray[0].data, ioarray[0].len);
+      xfree (ioarray[0].data);
+      *use_pss = 1;
+    }
+  else
+    *algo = gcry_md_map_name (algoid);
   if (!*algo)
     {
       log_error (_("unknown hash algorithm '%s'\n"), algoid? algoid:"?");
@@ -1570,15 +1653,13 @@
    certificate of the CRL issuer.  This function takes ownership of MD.  */
 static gpg_error_t
 finish_sig_check (ksba_crl_t crl, gcry_md_hd_t md, int algo,
-                  ksba_cert_t issuer_cert)
+                  ksba_cert_t issuer_cert, int use_pss)
 {
   gpg_error_t err;
   ksba_sexp_t sigval = NULL, pubkey = NULL;
-  const char *s;
-  char algoname[50];
   size_t n;
   gcry_sexp_t s_sig = NULL, s_hash = NULL, s_pkey = NULL;
-  unsigned int i;
+  unsigned int saltlen = 0;  /* (used only with use_pss)  */
 
   /* This also stops debugging on the MD.  */
   gcry_md_final (md);
@@ -1600,6 +1681,78 @@
       goto leave;
     }
 
+  if (use_pss)
+    {
+      /* Parse rsaPSS parameter which we should find in S_SIG.  */
+      gcry_buffer_t ioarray[2] = { {0}, {0} };
+      ksba_sexp_t pssparam;
+      gcry_sexp_t psssexp;
+      int hashalgo;
+
+      pssparam = ksba_crl_get_sig_val (crl);
+      n = gcry_sexp_canon_len (pssparam, 0, NULL, NULL);
+      if (!n)
+        {
+          ksba_free (pssparam);
+          log_error (_("got an invalid S-expression from libksba\n"));
+          err = gpg_error (GPG_ERR_INV_SEXP);
+          goto leave;
+        }
+      err = gcry_sexp_sscan (&psssexp, NULL, pssparam, n);
+      ksba_free (pssparam);
+      if (err)
+        {
+          log_error (_("converting S-expression failed: %s\n"),
+                     gcry_strerror (err));
+          goto leave;
+        }
+
+      err = gcry_sexp_extract_param (psssexp, "sig-val",
+                                    "&'hash-algo''salt-length'",
+                                     ioarray+0, ioarray+1, NULL);
+      gcry_sexp_release (psssexp);
+      if (err)
+        {
+          log_error ("extracting params from PSS failed: %s\n",
+                     gpg_strerror (err));
+          goto leave;
+        }
+      hashalgo = hash_algo_from_buffer (ioarray[0].data, ioarray[0].len);
+      saltlen = uint_from_buffer (ioarray[1].data, ioarray[1].len);
+      xfree (ioarray[0].data);
+      xfree (ioarray[1].data);
+      if (hashalgo != algo)
+        {
+          log_error ("hash algo mismatch: %d announced but %d used\n",
+                     algo, hashalgo);
+          return gpg_error (GPG_ERR_INV_CRL);
+        }
+      /* Add some restrictions; see ../sm/certcheck.c for details.  */
+      switch (algo)
+        {
+        case GCRY_MD_SHA1:
+        case GCRY_MD_SHA256:
+        case GCRY_MD_SHA384:
+        case GCRY_MD_SHA512:
+        case GCRY_MD_SHA3_256:
+        case GCRY_MD_SHA3_384:
+        case GCRY_MD_SHA3_512:
+          break;
+        default:
+          log_error ("PSS hash algorithm '%s' rejected\n",
+                     gcry_md_algo_name (algo));
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+
+      if (gcry_md_get_algo_dlen (algo) != saltlen)
+        {
+          log_error ("PSS hash algorithm '%s' rejected due to salt length %u\n",
+                     gcry_md_algo_name (algo), saltlen);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+    }
+
+
   /* Get and convert the public key for the issuer certificate. */
   if (DBG_X509)
     dump_cert ("crl_issuer_cert", issuer_cert);
@@ -1620,13 +1773,25 @@
     }
 
   /* Create an S-expression with the actual hash value. */
-  s = gcry_md_algo_name (algo);
-  for (i = 0; *s && i < sizeof(algoname) - 1; s++, i++)
-    algoname[i] = ascii_tolower (*s);
-  algoname[i] = 0;
-  err = gcry_sexp_build (&s_hash, NULL, "(data(flags pkcs1)(hash %s %b))",
-                         algoname,
-                         gcry_md_get_algo_dlen (algo), gcry_md_read (md, algo));
+  if (use_pss)
+    {
+      err = gcry_sexp_build (&s_hash, NULL,
+                             "(data (flags pss)"
+                             "(hash %s %b)"
+                             "(salt-length %u))",
+                             hash_algo_to_string (algo),
+                             (int)gcry_md_get_algo_dlen (algo),
+                             gcry_md_read (md, algo),
+                             saltlen);
+    }
+  else
+    {
+      err = gcry_sexp_build (&s_hash, NULL,
+                             "(data(flags pkcs1)(hash %s %b))",
+                             hash_algo_to_string (algo),
+                             (int)gcry_md_get_algo_dlen (algo),
+                             gcry_md_read (md, algo));
+    }
   if (err)
     {
       log_error (_("creating S-expression failed: %s\n"), gcry_strerror (err));
@@ -1688,6 +1853,7 @@
   ksba_cert_t crlissuer_cert = NULL;
   gcry_md_hd_t md = NULL;
   int algo = 0;
+  int use_pss = 0;
   size_t n;
 
   (void)fname;
@@ -1710,7 +1876,7 @@
         {
         case KSBA_SR_BEGIN_ITEMS:
           {
-            err = start_sig_check (crl, &md, &algo);
+            err = start_sig_check (crl, &md, &algo, &use_pss);
             if (err)
               goto failure;
 
@@ -1847,7 +2013,7 @@
                 goto failure;
               }
 
-            err = finish_sig_check (crl, md, algo, crlissuer_cert);
+            err = finish_sig_check (crl, md, algo, crlissuer_cert, use_pss);
             md = NULL; /* Closed.  */
             if (err)
               {
@@ -2056,7 +2222,7 @@
       }
   }
 
-  fd_cdb = open (fname, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
+  fd_cdb = gnupg_open (fname, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
   if (fd_cdb == -1)
     {
       err = gpg_error_from_errno (errno);
diff -Nru gnupg2-2.2.20/dirmngr/crlfetch.c gnupg2-2.2.27/dirmngr/crlfetch.c
--- gnupg2-2.2.20/dirmngr/crlfetch.c	2018-04-25 12:38:05.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/crlfetch.c	2020-10-23 20:08:54.000000000 +0200
@@ -302,7 +302,7 @@
       return gpg_error (GPG_ERR_NOT_SUPPORTED);
     }
 #if USE_LDAP
-  return start_default_fetch_ldap (ctrl, context, dn, "cACertificate");
+  return start_cacert_fetch_ldap (ctrl, context, dn);
 #else
   (void)ctrl;
   (void)context;
@@ -408,40 +408,124 @@
 }
 
 
+/* Read a certificate from an HTTP URL and return it as an estream
+ * memory buffer at R_FP.  */
+static gpg_error_t
+read_cert_via_http (ctrl_t ctrl, const char *url, estream_t *r_fp)
+{
+  gpg_error_t err;
+  estream_t fp = NULL;
+  estream_t httpfp = NULL;
+  size_t nread, nwritten;
+  char buffer[1024];
+
+  if ((err = ks_http_fetch (ctrl, url, KS_HTTP_FETCH_TRUST_CFG, &httpfp)))
+    goto leave;
+
+  /* We now read the data from the web server into a memory buffer.
+   * To DOS we limit the certificate length to 32k.  */
+  fp = es_fopenmem (32*1024, "rw");
+  if (!fp)
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("error allocating memory buffer: %s\n", gpg_strerror (err));
+      goto leave;
+    }
+
+  for (;;)
+    {
+      if (es_read (httpfp, buffer, sizeof buffer, &nread))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error reading '%s': %s\n",
+                     es_fname_get (httpfp), gpg_strerror (err));
+          goto leave;
+        }
+
+      if (!nread)
+        break; /* Ready.  */
+      if (es_write (fp, buffer, nread, &nwritten))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error writing '%s': %s\n",
+                     es_fname_get (fp), gpg_strerror (err));
+          goto leave;
+        }
+      else if (nread != nwritten)
+        {
+          err = gpg_error (GPG_ERR_EIO);
+          log_error ("error writing '%s': %s\n",
+                     es_fname_get (fp), "short write");
+          goto leave;
+        }
+    }
+
+  es_rewind (fp);
+  *r_fp = fp;
+  fp = NULL;
+
+ leave:
+  es_fclose (httpfp);
+  es_fclose (fp);
+  return err;
+}
+
+
 /* Lookup a cert by it's URL.  */
 gpg_error_t
 fetch_cert_by_url (ctrl_t ctrl, const char *url,
 		   unsigned char **value, size_t *valuelen)
 {
-  const unsigned char *cert_image;
+  const unsigned char *cert_image = NULL;
   size_t cert_image_n;
-  ksba_reader_t reader;
-  ksba_cert_t cert;
+  ksba_reader_t reader = NULL;
+  ksba_cert_t cert = NULL;
   gpg_error_t err;
 
   *value = NULL;
   *valuelen = 0;
-  cert_image = NULL;
-  reader = NULL;
-  cert = NULL;
-
-#if USE_LDAP
-  err = url_fetch_ldap (ctrl, url, NULL, 0, &reader);
-#else
-  (void)ctrl;
-  (void)url;
-  err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-#endif /*USE_LDAP*/
-  if (err)
-    goto leave;
 
   err = ksba_cert_new (&cert);
   if (err)
     goto leave;
 
-  err = ksba_cert_read_der (cert, reader);
-  if (err)
-    goto leave;
+  if (url && (!strncmp (url, "http:", 5) || !strncmp (url, "https:", 6)))
+    {
+      estream_t stream;
+      void *der;
+      size_t derlen;
+
+      err = read_cert_via_http (ctrl, url, &stream);
+      if (err)
+        goto leave;
+
+      if (es_fclose_snatch (stream, &der, &derlen))
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+
+      err = ksba_cert_init_from_mem (cert, der, derlen);
+      xfree (der);
+      if (err)
+        goto leave;
+    }
+  else /* Assume LDAP.  */
+    {
+#if USE_LDAP
+      err = url_fetch_ldap (ctrl, url, NULL, 0, &reader);
+#else
+      (void)ctrl;
+      (void)url;
+      err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+#endif /*USE_LDAP*/
+      if (err)
+        goto leave;
+
+      err = ksba_cert_read_der (cert, reader);
+      if (err)
+        goto leave;
+    }
 
   cert_image = ksba_cert_get_image (cert, &cert_image_n);
   if (!cert_image || !cert_image_n)
@@ -461,7 +545,6 @@
   *valuelen = cert_image_n;
 
  leave:
-
   ksba_cert_release (cert);
 #if USE_LDAP
   ldap_wrapper_release_context (reader);
diff -Nru gnupg2-2.2.20/dirmngr/crlfetch.h gnupg2-2.2.27/dirmngr/crlfetch.h
--- gnupg2-2.2.20/dirmngr/crlfetch.h	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/crlfetch.h	2020-10-23 20:08:54.000000000 +0200
@@ -69,9 +69,9 @@
                              ksba_reader_t *reader);
 
 
-gpg_error_t start_default_fetch_ldap (ctrl_t ctrl,
-                                      cert_fetch_context_t *context,
-                                      const char *dn, const char *attr);
+gpg_error_t start_cacert_fetch_ldap (ctrl_t ctrl,
+                                     cert_fetch_context_t *context,
+                                     const char *dn);
 gpg_error_t start_cert_fetch_ldap( ctrl_t ctrl,
                                    cert_fetch_context_t *context,
                                    strlist_t patterns,
diff -Nru gnupg2-2.2.20/dirmngr/dirmngr.c gnupg2-2.2.27/dirmngr/dirmngr.c
--- gnupg2-2.2.20/dirmngr/dirmngr.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/dirmngr.c	2020-12-18 11:22:45.000000000 +0100
@@ -1,6 +1,6 @@
 /* dirmngr.c - Keyserver and X.509 LDAP access
  * Copyright (C) 2002 Klarälvdalens Datakonsult AB
- * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2010, 2011 g10 Code GmbH
+ * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2010, 2011, 2020 g10 Code GmbH
  * Copyright (C) 2014 Werner Koch
  *
  * This file is part of GnuPG.
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: GPL-3.0+
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -100,6 +99,7 @@
   aFlush,
   aGPGConfList,
   aGPGConfTest,
+  aGPGConfVersions,
 
   oOptions,
   oDebug,
@@ -174,6 +174,7 @@
   ARGPARSE_c (aFlush,    "flush",     N_("flush the cache")),
   ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
   ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
+  ARGPARSE_c (aGPGConfVersions, "gpgconf-versions", "@"),
 
   ARGPARSE_group (301, N_("@\nOptions:\n ")),
 
@@ -181,7 +182,7 @@
   ARGPARSE_s_n (oQuiet,    "quiet",     N_("be somewhat more quiet")),
   ARGPARSE_s_n (oSh,       "sh",        N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,      "csh",       N_("csh-style command output")),
-  ARGPARSE_s_s (oOptions,  "options",   N_("|FILE|read options from FILE")),
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
   ARGPARSE_s_s (oDebugLevel, "debug-level",
                 N_("|LEVEL|set the debugging level to LEVEL")),
   ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
@@ -259,6 +260,7 @@
   ARGPARSE_s_i (oConnectTimeout, "connect-timeout", "@"),
   ARGPARSE_s_i (oConnectQuickTimeout, "connect-quick-timeout", "@"),
   ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
 
   ARGPARSE_group (302,N_("@\n(See the \"info\" manual for a complete listing "
                          "of all commands and options)\n")),
@@ -373,11 +375,13 @@
 /* Prototypes. */
 static void cleanup (void);
 #if USE_LDAP
-static ldap_server_t parse_ldapserver_file (const char* filename);
+static ldap_server_t parse_ldapserver_file (const char* filename, int ienoent);
 #endif /*USE_LDAP*/
 static fingerprint_list_t parse_ocsp_signer (const char *string);
 static void netactivity_action (void);
 static void handle_connections (assuan_fd_t listen_fd);
+static void gpgconf_versions (void);
+
 
 /* NPth wrapper function definitions. */
 ASSUAN_SYSTEM_NPTH_IMPL;
@@ -388,9 +392,11 @@
   const char *p;
   switch ( level )
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@DIRMNGR@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
       /* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
          reporting address.  This is so that we can change the
@@ -824,12 +830,10 @@
   ARGPARSE_ARGS pargs;
   int orig_argc;
   char **orig_argv;
-  FILE *configfp = NULL;
-  char *configname = NULL;
+  char *last_configname = NULL;
+  const char *configname = NULL;
   const char *shell;
-  unsigned configlineno;
-  int parse_debug = 0;
-  int default_config =1;
+  int debug_argparser = 0;
   int greeting = 0;
   int nogreeting = 0;
   int nodetach = 0;
@@ -911,63 +915,56 @@
   orig_argv = argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1|(1<<6);  /* do not remove the args, ignore version */
-  while (arg_parse( &pargs, opts))
+  pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
-      if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
-        parse_debug++;
-      else if (pargs.r_opt == oOptions)
-        { /* Yes there is one, so we do not try the default one, but
-	     read the option file when it is encountered at the
-	     commandline */
-          default_config = 0;
-	}
-      else if (pargs.r_opt == oNoOptions)
-        default_config = 0; /* --no-options */
-      else if (pargs.r_opt == oHomedir)
+      switch (pargs.r_opt)
         {
+        case oDebug:
+        case oDebugAll:
+          debug_argparser++;
+          break;
+        case oHomedir:
           gnupg_set_homedir (pargs.r.ret_str);
+          break;
         }
     }
+  /* Reset the flags.  */
+  pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
   socket_name = dirmngr_socket_name ();
-  if (default_config)
-    configname = make_filename (gnupg_homedir (), DIRMNGR_NAME".conf", NULL );
 
+  /* The configuraton directories for use by gpgrt_argparser.  */
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
+
+  /* We are re-using the struct, thus the reset flag.  We OR the
+   * flags so that the internal intialized flag won't be cleared. */
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1;  /* do not remove the args */
- next_pass:
-  if (configname)
-    {
-      configlineno = 0;
-      configfp = fopen (configname, "r");
-      if (!configfp)
-        {
-          if (default_config)
+  pargs.flags |=  (ARGPARSE_FLAG_RESET
+                   | ARGPARSE_FLAG_KEEP
+                   | ARGPARSE_FLAG_SYS
+                   | ARGPARSE_FLAG_USER);
+  while (gnupg_argparser (&pargs, opts, DIRMNGR_NAME EXTSEP_S "conf"))
+    {
+      if (pargs.r_opt == ARGPARSE_CONFFILE)
+        {
+          if (debug_argparser)
+            log_info (_("reading options from '%s'\n"),
+                      pargs.r_type? pargs.r.ret_str: "[cmdline]");
+          if (pargs.r_type)
             {
-              if( parse_debug )
-                log_info (_("Note: no default option file '%s'\n"),
-                          configname );
-	    }
+              xfree (last_configname);
+              last_configname = xstrdup (pargs.r.ret_str);
+              configname = last_configname;
+            }
           else
-            {
-              log_error (_("option file '%s': %s\n"),
-                         configname, strerror(errno) );
-              exit(2);
-	    }
-          xfree (configname);
-          configname = NULL;
-	}
-      if (parse_debug && configname )
-        log_info (_("reading options from '%s'\n"), configname );
-      default_config = 0;
-    }
-
-  while (optfile_parse( configfp, configname, &configlineno, &pargs, opts) )
-    {
+            configname = NULL;
+          continue;
+        }
       if (parse_rereadable_options (&pargs, 0))
         continue; /* Already handled */
       switch (pargs.r_opt)
@@ -982,6 +979,7 @@
         case aFetchCRL:
 	case aGPGConfList:
 	case aGPGConfTest:
+	case aGPGConfVersions:
           cmd = pargs.r_opt;
           break;
 
@@ -991,18 +989,8 @@
 
         case oDebugWait: debug_wait = pargs.r.ret_int; break;
 
-        case oOptions:
-          /* Config files may not be nested (silently ignore them) */
-          if (!configfp)
-            {
-		xfree(configname);
-		configname = xstrdup(pargs.r.ret_str);
-		goto next_pass;
-	    }
-          break;
         case oNoGreeting: nogreeting = 1; break;
         case oNoVerbose: opt.verbose = 0; break;
-        case oNoOptions: break; /* no-options */
         case oHomedir: /* Ignore this option here. */; break;
         case oNoDetach: nodetach = 1; break;
         case oLogFile: logfile = pargs.r.ret_str; break;
@@ -1030,20 +1018,26 @@
           listen_backlog = pargs.r.ret_int;
           break;
 
-        default : pargs.err = configfp? 1:2; break;
+        default:
+          if (configname)
+            pargs.err = ARGPARSE_PRINT_WARNING;
+          else
+            pargs.err = ARGPARSE_PRINT_ERROR;
+          break;
 	}
     }
-  if (configfp)
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
+  if (!last_configname)
+    opt.config_filename = make_filename (gnupg_homedir (),
+                                         DIRMNGR_NAME EXTSEP_S "conf",
+                                         NULL);
+  else
     {
-      fclose (configfp);
-      configfp = NULL;
-      /* Keep a copy of the name so that it can be read on SIGHUP. */
-      opt.config_filename = configname;
-      configname = NULL;
-      goto next_pass;
+      opt.config_filename = last_configname;
+      last_configname = NULL;
     }
-  xfree (configname);
-  configname = NULL;
+
   if (log_get_errorcount(0))
     exit(2);
   if (nogreeting )
@@ -1073,7 +1067,7 @@
           log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
-  if (!access ("/etc/"DIRMNGR_NAME, F_OK)
+  if (!gnupg_access ("/etc/"DIRMNGR_NAME, F_OK)
       && !strncmp (gnupg_homedir (), "/etc/", 5))
     log_info
       ("NOTE: DirMngr is now a proper part of %s.  The configuration and"
@@ -1100,11 +1094,11 @@
       ldapfile = make_filename (gnupg_homedir (),
                                 "dirmngr_ldapservers.conf",
                                 NULL);
-      opt.ldapservers = parse_ldapserver_file (ldapfile);
+      opt.ldapservers = parse_ldapserver_file (ldapfile, 1);
       xfree (ldapfile);
     }
   else
-      opt.ldapservers = parse_ldapserver_file (ldapfile);
+    opt.ldapservers = parse_ldapserver_file (ldapfile, 0);
 #endif /*USE_LDAP*/
 
 #ifndef HAVE_W32_SYSTEM
@@ -1272,7 +1266,7 @@
         {
           log_error (_("error binding socket to '%s': %s\n"),
                      serv_addr.sun_path,
-                     gpg_strerror (gpg_error_from_errno (errno)));
+                     gpg_strerror (gpg_error_from_syserror ()));
           assuan_sock_close (fd);
           dirmngr_exit (1);
         }
@@ -1474,12 +1468,6 @@
       char *filename;
       char *filename_esc;
 
-      /* First the configuration file.  This is not an option, but it
-	 is vital information for GPG Conf.  */
-      if (!opt.config_filename)
-        opt.config_filename = make_filename (gnupg_homedir (),
-                                             "dirmngr.conf", NULL );
-
       filename = percent_escape (opt.config_filename, NULL);
       es_printf ("gpgconf-dirmngr.conf:%lu:\"%s\n",
               GC_OPT_FLAG_DEFAULT, filename);
@@ -1538,11 +1526,13 @@
                  filename_esc);
       xfree (filename_esc);
 
-
       es_printf ("nameserver:%lu:\n", flags | GC_OPT_FLAG_NONE);
       es_printf ("resolver-timeout:%lu:%u\n",
                  flags | GC_OPT_FLAG_DEFAULT, 0);
     }
+  else if (cmd == aGPGConfVersions)
+    gpgconf_versions ();
+
   cleanup ();
   return !!rc;
 }
@@ -1618,7 +1608,7 @@
 */
 #if USE_LDAP
 static ldap_server_t
-parse_ldapserver_file (const char* filename)
+parse_ldapserver_file (const char* filename, int ignore_enoent)
 {
   char buffer[1024];
   char *p;
@@ -1631,7 +1621,10 @@
   if (!fp)
     {
       if (errno == ENOENT)
-        log_info ("No ldapserver file at: '%s'\n", filename);
+        {
+          if (!ignore_enoent)
+            log_info ("No ldapserver file at: '%s'\n", filename);
+        }
       else
         log_error (_("error opening '%s': %s\n"), filename,
                    strerror (errno));
@@ -1822,36 +1815,39 @@
 reread_configuration (void)
 {
   ARGPARSE_ARGS pargs;
-  FILE *fp;
-  unsigned int configlineno = 0;
+  char *twopart;
   int dummy;
 
   if (!opt.config_filename)
     return; /* No config file. */
 
-  fp = fopen (opt.config_filename, "r");
-  if (!fp)
-    {
-      log_error (_("option file '%s': %s\n"),
-                 opt.config_filename, strerror(errno) );
-      return;
-    }
+  twopart = strconcat (DIRMNGR_NAME EXTSEP_S "conf" PATHSEP_S,
+                       opt.config_filename, NULL);
+  if (!twopart)
+    return;  /* Out of core.  */
 
   parse_rereadable_options (NULL, 1); /* Start from the default values. */
 
   memset (&pargs, 0, sizeof pargs);
   dummy = 0;
   pargs.argc = &dummy;
-  pargs.flags = 1;  /* do not remove the args */
-  while (optfile_parse (fp, opt.config_filename, &configlineno, &pargs, opts) )
+  pargs.flags = (ARGPARSE_FLAG_KEEP
+                 |ARGPARSE_FLAG_SYS
+                 |ARGPARSE_FLAG_USER);
+  while (gnupg_argparser (&pargs, opts, twopart))
     {
-      if (pargs.r_opt < -1)
-        pargs.err = 1; /* Print a warning. */
+      if (pargs.r_opt == ARGPARSE_CONFFILE)
+        {
+          log_info (_("reading options from '%s'\n"),
+                    pargs.r_type? pargs.r.ret_str: "[cmdline]");
+        }
+      else if (pargs.r_opt < -1)
+        pargs.err = ARGPARSE_PRINT_WARNING;
       else /* Try to parse this option - ignore unchangeable ones. */
         parse_rereadable_options (&pargs, 1);
     }
-  fclose (fp);
-
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+  xfree (twopart);
   post_option_parsing ();
 }
 
@@ -2033,7 +2029,7 @@
 
   /* Check whether the homedir is still available.  */
   if (!shutdown_pending
-      && stat (gnupg_homedir (), &statbuf) && errno == ENOENT)
+      && gnupg_stat (gnupg_homedir (), &statbuf) && errno == ENOENT)
     {
       shutdown_pending = 1;
       log_info ("homedir has been removed - shutting down\n");
@@ -2344,3 +2340,62 @@
   else
     return dirmngr_socket_name ();
 }
+
+
+
+/* Parse the revision part from the extended version blurb.  */
+static const char *
+get_revision_from_blurb (const char *blurb, int *r_len)
+{
+  const char *s = blurb? blurb : "";
+  int n;
+
+  for (; *s; s++)
+    if (*s == '\n' && s[1] == '(')
+      break;
+  if (*s)
+    {
+      s += 2;
+      for (n=0; s[n] && s[n] != ' '; n++)
+        ;
+    }
+  else
+    {
+      s = "?";
+      n = 1;
+    }
+  *r_len = n;
+  return s;
+}
+
+
+/* Print versions of dirmngr and used libraries.  This is used by
+ * "gpgconf --show-versions" so that there is no need to link gpgconf
+ * against all these libraries.  This is an internal API and should
+ * not be relied upon.  */
+static void
+gpgconf_versions (void)
+{
+  const char *s;
+  int n;
+
+  /* Unfortunately Npth has no way to get the version.  */
+
+  s = get_revision_from_blurb (assuan_check_version ("\x01\x01"), &n);
+  es_fprintf (es_stdout, "* Libassuan %s (%.*s)\n\n",
+              assuan_check_version (NULL), n, s);
+
+  s = get_revision_from_blurb (ksba_check_version ("\x01\x01"), &n);
+  es_fprintf (es_stdout, "* KSBA %s (%.*s)\n\n",
+              ksba_check_version (NULL), n, s);
+
+#ifdef HTTP_USE_NTBTLS
+  s = get_revision_from_blurb (ntbtls_check_version ("\x01\x01"), &n);
+  es_fprintf (es_stdout, "* NTBTLS %s (%.*s)\n\n",
+              ntbtls_check_version (NULL), n, s);
+#elif HTTP_USE_GNUTLS
+  es_fprintf (es_stdout, "* GNUTLS %s\n\n",
+              gnutls_check_version (NULL));
+#endif
+
+}
diff -Nru gnupg2-2.2.20/dirmngr/dirmngr-client.c gnupg2-2.2.27/dirmngr/dirmngr-client.c
--- gnupg2-2.2.20/dirmngr/dirmngr-client.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/dirmngr-client.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -158,9 +159,11 @@
 
   switch(level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "dirmngr-client (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
     case 49: p = PACKAGE_BUGREPORT; break;
@@ -202,6 +205,9 @@
   set_strusage (my_strusage);
   log_set_prefix ("dirmngr-client",
                   GPGRT_LOG_WITH_PREFIX);
+  /* Register our string mapper.  Usually done in
+   * init_common_subsystems, but we don't use that here.  */
+  gnupg_set_fixed_string_mapper (map_static_macro_string);
 
   /* For W32 we need to initialize the socket subsystem.  Because we
      don't use Pth we need to do this explicit. */
@@ -223,8 +229,8 @@
   /* Parse the command line.  */
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1;  /* Do not remove the args. */
-  while (arg_parse (&pargs, opts) )
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -247,9 +253,11 @@
           break;
         case oForceDefaultResponder: opt.force_default_responder = 1; break;
 
-        default : pargs.err = 2; break;
+        default : pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
   if (log_get_errorcount (0))
     exit (2);
 
@@ -468,7 +476,7 @@
 
   init_asctobin ();
 
-  fp = fname? fopen (fname, "r") : stdin;
+  fp = fname? gnupg_fopen (fname, "r") : stdin;
   if (!fp)
     return gpg_error_from_errno (errno);
 
@@ -629,7 +637,7 @@
         return 0;
     }
 
-  fp = fname? fopen (fname, "rb") : stdin;
+  fp = fname? gnupg_fopen (fname, "rb") : stdin;
   if (!fp)
     return gpg_error_from_errno (errno);
 
diff -Nru gnupg2-2.2.20/dirmngr/dirmngr_ldap.c gnupg2-2.2.27/dirmngr/dirmngr_ldap.c
--- gnupg2-2.2.20/dirmngr/dirmngr_ldap.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/dirmngr_ldap.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -197,9 +198,11 @@
 
   switch(level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "dirmngr_ldap (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
     case 49: p = PACKAGE_BUGREPORT; break;
@@ -267,8 +270,8 @@
   /* Parse the command line.  */
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1;  /* Do not remove the args. */
-  while (arg_parse (&pargs, opts) )
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -309,6 +312,7 @@
           break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (only_search_timeout)
     myopt->alarm_timeout = 0;
diff -Nru gnupg2-2.2.20/dirmngr/dirmngr-w32info.rc gnupg2-2.2.27/dirmngr/dirmngr-w32info.rc
--- gnupg2-2.2.20/dirmngr/dirmngr-w32info.rc	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/dirmngr-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,52 @@
+/* dirmngr-w32info.rc                                        -*- c -*-
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s network daemon\0"
+            VALUE "InternalName", "dirmngr\0"
+            VALUE "OriginalFilename", "dirmngr.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "dirmngr.w32-manifest"
diff -Nru gnupg2-2.2.20/dirmngr/dirmngr.w32-manifest.in gnupg2-2.2.27/dirmngr/dirmngr.w32-manifest.in
--- gnupg2-2.2.20/dirmngr/dirmngr.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/dirmngr.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Network daemon)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.dirmngr"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/dirmngr/dns.c gnupg2-2.2.27/dirmngr/dns.c
--- gnupg2-2.2.20/dirmngr/dns.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/dns.c	2020-11-10 12:02:31.000000000 +0100
@@ -2150,6 +2150,7 @@
 static size_t dns_p_lines(void *dst, size_t lim, dns_error_t *_error, struct dns_packet *P, struct dns_rr_i *I, struct dns_p_lines_i *state) {
 	int error, pc;
 	size_t len;
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 
 	*_error = 0;
 
@@ -2168,7 +2169,7 @@
 	while (dns_rr_grep(&state->rr, 1, I, P, &error)) {
 		if (state->section != state->rr.section) {
 			DNS_P_LINE("\n");
-			DNS_P_LINE(";; [%s:%d]\n", dns_strsection(state->rr.section), dns_p_count(P, state->rr.section));
+			DNS_P_LINE(";; [%s:%d]\n", dns_strsection(state->rr.section, __dst), dns_p_count(P, state->rr.section));
 		}
 
 		if (!(len = dns_rr_print(dst, lim, &state->rr, P, &error)))
@@ -3274,6 +3275,7 @@
 	union dns_any any;
 	size_t n;
 	int error;
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 
 	if (rr->section == DNS_S_QD)
 		dns_b_putc(&dst, ';');
@@ -3288,9 +3290,9 @@
 	}
 
 	dns_b_putc(&dst, ' ');
-	dns_b_puts(&dst, dns_strclass(rr->class));
+	dns_b_puts(&dst, dns_strclass(rr->class, __dst));
 	dns_b_putc(&dst, ' ');
-	dns_b_puts(&dst, dns_strtype(rr->type));
+	dns_b_puts(&dst, dns_strtype(rr->type, __dst));
 
 	if (rr->section == DNS_S_QD)
 		goto epilog;
@@ -4864,6 +4866,7 @@
 		dns_microseconds_t begin, elapsed;
 	} state = { 0 };
 	int error;
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 
 	if (!trace || !trace->fp)
 		return EINVAL;
@@ -4886,8 +4889,8 @@
 			fprintf(fp, "dns_res_submit:\n");
 			dns_trace_dump_meta(trace, "  ", te, state.elapsed, fp);
 			fprintf(fp, "  qname: %s\n", te->res_submit.qname);
-			fprintf(fp, "  qtype: %s\n", dns_strtype(te->res_submit.qtype));
-			fprintf(fp, "  qclass: %s\n", dns_strclass(te->res_submit.qclass));
+			fprintf(fp, "  qtype: %s\n", dns_strtype(te->res_submit.qtype, __dst));
+			fprintf(fp, "  qclass: %s\n", dns_strclass(te->res_submit.qclass, __dst));
 			dns_trace_dump_error(trace, "  error: ", te->res_submit.error, fp);
 			break;
 		case DNS_TE_RES_FETCH:
@@ -10010,16 +10013,17 @@
 size_t dns_ai_print(void *_dst, size_t lim, struct addrinfo *ent, struct dns_addrinfo *ai) {
 	struct dns_buf dst = DNS_B_INTO(_dst, lim);
 	char addr[DNS_PP_MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 
 	dns_b_puts(&dst, "[ ");
 	dns_b_puts(&dst, ai->qname);
 	dns_b_puts(&dst, " IN ");
 	if (ai->qtype) {
-		dns_b_puts(&dst, dns_strtype(ai->qtype));
+		dns_b_puts(&dst, dns_strtype(ai->qtype, __dst));
 	} else if (ent->ai_family == AF_INET) {
-		dns_b_puts(&dst, dns_strtype(DNS_T_A));
+		dns_b_puts(&dst, dns_strtype(DNS_T_A, __dst));
 	} else if (ent->ai_family == AF_INET6) {
-		dns_b_puts(&dst, dns_strtype(DNS_T_AAAA));
+		dns_b_puts(&dst, dns_strtype(DNS_T_AAAA, __dst));
 	} else {
 		dns_b_puts(&dst, "0");
 	}
@@ -10106,9 +10110,8 @@
 	{ "AR",         DNS_S_ADDITIONAL },
 };
 
-const char *(dns_strsection)(enum dns_section section) {
-	char _dst[DNS_STRMAXLEN + 1] = { 0 };
-	struct dns_buf dst = DNS_B_INTO(_dst, sizeof _dst);
+const char *(dns_strsection)(enum dns_section section, char *_dst) {
+	struct dns_buf dst = DNS_B_INTO(_dst, DNS_STRMAXLEN + 1);
 	unsigned i;
 
 	for (i = 0; i < lengthof(dns_sections); i++) {
@@ -10156,9 +10159,8 @@
 	{ "IN", DNS_C_IN },
 };
 
-const char *(dns_strclass)(enum dns_class type) {
-	char _dst[DNS_STRMAXLEN + 1] = { 0 };
-	struct dns_buf dst = DNS_B_INTO(_dst, sizeof _dst);
+const char *(dns_strclass)(enum dns_class type, char *_dst) {
+	struct dns_buf dst = DNS_B_INTO(_dst, DNS_STRMAXLEN + 1);
 	unsigned i;
 
 	for (i = 0; i < lengthof(dns_classes); i++) {
@@ -10193,9 +10195,8 @@
 } /* dns_iclass() */
 
 
-const char *(dns_strtype)(enum dns_type type) {
-	char _dst[DNS_STRMAXLEN + 1] = { 0 };
-	struct dns_buf dst = DNS_B_INTO(_dst, sizeof _dst);
+const char *(dns_strtype)(enum dns_type type, char *_dst) {
+	struct dns_buf dst = DNS_B_INTO(_dst, DNS_STRMAXLEN + 1);
 	unsigned i;
 
 	for (i = 0; i < lengthof(dns_rrtypes); i++) {
@@ -10618,6 +10619,7 @@
 	union dns_any any;
 	char pretty[sizeof any * 2];
 	size_t len;
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 
 	P->end	= fread(P->data, 1, P->size, stdin);
 
@@ -10634,7 +10636,7 @@
 
 	dns_rr_foreach(&rr, P, .sort = MAIN.sort) {
 		if (section != rr.section)
-			fprintf(stdout, "\n;; [%s:%d]\n", dns_strsection(rr.section), dns_p_count(P, rr.section));
+			fprintf(stdout, "\n;; [%s:%d]\n", dns_strsection(rr.section, __dst), dns_p_count(P, rr.section));
 
 		if ((len = dns_rr_print(pretty, sizeof pretty, &rr, P, &error)))
 			fprintf(stdout, "%s\n", pretty);
@@ -10665,7 +10667,7 @@
 		rr	= rrset[i];
 #endif
 		if (section != rr.section)
-			fprintf(stdout, "\n;; [%s:%d]\n", dns_strsection(rr.section), dns_p_count(Q, rr.section));
+			fprintf(stdout, "\n;; [%s:%d]\n", dns_strsection(rr.section, __dst), dns_p_count(Q, rr.section));
 
 		if ((len = dns_rr_print(pretty, sizeof pretty, &rr, Q, &error)))
 			fprintf(stdout, "%s\n", pretty);
@@ -10944,6 +10946,7 @@
 	struct dns_socket *so;
 	int error, type;
 	struct dns_options opts = { 0 };
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 
 	memset(&ss, 0, sizeof ss);
 	if (argc > 1) {
@@ -10976,7 +10979,7 @@
 	else
 		type	= dns_res_tcp2type(resconf()->options.tcp);
 
-	fprintf(stderr, "querying %s for %s IN %s\n", host, MAIN.qname, dns_strtype(MAIN.qtype));
+	fprintf(stderr, "querying %s for %s IN %s\n", host, MAIN.qname, dns_strtype(MAIN.qtype, __dst));
 
 	if (!(so = dns_so_open((struct sockaddr *)&resconf()->iface, type, &opts, &error)))
 		panic("dns_so_open: %s", dns_strerror(error));
@@ -11227,11 +11230,12 @@
 
 
 static int isection(int argc, char *argv[]) {
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 	const char *name = (argc > 1)? argv[1] : "";
 	int type;
 
 	type = dns_isection(name);
-	name = dns_strsection(type);
+	name = dns_strsection(type, __dst);
 
 	printf("%s (%d)\n", name, type);
 
@@ -11240,11 +11244,12 @@
 
 
 static int iclass(int argc, char *argv[]) {
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 	const char *name = (argc > 1)? argv[1] : "";
 	int type;
 
 	type = dns_iclass(name);
-	name = dns_strclass(type);
+	name = dns_strclass(type, __dst);
 
 	printf("%s (%d)\n", name, type);
 
@@ -11253,11 +11258,12 @@
 
 
 static int itype(int argc, char *argv[]) {
+	char __dst[DNS_STRMAXLEN + 1] = { 0 };
 	const char *name = (argc > 1)? argv[1] : "";
 	int type;
 
 	type = dns_itype(name);
-	name = dns_strtype(type);
+	name = dns_strtype(type, __dst);
 
 	printf("%s (%d)\n", name, type);
 
diff -Nru gnupg2-2.2.20/dirmngr/dns.h gnupg2-2.2.27/dirmngr/dns.h
--- gnupg2-2.2.20/dirmngr/dns.h	2019-03-07 13:03:26.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/dns.h	2020-06-02 08:22:07.000000000 +0200
@@ -272,15 +272,15 @@
  */
 #define DNS_STRMAXLEN 47 /* "QUESTION|ANSWER|AUTHORITY|ADDITIONAL" */
 
-DNS_PUBLIC const char *dns_strsection(enum dns_section);
+DNS_PUBLIC const char *dns_strsection(enum dns_section, char *);
 
 DNS_PUBLIC enum dns_section dns_isection(const char *);
 
-DNS_PUBLIC const char *dns_strclass(enum dns_class);
+DNS_PUBLIC const char *dns_strclass(enum dns_class, char *);
 
 DNS_PUBLIC enum dns_class dns_iclass(const char *);
 
-DNS_PUBLIC const char *dns_strtype(enum dns_type);
+DNS_PUBLIC const char *dns_strtype(enum dns_type, char *);
 
 DNS_PUBLIC enum dns_type dns_itype(const char *);
 
diff -Nru gnupg2-2.2.20/dirmngr/http.c gnupg2-2.2.27/dirmngr/http.c
--- gnupg2-2.2.20/dirmngr/http.c	2019-11-18 18:44:33.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/http.c	2020-10-23 20:08:54.000000000 +0200
@@ -579,6 +579,7 @@
 void
 http_register_tls_ca (const char *fname)
 {
+  gpg_err_code_t ec;
   strlist_t sl;
 
   if (!fname)
@@ -590,9 +591,8 @@
     {
       /* Warn if we can't access right now, but register it anyway in
          case it becomes accessible later */
-      if (access (fname, F_OK))
-        log_info (_("can't access '%s': %s\n"), fname,
-                  gpg_strerror (gpg_error_from_syserror()));
+      if ((ec = gnupg_access (fname, F_OK)))
+        log_info (_("can't access '%s': %s\n"), fname, gpg_strerror (ec));
       sl = add_to_strlist (&tls_ca_certlist, fname);
       if (*sl->d && !strcmp (sl->d + strlen (sl->d) - 4, ".pem"))
         sl->flags = 1;
@@ -608,6 +608,7 @@
 void
 http_register_cfg_ca (const char *fname)
 {
+  gpg_err_code_t ec;
   strlist_t sl;
 
   if (!fname)
@@ -619,9 +620,8 @@
     {
       /* Warn if we can't access right now, but register it anyway in
          case it becomes accessible later */
-      if (access (fname, F_OK))
-        log_info (_("can't access '%s': %s\n"), fname,
-                  gpg_strerror (gpg_error_from_syserror()));
+      if ((ec = gnupg_access (fname, F_OK)))
+        log_info (_("can't access '%s': %s\n"), fname, gpg_strerror (ec));
       sl = add_to_strlist (&cfg_ca_certlist, fname);
       if (*sl->d && !strcmp (sl->d + strlen (sl->d) - 4, ".pem"))
         sl->flags = 1;
@@ -770,10 +770,9 @@
                     && !ascii_strcasecmp (intended_hostname,
                                           get_default_keyserver (1)));
 
-    /* If the user has not specified a CA list, and they are looking
-     * for the hkps pool from sks-keyservers.net, then default to
-     * Kristian's certificate authority:  */
-    if (!tls_ca_certlist && is_hkps_pool)
+    /* If we are looking for the hkps pool from sks-keyservers.net,
+     * then forcefully use its dedicated certificate authority.  */
+    if (is_hkps_pool)
       {
         char *pemname = make_filename_try (gnupg_datadir (),
                                            "sks-keyservers.netCA.pem", NULL);
@@ -793,11 +792,12 @@
             xfree (pemname);
           }
 
-        add_system_cas = 0;
+        if (is_hkps_pool)
+          add_system_cas = 0;
       }
 
     /* Add configured certificates to the session.  */
-    if ((flags & HTTP_FLAG_TRUST_DEF))
+    if ((flags & HTTP_FLAG_TRUST_DEF) && !is_hkps_pool)
       {
         for (sl = tls_ca_certlist; sl; sl = sl->next)
           {
@@ -808,7 +808,10 @@
               log_info ("setting CA from file '%s' failed: %s\n",
                         sl->d, gnutls_strerror (rc));
           }
-        if (!tls_ca_certlist && !is_hkps_pool)
+
+        /* If HKP trust is requested and there are no HKP certificates
+         * configured, also try the standard system certificates.  */
+        if (!tls_ca_certlist)
           add_system_cas = 1;
       }
 
@@ -830,7 +833,7 @@
       }
 
     /* Add other configured certificates to the session.  */
-    if ((flags & HTTP_FLAG_TRUST_CFG))
+    if ((flags & HTTP_FLAG_TRUST_CFG) && !is_hkps_pool)
       {
         for (sl = cfg_ca_certlist; sl; sl = sl->next)
           {
@@ -2057,6 +2060,14 @@
 
       while ((err = ntbtls_handshake (hd->session->tls_session)))
         {
+#if NTBTLS_VERSION_NUMBER >= 0x000200
+          unsigned int tlevel, ttype;
+          const char *s = ntbtls_get_last_alert (hd->session->tls_session,
+                                                 &tlevel, &ttype);
+          if (s)
+            log_info ("TLS alert: %s (%u.%u)\n", s, tlevel, ttype);
+#endif
+
           switch (err)
             {
             default:
@@ -3005,6 +3016,15 @@
           sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol);
           if (sock == ASSUAN_INVALID_FD)
             {
+              if (errno == EAFNOSUPPORT)
+                {
+                  if (ai->family == AF_INET)
+                    v4_valid = 0;
+                  if (ai->family == AF_INET6)
+                    v6_valid = 0;
+                  continue;
+                }
+
               err = gpg_err_make (default_errsource,
                                   gpg_err_code_from_syserror ());
               log_error ("error creating socket: %s\n", gpg_strerror (err));
diff -Nru gnupg2-2.2.20/dirmngr/http.h gnupg2-2.2.27/dirmngr/http.h
--- gnupg2-2.2.20/dirmngr/http.h	2019-11-18 18:44:33.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/http.h	2020-12-18 11:22:00.000000000 +0100
@@ -55,7 +55,8 @@
   unsigned int opaque:1;/* Unknown scheme; PATH has the rest.  */
   unsigned int v6lit:1; /* Host was given as a literal v6 address.  */
   unsigned int onion:1; /* .onion address given.  */
-  unsigned int explicit_port :1; /* The port was explicitly specified.  */
+  unsigned int explicit_port:1; /* The port was explicitly specified.  */
+  unsigned int ad_current:1;    /* Use Active Directory's current user.  */
   char *auth;           /* username/password for basic auth.  */
   char *host; 	        /* Host (converted to lowercase). */
   unsigned short port;  /* Port (always set if the host is set). */
diff -Nru gnupg2-2.2.20/dirmngr/http-ntbtls.c gnupg2-2.2.27/dirmngr/http-ntbtls.c
--- gnupg2-2.2.20/dirmngr/http-ntbtls.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/http-ntbtls.c	2020-10-23 20:08:54.000000000 +0200
@@ -77,8 +77,10 @@
 
   validate_flags = VALIDATE_FLAG_TLS;
 
-  /* If we are using the standard hkps:// pool use the dedicated
-   * root certificate.  */
+  /* If we are using the standard hkps:// pool use the dedicated root
+   * certificate.  Note that this differes from the GnuTLS
+   * implementation which uses this special certificate only if no
+   * other certificates are configured. */
   hostname = ntbtls_get_hostname (tls);
   if (hostname
       && !ascii_strcasecmp (hostname, get_default_keyserver (1)))
diff -Nru gnupg2-2.2.20/dirmngr/ks-action.c gnupg2-2.2.27/dirmngr/ks-action.c
--- gnupg2-2.2.20/dirmngr/ks-action.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/ks-action.c	2020-12-18 11:22:00.000000000 +0100
@@ -357,9 +357,9 @@
 /* Send an OpenPGP key to all keyservers.  The key in {DATA,DATALEN}
    is expected to be in OpenPGP binary transport format.  The metadata
    in {INFO,INFOLEN} is in colon-separated format (concretely, it is
-   the output of 'for x in keys sigs; do gpg --list-$x --with-colons
-   KEYID; done'.  This function may modify DATA and INFO.  If this is
-   a problem, then the caller should create a copy.  */
+   the output of 'gpg --list-keys --with-colons KEYID').  This function
+   may modify DATA and INFO.  If this is a problem, then the caller
+   should create a copy.  */
 gpg_error_t
 ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
 	       void *data, size_t datalen,
diff -Nru gnupg2-2.2.20/dirmngr/ks-engine-hkp.c gnupg2-2.2.27/dirmngr/ks-engine-hkp.c
--- gnupg2-2.2.20/dirmngr/ks-engine-hkp.c	2019-11-18 18:44:33.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/ks-engine-hkp.c	2020-10-23 20:08:54.000000000 +0200
@@ -476,7 +476,20 @@
   if (!name || !*name)
     {
       *r_host = xtrystrdup ("localhost");
-      return *r_host? 0 : gpg_error_from_syserror ();
+      if (!*r_host)
+        return gpg_error_from_syserror ();
+      if (r_httphost)
+        {
+          *r_httphost = xtrystrdup (*r_host);
+          if (!*r_httphost)
+            {
+              err = gpg_error_from_syserror ();
+              xfree (*r_host);
+              *r_host = NULL;
+              return err;
+            }
+        }
+      return 0;
     }
 
   /* See whether the host is in our table.  */
@@ -648,6 +661,12 @@
         }
       free_dns_addrinfo (aibuf);
     }
+  else if (r_httphost)
+    {
+      *r_httphost = xtrystrdup (hi->name);
+      if (!*r_httphost)
+        return gpg_error_from_syserror ();
+    }
 
   if (hi->dead)
     {
diff -Nru gnupg2-2.2.20/dirmngr/ks-engine-ldap.c gnupg2-2.2.27/dirmngr/ks-engine-ldap.c
--- gnupg2-2.2.20/dirmngr/ks-engine-ldap.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/ks-engine-ldap.c	2020-12-21 13:57:23.000000000 +0100
@@ -1,7 +1,7 @@
 /* ks-engine-ldap.c - talk to a LDAP keyserver
  * Copyright (C) 2001, 2002, 2004, 2005, 2006
  *               2007  Free Software Foundation, Inc.
- * Copyright (C) 2015  g10 Code GmbH
+ * Copyright (C) 2015, 2020  g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -42,13 +42,24 @@
 # define LDAP_DEPRECATED 1
 # include <ldap.h>
 #endif
+#include <npth.h>
 
 #include "dirmngr.h"
 #include "misc.h"
 #include "../common/userids.h"
+#include "../common/mbox-util.h"
 #include "ks-engine.h"
 #include "ldap-parse-uri.h"
 
+
+/* Flags with infos from the connected server.  */
+#define SERVERINFO_REALLDAP 1 /* This is not the PGP keyserver.      */
+#define SERVERINFO_PGPKEYV2 2 /* Needs "pgpeyV2" instead of "pgpKey" */
+#define SERVERINFO_SCHEMAV2 4 /* Version 2 of the Schema.            */
+#define SERVERINFO_NTDS     8 /* Server is an Active Directory.      */
+
+
+
 #ifndef HAVE_TIMEGM
 time_t timegm(struct tm *tm);
 #endif
@@ -323,7 +334,8 @@
    *filter.  It is the caller's responsibility to free *filter.
    *filter is only set if this function returns success (i.e., 0).  */
 static gpg_error_t
-keyspec_to_ldap_filter (const char *keyspec, char **filter, int only_exact)
+keyspec_to_ldap_filter (const char *keyspec, char **filter, int only_exact,
+                        unsigned int serverinfo)
 {
   /* Remove search type indicator and adjust PATTERN accordingly.
      Note: don't include a preceding 0x when searching by keyid.  */
@@ -332,6 +344,7 @@
   KEYDB_SEARCH_DESC desc;
   char *f = NULL;
   char *freeme = NULL;
+  char *p;
 
   gpg_error_t err = classify_user_id (keyspec, &desc, 1);
   if (err)
@@ -351,9 +364,24 @@
       break;
 
     case KEYDB_SEARCH_MODE_MAIL:
-      if (! only_exact)
-	f = xasprintf ("(pgpUserID=*<%s>*)",
-		       (freeme = ldap_escape_filter (desc.u.name)));
+      freeme = ldap_escape_filter (desc.u.name);
+      if (!freeme)
+        break;
+      if (*freeme == '<' && freeme[1] && freeme[2])
+        {
+          /* Strip angle brackets.  Note that it is does not
+           * matter whether we work on the plan or LDAP escaped
+           * version of the mailbox.  */
+          p = freeme + 1;
+          if (p[strlen(p)-1] == '>')
+            p[strlen(p)-1] = 0;
+        }
+      else
+        p = freeme;
+      if ((serverinfo & SERVERINFO_SCHEMAV2))
+        f = xasprintf ("(gpgMailbox=%s)", p);
+      else if (!only_exact)
+        f = xasprintf ("(pgpUserID=*<%s>*)", p);
       break;
 
     case KEYDB_SEARCH_MODE_MAILSUB:
@@ -379,6 +407,19 @@
     case KEYDB_SEARCH_MODE_FPR16:
     case KEYDB_SEARCH_MODE_FPR20:
     case KEYDB_SEARCH_MODE_FPR:
+      if ((serverinfo & SERVERINFO_SCHEMAV2))
+        {
+          freeme = bin2hex (desc.u.fpr, 20, NULL);
+          if (!freeme)
+            return gpg_error_from_syserror ();
+          f = xasprintf ("(|(gpgFingerprint=%s)(gpgSubFingerprint=%s))",
+                         freeme, freeme);
+          /* FIXME: For an exact search and in case of a match on
+           * gpgSubFingerprint we need to check that there is only one
+           * matching value.  */
+        }
+      break;
+
     case KEYDB_SEARCH_MODE_ISSUER:
     case KEYDB_SEARCH_MODE_ISSUER_SN:
     case KEYDB_SEARCH_MODE_SN:
@@ -429,40 +470,44 @@
    The values are returned in the passed variables.  If you pass NULL,
    then the value won't be returned.  It is the caller's
    responsibility to release *LDAP_CONNP with ldap_unbind and xfree
-   *BASEDNP and *PGPKEYATTRP.
+   *BASEDNP.
 
    If this function successfully interrogated the server, it returns
    0.  If there was an LDAP error, it returns the LDAP error code.  If
    an error occurred, *basednp, etc., are undefined (and don't need to
    be freed.)
 
+   R_SERVERINFO receives information about the server.
+
    If no LDAP error occurred, you still need to check that *basednp is
    valid.  If it is NULL, then the server does not appear to be an
-   OpenPGP Keyserver.  In this case, you also do not need to xfree
-   *pgpkeyattrp.  */
+   OpenPGP Keyserver.  */
 static int
 my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
-                 char **basednp, char **pgpkeyattrp, int *real_ldapp)
+                 char **basednp, unsigned int *r_serverinfo)
 {
   int err = 0;
-
   LDAP *ldap_conn = NULL;
-
   char *user = uri->auth;
-  struct uri_tuple_s *password_param = uri_query_lookup (uri, "password");
-  char *password = password_param ? password_param->value : NULL;
-
+  struct uri_tuple_s *password_param;
+  char *password;
   char *basedn = NULL;
-  /* Whether to look for the pgpKey or pgpKeyv2 attribute.  */
-  char *pgpkeyattr = "pgpKey";
-  int real_ldap = 0;
-
-  log_debug ("my_ldap_connect(%s:%d/%s????%s%s%s%s%s)\n",
-	     uri->host, uri->port,
-	     uri->path ?: "",
-	     uri->auth ? "bindname=" : "", uri->auth ?: "",
-	     uri->auth && password ? "," : "",
-	     password ? "password=" : "", password ?: "");
+
+  *r_serverinfo = 0;
+
+  password_param = uri_query_lookup (uri, "password");
+  password = password_param ? password_param->value : NULL;
+
+  if (opt.debug)
+    log_debug ("my_ldap_connect(%s:%d/%s????%s%s%s%s%s%s)\n",
+               uri->host, uri->port,
+               uri->path ? uri->path : "",
+               uri->auth ? "bindname=" : "",
+               uri->auth ? uri->auth : "",
+               uri->auth && password ? "," : "",
+               password ? "password=" : "",
+               password ? ">not shown<": "",
+               uri->ad_current? " auth=>current_user<":"");
 
   /* If the uri specifies a secure connection and we don't support
      TLS, then fail; don't silently revert to an insecure
@@ -476,12 +521,18 @@
 #endif
     }
 
-  ldap_conn = ldap_init (uri->host, uri->port);
-  if (! ldap_conn)
+  if (uri->ad_current)
+    ldap_conn = ldap_init (NULL, uri->port);
+  else
+    ldap_conn = ldap_init (uri->host, uri->port);
+  if (!ldap_conn)
     {
       err = gpg_err_code_from_syserror ();
-      log_error ("Failed to open connection to LDAP server (%s://%s:%d)\n",
-		 uri->scheme, uri->host, uri->port);
+      if (uri->ad_current)
+        log_error ("error initializing LDAP for current user\n");
+      else
+        log_error ("error initializing LDAP for (%s://%s:%d)\n",
+                   uri->scheme, uri->host, uri->port);
       goto out;
     }
 
@@ -492,7 +543,7 @@
     err = ldap_set_option (ldap_conn, LDAP_OPT_PROTOCOL_VERSION, &ver);
     if (err != LDAP_SUCCESS)
       {
-	log_error ("gpgkeys: unable to go to LDAP 3: %s\n",
+	log_error ("ks-ldap: unable to go to LDAP 3: %s\n",
 		   ldap_err2string (err));
 	goto out;
       }
@@ -526,7 +577,7 @@
 			     LDAP_OPT_X_TLS_REQUIRE_CERT, &check_cert);
       if (err)
 	{
-	  log_error ("Failed to set TLS option on LDAP connection.\n");
+	  log_error ("error setting TLS option on LDAP connection\n");
 	  goto out;
 	}
 #else
@@ -537,6 +588,7 @@
 	 LDAP_OPT_SERVER_CERTIFICATE, ..); */
 #endif
 
+      npth_unprotect ();
       err = ldap_start_tls_s (ldap_conn,
 #ifdef HAVE_W32_SYSTEM
 			      /* ServerReturnValue, result */
@@ -544,71 +596,104 @@
 #endif
 			      /* ServerControls, ClientControls */
 			      NULL, NULL);
+      npth_protect ();
       if (err)
 	{
-	  log_error ("Failed to connect to LDAP server with TLS.\n");
+	  log_error ("error connecting to LDAP server with TLS\n");
 	  goto out;
 	}
     }
 #endif
 
-  /* By default we don't bind as there is usually no need to.  */
-  if (uri->auth)
+  if (uri->ad_current)
+    {
+      if (opt.debug)
+        log_debug ("LDAP bind to current user via AD\n");
+#ifdef HAVE_W32_SYSTEM
+      npth_unprotect ();
+      err = ldap_bind_s (ldap_conn, NULL, NULL, LDAP_AUTH_NEGOTIATE);
+      npth_protect ();
+#else
+      err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+#endif
+      if (err != LDAP_SUCCESS)
+	{
+	  log_error ("error binding to LDAP via AD: %s\n",
+                     ldap_err2string (err));
+	  goto out;
+	}
+    }
+  else if (uri->auth)
     {
-      log_debug ("LDAP bind to %s, password %s\n",
-		 user, password ? ">not shown<" : ">none<");
+      if (opt.debug)
+        log_debug ("LDAP bind to %s, password %s\n",
+                   user, password ? ">not shown<" : ">none<");
 
+      npth_unprotect ();
       err = ldap_simple_bind_s (ldap_conn, user, password);
+      npth_protect ();
       if (err != LDAP_SUCCESS)
 	{
-	  log_error ("Internal LDAP bind error: %s\n",
-		     ldap_err2string (err));
+	  log_error ("error binding to LDAP: %s\n", ldap_err2string (err));
 	  goto out;
 	}
     }
+  else
+    {
+      /* By default we don't bind as there is usually no need to.  */
+    }
 
   if (uri->path && *uri->path)
-    /* User specified base DN.  */
     {
+      /* User specified base DN.  */
       basedn = xstrdup (uri->path);
 
       /* If the user specifies a base DN, then we know the server is a
-	 real LDAP server.  */
-      real_ldap = 1;
+       * real LDAP server.  */
+      *r_serverinfo |= SERVERINFO_REALLDAP;
     }
   else
-    {
+    { /* Look for namingContexts.  */
       LDAPMessage *res = NULL;
-      /* Look for namingContexts.  */
       char *attr[] = { "namingContexts", NULL };
 
+      npth_unprotect ();
       err = ldap_search_s (ldap_conn, "", LDAP_SCOPE_BASE,
 			   "(objectClass=*)", attr, 0, &res);
+      npth_protect ();
+
       if (err == LDAP_SUCCESS)
 	{
-	  char **context = ldap_get_values (ldap_conn, res, "namingContexts");
+	  char **context;
+
+          npth_unprotect ();
+          context = ldap_get_values (ldap_conn, res, "namingContexts");
+          npth_protect ();
 	  if (context)
-	    /* We found some, so try each namingContext as the search
-	       base and look for pgpBaseKeySpaceDN.  Because we found
-	       this, we know we're talking to a regular-ish LDAP
-	       server and not an LDAP keyserver.  */
 	    {
+              /* We found some, so try each namingContext as the
+               * search base and look for pgpBaseKeySpaceDN.  Because
+               * we found this, we know we're talking to a regular-ish
+               * LDAP server and not an LDAP keyserver.  */
 	      int i;
 	      char *attr2[] =
 		{ "pgpBaseKeySpaceDN", "pgpVersion", "pgpSoftware", NULL };
 
-	      real_ldap = 1;
+              *r_serverinfo |= SERVERINFO_REALLDAP;
 
 	      for (i = 0; context[i] && ! basedn; i++)
 		{
 		  char **vals;
 		  LDAPMessage *si_res;
+                  int is_gnupg = 0;
 
                   {
                     char *object = xasprintf ("cn=pgpServerInfo,%s",
                                               context[i]);
+                    npth_unprotect ();
                     err = ldap_search_s (ldap_conn, object, LDAP_SCOPE_BASE,
                                          "(objectClass=*)", attr2, 0, &si_res);
+                    npth_protect ();
                     xfree (object);
                   }
 
@@ -626,7 +711,10 @@
 					      "pgpSoftware");
 		      if (vals)
 			{
-			  log_debug ("Server: \t%s\n", vals[0]);
+                          if (opt.debug)
+                            log_debug ("Server: \t%s\n", vals[0]);
+                          if (!ascii_strcasecmp (vals[0], "GnuPG"))
+                            is_gnupg = 1;
 			  ldap_value_free (vals);
 			}
 
@@ -634,7 +722,20 @@
 					      "pgpVersion");
 		      if (vals)
 			{
-			  log_debug ("Version:\t%s\n", vals[0]);
+                          if (opt.debug)
+                            log_debug ("Version:\t%s\n", vals[0]);
+                          if (is_gnupg)
+                            {
+                              char *fields[2];
+                              int nfields;
+                              nfields = split_fields (vals[0],
+                                                      fields, DIM(fields));
+                              if (nfields > 0 && atoi(fields[0]) > 1)
+                                *r_serverinfo |= SERVERINFO_SCHEMAV2;
+                              if (nfields > 1
+                                  && !ascii_strcasecmp (fields[1], "ntds"))
+                                *r_serverinfo |= SERVERINFO_NTDS;
+                            }
 			  ldap_value_free (vals);
 			}
 		    }
@@ -652,19 +753,21 @@
       else
 	{
 	  /* We don't have an answer yet, which means the server might
-	     be an LDAP keyserver. */
+	     be a PGP.com keyserver. */
 	  char **vals;
 	  LDAPMessage *si_res = NULL;
 
 	  char *attr2[] = { "pgpBaseKeySpaceDN", "version", "software", NULL };
 
+          npth_unprotect ();
 	  err = ldap_search_s (ldap_conn, "cn=pgpServerInfo", LDAP_SCOPE_BASE,
 			       "(objectClass=*)", attr2, 0, &si_res);
+          npth_protect ();
 	  if (err == LDAP_SUCCESS)
 	    {
-	      /* For the LDAP keyserver, this is always
-		 "OU=ACTIVE,O=PGP KEYSPACE,C=US", but it might not be
-		 in the future. */
+	      /* For the PGP LDAP keyserver, this is always
+	       * "OU=ACTIVE,O=PGP KEYSPACE,C=US", but it might not be
+               * in the future. */
 
 	      vals = ldap_get_values (ldap_conn, si_res, "baseKeySpaceDN");
 	      if (vals)
@@ -676,14 +779,16 @@
 	      vals = ldap_get_values (ldap_conn, si_res, "software");
 	      if (vals)
 		{
-		  log_debug ("ldap: Server: \t%s\n", vals[0]);
+                  if (opt.debug)
+                    log_debug ("ks-ldap: PGP Server: \t%s\n", vals[0]);
 		  ldap_value_free (vals);
 		}
 
 	      vals = ldap_get_values (ldap_conn, si_res, "version");
 	      if (vals)
 		{
-		  log_debug ("ldap: Version:\t%s\n", vals[0]);
+                  if (opt.debug)
+                    log_debug ("ks-ldap: PGP Server Version:\t%s\n", vals[0]);
 
 		  /* If the version is high enough, use the new
 		     pgpKeyV2 attribute.  This design is iffy at best,
@@ -692,7 +797,7 @@
 		     keyserver vendor with a different numbering
 		     scheme. */
 		  if (atoi (vals[0]) > 1)
-		    pgpkeyattr = "pgpKeyV2";
+                    *r_serverinfo |= SERVERINFO_PGPKEYV2;
 
 		  ldap_value_free (vals);
 		}
@@ -708,29 +813,20 @@
     }
 
  out:
-  if (! err)
+  if (!err && opt.debug)
     {
       log_debug ("ldap_conn: %p\n", ldap_conn);
-      log_debug ("real_ldap: %d\n", real_ldap);
+      log_debug ("server_type: %s\n", ((*r_serverinfo & SERVERINFO_REALLDAP)
+                                       ? "LDAP" : "PGP.com keyserver") );
       log_debug ("basedn: %s\n", basedn);
-      log_debug ("pgpkeyattr: %s\n", pgpkeyattr);
+      log_debug ("pgpkeyattr: %s\n",
+                 (*r_serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2":"pgpKey");
     }
 
-  if (! err && real_ldapp)
-    *real_ldapp = real_ldap;
-
   if (err)
     xfree (basedn);
   else
     {
-      if (pgpkeyattrp)
-	{
-	  if (basedn)
-	    *pgpkeyattrp = xstrdup (pgpkeyattr);
-	  else
-	    *pgpkeyattrp = NULL;
-	}
-
       if (basednp)
 	*basednp = basedn;
       else
@@ -760,7 +856,7 @@
   es_fprintf (output, "INFO %s BEGIN\n", certid);
   es_fprintf (output, "pub:%s:", certid);
 
-  /* Note: ldap_get_values returns a NULL terminates array of
+  /* Note: ldap_get_values returns a NULL terminated array of
      strings.  */
   vals = ldap_get_values (ldap_conn, message, "pgpkeytype");
   if (vals && vals[0])
@@ -836,16 +932,11 @@
 {
   gpg_error_t err = 0;
   int ldap_err;
-
+  unsigned int serverinfo;
   char *filter = NULL;
-
   LDAP *ldap_conn = NULL;
-
   char *basedn = NULL;
-  char *pgpkeyattr = NULL;
-
   estream_t fp = NULL;
-
   LDAPMessage *message = NULL;
 
   (void) ctrl;
@@ -857,48 +948,54 @@
       return gpg_error (GPG_ERR_NOT_SUPPORTED);
     }
 
-  /* Before connecting to the server, make sure we have a sane
-     keyspec.  If not, there is no need to establish a network
-     connection.  */
-  err = keyspec_to_ldap_filter (keyspec, &filter, 1);
-  if (err)
-    return (err);
-
   /* Make sure we are talking to an OpenPGP LDAP server.  */
-  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &pgpkeyattr, NULL);
+  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &serverinfo);
   if (ldap_err || !basedn)
     {
       if (ldap_err)
 	err = ldap_err_to_gpg_err (ldap_err);
       else
-	err = GPG_ERR_GENERAL;
+	err = gpg_error (GPG_ERR_GENERAL);
       goto out;
     }
 
+  /* Now that we have information about the server we can construct a
+   * query best suited for the capabilities of the server.  */
+  err = keyspec_to_ldap_filter (keyspec, &filter, 1, serverinfo);
+  if (err)
+    goto out;
+
+  if (opt.debug)
+    log_debug ("ks-ldap: using filter: %s\n", filter);
+
   {
     /* The ordering is significant.  Specifically, "pgpcertid" needs
        to be the second item in the list, since everything after it
        may be discarded we aren't in verbose mode. */
     char *attrs[] =
       {
-	pgpkeyattr,
+	"dummy",
 	"pgpcertid", "pgpuserid", "pgpkeyid", "pgprevoked", "pgpdisabled",
 	"pgpkeycreatetime", "modifytimestamp", "pgpkeysize", "pgpkeytype",
 	NULL
       };
     /* 1 if we want just attribute types; 0 if we want both attribute
-       types and values.  */
+     * types and values.  */
     int attrsonly = 0;
-
     int count;
 
+    /* Replace "dummy".  */
+    attrs[0] = (serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2" : "pgpKey";
+
+    npth_unprotect ();
     ldap_err = ldap_search_s (ldap_conn, basedn, LDAP_SCOPE_SUBTREE,
 			      filter, attrs, attrsonly, &message);
+    npth_protect ();
     if (ldap_err)
       {
 	err = ldap_err_to_gpg_err (ldap_err);
 
-	log_error ("gpgkeys: LDAP search error: %s\n",
+	log_error ("ks-ldap: LDAP search error: %s\n",
 		   ldap_err2string (ldap_err));
 	goto out;
       }
@@ -906,7 +1003,7 @@
     count = ldap_count_entries (ldap_conn, message);
     if (count < 1)
       {
-	log_error ("gpgkeys: key %s not found on keyserver\n", keyspec);
+	log_info ("ks-ldap: key %s not found on keyserver\n", keyspec);
 
 	if (count == -1)
 	  err = ldap_to_gpg_err (ldap_conn);
@@ -925,9 +1022,13 @@
       strlist_t seen = NULL;
       LDAPMessage *each;
 
-      for (each = ldap_first_entry (ldap_conn, message);
+      for (npth_unprotect (),
+             each = ldap_first_entry (ldap_conn, message),
+             npth_protect ();
 	   each;
-	   each = ldap_next_entry (ldap_conn, each))
+           npth_unprotect (),
+             each = ldap_next_entry (ldap_conn, each),
+             npth_protect ())
 	{
 	  char **vals;
 	  char **certid;
@@ -956,11 +1057,11 @@
 
 		  extract_keys (fp, ldap_conn, certid[0], each);
 
-		  vals = ldap_get_values (ldap_conn, each, pgpkeyattr);
+		  vals = ldap_get_values (ldap_conn, each, attrs[0]);
 		  if (! vals)
 		    {
 		      err = ldap_to_gpg_err (ldap_conn);
-		      log_error("gpgkeys: unable to retrieve key %s "
+		      log_error("ks-ldap: unable to retrieve key %s "
 				"from keyserver\n", certid[0]);
 		      goto out;
 		    }
@@ -1003,7 +1104,6 @@
       *r_fp = fp;
     }
 
-  xfree (pgpkeyattr);
   xfree (basedn);
 
   if (ldap_conn)
@@ -1014,6 +1114,7 @@
   return err;
 }
 
+
 /* Search the keyserver identified by URI for keys matching PATTERN.
    On success R_FP has an open stream to read the data.  */
 gpg_error_t
@@ -1022,13 +1123,10 @@
 {
   gpg_error_t err;
   int ldap_err;
-
+  unsigned int serverinfo;
   char *filter = NULL;
-
   LDAP *ldap_conn = NULL;
-
   char *basedn = NULL;
-
   estream_t fp = NULL;
 
   (void) ctrl;
@@ -1040,18 +1138,8 @@
       return gpg_error (GPG_ERR_NOT_SUPPORTED);
     }
 
-  /* Before connecting to the server, make sure we have a sane
-     keyspec.  If not, there is no need to establish a network
-     connection.  */
-  err = keyspec_to_ldap_filter (pattern, &filter, 0);
-  if (err)
-    {
-      log_error ("Bad search pattern: '%s'\n", pattern);
-      return (err);
-    }
-
   /* Make sure we are talking to an OpenPGP LDAP server.  */
-  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, NULL, NULL);
+  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &serverinfo);
   if (ldap_err || !basedn)
     {
       if (ldap_err)
@@ -1061,6 +1149,15 @@
       goto out;
     }
 
+  /* Now that we have information about the server we can construct a
+   * query best suited for the capabilities of the server.  */
+  err = keyspec_to_ldap_filter (pattern, &filter, 0, serverinfo);
+  if (err)
+    {
+      log_error ("Bad search pattern: '%s'\n", pattern);
+      goto out;
+    }
+
   /* Even if we have no results, we want to return a stream.  */
   fp = es_fopenmem(0, "rw");
   if (!fp)
@@ -1084,10 +1181,13 @@
 	"pgpkeysize", "pgpkeytype", NULL
       };
 
-    log_debug ("SEARCH '%s' => '%s' BEGIN\n", pattern, filter);
+    if (opt.debug)
+      log_debug ("SEARCH '%s' => '%s' BEGIN\n", pattern, filter);
 
+    npth_unprotect ();
     ldap_err = ldap_search_s (ldap_conn, basedn,
 			      LDAP_SCOPE_SUBTREE, filter, attrs, 0, &res);
+    npth_protect ();
 
     xfree (filter);
     filter = NULL;
@@ -1097,16 +1197,20 @@
 	err = ldap_err_to_gpg_err (ldap_err);
 
 	log_error ("SEARCH %s FAILED %d\n", pattern, err);
-	log_error ("gpgkeys: LDAP search error: %s\n",
+	log_error ("ks-ldap: LDAP search error: %s\n",
 		   ldap_err2string (err));
 	goto out;
     }
 
     /* The LDAP server doesn't return a real count of unique keys, so we
        can't use ldap_count_entries here. */
-    for (each = ldap_first_entry (ldap_conn, res);
+    for (npth_unprotect (),
+           each = ldap_first_entry (ldap_conn, res),
+           npth_protect ();
 	 each;
-	 each = ldap_next_entry (ldap_conn, each))
+         npth_unprotect (),
+           each = ldap_next_entry (ldap_conn, each),
+           npth_protect ())
       {
 	char **certid = ldap_get_values (ldap_conn, each, "pgpcertid");
 	if (certid && certid[0] && ! strlist_find (dupelist, certid[0]))
@@ -1119,10 +1223,10 @@
     if (ldap_err == LDAP_SIZELIMIT_EXCEEDED)
       {
 	if (count == 1)
-	  log_error ("gpgkeys: search results exceeded server limit."
+	  log_error ("ks-ldap: search results exceeded server limit."
 		     "  First 1 result shown.\n");
 	else
-	  log_error ("gpgkeys: search results exceeded server limit."
+	  log_error ("ks-ldap: search results exceeded server limit."
 		     "  First %d results shown.\n", count);
       }
 
@@ -1274,7 +1378,8 @@
     free_strlist (dupelist);
   }
 
-  log_debug ("SEARCH %s END\n", pattern);
+  if (opt.debug)
+    log_debug ("SEARCH %s END\n", pattern);
 
  out:
   if (err)
@@ -1614,15 +1719,16 @@
 
 /* Given one line from an info block (`gpg --list-{keys,sigs}
    --with-colons KEYID'), pull it apart and fill in the modlist with
-   the relevant (for the LDAP schema) attributes.  */
+   the relevant (for the LDAP schema) attributes.  EXTRACT_STATE
+   should initally be set to 0 by the caller.  SCHEMAV2 is set if the
+   server supports the version 2 schema.  */
 static void
-extract_attributes (LDAPMod ***modlist, char *line)
+extract_attributes (LDAPMod ***modlist, int *extract_state,
+                    char *line, int schemav2)
 {
   int field_count;
   char **fields;
-
   char *keyid;
-
   int is_pub, is_sub, is_uid, is_sig;
 
   /* Remove trailing whitespace */
@@ -1637,24 +1743,42 @@
   if (field_count < 7)
     goto out;
 
-  is_pub = strcasecmp ("pub", fields[0]) == 0;
-  is_sub = strcasecmp ("sub", fields[0]) == 0;
-  is_uid = strcasecmp ("uid", fields[0]) == 0;
-  is_sig = strcasecmp ("sig", fields[0]) == 0;
+  is_pub = !ascii_strcasecmp ("pub", fields[0]);
+  is_sub = !ascii_strcasecmp ("sub", fields[0]);
+  is_uid = !ascii_strcasecmp ("uid", fields[0]);
+  is_sig = !ascii_strcasecmp ("sig", fields[0]);
+  if (!ascii_strcasecmp ("fpr", fields[0]))
+    {
+      /* Special treatment for a fingerprint.  */
+      if (!(*extract_state & 1))
+        goto out;  /* Stray fingerprint line - ignore.  */
+      *extract_state &= ~1;
+      if (field_count >= 10 && schemav2)
+        {
+          if ((*extract_state & 2))
+            modlist_add (modlist, "gpgFingerprint", fields[9]);
+          else
+            modlist_add (modlist, "gpgSubFingerprint", fields[9]);
+        }
+      goto out;
+    }
+
+  *extract_state &= ~(1|2);
+  if (is_pub)
+    *extract_state |= (1|2);
+  else if (is_sub)
+    *extract_state |= 1;
 
   if (!is_pub && !is_sub && !is_uid && !is_sig)
-    /* Not a relevant line.  */
-    goto out;
+    goto out; /* Not a relevant line.  */
 
   keyid = fields[4];
 
   if (is_uid && strlen (keyid) == 0)
-    /* The uid record type can have an empty keyid.  */
-    ;
+    ; /* The uid record type can have an empty keyid.  */
   else if (strlen (keyid) == 16
 	   && strspn (keyid, "0123456789aAbBcCdDeEfF") == 16)
-    /* Otherwise, we expect exactly 16 hex characters.  */
-    ;
+    ; /* Otherwise, we expect exactly 16 hex characters.  */
   else
     {
       log_error ("malformed record!\n");
@@ -1733,15 +1857,12 @@
     {
       if (is_pub)
 	{
-	  modlist_add (modlist, "pgpCertID", keyid);
-	  modlist_add (modlist, "pgpKeyID", &keyid[8]);
+	  modlist_add (modlist, "pgpCertID", keyid);    /* Long keyid(!) */
+	  modlist_add (modlist, "pgpKeyID", &keyid[8]); /* Short keyid   */
 	}
 
       if (is_sub)
-	modlist_add (modlist, "pgpSubKeyID", keyid);
-
-      if (is_sig)
-	modlist_add (modlist, "pgpSignerID", keyid);
+        modlist_add (modlist, "pgpSubKeyID", keyid);    /* Long keyid(!)  */
     }
 
   if (is_pub)
@@ -1839,25 +1960,22 @@
 	}
     }
 
-  if ((is_uid || is_pub) && field_count >= 10)
+  if (is_uid && field_count >= 10)
     {
       char *uid = fields[9];
+      char *mbox;
 
-      if (is_pub && strlen (uid) == 0)
-	/* When using gpg --list-keys, the uid is included.  When
-	   passed via gpg, it is not.  It is important to process it
-	   when it is present, because gpg 1 won't print a UID record
-	   if there is only one key.  */
-	;
-      else
-	{
-	  uncescape (uid);
-	  modlist_add (modlist, "pgpUserID", uid);
-	}
+      uncescape (uid);
+      modlist_add (modlist, "pgpUserID", uid);
+      if (schemav2 && (mbox = mailbox_from_userid (uid)))
+        {
+          modlist_add (modlist, "gpgMailbox", mbox);
+          xfree (mbox);
+        }
     }
 
  out:
-  free (fields);
+  xfree (fields);
 }
 
 /* Send the key in {KEY,KEYLEN} with the metadata {INFO,INFOLEN} to
@@ -1870,16 +1988,13 @@
 {
   gpg_error_t err = 0;
   int ldap_err;
-
+  unsigned int serverinfo;
   LDAP *ldap_conn = NULL;
   char *basedn = NULL;
-  char *pgpkeyattr = NULL;
-  int real_ldap;
-
   LDAPMod **modlist = NULL;
   LDAPMod **addlist = NULL;
-
   char *data_armored = NULL;
+  int extract_state;
 
   /* The last byte of the info block.  */
   const char *infoend = (const char *) info + infolen - 1;
@@ -1903,8 +2018,7 @@
       return gpg_error (GPG_ERR_NOT_SUPPORTED);
     }
 
-  ldap_err = my_ldap_connect (uri,
-                              &ldap_conn, &basedn, &pgpkeyattr, &real_ldap);
+  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &serverinfo);
   if (ldap_err || !basedn)
     {
       if (ldap_err)
@@ -1914,22 +2028,31 @@
       goto out;
     }
 
-  if (! real_ldap)
-    /* We appear to have an OpenPGP Keyserver, which can unpack the key
-       on its own (not just a dumb LDAP server).  */
+  if (!(serverinfo & SERVERINFO_REALLDAP))
     {
-      LDAPMod mod, *attrs[2];
-      char *key[] = { data, NULL };
+      /* We appear to have a PGP.com Keyserver, which can unpack the
+       * key on its own (not just a dump LDAP server).  This will
+       * rarely be the case these days.  */
+      LDAPMod mod;
+      LDAPMod *attrs[2];
+      char *key[2];
       char *dn;
 
+      key[0] = data;
+      key[1] = NULL;
       memset (&mod, 0, sizeof (mod));
       mod.mod_op = LDAP_MOD_ADD;
-      mod.mod_type = pgpkeyattr;
+      mod.mod_type = (serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2":"pgpKey";
       mod.mod_values = key;
       attrs[0] = &mod;
       attrs[1] = NULL;
 
-      dn = xasprintf ("pgpCertid=virtual,%s", basedn);
+      dn = xtryasprintf ("pgpCertid=virtual,%s", basedn);
+      if (!dn)
+        {
+          err = gpg_error_from_syserror ();
+          goto out;
+        }
       ldap_err = ldap_add_s (ldap_conn, dn, attrs);
       xfree (dn);
 
@@ -1942,7 +2065,12 @@
       goto out;
     }
 
-  modlist = xmalloc (sizeof (LDAPMod *));
+  modlist = xtrymalloc (sizeof (LDAPMod *));
+  if (!modlist)
+    {
+      err = gpg_error_from_syserror ();
+      goto out;
+    }
   *modlist = NULL;
 
   if (dump_modlist)
@@ -1969,15 +2097,20 @@
   modlist_add (&modlist, "pgpKeyType", NULL);
   modlist_add (&modlist, "pgpUserID", NULL);
   modlist_add (&modlist, "pgpKeyCreateTime", NULL);
-  modlist_add (&modlist, "pgpSignerID", NULL);
   modlist_add (&modlist, "pgpRevoked", NULL);
   modlist_add (&modlist, "pgpSubKeyID", NULL);
   modlist_add (&modlist, "pgpKeySize", NULL);
   modlist_add (&modlist, "pgpKeyExpireTime", NULL);
   modlist_add (&modlist, "pgpCertID", NULL);
+  if ((serverinfo & SERVERINFO_SCHEMAV2))
+    {
+      modlist_add (&modlist, "gpgFingerprint", NULL);
+      modlist_add (&modlist, "gpgSubFingerprint", NULL);
+      modlist_add (&modlist, "gpgMailbox", NULL);
+    }
 
   /* Assemble the INFO stuff into LDAP attributes */
-
+  extract_state = 0;
   while (infolen > 0)
     {
       char *temp = NULL;
@@ -1995,17 +2128,18 @@
 
       *newline = '\0';
 
-      extract_attributes (&modlist, info);
+      extract_attributes (&addlist, &extract_state, info,
+                          (serverinfo & SERVERINFO_SCHEMAV2));
 
       infolen = infolen - ((uintptr_t) newline - (uintptr_t) info + 1);
       info = newline + 1;
 
       /* Sanity check.  */
       if (! temp)
-	assert ((char *) info + infolen - 1 == infoend);
+	log_assert ((char *) info + infolen - 1 == infoend);
       else
 	{
-	  assert (infolen == -1);
+	  log_assert (infolen == -1);
 	  xfree (temp);
 	}
     }
@@ -2016,7 +2150,9 @@
   if (err)
     goto out;
 
-  modlist_add (&addlist, pgpkeyattr, data_armored);
+  modlist_add (&addlist,
+               (serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2":"pgpKey",
+               data_armored);
 
   /* Now append addlist onto modlist.  */
   modlists_join (&modlist, addlist);
@@ -2039,31 +2175,56 @@
      keyserver) this does NOT merge signatures, but replaces the whole
      key.  This should make some people very happy. */
   {
-    char **certid;
+    char **attrval;
     char *dn;
 
-    certid = modlist_lookup (modlist, "pgpCertID");
-    if (/* We should have a value.  */
-	! certid
-	/* Exactly one.  */
-	|| !(certid[0] && !certid[1]))
+    if ((serverinfo & SERVERINFO_NTDS))
       {
-	log_error ("Bad certid.\n");
-	err = GPG_ERR_GENERAL;
-	goto out;
+        /* The modern way using a CN RDN with the fingerprint.  This
+         * has the advantage that we won't have duplicate 64 bit
+         * keyids in the store.  In particular NTDS requires the
+         * DN to be unique.  */
+        attrval = modlist_lookup (addlist, "gpgFingerprint");
+        /* We should have exactly one value.  */
+        if (!attrval || !(attrval[0] && !attrval[1]))
+          {
+            log_error ("ks-ldap: bad gpgFingerprint provided\n");
+            err = GPG_ERR_GENERAL;
+            goto out;
+          }
+        dn = xtryasprintf ("CN=%s,%s", attrval[0], basedn);
       }
+    else  /* The old style way.  */
+      {
+        attrval = modlist_lookup (addlist, "pgpCertID");
+        /* We should have exactly one value.  */
+        if (!attrval || !(attrval[0] && !attrval[1]))
+          {
+            log_error ("ks-ldap: bad pgpCertID provided\n");
+            err = GPG_ERR_GENERAL;
+            goto out;
+          }
+        dn = xtryasprintf ("pgpCertID=%s,%s", attrval[0], basedn);
+      }
+    if (!dn)
+      {
+        err = gpg_error_from_syserror ();
+        goto out;
+      }
+    if (opt.debug)
+      log_debug ("ks-ldap: using DN: %s\n", dn);
 
-    dn = xasprintf ("pgpCertID=%s,%s", certid[0], basedn);
-
+    npth_unprotect ();
     err = ldap_modify_s (ldap_conn, dn, modlist);
     if (err == LDAP_NO_SUCH_OBJECT)
       err = ldap_add_s (ldap_conn, dn, addlist);
+    npth_protect ();
 
     xfree (dn);
 
     if (err != LDAP_SUCCESS)
       {
-	log_error ("gpgkeys: error adding key to keyserver: %s\n",
+	log_error ("ks-ldap: error adding key to keyserver: %s\n",
 		   ldap_err2string (err));
 	err = ldap_err_to_gpg_err (err);
       }
@@ -2077,7 +2238,6 @@
     ldap_unbind (ldap_conn);
 
   xfree (basedn);
-  xfree (pgpkeyattr);
 
   modlist_free (modlist);
   xfree (addlist);
diff -Nru gnupg2-2.2.20/dirmngr/ldap.c gnupg2-2.2.27/dirmngr/ldap.c
--- gnupg2-2.2.20/dirmngr/ldap.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/ldap.c	2020-10-23 20:08:54.000000000 +0200
@@ -463,18 +463,19 @@
 }
 
 
-/* Prepare an LDAP query to return the attribute ATTR for the DN.  All
-   configured default servers are queried until one responds.  This
-   function returns an error code or 0 and a CONTEXT on success. */
+/* Prepare an LDAP query to return the cACertificate attribute for DN.
+ * All configured default servers are queried until one responds.
+ * This function returns an error code or 0 and stored a newly
+ * allocated contect object at CONTEXT on success. */
 gpg_error_t
-start_default_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *context,
-                          const char *dn, const char *attr)
+start_cacert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
+                         const char *dn)
 {
   gpg_error_t err;
   struct ldapserver_iter iter;
 
-  *context = xtrycalloc (1, sizeof **context);
-  if (!*context)
+  *r_context = xtrycalloc (1, sizeof **r_context);
+  if (!*r_context)
     return gpg_error_from_errno (errno);
 
   /* FIXME; we might want to look at the Base SN to try matching
@@ -488,30 +489,30 @@
 
       err = run_ldap_wrapper (ctrl,
                               0,
-                              1,
+                              1,  /* --multi (record format) */
                               opt.ldap_proxy,
                               server->host, server->port,
                               server->user, server->pass,
-                              dn, "objectClass=*", attr, NULL,
-                              &(*context)->reader);
+                              dn, "objectClass=*", "cACertificate", NULL,
+                              &(*r_context)->reader);
       if (!err)
         break; /* Probably found a result. */
     }
 
   if (err)
     {
-      xfree (*context);
-      *context = NULL;
+      xfree (*r_context);
+      *r_context = NULL;
     }
   return err;
 }
 
 
-/* Prepare an LDAP query to return certificates matching PATTERNS using
-   the SERVER.  This function returns an error code or 0 and a CONTEXT
-   on success. */
+/* Prepare an LDAP query to return certificates matching PATTERNS
+ * using the SERVER.  This function returns an error code or 0 and
+ * stores a newly allocated object at R_CONTEXT on success. */
 gpg_error_t
-start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *context,
+start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
                        strlist_t patterns, const ldap_server_t server)
 {
   gpg_error_t err;
@@ -527,7 +528,7 @@
   char portbuf[30], timeoutbuf[30];
 
 
-  *context = NULL;
+  *r_context = NULL;
 
   if (opt.ldap_proxy && !(proxy = xtrystrdup (opt.ldap_proxy)))
     {
@@ -639,19 +640,19 @@
     }
   argv[argc] = NULL;
 
-  *context = xtrycalloc (1, sizeof **context);
-  if (!*context)
+  *r_context = xtrycalloc (1, sizeof **r_context);
+  if (!*r_context)
     {
       err = gpg_error_from_errno (errno);
       goto leave;
     }
 
-  err = ldap_wrapper (ctrl, &(*context)->reader, (const char**)argv);
+  err = ldap_wrapper (ctrl, &(*r_context)->reader, (const char**)argv);
 
   if (err)
     {
-      xfree (*context);
-      *context = NULL;
+      xfree (*r_context);
+      *r_context = NULL;
     }
 
  leave:
@@ -711,8 +712,7 @@
       n = buf32_to_ulong (hdr+1);
       if (*hdr == 'V' && okay)
         {
-#if 0  /* That code is not yet ready.  */
-
+#if 0  /* That code to extra a cert from a CMS object is not yet ready.  */
           if (is_cms)
             {
               /* The certificate needs to be parsed from CMS data. */
@@ -759,7 +759,7 @@
                 any = 1;
             }
           else
-#endif
+#endif /* End unfinished code to extract from a CMS object.  */
             {
               *value = xtrymalloc (n);
               if (!*value)
diff -Nru gnupg2-2.2.20/dirmngr/ldap-parse-uri.c gnupg2-2.2.27/dirmngr/ldap-parse-uri.c
--- gnupg2-2.2.20/dirmngr/ldap-parse-uri.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/ldap-parse-uri.c	2020-12-18 11:22:00.000000000 +0100
@@ -54,7 +54,7 @@
 	      && (url[3] == 'p' || url[3] == 'P')
 	      && (url[4] == ':'
 		  || ((url[4] == 's' || url[4] == 'S'
-		       || url[4] == 'i' || url[4] == 'i')
+		       || url[4] == 'i' || url[4] == 'I')
 		      && url[5] == ':'))))
 	return 1;
       return 0;
@@ -176,9 +176,21 @@
       puri->query->valuelen = strlen (password) + 1;
     }
 
-  puri->use_tls = strcmp (puri->scheme, "ldaps") == 0;
+  puri->use_tls = !strcmp (puri->scheme, "ldaps");
   puri->port = lud->lud_port;
 
+  /* On Windows detect whether this is ldap:// or ldaps:// to indicate
+   * that authentication via AD and the current user is requested.  */
+  puri->ad_current = 0;
+#ifdef HAVE_W32_SYSTEM
+  if ((!puri->host || !*puri->host)
+      && (!puri->path || !*puri->path)
+      && (!puri->auth || !*puri->auth)
+      && !password
+      )
+    puri->ad_current = 1;
+#endif
+
  out:
   if (lud)
     ldap_free_urldesc (lud);
diff -Nru gnupg2-2.2.20/dirmngr/Makefile.am gnupg2-2.2.27/dirmngr/Makefile.am
--- gnupg2-2.2.20/dirmngr/Makefile.am	2019-11-18 18:44:30.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/Makefile.am	2020-10-23 20:08:54.000000000 +0200
@@ -21,7 +21,10 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem
+EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem \
+             dirmngr-w32info.rc dirmngr.w32-manifest.in
+
+
 dist_pkgdata_DATA = sks-keyservers.netCA.pem
 
 bin_PROGRAMS = dirmngr dirmngr-client
@@ -31,7 +34,11 @@
 endif
 
 noinst_PROGRAMS = $(module_tests) $(module_net_tests) $(module_maint_tests)
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = $(module_tests) $(module_net_tests)
+endif
 
 AM_CPPFLAGS =
 
@@ -82,11 +89,19 @@
 ldaplibs =
 endif
 
+if HAVE_W32_SYSTEM
+dirmngr_robjs = $(resource_objs) dirmngr-w32info.o
+dirmngr-w32info.o : dirmngr.w32-manifest
+else
+dirmngr_robjs =
+endif
+
 
 dirmngr_LDADD = $(libcommonpth) \
         $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
-	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
+	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
+        $(dirmngr_robj)
 if USE_LDAP
 dirmngr_LDADD += $(ldaplibs)
 endif
diff -Nru gnupg2-2.2.20/dirmngr/Makefile.in gnupg2-2.2.27/dirmngr/Makefile.in
--- gnupg2-2.2.20/dirmngr/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -132,7 +132,7 @@
 bin_PROGRAMS = dirmngr$(EXEEXT) dirmngr-client$(EXEEXT)
 @USE_LDAPWRAPPER_TRUE@libexec_PROGRAMS = dirmngr_ldap$(EXEEXT)
 noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
-TESTS = $(am__EXEEXT_2) $(am__EXEEXT_3)
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\""            \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""    \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\""  \
@@ -181,7 +181,7 @@
 	$(noinst_HEADERS) $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = dirmngr.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(pkgdatadir)"
@@ -229,7 +229,8 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_4)
 dirmngr_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dirmngr_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_dirmngr_client_OBJECTS = dirmngr-client.$(OBJEXT)
@@ -474,7 +475,8 @@
     std=''; \
   fi; \
 }
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/am/cmacros.am \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/dirmngr.w32-manifest.in $(top_srcdir)/am/cmacros.am \
 	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -486,6 +488,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -652,6 +655,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -660,7 +664,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem
+EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem \
+             dirmngr-w32info.rc dirmngr.w32-manifest.in
+
 dist_pkgdata_DATA = sks-keyservers.netCA.pem
 
 # NB: AM_CFLAGS may also be used by tools running on the build
@@ -705,10 +711,12 @@
 	$(am__append_9)
 @USE_LDAP_FALSE@ldaplibs = 
 @USE_LDAP_TRUE@ldaplibs = $(LDAPLIBS)
+@HAVE_W32_SYSTEM_FALSE@dirmngr_robjs = 
+@HAVE_W32_SYSTEM_TRUE@dirmngr_robjs = $(resource_objs) dirmngr-w32info.o
 dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) \
-	$(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(am__append_10) \
-	$(am__append_11)
+	$(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
+	$(dirmngr_robj) $(am__append_10) $(am__append_11)
 dirmngr_LDFLAGS = $(extra_bin_ldflags)
 @USE_LDAPWRAPPER_TRUE@dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
 @USE_LDAPWRAPPER_TRUE@dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
@@ -810,6 +818,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+dirmngr.w32-manifest: $(top_builddir)/config.status $(srcdir)/dirmngr.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1818,6 +1828,7 @@
 
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+@HAVE_W32_SYSTEM_TRUE@dirmngr-w32info.o : dirmngr.w32-manifest
 
 $(PROGRAMS) : $(libcommon) $(libcommonpth)
 
diff -Nru gnupg2-2.2.20/dirmngr/misc.c gnupg2-2.2.27/dirmngr/misc.c
--- gnupg2-2.2.20/dirmngr/misc.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/misc.c	2020-05-12 18:23:19.000000000 +0200
@@ -284,7 +284,7 @@
       else
         {
           log_printf ( "[ ");
-          log_printhex (NULL, string, strlen (string));
+          log_printhex (string, strlen (string), NULL);
           log_printf ( " ]");
         }
     }
diff -Nru gnupg2-2.2.20/dirmngr/ocsp.c gnupg2-2.2.27/dirmngr/ocsp.c
--- gnupg2-2.2.20/dirmngr/ocsp.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/ocsp.c	2020-04-15 15:45:25.000000000 +0200
@@ -305,7 +305,7 @@
       if (opt.verbose)
         log_info (_("OCSP responder at '%s' status: %s\n"), url, t);
 
-      /* Get the signature value now because we can all this fucntion
+      /* Get the signature value now because we can call this function
        * only once.  */
       *r_sigval = ksba_ocsp_get_sig_val (ocsp, r_produced_at);
 
diff -Nru gnupg2-2.2.20/dirmngr/server.c gnupg2-2.2.27/dirmngr/server.c
--- gnupg2-2.2.20/dirmngr/server.c	2019-12-07 11:41:22.000000000 +0100
+++ gnupg2-2.2.27/dirmngr/server.c	2020-12-18 11:22:00.000000000 +0100
@@ -2526,7 +2526,7 @@
   "  INQUIRE KEYBLOCK_INFO\n"
   "\n"
   "The client shall respond with a colon delimited info lines (the output\n"
-  "of 'for x in keys sigs; do gpg --list-$x --with-colons KEYID; done').\n";
+  "of 'gpg --list-keys --with-colons KEYID').\n";
 static gpg_error_t
 cmd_ks_put (assuan_context_t ctx, char *line)
 {
@@ -2559,8 +2559,7 @@
       goto leave;
     }
 
-  /* Ask for the key meta data. Not actually needed for HKP servers
-     but we do it anyway to test the client implementation.  */
+  /* Ask for the key meta data.  */
   err = assuan_inquire (ctx, "KEYBLOCK_INFO",
                         &info, &infolen, MAX_KEYBLOCK_LENGTH);
   if (err)
@@ -2718,7 +2717,7 @@
 
   ctrl->server_local->stopme = 1;
   assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
-  return gpg_error (GPG_ERR_EOF);
+  return 0;
 }
 
 
diff -Nru gnupg2-2.2.20/dirmngr/validate.c gnupg2-2.2.27/dirmngr/validate.c
--- gnupg2-2.2.20/dirmngr/validate.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/dirmngr/validate.c	2020-04-15 15:45:58.000000000 +0200
@@ -888,6 +888,53 @@
 }
 
 
+/* Return the hash algorithm's algo id from its name given in the
+ * non-null termnated string in (buffer,buflen).  Returns 0 on failure
+ * or if the algo is not known.  */
+static int
+hash_algo_from_buffer (const void *buffer, size_t buflen)
+{
+  char *string;
+  int algo;
+
+  string = xtrymalloc (buflen + 1);
+  if (!string)
+    {
+      log_error (_("out of core\n"));
+      return 0;
+    }
+  memcpy (string, buffer, buflen);
+  string[buflen] = 0;
+  algo = gcry_md_map_name (string);
+  if (!algo)
+    log_error ("unknown digest algorithm '%s' used in certificate\n", string);
+  xfree (string);
+  return algo;
+}
+
+
+/* Return an unsigned integer from the non-null termnated string
+ * (buffer,buflen).  Returns 0 on failure.  */
+static unsigned int
+uint_from_buffer (const void *buffer, size_t buflen)
+{
+  char *string;
+  unsigned int val;
+
+  string = xtrymalloc (buflen + 1);
+  if (!string)
+    {
+      log_error (_("out of core\n"));
+      return 0;
+    }
+  memcpy (string, buffer, buflen);
+  string[buflen] = 0;
+  val = strtoul (string, NULL, 10);
+  xfree (string);
+  return val;
+}
+
+
 /* Check the signature on CERT using the ISSUER_CERT.  This function
  * does only test the cryptographic signature and nothing else.  It is
  * assumed that the ISSUER_CERT is valid.  */
@@ -897,45 +944,26 @@
   gpg_error_t err;
   const char *algoid;
   gcry_md_hd_t md;
-  int i, algo;
+  int algo;
   ksba_sexp_t p;
   size_t n;
   gcry_sexp_t s_sig, s_hash, s_pkey;
-  const char *s;
-  char algo_name[16+1]; /* hash algorithm name converted to lower case. */
+  const char *algo_name; /* hash algorithm name converted to lower case. */
   int digestlen;
   unsigned char *digest;
+  int use_pss = 0;
+  unsigned int saltlen;
 
   /* Hash the target certificate using the algorithm from that certificate.  */
   algoid = ksba_cert_get_digest_algo (cert);
   algo = gcry_md_map_name (algoid);
-  if (!algo)
+  if (!algo && algoid && !strcmp (algoid, "1.2.840.113549.1.1.10"))
+    use_pss = 1;
+  else if (!algo)
     {
       log_error (_("unknown hash algorithm '%s'\n"), algoid? algoid:"?");
       return gpg_error (GPG_ERR_GENERAL);
     }
-  s = gcry_md_algo_name (algo);
-  for (i=0; *s && i < sizeof algo_name - 1; s++, i++)
-    algo_name[i] = tolower (*s);
-  algo_name[i] = 0;
-
-  err = gcry_md_open (&md, algo, 0);
-  if (err)
-    {
-      log_error ("md_open failed: %s\n", gpg_strerror (err));
-      return err;
-    }
-  if (DBG_HASHING)
-    gcry_md_debug (md, "hash.cert");
-
-  err = ksba_cert_hash (cert, 1, HASH_FNC, md);
-  if (err)
-    {
-      log_error ("ksba_cert_hash failed: %s\n", gpg_strerror (err));
-      gcry_md_close (md);
-      return err;
-    }
-  gcry_md_final (md);
 
   /* Get the signature value out of the target certificate.  */
   p = ksba_cert_get_sig_val (cert);
@@ -943,27 +971,96 @@
   if (!n)
     {
       log_error ("libksba did not return a proper S-Exp\n");
-      gcry_md_close (md);
       ksba_free (p);
       return gpg_error (GPG_ERR_BUG);
     }
+  err = gcry_sexp_sscan ( &s_sig, NULL, p, n);
+  ksba_free (p);
+  if (err)
+    {
+      log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (err));
+      return err;
+    }
   if (DBG_CRYPTO)
+    gcry_log_debugsxp ("sigval", s_sig);
+
+  if (use_pss)
+    {
+      /* Extract the hash algorithm and the salt length from the sigval.  */
+      gcry_buffer_t ioarray[2] = { {0}, {0} };
+
+      err = gcry_sexp_extract_param (s_sig, "sig-val",
+                                    "&'hash-algo''salt-length'",
+                                    ioarray+0, ioarray+1, NULL);
+      if (err)
+        {
+          gcry_sexp_release (s_sig);
+          log_error ("extracting params from PSS failed: %s\n",
+                     gpg_strerror (err));
+          return err;
+        }
+      algo = hash_algo_from_buffer (ioarray[0].data, ioarray[0].len);
+      saltlen = uint_from_buffer (ioarray[1].data, ioarray[1].len);
+      xfree (ioarray[0].data);
+      xfree (ioarray[1].data);
+      if (saltlen < 20)
+        {
+          log_error ("length of PSS salt too short\n");
+          gcry_sexp_release (s_sig);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+      if (!algo)
+        {
+          gcry_sexp_release (s_sig);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+      /* Add some restrictions; see ../sm/certcheck.c for details.  */
+      switch (algo)
+        {
+        case GCRY_MD_SHA1:
+        case GCRY_MD_SHA256:
+        case GCRY_MD_SHA384:
+        case GCRY_MD_SHA512:
+        case GCRY_MD_SHA3_256:
+        case GCRY_MD_SHA3_384:
+        case GCRY_MD_SHA3_512:
+          break;
+        default:
+          log_error ("PSS hash algorithm '%s' rejected\n",
+                     gcry_md_algo_name (algo));
+          gcry_sexp_release (s_sig);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+
+      if (gcry_md_get_algo_dlen (algo) != saltlen)
+        {
+          log_error ("PSS hash algorithm '%s' rejected due to salt length %u\n",
+                     gcry_md_algo_name (algo), saltlen);
+          gcry_sexp_release (s_sig);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+    }
+
+  algo_name = hash_algo_to_string (algo);
+  err = gcry_md_open (&md, algo, 0);
+  if (err)
     {
-      int j;
-      log_debug ("signature value:");
-      for (j=0; j < n; j++)
-        log_printf (" %02X", p[j]);
-      log_printf ("\n");
+      log_error ("md_open failed: %s\n", gpg_strerror (err));
+      gcry_sexp_release (s_sig);
+      return err;
     }
+  if (DBG_HASHING)
+    gcry_md_debug (md, "hash.cert");
 
-  err = gcry_sexp_sscan ( &s_sig, NULL, p, n);
-  ksba_free (p);
+  err = ksba_cert_hash (cert, 1, HASH_FNC, md);
   if (err)
     {
-      log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (err));
+      log_error ("ksba_cert_hash failed: %s\n", gpg_strerror (err));
       gcry_md_close (md);
+      gcry_sexp_release (s_sig);
       return err;
     }
+  gcry_md_final (md);
 
   /* Get the public key from the issuer certificate.  */
   p = ksba_cert_get_public_key (issuer_cert);
@@ -994,10 +1091,22 @@
    * S_SIG     - Signature value as given in the certificate.
    * MD        - Finalized hash context with hash of the certificate.
    * ALGO_NAME - Lowercase hash algorithm name
+   * SALTLEN   - Salt length for rsaPSS.
    */
   digestlen = gcry_md_get_algo_dlen (algo);
   digest = gcry_md_read (md, algo);
-  if (pk_algo_from_sexp (s_pkey) == GCRY_PK_DSA)
+  if (use_pss)
+    {
+      err = gcry_sexp_build (&s_hash, NULL,
+                             "(data (flags pss)"
+                             "(hash %s %b)"
+                             "(salt-length %u))",
+                             algo_name,
+                             (int)digestlen,
+                             digest,
+                             saltlen);
+    }
+  else if (pk_algo_from_sexp (s_pkey) == GCRY_PK_DSA)
     {
       /* NB.: We support only SHA-1 here because we had problems back
        * then to get test data for DSA-2.  Meanwhile DSA has been
@@ -1010,19 +1119,17 @@
           gcry_sexp_release (s_pkey);
           return gpg_error (GPG_ERR_INTERNAL);
         }
-      if ( gcry_sexp_build (&s_hash, NULL, "(data(flags raw)(value %b))",
-                            (int)digestlen, digest) )
-        BUG ();
+      err = gcry_sexp_build (&s_hash, NULL, "(data(flags raw)(value %b))",
+                             (int)digestlen, digest);
     }
   else /* Not DSA - we assume RSA  */
     {
-      if ( gcry_sexp_build (&s_hash, NULL, "(data(flags pkcs1)(hash %s %b))",
-                            algo_name, (int)digestlen, digest) )
-        BUG ();
-
+      err = gcry_sexp_build (&s_hash, NULL, "(data(flags pkcs1)(hash %s %b))",
+                             algo_name, (int)digestlen, digest);
     }
 
-  err = gcry_pk_verify (s_sig, s_hash, s_pkey);
+  if (!err)
+    err = gcry_pk_verify (s_sig, s_hash, s_pkey);
   if (DBG_X509)
     log_debug ("gcry_pk_verify: %s\n", gpg_strerror (err));
   gcry_md_close (md);
diff -Nru gnupg2-2.2.20/doc/defsincdate gnupg2-2.2.27/doc/defsincdate
--- gnupg2-2.2.20/doc/defsincdate	2020-03-20 16:38:30.000000000 +0100
+++ gnupg2-2.2.27/doc/defsincdate	2021-01-11 18:47:23.000000000 +0100
@@ -1 +1 @@
-1584536477
+1608567881
diff -Nru gnupg2-2.2.20/doc/DETAILS gnupg2-2.2.27/doc/DETAILS
--- gnupg2-2.2.20/doc/DETAILS	2020-03-03 11:56:29.000000000 +0100
+++ gnupg2-2.2.27/doc/DETAILS	2020-11-09 12:57:13.000000000 +0100
@@ -61,6 +61,7 @@
     - rev :: Revocation signature
     - rvs :: Recocation signature (standalone) [since 2.2.9]
     - fpr :: Fingerprint (fingerprint is in field 10)
+    - fp2 :: SHA-256 fingerprint (fingerprint is in field 10)
     - pkd :: Public key data [*]
     - grp :: Keygrip
     - rvk :: Revocation key
@@ -168,8 +169,8 @@
     (the colon is quoted =\x3a=).  For a "pub" record this field is
     not used on --fixed-list-mode.  A UAT record puts the attribute
     subpacket count here, a space, and then the total attribute
-    subpacket size.  In gpgsm the issuer name comes here.  A FPR
-    record stores the fingerprint here.  The fingerprint of a
+    subpacket size.  In gpgsm the issuer name comes here.  The FPR and FP2
+    records store the fingerprints here.  The fingerprint of a
     revocation key is stored here.
 
 *** Field 11 - Signature class
@@ -545,9 +546,10 @@
     actual key used for descryption.  <fpr2> is the fingerprint of the
     primary key.  <otrust> is the letter with the ownertrust; this is
     in general a 'u' which stands for ultimately trusted.
-*** DECRYPTION_INFO <mdc_method> <sym_algo>
+*** DECRYPTION_INFO <mdc_method> <sym_algo> [<aead_algo>]
     Print information about the symmetric encryption algorithm and the
     MDC method.  This will be emitted even if the decryption fails.
+    For an AEAD algorithm AEAD_ALGO is not 0.
 
 *** DECRYPTION_FAILED
     The symmetric decryption failed - one reason could be a wrong
@@ -1101,6 +1103,7 @@
            - learncard :: Send by the agent and gpgsm while learing
                           the data of a smartcard.
            - card_busy :: A smartcard is still working
+           - scd_locked :: Waiting for other clients to unlock the scdaemon
 
     When <what> refers to a file path, it may be truncated.
 
@@ -1138,6 +1141,38 @@
 *** BEGIN_STREAM, END_STREAM
     Used to issued by the experimental pipemode.
 
+** Inter-component codes
+   Status codes are also used between the components of the GnuPG
+   system via the Assuan S lines.  Some of them are documented here:
+
+*** PUBKEY_INFO <n> <ubid>
+    The type of the public key in the following D-lines or
+    communicated via a pipe.  <n> is the value of =enum pubkey_types=
+    and <ubid> the Unique Blob ID (UBID) which is the fingerprint of
+    the primary key truncated to 20 octets and formatted in hex.  Note
+    that the keyboxd SEARCH command can be used to lookup the public
+    key using the <ubid> prefixed with a caret (^).
+
+*** KEYPAIRINFO <grip> <keyref> [<usage>] [<keytime>]
+
+    This status is emitted by scdaemon and gpg-agent to convey brief
+    information about keypairs stored on tokens.  <grip> is the
+    hexified keygrip of the key or, if no key is stored, an "X".
+    <keyref> is the ID of a card's key; for example "OPENPGP.2" for
+    the second key slot of an OpenPGP card.  <usage> is optional and
+    returns technically possible key usages, this is a string of
+    single letters describing the usage ('c' for certify, 'e' for
+    encryption, 's' for signing, 'a' for authentication). A '-' can be
+    used to tell that usage flags are not conveyed.  <keytime> is used
+    by OpenPGP cards for the stored key creation time.  A '-' means no
+    info available.  The format is the usual ISO string are a number
+    with the seconds since Epoch.
+*** MANUFACTURER <n> [<string>]
+
+    This status returns the Manufactorer ID as the unsigned number N.
+    For OpenPGP this is weel defined; for other cards this is 0.  The
+    name of the manufacturer is also given as <string>; spaces are not
+    escaped.  For PKCS#15 cards <string> is TokenInfo.manufactorerID.
 
 * Format of the --attribute-fd output
 
@@ -1393,7 +1428,7 @@
                - 5 :: Import from a trusted URL.
                - 6 :: Import from a trusted file.
                - 7 :: Self generated.
-  - 4 octets :: Time of last update.  This is a a four-octet scalar
+  - 4 octets :: Time of last update.  This is a four-octet scalar
                 with the seconds since Epoch.
   - 1 octet  :: Scalar with the length of the following field.
   - N octets :: String with the URL of the source.  This may be a
diff -Nru gnupg2-2.2.20/doc/dirmngr.texi gnupg2-2.2.27/doc/dirmngr.texi
--- gnupg2-2.2.20/doc/dirmngr.texi	2019-11-23 20:29:57.000000000 +0100
+++ gnupg2-2.2.27/doc/dirmngr.texi	2020-12-21 17:24:41.000000000 +0100
@@ -328,7 +328,26 @@
 done for each new connection.
 
 If no keyserver is explicitly configured, dirmngr will use the
-built-in default of hkps://hkps.pool.sks-keyservers.net.
+built-in default of @code{hkps://hkps.pool.sks-keyservers.net}.
+
+Windows users with a keyserver running on their Active Directory
+should use @code{ldap:///} for @var{name} to access this directory.
+
+For accessing anonymous LDAP keyservers @var{name} is in general just
+a @code{ldaps://ldap.example.com}.  A BaseDN parameter should never be
+specified.  If authentication is required the value of @var{name} is
+for example:
+
+@example
+       keyserver ldaps://ldap.example.com/????bindname=uid=USERNAME
+       %2Cou=GnuPG%20Users%2Cdc=example%2Cdc=com,password=PASSWORD
+@end example
+
+       Put this all on one line without any spaces and keep the '%2C' as given.
+       Replace USERNAME, PASSWORD, and the 'dc' parts according to the
+       instructions received from the LDAP administrator.  Note that only
+       simple authentication (i.e. cleartext passwords) is supported and thus
+       using ldaps is strongly suggested.
 
 @item --nameserver @var{ipaddr}
 @opindex nameserver
diff -Nru gnupg2-2.2.20/doc/examples/Automatic.prf gnupg2-2.2.27/doc/examples/Automatic.prf
--- gnupg2-2.2.20/doc/examples/Automatic.prf	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/doc/examples/Automatic.prf	2020-11-04 16:32:20.000000000 +0100
@@ -0,0 +1,15 @@
+# Automatic.prf - Configure options for a more automatic mode  -*- conf -*-
+#
+# The options for each tool are configured in a section ("[TOOL]");
+# see the respective man page for a description of these options and
+# the gpgconf manpage for a description of this file's syntax.
+
+[gpg]
+auto-key-locate local,wkd,dane
+auto-key-retrieve
+trust-model tofu+pgp$\r$\n'
+
+[gpg-agent]
+default-cache-ttl 900
+max-cache-ttl 3600
+min-passphrase-nonalpha 0
diff -Nru gnupg2-2.2.20/doc/examples/vsnfd.prf gnupg2-2.2.27/doc/examples/vsnfd.prf
--- gnupg2-2.2.20/doc/examples/vsnfd.prf	2018-04-23 08:38:04.000000000 +0200
+++ gnupg2-2.2.27/doc/examples/vsnfd.prf	1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-# vsnfd.prf - Configure options for the VS-NfD mode           -*- conf -*-
-#
-# The options for each tool are configured in a section ("[TOOL]");
-# see the respective man page for a description of these options and
-# the gpgconf manpage for a description of this file's syntax.
-
-[gpg]
-compliance de-vs
-default-new-key-algo rsa3072/cert,sign+rsa3072/encr
-
-[gpgsm]
-compliance de-vs
-enable-crl-checks
-
-[gpg-agent]
-enable-extended-key-format
-default-cache-ttl 900
-max-cache-ttl 3600
-no-allow-mark-trusted
-no-allow-external-cache
-enforce-passphrase-constraints
-min-passphrase-len 9
-min-passphrase-nonalpha 0
-
-[dirmngr]
-allow-ocsp
diff -Nru gnupg2-2.2.20/doc/examples/VS-NfD.prf gnupg2-2.2.27/doc/examples/VS-NfD.prf
--- gnupg2-2.2.20/doc/examples/VS-NfD.prf	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/doc/examples/VS-NfD.prf	2020-11-04 16:32:20.000000000 +0100
@@ -0,0 +1,24 @@
+# VS-NfD.prf - Configure options for the VS-NfD mode           -*- conf -*-
+#
+# The options for each tool are configured in a section ("[TOOL]");
+# see the respective man page for a description of these options and
+# the gpgconf manpage for a description of this file's syntax.
+
+[gpg]
+compliance de-vs
+
+[gpgsm]
+compliance de-vs
+enable-crl-checks
+
+[gpg-agent]
+default-cache-ttl 900
+max-cache-ttl 3600
+no-allow-mark-trusted
+no-allow-external-cache
+enforce-passphrase-constraints
+min-passphrase-len 9
+min-passphrase-nonalpha 0
+
+[dirmngr]
+allow-ocsp
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/doc/gnupg-card-architecture.pdf et /tmp/xF6ffeaI4R/gnupg2-2.2.27/doc/gnupg-card-architecture.pdf sont différents
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/doc/gnupg-card-architecture.png et /tmp/xF6ffeaI4R/gnupg2-2.2.27/doc/gnupg-card-architecture.png sont différents
diff -Nru gnupg2-2.2.20/doc/gnupg.info gnupg2-2.2.27/doc/gnupg.info
--- gnupg2-2.2.20/doc/gnupg.info	2020-03-18 14:01:34.000000000 +0100
+++ gnupg2-2.2.27/doc/gnupg.info	2020-12-21 17:26:56.000000000 +0100
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.20-beta6, March
-2020).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.26-beta25,
+December 2020).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -23,203 +23,202 @@
 
 
 Indirect:
-gnupg.info-1: 988
-gnupg.info-2: 301351
+gnupg.info-1: 992
+gnupg.info-2: 301197
 
 Tag Table:
 (Indirect)
-Node: Top988
-Node: Installation2913
-Node: Invoking GPG-AGENT5262
-Node: Agent Commands7028
-Node: Agent Options8832
-Ref: option --options9112
-Ref: option --homedir9438
-Ref: option --log-file14479
-Ref: option --no-allow-mark-trusted14852
-Ref: option --allow-preset-passphrase15056
-Ref: option --no-allow-loopback-pinentry15209
-Ref: option --extra-socket22597
-Ref: option --enable-extended-key-format23274
-Ref: option --enable-ssh-support23762
-Ref: option --ssh-fingerprint-digest26099
-Node: Agent Configuration27756
-Node: Agent Signals33154
-Node: Agent Examples34614
-Node: Agent Protocol35181
-Node: Agent PKDECRYPT37335
-Node: Agent PKSIGN39247
-Node: Agent GENKEY41551
-Node: Agent IMPORT43448
-Node: Agent EXPORT43892
-Node: Agent ISTRUSTED44107
-Node: Agent GET_PASSPHRASE46482
-Node: Agent CLEAR_PASSPHRASE48923
-Node: Agent PRESET_PASSPHRASE49314
-Node: Agent GET_CONFIRMATION50152
-Node: Agent HAVEKEY50824
-Node: Agent LEARN51456
-Node: Agent PASSWD51754
-Node: Agent UPDATESTARTUPTTY52220
-Node: Agent GETEVENTCOUNTER52698
-Node: Agent GETINFO53500
-Node: Agent OPTION54204
-Node: Invoking DIRMNGR57262
-Node: Dirmngr Commands58160
-Node: Dirmngr Options60613
-Ref: Dirmngr Options-Footnote-174974
-Node: Dirmngr Configuration75109
-Node: Dirmngr Signals78239
-Node: Dirmngr Examples79267
-Node: Dirmngr Protocol79949
-Node: Dirmngr LOOKUP80599
-Node: Dirmngr ISVALID81970
-Node: Dirmngr CHECKCRL84543
-Node: Dirmngr CHECKOCSP85600
-Node: Dirmngr CACHECERT86906
-Node: Dirmngr VALIDATE87745
-Node: Invoking GPG88313
-Node: GPG Commands89543
-Node: General GPG Commands90437
-Node: Operational GPG Commands91126
-Ref: option --export-ownertrust108039
-Node: OpenPGP Key Management110152
-Node: GPG Options131402
-Node: GPG Configuration Options132735
-Ref: gpg-option --options145535
-Ref: trust-model-tofu149999
-Node: GPG Key related Options169755
-Node: GPG Input and Output174951
-Node: OpenPGP Options188655
-Node: Compliance Options193383
-Node: GPG Esoteric Options196534
-Ref: GPG Esoteric Options-Footnote-1223197
-Node: Deprecated Options223351
-Node: GPG Configuration224854
-Node: GPG Examples228965
-Node: Unattended Usage of GPG237652
-Node: Programmatic use of GnuPG238283
-Node: Ephemeral home directories238834
-Node: The quick key manipulation interface240141
-Node: Unattended GPG key generation240728
-Node: Invoking GPGSM249771
-Node: GPGSM Commands250640
-Node: General GPGSM Commands251078
-Node: Operational GPGSM Commands251766
-Node: Certificate Management253800
-Node: GPGSM Options258776
-Node: Configuration Options259350
-Ref: gpgsm-option --options259619
-Node: Certificate Options262434
-Ref: gpgsm-option --validation-model265341
-Node: Input and Output266321
-Ref: option --p12-charset266904
-Ref: gpgsm-option --with-key-data268148
-Ref: gpgsm-option --with-validation268422
-Node: CMS Options269300
-Node: Esoteric Options270320
-Node: GPGSM Configuration275747
-Node: GPGSM Examples281415
-Node: Unattended Usage281612
-Node: Automated signature checking282203
-Node: CSR and certificate creation284026
-Node: GPGSM Protocol288972
-Node: GPGSM ENCRYPT290228
-Node: GPGSM DECRYPT292903
-Node: GPGSM SIGN293739
-Node: GPGSM VERIFY295195
-Node: GPGSM GENKEY295711
-Node: GPGSM LISTKEYS296726
-Ref: gpgsm-cmd listkeys296885
-Node: GPGSM EXPORT297638
-Node: GPGSM IMPORT298602
-Node: GPGSM DELETE299343
-Node: GPGSM GETAUDITLOG299850
-Ref: gpgsm-cmd getauditlog300019
-Node: GPGSM GETINFO301351
-Node: GPGSM OPTION302200
-Node: Invoking SCDAEMON305553
-Node: Scdaemon Commands306227
-Node: Scdaemon Options307355
-Node: Card applications316419
-Node: OpenPGP Card317084
-Node: NKS Card317557
-Node: DINSIG Card317883
-Node: PKCS#15 Card318259
-Node: Geldkarte Card318529
-Node: SmartCard-HSM318920
-Node: Undefined Card319516
-Node: Scdaemon Configuration319929
-Node: Scdaemon Examples320967
-Node: Scdaemon Protocol321150
-Node: Scdaemon SERIALNO322669
-Node: Scdaemon LEARN323515
-Node: Scdaemon READCERT324362
-Node: Scdaemon READKEY324764
-Node: Scdaemon PKSIGN325050
-Node: Scdaemon PKDECRYPT325776
-Node: Scdaemon GETATTR326526
-Node: Scdaemon SETATTR326728
-Node: Scdaemon WRITEKEY326933
-Node: Scdaemon GENKEY327635
-Node: Scdaemon RANDOM327838
-Node: Scdaemon PASSWD328061
-Node: Scdaemon CHECKPIN328452
-Node: Scdaemon RESTART329455
-Node: Scdaemon APDU329988
-Node: Specify a User ID330961
-Ref: how-to-specify-a-user-id331119
-Node: Trust Values335977
-Ref: trust-values336106
-Node: Helper Tools336711
-Node: watchgnupg337551
-Ref: option watchgnupg --tcp338373
-Node: gpgv339951
-Node: addgnupghome345150
-Node: gpgconf345846
-Ref: gpgconf-Footnote-1348033
-Node: Invoking gpgconf348331
-Node: Format conventions354916
-Node: Listing components360247
-Node: Checking programs362330
-Node: Listing options365068
-Node: Changing options372564
-Node: Listing global options374266
-Node: Querying versions376037
-Node: Files used by gpgconf378735
-Node: applygnupgdefaults379211
-Node: gpg-preset-passphrase379955
-Node: Invoking gpg-preset-passphrase380990
-Node: gpg-connect-agent382392
-Node: Invoking gpg-connect-agent383106
-Node: Controlling gpg-connect-agent386652
-Node: dirmngr-client393125
-Node: gpgparsemail396476
-Node: symcryptrun396794
-Node: Invoking symcryptrun397692
-Node: gpgtar400239
-Node: Web Key Service403977
-Node: gpg-wks-client404290
-Node: gpg-wks-server409456
-Node: Howtos414813
-Node: Howto Create a Server Cert415085
-Node: System Notes423498
-Node: W32 Notes424709
-Node: Debugging425131
-Node: Debugging Tools425959
-Node: kbxutil426239
-Node: Debugging Hints427770
-Node: Common Problems428901
-Node: Architecture Details434138
-Node: Component interaction434448
-Ref: fig:moduleoverview434634
-Node: GnuPG-1 and GnuPG-2434741
-Ref: fig:cardarchitecture435031
-Node: Copying435146
-Node: Contributors472670
-Node: Glossary478925
-Node: Option Index481444
-Node: Environment Index560701
-Node: Index566556
+Node: Top992
+Node: Installation2921
+Node: Invoking GPG-AGENT5270
+Node: Agent Commands7036
+Node: Agent Options8840
+Ref: option --options9120
+Ref: option --homedir9446
+Ref: option --log-file14487
+Ref: option --no-allow-mark-trusted14860
+Ref: option --allow-preset-passphrase15064
+Ref: option --no-allow-loopback-pinentry15217
+Ref: option --extra-socket22608
+Ref: option --enable-ssh-support24074
+Ref: option --ssh-fingerprint-digest26411
+Node: Agent Configuration28068
+Node: Agent Signals33466
+Node: Agent Examples34926
+Node: Agent Protocol35493
+Node: Agent PKDECRYPT37647
+Node: Agent PKSIGN39559
+Node: Agent GENKEY41863
+Node: Agent IMPORT43760
+Node: Agent EXPORT44204
+Node: Agent ISTRUSTED44419
+Node: Agent GET_PASSPHRASE46794
+Node: Agent CLEAR_PASSPHRASE49235
+Node: Agent PRESET_PASSPHRASE49626
+Node: Agent GET_CONFIRMATION50464
+Node: Agent HAVEKEY51136
+Node: Agent LEARN51768
+Node: Agent PASSWD52066
+Node: Agent UPDATESTARTUPTTY52532
+Node: Agent GETEVENTCOUNTER53010
+Node: Agent GETINFO53812
+Node: Agent OPTION54516
+Node: Invoking DIRMNGR57574
+Node: Dirmngr Commands58472
+Node: Dirmngr Options60925
+Ref: Dirmngr Options-Footnote-176142
+Node: Dirmngr Configuration76277
+Node: Dirmngr Signals79407
+Node: Dirmngr Examples80435
+Node: Dirmngr Protocol81117
+Node: Dirmngr LOOKUP81767
+Node: Dirmngr ISVALID83138
+Node: Dirmngr CHECKCRL85711
+Node: Dirmngr CHECKOCSP86768
+Node: Dirmngr CACHECERT88074
+Node: Dirmngr VALIDATE88913
+Node: Invoking GPG89481
+Node: GPG Commands90711
+Node: General GPG Commands91605
+Node: Operational GPG Commands92294
+Ref: option --export-ownertrust109367
+Node: OpenPGP Key Management111480
+Node: GPG Options133287
+Node: GPG Configuration Options134620
+Ref: gpg-option --options147420
+Ref: trust-model-tofu151884
+Node: GPG Key related Options171719
+Node: GPG Input and Output176915
+Node: OpenPGP Options190619
+Node: Compliance Options195347
+Node: GPG Esoteric Options198498
+Ref: GPG Esoteric Options-Footnote-1225359
+Node: Deprecated Options225513
+Node: GPG Configuration227016
+Node: GPG Examples232486
+Node: Unattended Usage of GPG241173
+Node: Programmatic use of GnuPG241804
+Node: Ephemeral home directories242355
+Node: The quick key manipulation interface243662
+Node: Unattended GPG key generation244249
+Node: Invoking GPGSM253568
+Node: GPGSM Commands254437
+Node: General GPGSM Commands254875
+Node: Operational GPGSM Commands255563
+Node: Certificate Management257597
+Node: GPGSM Options262573
+Node: Configuration Options263147
+Ref: gpgsm-option --options263416
+Node: Certificate Options266231
+Ref: gpgsm-option --validation-model269835
+Node: Input and Output270815
+Ref: option --p12-charset271398
+Ref: gpgsm-option --with-key-data272642
+Ref: gpgsm-option --with-validation272916
+Node: CMS Options273794
+Node: Esoteric Options274814
+Node: GPGSM Configuration280241
+Node: GPGSM Examples285909
+Node: Unattended Usage286106
+Node: Automated signature checking286697
+Node: CSR and certificate creation288520
+Node: GPGSM Protocol293466
+Node: GPGSM ENCRYPT294722
+Node: GPGSM DECRYPT297397
+Node: GPGSM SIGN298233
+Node: GPGSM VERIFY299689
+Node: GPGSM GENKEY301197
+Node: GPGSM LISTKEYS302212
+Ref: gpgsm-cmd listkeys302371
+Node: GPGSM EXPORT303124
+Node: GPGSM IMPORT304088
+Node: GPGSM DELETE304829
+Node: GPGSM GETAUDITLOG305336
+Ref: gpgsm-cmd getauditlog305505
+Node: GPGSM GETINFO305849
+Node: GPGSM OPTION306698
+Node: Invoking SCDAEMON310051
+Node: Scdaemon Commands310725
+Node: Scdaemon Options311853
+Node: Card applications320917
+Node: OpenPGP Card321582
+Node: NKS Card322055
+Node: DINSIG Card322381
+Node: PKCS#15 Card322757
+Node: Geldkarte Card323027
+Node: SmartCard-HSM323418
+Node: Undefined Card324014
+Node: Scdaemon Configuration324427
+Node: Scdaemon Examples325465
+Node: Scdaemon Protocol325648
+Node: Scdaemon SERIALNO327167
+Node: Scdaemon LEARN328013
+Node: Scdaemon READCERT328860
+Node: Scdaemon READKEY329262
+Node: Scdaemon PKSIGN329548
+Node: Scdaemon PKDECRYPT330274
+Node: Scdaemon GETATTR331024
+Node: Scdaemon SETATTR331226
+Node: Scdaemon WRITEKEY331431
+Node: Scdaemon GENKEY332133
+Node: Scdaemon RANDOM332336
+Node: Scdaemon PASSWD332559
+Node: Scdaemon CHECKPIN332950
+Node: Scdaemon RESTART333953
+Node: Scdaemon APDU334486
+Node: Specify a User ID335459
+Ref: how-to-specify-a-user-id335617
+Node: Trust Values340475
+Ref: trust-values340604
+Node: Helper Tools341209
+Node: watchgnupg342049
+Ref: option watchgnupg --tcp342871
+Node: gpgv344449
+Node: addgnupghome349648
+Node: gpgconf350344
+Ref: gpgconf-Footnote-1352531
+Node: Invoking gpgconf352829
+Node: Format conventions359414
+Node: Listing components364745
+Node: Checking programs366828
+Node: Listing options369566
+Node: Changing options377062
+Node: Listing global options378764
+Node: Querying versions380535
+Node: Files used by gpgconf383233
+Node: applygnupgdefaults383709
+Node: gpg-preset-passphrase384453
+Node: Invoking gpg-preset-passphrase385488
+Node: gpg-connect-agent386890
+Node: Invoking gpg-connect-agent387604
+Node: Controlling gpg-connect-agent391150
+Node: dirmngr-client397623
+Node: gpgparsemail400974
+Node: symcryptrun401292
+Node: Invoking symcryptrun402190
+Node: gpgtar404737
+Node: Web Key Service408669
+Node: gpg-wks-client408982
+Node: gpg-wks-server414148
+Node: Howtos419505
+Node: Howto Create a Server Cert419777
+Node: System Notes428190
+Node: W32 Notes429401
+Node: Debugging429823
+Node: Debugging Tools430651
+Node: kbxutil430931
+Node: Debugging Hints432462
+Node: Common Problems433593
+Node: Architecture Details438830
+Node: Component interaction439140
+Ref: fig:moduleoverview439326
+Node: GnuPG-1 and GnuPG-2439433
+Ref: fig:cardarchitecture439723
+Node: Copying439838
+Node: Contributors477362
+Node: Glossary483617
+Node: Option Index486136
+Node: Environment Index565750
+Node: Index571605
 
 End Tag Table
diff -Nru gnupg2-2.2.20/doc/gnupg.info-1 gnupg2-2.2.27/doc/gnupg.info-1
--- gnupg2-2.2.20/doc/gnupg.info-1	2020-03-18 14:01:33.000000000 +0100
+++ gnupg2-2.2.27/doc/gnupg.info-1	2020-12-21 17:26:56.000000000 +0100
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.20-beta6, March
-2020).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.26-beta25,
+December 2020).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -27,8 +27,8 @@
 Using the GNU Privacy Guard
 ***************************
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.20-beta6, March
-2020).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.26-beta25,
+December 2020).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -424,7 +424,7 @@
      Set the time a cache entry is valid to N seconds.  The default is
      600 seconds.  Each time a cache entry is accessed, the entry's
      timer is reset.  To set an entry's maximum lifetime, use
-     'max-cache-ttl'.  Note that a cached passphrase may not evicted
+     'max-cache-ttl'.  Note that a cached passphrase may not be evicted
      immediately from memory if no client requests a cache operation.
      This is due to an internal housekeeping function which is only run
      every few seconds.
@@ -573,13 +573,18 @@
      private keys to the remote machine.
 
 '--enable-extended-key-format'
-     This option creates keys in the extended private key format.
-     Changing the passphrase of a key will also convert the key to that
-     new format.  Using this option makes the private keys unreadable
-     for gpg-agent versions before 2.1.12.  The advantage of the
+'--disable-extended-key-format'
+     Since version 2.2.22 keys are created in the extended private key
+     format by default.  Changing the passphrase of a key will also
+     convert the key to that new format.  This key format is supported
+     since GnuPG version 2.1.12 and thus there should be no need to
+     disable it.  Anyway, the disable option still allows to revert to
+     the old behavior for new keys; be aware that keys are never
+     migrated back to the old format.  If the enable option has been
+     used the disable option won't have an effect.  The advantage of the
      extended private key format is that it is text based and can carry
-     additional meta data.  Note that this option also changes the key
-     protection format to use OCB mode.
+     additional meta data.  In extended key format the OCB mode is used
+     for key protection.
 
 '--enable-ssh-support'
 '--enable-putty-support'
@@ -1728,7 +1733,24 @@
      a running Tor is done for each new connection.
 
      If no keyserver is explicitly configured, dirmngr will use the
-     built-in default of hkps://hkps.pool.sks-keyservers.net.
+     built-in default of 'hkps://hkps.pool.sks-keyservers.net'.
+
+     Windows users with a keyserver running on their Active Directory
+     should use 'ldap:///' for NAME to access this directory.
+
+     For accessing anonymous LDAP keyservers NAME is in general just a
+     'ldaps://ldap.example.com'.  A BaseDN parameter should never be
+     specified.  If authentication is required the value of NAME is for
+     example:
+
+                 keyserver ldaps://ldap.example.com/????bindname=uid=USERNAME
+                 %2Cou=GnuPG%20Users%2Cdc=example%2Cdc=com,password=PASSWORD
+
+     Put this all on one line without any spaces and keep the '%2C' as
+     given.  Replace USERNAME, PASSWORD, and the 'dc' parts according to
+     the instructions received from the LDAP administrator.  Note that
+     only simple authentication (i.e.  cleartext passwords) is supported
+     and thus using ldaps is strongly suggested.
 
 '--nameserver IPADDR'
      In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS
@@ -2553,7 +2575,7 @@
 
 '--delete-secret-keys NAME'
      Remove key from the secret keyring.  In batch mode the key must be
-     specified by fingerprint.  The option '--yes' can be used to advice
+     specified by fingerprint.  The option '--yes' can be used to advise
      gpg-agent not to request a confirmation.  This extra pre-caution is
      done because 'gpg' can't be sure that the secret key (as controlled
      by gpg-agent) is only used for the given OpenPGP public key.  If
@@ -2565,7 +2587,7 @@
 '--delete-secret-and-public-key NAME'
      Same as '--delete-key', but if a secret key exists, it will be
      removed first.  In batch mode the key must be specified by
-     fingerprint.  The option '--yes' can be used to advice gpg-agent
+     fingerprint.  The option '--yes' can be used to advise gpg-agent
      not to request a confirmation.
 
 '--export'
@@ -2581,6 +2603,10 @@
      complete keyring to a keyserver -- select only those keys which are
      new or changed by you.  If no KEYIDS are given, 'gpg' does nothing.
 
+     Take care: Keyservers are by design write only systems and thus it
+     is not possible to ever delete keys once they have been send to a
+     keyserver.
+
 '--export-secret-keys'
 '--export-secret-subkeys'
      Same as '--export', but exports the secret keys instead.  The
@@ -3159,6 +3185,16 @@
      supplementary revocation text, you should use the interactive
      sub-command 'revuid' of '--edit-key'.
 
+'--quick-revoke-sig FPR SIGNING-FPR [NAMES]'
+     This command revokes the key signatures made by SIGNING-FPR from
+     the key specified by the fingerprint FPR.  With NAMES given only
+     the signatures on user ids of the key matching any of the given
+     names are affected (see '--quick-sign-key').  If a revocation
+     already exists a notice is printed instead of creating a new
+     revocation; no error is returned in this case.  Note that key
+     signature revocations may be superseded by a newer key signature
+     and in turn again revoked.
+
 '--quick-set-primary-uid USER-ID PRIMARY-USER-ID'
      This command sets or updates the primary user ID flag on an
      existing key.  USER-ID specifies the key and PRIMARY-USER-ID the
@@ -3729,6 +3765,9 @@
           the key using the PGP Universal method of checking
           'ldap://keys.(thedomain)'.
 
+     ntds
+          Locate the key using the Active Directory (Windows only).
+
      keyserver
           Locate a key using a keyserver.
 
@@ -4934,7 +4973,10 @@
 '--passphrase-repeat N'
      Specify how many times 'gpg' will request a new passphrase be
      repeated.  This is useful for helping memorize a passphrase.
-     Defaults to 1 repetition.
+     Defaults to 1 repetition; can be set to 0 to disable any passphrase
+     repetition.  Note that a N greater than 1 will pop up the pinentry
+     window N+1 times even if a modern pinentry with two entry fields is
+     used.
 
 '--passphrase-fd N'
      Read the passphrase from file descriptor N.  Only the first line
@@ -5319,24 +5361,49 @@
      given.
 
 '~/.gnupg/pubring.gpg'
-     The public keyring.  You should backup this file.
+     The public keyring using a legacy format.  You should backup this
+     file.
+
+     If this file is not available, 'gpg' defaults to the new keybox
+     format and creates a file 'pubring.kbx' unless that file already
+     exists in which case that file will also be used for OpenPGP keys.
+
+     Note that in the case that both files, 'pubring.gpg' and
+     'pubring.kbx' exists but the latter has no OpenPGP keys, the legacy
+     file 'pubring.gpg' will be used.  Take care: GnuPG versions before
+     2.1 will always use the file 'pubring.gpg' because they do not know
+     about the new keybox format.  In the case that you have to use
+     GnuPG 1.4 to decrypt archived data you should keep this file.
 
 '~/.gnupg/pubring.gpg.lock'
      The lock file for the public keyring.
 
 '~/.gnupg/pubring.kbx'
-     The public keyring using a different format.  This file is shared
-     with 'gpgsm'.  You should backup this file.
+     The public keyring using the new keybox format.  This file is
+     shared with 'gpgsm'.  You should backup this file.  See above for
+     the relation between this file and it predecessor.
+
+     To convert an existing 'pubring.gpg' file to the keybox format, you
+     first backup the ownertrust values, then rename 'pubring.gpg' to
+     'publickeys.backup', so it won’t be recognized by any GnuPG
+     version, run import, and finally restore the ownertrust values:
+
+            $ cd ~/.gnupg
+            $ gpg --export-ownertrust >otrust.lst
+            $ mv pubring.gpg publickeys.backup
+            $ gpg --import-options restore --import publickeys.backups
+            $ gpg --import-ownertrust otrust.lst
 
 '~/.gnupg/pubring.kbx.lock'
      The lock file for 'pubring.kbx'.
 
 '~/.gnupg/secring.gpg'
-     A secret keyring as used by GnuPG versions before 2.1.  It is not
-     used by GnuPG 2.1 and later.
+     The legacy secret keyring as used by GnuPG versions before 2.1.  It
+     is not used by GnuPG 2.1 and later.  You may want to keep it in
+     case you have to use GnuPG 1.4 to decrypt archived data.
 
 '~/.gnupg/secring.gpg.lock'
-     The lock file for the secret keyring.
+     The lock file for the legacy secret keyring.
 
 '~/.gnupg/.gpg-v21-migrated'
      File indicating that a migration to GnuPG 2.1 has been done.
@@ -5795,7 +5862,12 @@
 
 Key-Length: NBITS
      The requested length of the generated key in bits.  The default is
-     returned by running the command 'gpg --gpgconf-list'.
+     returned by running the command 'gpg --gpgconf-list'.  For ECC keys
+     this parameter is ignored.
+
+Key-Curve: CURVE
+     The requested elliptic curve of the generated key.  This is a
+     required parameter for ECC keys.  It is ignored for non-ECC keys.
 
 Key-Grip: HEXSTRING
      This is optional and used to generate a CSR or certificate for an
@@ -5820,6 +5892,9 @@
      Length of the secondary key (subkey) in bits.  The default is
      returned by running the command 'gpg --gpgconf-list'.
 
+Subkey-Curve: CURVE
+     Key curve for a subkey; similar to 'Key-Curve'.
+
 Subkey-Usage: USAGE-LIST
      Key usage lists for a subkey; similar to 'Key-Usage'.
 
@@ -6250,7 +6325,12 @@
 '--disable-crl-checks'
      By default the CRL checks are enabled and the DirMngr is used to
      check for revoked certificates.  The disable option is most useful
-     with an off-line network connection to suppress this check.
+     with an off-line network connection to suppress this check and also
+     to avoid that new certificates introduce a web bug by including a
+     certificate specific CRL DP. The disable option also disables an
+     issuer certificate lookup via the authorityInfoAccess property of
+     the certificate; the '--enable-issuer-key-retrieve' can be used to
+     make use of that property anyway.
 
 '--enable-trusted-cert-crl-check'
 '--disable-trusted-cert-crl-check'
@@ -6274,6 +6354,13 @@
      listing command.  This option should not be used in a configuration
      file.
 
+'--enable-issuer-based-crl-check'
+     Run a CRL check even for certificates which do not have any CRL
+     distribution point.  This requires that a suitable LDAP server has
+     been configured in Dirmngr and that the CRL can be found using the
+     issuer.  This option reverts to what GnuPG did up to version
+     2.2.20.  This option is in general not useful.
+
 '--enable-ocsp'
 '--disable-ocsp'
      By default OCSP checks are disabled.  The enable option may be used
@@ -6921,9 +7008,9 @@
 file descriptor passed to the application.  *Note the assuan_sendfd
 function: (assuan)fun-assuan_sendfd, on how to do descriptor passing.
 
-   The '--armor' option may be used to advice the server that the input
-data is in PEM format, '--base64' advices that a raw base-64 encoding is
-used, '--binary' advices of raw binary input (BER).  If none of these
+   The '--armor' option may be used to advise the server that the input
+data is in PEM format, '--base64' advises that a raw base-64 encoding is
+used, '--binary' advises of raw binary input (BER).  If none of these
 options is used, the server tries to figure out the used encoding, but
 this may not always be correct.
 
@@ -7030,143 +7117,3 @@
 detached one, the server will inquire about the signed material and the
 client must provide it.
 
-
-File: gnupg.info,  Node: GPGSM GENKEY,  Next: GPGSM LISTKEYS,  Prev: GPGSM VERIFY,  Up: GPGSM Protocol
-
-5.6.5 Generating a Key
-----------------------
-
-This is used to generate a new keypair, store the secret part in the PSE
-and the public key in the key database.  We will probably add optional
-commands to allow the client to select whether a hardware token is used
-to store the key.  Configuration options to 'GPGSM' can be used to
-restrict the use of this command.
-
-       GENKEY
-
-   'GPGSM' checks whether this command is allowed and then does an
-INQUIRY to get the key parameters, the client should then send the key
-parameters in the native format:
-
-         S: INQUIRE KEY_PARAM native
-         C: D foo:fgfgfg
-         C: D bar
-         C: END
-
-   Please note that the server may send Status info lines while reading
-the data lines from the client.  After this the key generation takes
-place and the server eventually does send an ERR or OK response.  Status
-lines may be issued as a progress indicator.
-
-
-File: gnupg.info,  Node: GPGSM LISTKEYS,  Next: GPGSM EXPORT,  Prev: GPGSM GENKEY,  Up: GPGSM Protocol
-
-5.6.6 List available keys
--------------------------
-
-To list the keys in the internal database or using an external key
-provider, the command:
-
-       LISTKEYS  PATTERN
-
-   is used.  To allow multiple patterns (which are ORed during the
-search) quoting is required: Spaces are to be translated into "+" or
-into "%20"; in turn this requires that the usual escape quoting rules
-are done.
-
-       LISTSECRETKEYS PATTERN
-
-   Lists only the keys where a secret key is available.
-
-   The list commands are affected by the option
-
-       OPTION list-mode=MODE
-
-   where mode may be:
-'0'
-     Use default (which is usually the same as 1).
-'1'
-     List only the internal keys.
-'2'
-     List only the external keys.
-'3'
-     List internal and external keys.
-
-   Note that options are valid for the entire session.
-
-
-File: gnupg.info,  Node: GPGSM EXPORT,  Next: GPGSM IMPORT,  Prev: GPGSM LISTKEYS,  Up: GPGSM Protocol
-
-5.6.7 Export certificates
--------------------------
-
-To export certificate from the internal key database the command:
-
-       EXPORT [--data [--armor] [--base64]] [--] PATTERN
-
-   is used.  To allow multiple patterns (which are ORed) quoting is
-required: Spaces are to be translated into "+" or into "%20"; in turn
-this requires that the usual escape quoting rules are done.
-
-   If the '--data' option has not been given, the format of the output
-depends on what was set with the 'OUTPUT' command.  When using PEM
-encoding a few informational lines are prepended.
-
-   If the '--data' has been given, a target set via 'OUTPUT' is ignored
-and the data is returned inline using standard 'D'-lines.  This avoids
-the need for an extra file descriptor.  In this case the options
-'--armor' and '--base64' may be used in the same way as with the
-'OUTPUT' command.
-
-
-File: gnupg.info,  Node: GPGSM IMPORT,  Next: GPGSM DELETE,  Prev: GPGSM EXPORT,  Up: GPGSM Protocol
-
-5.6.8 Import certificates
--------------------------
-
-To import certificates into the internal key database, the command
-
-       IMPORT [--re-import]
-
-   is used.  The data is expected on the file descriptor set with the
-'INPUT' command.  Certain checks are performed on the certificate.  Note
-that the code will also handle PKCS#12 files and import private keys; a
-helper program is used for that.
-
-   With the option '--re-import' the input data is expected to a be a
-linefeed separated list of fingerprints.  The command will re-import the
-corresponding certificates; that is they are made permanent by removing
-their ephemeral flag.
-
-
-File: gnupg.info,  Node: GPGSM DELETE,  Next: GPGSM GETAUDITLOG,  Prev: GPGSM IMPORT,  Up: GPGSM Protocol
-
-5.6.9 Delete certificates
--------------------------
-
-To delete a certificate the command
-
-       DELKEYS PATTERN
-
-   is used.  To allow multiple patterns (which are ORed) quoting is
-required: Spaces are to be translated into "+" or into "%20"; in turn
-this requires that the usual escape quoting rules are done.
-
-   The certificates must be specified unambiguously otherwise an error
-is returned.
-
-
-File: gnupg.info,  Node: GPGSM GETAUDITLOG,  Next: GPGSM GETINFO,  Prev: GPGSM DELETE,  Up: GPGSM Protocol
-
-5.6.10 Retrieve an audit log
-----------------------------
-
-This command is used to retrieve an audit log.
-
-     GETAUDITLOG [--data] [--html]
-
-   If '--data' is used, the audit log is send using D-lines instead of
-being sent to the file descriptor given by an 'OUTPUT' command.  If
-'--html' is used, the output is formatted as an XHTML block.  This is
-designed to be incorporated into a HTML document.
-
diff -Nru gnupg2-2.2.20/doc/gnupg.info-2 gnupg2-2.2.27/doc/gnupg.info-2
--- gnupg2-2.2.20/doc/gnupg.info-2	2020-03-18 14:01:34.000000000 +0100
+++ gnupg2-2.2.27/doc/gnupg.info-2	2020-12-21 17:26:56.000000000 +0100
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.20-beta6, March
-2020).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.26-beta25,
+December 2020).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -22,6 +22,146 @@
 END-INFO-DIR-ENTRY
 
 
+File: gnupg.info,  Node: GPGSM GENKEY,  Next: GPGSM LISTKEYS,  Prev: GPGSM VERIFY,  Up: GPGSM Protocol
+
+5.6.5 Generating a Key
+----------------------
+
+This is used to generate a new keypair, store the secret part in the PSE
+and the public key in the key database.  We will probably add optional
+commands to allow the client to select whether a hardware token is used
+to store the key.  Configuration options to 'GPGSM' can be used to
+restrict the use of this command.
+
+       GENKEY
+
+   'GPGSM' checks whether this command is allowed and then does an
+INQUIRY to get the key parameters, the client should then send the key
+parameters in the native format:
+
+         S: INQUIRE KEY_PARAM native
+         C: D foo:fgfgfg
+         C: D bar
+         C: END
+
+   Please note that the server may send Status info lines while reading
+the data lines from the client.  After this the key generation takes
+place and the server eventually does send an ERR or OK response.  Status
+lines may be issued as a progress indicator.
+
+
+File: gnupg.info,  Node: GPGSM LISTKEYS,  Next: GPGSM EXPORT,  Prev: GPGSM GENKEY,  Up: GPGSM Protocol
+
+5.6.6 List available keys
+-------------------------
+
+To list the keys in the internal database or using an external key
+provider, the command:
+
+       LISTKEYS  PATTERN
+
+   is used.  To allow multiple patterns (which are ORed during the
+search) quoting is required: Spaces are to be translated into "+" or
+into "%20"; in turn this requires that the usual escape quoting rules
+are done.
+
+       LISTSECRETKEYS PATTERN
+
+   Lists only the keys where a secret key is available.
+
+   The list commands are affected by the option
+
+       OPTION list-mode=MODE
+
+   where mode may be:
+'0'
+     Use default (which is usually the same as 1).
+'1'
+     List only the internal keys.
+'2'
+     List only the external keys.
+'3'
+     List internal and external keys.
+
+   Note that options are valid for the entire session.
+
+
+File: gnupg.info,  Node: GPGSM EXPORT,  Next: GPGSM IMPORT,  Prev: GPGSM LISTKEYS,  Up: GPGSM Protocol
+
+5.6.7 Export certificates
+-------------------------
+
+To export certificate from the internal key database the command:
+
+       EXPORT [--data [--armor] [--base64]] [--] PATTERN
+
+   is used.  To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+   If the '--data' option has not been given, the format of the output
+depends on what was set with the 'OUTPUT' command.  When using PEM
+encoding a few informational lines are prepended.
+
+   If the '--data' has been given, a target set via 'OUTPUT' is ignored
+and the data is returned inline using standard 'D'-lines.  This avoids
+the need for an extra file descriptor.  In this case the options
+'--armor' and '--base64' may be used in the same way as with the
+'OUTPUT' command.
+
+
+File: gnupg.info,  Node: GPGSM IMPORT,  Next: GPGSM DELETE,  Prev: GPGSM EXPORT,  Up: GPGSM Protocol
+
+5.6.8 Import certificates
+-------------------------
+
+To import certificates into the internal key database, the command
+
+       IMPORT [--re-import]
+
+   is used.  The data is expected on the file descriptor set with the
+'INPUT' command.  Certain checks are performed on the certificate.  Note
+that the code will also handle PKCS#12 files and import private keys; a
+helper program is used for that.
+
+   With the option '--re-import' the input data is expected to a be a
+linefeed separated list of fingerprints.  The command will re-import the
+corresponding certificates; that is they are made permanent by removing
+their ephemeral flag.
+
+
+File: gnupg.info,  Node: GPGSM DELETE,  Next: GPGSM GETAUDITLOG,  Prev: GPGSM IMPORT,  Up: GPGSM Protocol
+
+5.6.9 Delete certificates
+-------------------------
+
+To delete a certificate the command
+
+       DELKEYS PATTERN
+
+   is used.  To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+   The certificates must be specified unambiguously otherwise an error
+is returned.
+
+
+File: gnupg.info,  Node: GPGSM GETAUDITLOG,  Next: GPGSM GETINFO,  Prev: GPGSM DELETE,  Up: GPGSM Protocol
+
+5.6.10 Retrieve an audit log
+----------------------------
+
+This command is used to retrieve an audit log.
+
+     GETAUDITLOG [--data] [--html]
+
+   If '--data' is used, the audit log is send using D-lines instead of
+being sent to the file descriptor given by an 'OUTPUT' command.  If
+'--html' is used, the output is formatted as an XHTML block.  This is
+designed to be incorporated into a HTML document.
+
+
 File: gnupg.info,  Node: GPGSM GETINFO,  Next: GPGSM OPTION,  Prev: GPGSM GETAUDITLOG,  Up: GPGSM Protocol
 
 5.6.11 Return information about the process
@@ -2757,6 +2897,11 @@
      Modify option '--files-from' to use a binary nul instead of a
      linefeed to separate file names.
 
+'--utf8-strings'
+     Assume that the file names read by '--files-from' are UTF-8
+     encoded.  This option has an effect only on Windows where the
+     active code page is otherwise assumed.
+
 '--openpgp'
      This option has no effect because OpenPGP encryption and signing is
      the default.
@@ -4512,9 +4657,9 @@
 [index]
 * Menu:
 
-* add-servers:                           Dirmngr Options.     (line 246)
+* add-servers:                           Dirmngr Options.     (line 263)
 * agent-program:                         GPG Configuration Options.
-                                                              (line 730)
+                                                              (line 733)
 * agent-program <1>:                     Configuration Options.
                                                               (line  46)
 * agent-program <2>:                     Invoking gpg-connect-agent.
@@ -4522,31 +4667,31 @@
 * allow-admin:                           Scdaemon Options.    (line 197)
 * allow-emacs-pinentry:                  Agent Options.       (line 187)
 * allow-freeform-uid:                    GPG Esoteric Options.
-                                                              (line 364)
+                                                              (line 367)
 * allow-loopback-pinentry:               Agent Options.       (line 169)
 * allow-multiple-messages:               GPG Esoteric Options.
-                                                              (line 539)
+                                                              (line 542)
 * allow-non-selfsigned-uid:              GPG Esoteric Options.
-                                                              (line 359)
-* allow-ocsp:                            Dirmngr Options.     (line 263)
+                                                              (line 362)
+* allow-ocsp:                            Dirmngr Options.     (line 280)
 * allow-preset-passphrase:               Agent Options.       (line 164)
 * allow-secret-key-import:               GPG Esoteric Options.
-                                                              (line 535)
+                                                              (line 538)
 * allow-version-check:                   Dirmngr Options.     (line 135)
 * allow-weak-digest-algos:               GPG Esoteric Options.
-                                                              (line 400)
+                                                              (line 403)
 * allow-weak-key-signatures:             GPG Esoteric Options.
-                                                              (line 416)
+                                                              (line 419)
 * always-trust:                          Deprecated Options.  (line  21)
 * armor:                                 GPG Input and Output.
                                                               (line   8)
 * armor <1>:                             Input and Output.    (line   8)
 * ask-cert-expire:                       GPG Esoteric Options.
-                                                              (line 511)
+                                                              (line 514)
 * ask-cert-level:                        GPG Configuration Options.
                                                               (line 347)
 * ask-sig-expire:                        GPG Esoteric Options.
-                                                              (line 497)
+                                                              (line 500)
 * assume-armor:                          Input and Output.    (line  14)
 * assume-base64:                         Input and Output.    (line  18)
 * assume-binary:                         Input and Output.    (line  21)
@@ -4555,15 +4700,15 @@
 * attribute-file:                        GPG Esoteric Options.
                                                               (line  98)
 * auto-check-trustdb:                    GPG Configuration Options.
-                                                              (line 717)
-* auto-expand-secmem:                    Agent Options.       (line 414)
-* auto-issuer-key-retrieve:              Certificate Options. (line  50)
+                                                              (line 720)
+* auto-expand-secmem:                    Agent Options.       (line 419)
+* auto-issuer-key-retrieve:              Certificate Options. (line  62)
 * auto-key-import:                       GPG Configuration Options.
-                                                              (line 551)
+                                                              (line 554)
 * auto-key-locate:                       GPG Configuration Options.
                                                               (line 494)
 * auto-key-retrieve:                     GPG Configuration Options.
-                                                              (line 563)
+                                                              (line 566)
 * base64:                                Input and Output.    (line  11)
 * batch:                                 Agent Options.       (line  48)
 * batch <1>:                             GPG Configuration Options.
@@ -4590,7 +4735,7 @@
 * cert-policy-url:                       GPG Esoteric Options.
                                                               (line 160)
 * change-passphrase:                     OpenPGP Key Management.
-                                                              (line 439)
+                                                              (line 449)
 * change-passphrase <1>:                 Certificate Management.
                                                               (line 109)
 * change-pin:                            Operational GPG Commands.
@@ -4601,7 +4746,7 @@
 * check-sigs:                            Operational GPG Commands.
                                                               (line 141)
 * check-trustdb:                         Operational GPG Commands.
-                                                              (line 340)
+                                                              (line 344)
 * cipher-algo:                           GPG Esoteric Options.
                                                               (line 199)
 * cipher-algo <1>:                       CMS Options.         (line  13)
@@ -4609,16 +4754,16 @@
                                                               (line  17)
 * clearsign:                             Operational GPG Commands.
                                                               (line  18)
-* cms:                                   gpgtar.              (line  94)
+* cms:                                   gpgtar.              (line  99)
 * command-fd:                            GPG Esoteric Options.
-                                                              (line 347)
+                                                              (line 350)
 * command-file:                          GPG Esoteric Options.
-                                                              (line 354)
+                                                              (line 357)
 * comment:                               GPG Esoteric Options.
                                                               (line 103)
 * compliance:                            Compliance Options.  (line  67)
 * compliant-needed:                      GPG Configuration Options.
-                                                              (line 692)
+                                                              (line 695)
 * compress-algo:                         GPG Esoteric Options.
                                                               (line 215)
 * compress-level:                        GPG Configuration Options.
@@ -4634,7 +4779,7 @@
 * daemon <1>:                            Dirmngr Commands.    (line  27)
 * daemon <2>:                            Scdaemon Commands.   (line  31)
 * dearmor:                               Operational GPG Commands.
-                                                              (line 394)
+                                                              (line 398)
 * debug:                                 Agent Options.       (line  82)
 * debug <1>:                             Dirmngr Options.     (line  59)
 * debug <2>:                             GPG Esoteric Options.
@@ -4680,24 +4825,24 @@
 * default-cache-ttl:                     Agent Options.       (line 198)
 * default-cache-ttl <1>:                 Agent Options.       (line 207)
 * default-cert-expire:                   GPG Esoteric Options.
-                                                              (line 517)
+                                                              (line 520)
 * default-cert-level:                    GPG Configuration Options.
                                                               (line 355)
 * default-key:                           GPG Configuration Options.
                                                               (line  10)
 * default-key <1>:                       Input and Output.    (line  34)
 * default-keyserver-url:                 GPG Esoteric Options.
-                                                              (line 568)
+                                                              (line 571)
 * default-new-key-algo STRING:           GPG Esoteric Options.
-                                                              (line 524)
+                                                              (line 527)
 * default-preference-list:               GPG Esoteric Options.
-                                                              (line 563)
+                                                              (line 566)
 * default-recipient:                     GPG Configuration Options.
                                                               (line  19)
 * default-recipient-self:                GPG Configuration Options.
                                                               (line  23)
 * default-sig-expire:                    GPG Esoteric Options.
-                                                              (line 503)
+                                                              (line 506)
 * delete-keys:                           Operational GPG Commands.
                                                               (line 219)
 * delete-keys <1>:                       Certificate Management.
@@ -4719,7 +4864,7 @@
 * dirmngr:                               Invoking gpg-connect-agent.
                                                               (line  54)
 * dirmngr-program:                       GPG Configuration Options.
-                                                              (line 737)
+                                                              (line 740)
 * dirmngr-program <1>:                   Configuration Options.
                                                               (line  52)
 * dirmngr-program <2>:                   Invoking gpg-connect-agent.
@@ -4733,21 +4878,22 @@
 * disable-crl-checks:                    Certificate Options. (line  13)
 * disable-dsa2:                          GPG Configuration Options.
                                                               (line 191)
-* disable-http:                          Dirmngr Options.     (line 185)
-* disable-ipv4:                          Dirmngr Options.     (line 179)
-* disable-ipv6:                          Dirmngr Options.     (line 179)
+* disable-extended-key-format:           Agent Options.       (line 351)
+* disable-http:                          Dirmngr Options.     (line 202)
+* disable-ipv4:                          Dirmngr Options.     (line 196)
+* disable-ipv6:                          Dirmngr Options.     (line 196)
 * disable-large-rsa:                     GPG Configuration Options.
                                                               (line 182)
-* disable-ldap:                          Dirmngr Options.     (line 182)
+* disable-ldap:                          Dirmngr Options.     (line 199)
 * disable-mdc:                           OpenPGP Options.     (line  25)
-* disable-ocsp:                          Certificate Options. (line  41)
+* disable-ocsp:                          Certificate Options. (line  53)
 * disable-pinpad:                        Scdaemon Options.    (line 194)
 * disable-policy-checks:                 Certificate Options. (line   8)
 * disable-pubkey-algo:                   GPG Esoteric Options.
                                                               (line 251)
 * disable-scdaemon:                      Agent Options.       (line 299)
 * disable-signer-uid:                    OpenPGP Options.     (line  31)
-* disable-trusted-cert-crl-check:        Certificate Options. (line  19)
+* disable-trusted-cert-crl-check:        Certificate Options. (line  24)
 * display:                               Agent Options.       (line 323)
 * display-charset:                       GPG Configuration Options.
                                                               (line 276)
@@ -4790,23 +4936,24 @@
 * enable-crl-checks:                     Certificate Options. (line  13)
 * enable-dsa2:                           GPG Configuration Options.
                                                               (line 191)
-* enable-extended-key-format:            Agent Options.       (line 350)
+* enable-extended-key-format:            Agent Options.       (line 351)
+* enable-issuer-based-crl-check:         Certificate Options. (line  45)
 * enable-large-rsa:                      GPG Configuration Options.
                                                               (line 182)
-* enable-ocsp:                           Certificate Options. (line  41)
+* enable-ocsp:                           Certificate Options. (line  53)
 * enable-passphrase-history:             Agent Options.       (line 259)
 * enable-pinpad-varlen:                  Scdaemon Options.    (line 186)
 * enable-policy-checks:                  Certificate Options. (line   8)
 * enable-progress-filter:                GPG Esoteric Options.
                                                               (line  69)
-* enable-putty-support:                  Agent Options.       (line 360)
+* enable-putty-support:                  Agent Options.       (line 365)
 * enable-special-filenames:              GPG Esoteric Options.
-                                                              (line 550)
+                                                              (line 553)
 * enable-special-filenames <1>:          gpgv.                (line  97)
-* enable-ssh-support:                    Agent Options.       (line 360)
-* enable-trusted-cert-crl-check:         Certificate Options. (line  19)
+* enable-ssh-support:                    Agent Options.       (line 365)
+* enable-trusted-cert-crl-check:         Certificate Options. (line  24)
 * enarmor:                               Operational GPG Commands.
-                                                              (line 394)
+                                                              (line 398)
 * encrypt:                               Operational GPG Commands.
                                                               (line  32)
 * encrypt <1>:                           Operational GPGSM Commands.
@@ -4824,9 +4971,9 @@
 * exec-path:                             GPG Configuration Options.
                                                               (line 220)
 * exit-on-status-write-error:            GPG Configuration Options.
-                                                              (line 766)
+                                                              (line 769)
 * expert:                                GPG Configuration Options.
-                                                              (line 821)
+                                                              (line 824)
 * export:                                Operational GPG Commands.
                                                               (line 245)
 * export <1>:                            Certificate Management.
@@ -4836,7 +4983,7 @@
 * export-options:                        GPG Input and Output.
                                                               (line 220)
 * export-ownertrust:                     Operational GPG Commands.
-                                                              (line 355)
+                                                              (line 359)
 * export-secret-key-p12:                 Certificate Management.
                                                               (line  82)
 * export-secret-key-p8:                  Certificate Management.
@@ -4844,11 +4991,11 @@
 * export-secret-key-raw:                 Certificate Management.
                                                               (line  91)
 * export-secret-keys:                    Operational GPG Commands.
-                                                              (line 259)
+                                                              (line 263)
 * export-secret-subkeys:                 Operational GPG Commands.
-                                                              (line 259)
+                                                              (line 263)
 * export-ssh-key:                        Operational GPG Commands.
-                                                              (line 281)
+                                                              (line 285)
 * extra-digest-algo:                     Esoteric Options.    (line   7)
 * extra-socket:                          Agent Options.       (line 337)
 * extract:                               gpgtar.              (line  19)
@@ -4857,10 +5004,10 @@
                                                               (line  60)
 * faked-system-time <2>:                 Esoteric Options.    (line  18)
 * fast-list-mode:                        GPG Esoteric Options.
-                                                              (line 452)
+                                                              (line 455)
 * fetch-crl:                             Dirmngr Commands.    (line  52)
 * fetch-keys:                            Operational GPG Commands.
-                                                              (line 324)
+                                                              (line 328)
 * fingerprint:                           Operational GPG Commands.
                                                               (line 189)
 * fixed-list-mode:                       GPG Input and Output.
@@ -4870,7 +5017,7 @@
                                                               (line 185)
 * force:                                 Dirmngr Options.     (line  93)
 * force <1>:                             watchgnupg.          (line  23)
-* force-crl-refresh:                     Certificate Options. (line  30)
+* force-crl-refresh:                     Certificate Options. (line  35)
 * force-default-responder:               dirmngr-client.      (line  64)
 * force-mdc:                             OpenPGP Options.     (line  25)
 * forget:                                Invoking gpg-preset-passphrase.
@@ -4885,9 +5032,9 @@
 * gen-key <1>:                           Certificate Management.
                                                               (line   8)
 * gen-prime:                             Operational GPG Commands.
-                                                              (line 389)
+                                                              (line 393)
 * gen-random:                            Operational GPG Commands.
-                                                              (line 382)
+                                                              (line 386)
 * gen-revoke:                            OpenPGP Key Management.
                                                               (line 120)
 * generate-designated-revocation:        OpenPGP Key Management.
@@ -4899,14 +5046,14 @@
 * generate-revocation:                   OpenPGP Key Management.
                                                               (line 119)
 * gnupg:                                 Compliance Options.  (line  12)
-* gpg:                                   gpgtar.              (line 105)
+* gpg:                                   gpgtar.              (line 110)
 * gpg-agent-info:                        GPG Configuration Options.
-                                                              (line 727)
-* gpg-args:                              gpgtar.              (line 108)
+                                                              (line 730)
+* gpg-args:                              gpgtar.              (line 113)
 * gpgconf-list:                          GPG Esoteric Options.
-                                                              (line 584)
+                                                              (line 587)
 * gpgconf-test:                          GPG Esoteric Options.
-                                                              (line 588)
+                                                              (line 591)
 * grab:                                  Agent Options.       (line 145)
 * group:                                 GPG Key related Options.
                                                               (line  55)
@@ -4920,7 +5067,7 @@
 * help <4>:                              Scdaemon Commands.   (line  14)
 * help <5>:                              watchgnupg.          (line  39)
 * help <6>:                              dirmngr-client.      (line  44)
-* help <7>:                              gpgtar.              (line 120)
+* help <7>:                              gpgtar.              (line 125)
 * help <8>:                              gpg-wks-client.      (line 128)
 * help <9>:                              gpg-wks-server.      (line  87)
 * hex:                                   Invoking gpg-connect-agent.
@@ -4943,25 +5090,25 @@
                                                               (line  21)
 * homedir <7>:                           Invoking symcryptrun.
                                                               (line  36)
-* honor-http-proxy:                      Dirmngr Options.     (line 204)
-* http-proxy:                            Dirmngr Options.     (line 208)
+* honor-http-proxy:                      Dirmngr Options.     (line 221)
+* http-proxy:                            Dirmngr Options.     (line 225)
 * ignore-cache-for-signing:              Agent Options.       (line 192)
-* ignore-cert-extension:                 Dirmngr Options.     (line 312)
-* ignore-cert-extension <1>:             Certificate Options. (line  70)
+* ignore-cert-extension:                 Dirmngr Options.     (line 329)
+* ignore-cert-extension <1>:             Certificate Options. (line  82)
 * ignore-crc-error:                      GPG Esoteric Options.
-                                                              (line 384)
-* ignore-http-dp:                        Dirmngr Options.     (line 188)
-* ignore-ldap-dp:                        Dirmngr Options.     (line 195)
+                                                              (line 387)
+* ignore-http-dp:                        Dirmngr Options.     (line 205)
+* ignore-ldap-dp:                        Dirmngr Options.     (line 212)
 * ignore-mdc-error:                      GPG Esoteric Options.
-                                                              (line 391)
-* ignore-ocsp-service-url:               Dirmngr Options.     (line 200)
+                                                              (line 394)
+* ignore-ocsp-service-url:               Dirmngr Options.     (line 217)
 * ignore-time-conflict:                  GPG Esoteric Options.
-                                                              (line 370)
+                                                              (line 373)
 * ignore-time-conflict <1>:              gpgv.                (line  63)
 * ignore-valid-from:                     GPG Esoteric Options.
-                                                              (line 377)
+                                                              (line 380)
 * import:                                Operational GPG Commands.
-                                                              (line 295)
+                                                              (line 299)
 * import <1>:                            Certificate Management.
                                                               (line  99)
 * import-filter:                         GPG Input and Output.
@@ -4969,7 +5116,7 @@
 * import-options:                        GPG Input and Output.
                                                               (line  45)
 * import-ownertrust:                     Operational GPG Commands.
-                                                              (line 361)
+                                                              (line 365)
 * include-certs:                         CMS Options.         (line   7)
 * include-key-block:                     OpenPGP Options.     (line  38)
 * input-size-hint:                       GPG Input and Output.
@@ -5061,38 +5208,38 @@
 * keyedit:uid:                           OpenPGP Key Management.
                                                               (line 144)
 * keyid-format:                          GPG Configuration Options.
-                                                              (line 600)
+                                                              (line 603)
 * keyring:                               GPG Configuration Options.
                                                               (line 224)
 * keyring <1>:                           gpgv.                (line  38)
 * keyserver:                             Dirmngr Options.     (line 145)
 * keyserver <1>:                         GPG Configuration Options.
-                                                              (line 609)
+                                                              (line 612)
 * keyserver-options:                     GPG Configuration Options.
-                                                              (line 632)
+                                                              (line 635)
 * kill:                                  Invoking gpgconf.    (line  84)
 * known-notation:                        GPG Esoteric Options.
                                                               (line 151)
 * launch:                                Invoking gpgconf.    (line  76)
 * lc-ctype:                              Agent Options.       (line 323)
 * lc-messages:                           Agent Options.       (line 323)
-* ldap-proxy:                            Dirmngr Options.     (line 213)
-* ldapserverlist-file:                   Dirmngr Options.     (line 224)
-* ldaptimeout:                           Dirmngr Options.     (line 242)
+* ldap-proxy:                            Dirmngr Options.     (line 230)
+* ldapserverlist-file:                   Dirmngr Options.     (line 241)
+* ldaptimeout:                           Dirmngr Options.     (line 259)
 * learn-card:                            Certificate Management.
                                                               (line 104)
 * legacy-list-mode:                      GPG Input and Output.
                                                               (line 290)
 * limit-card-insert-tries:               GPG Configuration Options.
-                                                              (line 775)
+                                                              (line 778)
 * list-archive:                          gpgtar.              (line  39)
 * list-chain:                            Certificate Management.
                                                               (line  32)
 * list-config:                           GPG Esoteric Options.
-                                                              (line 573)
+                                                              (line 576)
 * list-crls:                             Dirmngr Commands.    (line  40)
 * list-gcrypt-config:                    GPG Esoteric Options.
-                                                              (line 581)
+                                                              (line 584)
 * list-keys:                             Operational GPG Commands.
                                                               (line 119)
 * list-keys <1>:                         Certificate Management.
@@ -5138,9 +5285,9 @@
 * list-secret-keys <1>:                  Certificate Management.
                                                               (line  24)
 * list-signatures:                       GPG Esoteric Options.
-                                                              (line 440)
+                                                              (line 443)
 * list-sigs:                             GPG Esoteric Options.
-                                                              (line 441)
+                                                              (line 444)
 * listen-backlog:                        Agent Options.       (line 333)
 * listen-backlog <1>:                    Dirmngr Options.     (line 131)
 * listen-backlog <2>:                    Scdaemon Options.    (line 135)
@@ -5155,11 +5302,11 @@
 * locate-keys:                           Operational GPG Commands.
                                                               (line 170)
 * lock-multiple:                         GPG Configuration Options.
-                                                              (line 755)
+                                                              (line 758)
 * lock-never:                            GPG Configuration Options.
-                                                              (line 759)
+                                                              (line 762)
 * lock-once:                             GPG Configuration Options.
-                                                              (line 751)
+                                                              (line 754)
 * log-file:                              Agent Options.       (line 151)
 * log-file <1>:                          Dirmngr Options.     (line  30)
 * log-file <2>:                          GPG Esoteric Options.
@@ -5179,15 +5326,15 @@
 * mangle-dos-filenames:                  GPG Configuration Options.
                                                               (line 339)
 * marginals-needed:                      GPG Configuration Options.
-                                                              (line 696)
+                                                              (line 699)
 * max-cache-ttl:                         Agent Options.       (line 213)
 * max-cache-ttl-ssh:                     Agent Options.       (line 219)
 * max-cert-depth:                        GPG Configuration Options.
-                                                              (line 704)
+                                                              (line 707)
 * max-output:                            GPG Input and Output.
                                                               (line  19)
 * max-passphrase-days:                   Agent Options.       (line 254)
-* max-replies:                           Dirmngr Options.     (line 309)
+* max-replies:                           Dirmngr Options.     (line 326)
 * min-cert-level:                        GPG Configuration Options.
                                                               (line 384)
 * min-passphrase-len:                    Agent Options.       (line 229)
@@ -5195,7 +5342,7 @@
 * multi-server:                          Scdaemon Commands.   (line  26)
 * multifile:                             Operational GPG Commands.
                                                               (line 100)
-* nameserver:                            Dirmngr Options.     (line 171)
+* nameserver:                            Dirmngr Options.     (line 188)
 * no:                                    GPG Configuration Options.
                                                               (line  63)
 * no-allow-external-cache:               Agent Options.       (line 177)
@@ -5204,11 +5351,11 @@
 * no-armor:                              GPG Input and Output.
                                                               (line  12)
 * no-auto-key-import:                    GPG Configuration Options.
-                                                              (line 551)
+                                                              (line 554)
 * no-auto-key-retrieve:                  GPG Configuration Options.
-                                                              (line 563)
+                                                              (line 566)
 * no-autostart:                          GPG Configuration Options.
-                                                              (line 744)
+                                                              (line 747)
 * no-autostart <1>:                      Configuration Options.
                                                               (line  62)
 * no-autostart <2>:                      Invoking gpg-connect-agent.
@@ -5217,7 +5364,7 @@
                                                               (line  43)
 * no-common-certs-import:                Esoteric Options.    (line 132)
 * no-default-keyring:                    GPG Esoteric Options.
-                                                              (line 421)
+                                                              (line 424)
 * no-default-recipient:                  GPG Configuration Options.
                                                               (line  29)
 * no-detach:                             Agent Options.       (line 131)
@@ -5225,34 +5372,34 @@
 * no-encrypt-to:                         GPG Key related Options.
                                                               (line  51)
 * no-expensive-trust-checks:             GPG Esoteric Options.
-                                                              (line 555)
+                                                              (line 558)
 * no-ext-connect:                        Invoking gpg-connect-agent.
                                                               (line  72)
 * no-grab:                               Agent Options.       (line 145)
 * no-greeting:                           GPG Configuration Options.
-                                                              (line 789)
+                                                              (line 792)
 * no-groups:                             GPG Key related Options.
                                                               (line  73)
 * no-keyring:                            GPG Esoteric Options.
-                                                              (line 428)
+                                                              (line 431)
 * no-literal:                            GPG Esoteric Options.
-                                                              (line 460)
+                                                              (line 463)
 * no-mangle-dos-filenames:               GPG Configuration Options.
                                                               (line 339)
 * no-options:                            GPG Configuration Options.
                                                               (line 314)
 * no-random-seed-file:                   GPG Configuration Options.
-                                                              (line 783)
+                                                              (line 786)
 * no-secmem-warning:                     GPG Configuration Options.
-                                                              (line 792)
+                                                              (line 795)
 * no-secmem-warning <1>:                 Configuration Options.
                                                               (line  69)
 * no-sig-cache:                          GPG Configuration Options.
-                                                              (line 707)
+                                                              (line 710)
 * no-skip-hidden-recipients:             GPG Key related Options.
                                                               (line 108)
 * no-symkey-cache:                       GPG Esoteric Options.
-                                                              (line 334)
+                                                              (line 337)
 * no-tty:                                GPG Configuration Options.
                                                               (line  55)
 * no-use-standard-socket:                Agent Options.       (line 313)
@@ -5263,14 +5410,14 @@
                                                               (line 266)
 * null:                                  gpgtar.              (line  86)
 * ocsp:                                  dirmngr-client.      (line  61)
-* ocsp-current-period:                   Dirmngr Options.     (line 304)
-* ocsp-max-clock-skew:                   Dirmngr Options.     (line 296)
-* ocsp-max-period:                       Dirmngr Options.     (line 300)
-* ocsp-responder:                        Dirmngr Options.     (line 270)
-* ocsp-signer:                           Dirmngr Options.     (line 275)
-* only-ldap-proxy:                       Dirmngr Options.     (line 219)
+* ocsp-current-period:                   Dirmngr Options.     (line 321)
+* ocsp-max-clock-skew:                   Dirmngr Options.     (line 313)
+* ocsp-max-period:                       Dirmngr Options.     (line 317)
+* ocsp-responder:                        Dirmngr Options.     (line 287)
+* ocsp-signer:                           Dirmngr Options.     (line 292)
+* only-ldap-proxy:                       Dirmngr Options.     (line 236)
 * openpgp:                               Compliance Options.  (line  19)
-* openpgp <1>:                           gpgtar.              (line  90)
+* openpgp <1>:                           gpgtar.              (line  95)
 * options:                               Agent Options.       (line  10)
 * options <1>:                           Dirmngr Options.     (line  11)
 * options <2>:                           Dirmngr Options.     (line  16)
@@ -5287,27 +5434,27 @@
 * output <4>:                            gpg-wks-client.      (line 104)
 * output <5>:                            gpg-wks-server.      (line  65)
 * override-session-key:                  GPG Esoteric Options.
-                                                              (line 484)
+                                                              (line 487)
 * p12-charset:                           Input and Output.    (line  24)
 * passphrase:                            GPG Esoteric Options.
-                                                              (line 309)
+                                                              (line 312)
 * passphrase <1>:                        Invoking gpg-preset-passphrase.
                                                               (line  36)
 * passphrase-fd:                         GPG Esoteric Options.
-                                                              (line 288)
+                                                              (line 291)
 * passphrase-fd <1>:                     Esoteric Options.    (line 100)
 * passphrase-file:                       GPG Esoteric Options.
-                                                              (line 298)
+                                                              (line 301)
 * passphrase-repeat:                     GPG Esoteric Options.
                                                               (line 283)
 * passwd:                                OpenPGP Key Management.
-                                                              (line 440)
+                                                              (line 450)
 * passwd <1>:                            Certificate Management.
                                                               (line 110)
 * pcsc-driver:                           Scdaemon Options.    (line 144)
 * pem:                                   dirmngr-client.      (line  58)
 * permission-warning:                    GPG Configuration Options.
-                                                              (line 795)
+                                                              (line 798)
 * personal-cipher-preferences:           OpenPGP Options.     (line  46)
 * personal-compress-preferences:         OpenPGP Options.     (line  64)
 * personal-digest-preferences:           OpenPGP Options.     (line  55)
@@ -5318,7 +5465,7 @@
                                                               (line 197)
 * pinentry-invisible-char:               Agent Options.       (line 262)
 * pinentry-mode:                         GPG Esoteric Options.
-                                                              (line 319)
+                                                              (line 322)
 * pinentry-mode <1>:                     Esoteric Options.    (line 109)
 * pinentry-program:                      Agent Options.       (line 273)
 * pinentry-timeout:                      Agent Options.       (line 267)
@@ -5329,13 +5476,13 @@
 * prefer-system-dirmngr:                 Configuration Options.
                                                               (line  56)
 * preserve-permissions:                  GPG Esoteric Options.
-                                                              (line 558)
+                                                              (line 561)
 * preset:                                Invoking gpg-preset-passphrase.
                                                               (line  22)
 * primary-keyring:                       GPG Configuration Options.
                                                               (line 243)
 * print-md:                              Operational GPG Commands.
-                                                              (line 377)
+                                                              (line 381)
 * q:                                     Invoking gpg-connect-agent.
                                                               (line  18)
 * q <1>:                                 Invoking symcryptrun.
@@ -5350,12 +5497,14 @@
                                                               (line  10)
 * quick-lsign-key:                       OpenPGP Key Management.
                                                               (line 398)
+* quick-revoke-sig:                      OpenPGP Key Management.
+                                                              (line 432)
 * quick-revoke-uid:                      OpenPGP Key Management.
                                                               (line 424)
 * quick-set-expire:                      OpenPGP Key Management.
                                                               (line  60)
 * quick-set-primary-uid:                 OpenPGP Key Management.
-                                                              (line 432)
+                                                              (line 442)
 * quick-sign-key:                        OpenPGP Key Management.
                                                               (line 398)
 * quiet:                                 Agent Options.       (line  45)
@@ -5375,9 +5524,9 @@
                                                               (line  59)
 * reader-port:                           Scdaemon Options.    (line 161)
 * rebuild-keydb-caches:                  Operational GPG Commands.
-                                                              (line 371)
+                                                              (line 375)
 * receive-keys:                          Operational GPG Commands.
-                                                              (line 304)
+                                                              (line 308)
 * recipient:                             GPG Key related Options.
                                                               (line   8)
 * recipient <1>:                         Input and Output.    (line  46)
@@ -5386,18 +5535,18 @@
                                                               (line  22)
 * recursive-resolver:                    Dirmngr Options.     (line 114)
 * recv-keys:                             Operational GPG Commands.
-                                                              (line 305)
+                                                              (line 309)
 * refresh-keys:                          Operational GPG Commands.
-                                                              (line 308)
+                                                              (line 312)
 * reload:                                Invoking gpgconf.    (line  70)
 * remove-socketdir:                      Invoking gpgconf.    (line  97)
 * request-origin:                        GPG Esoteric Options.
-                                                              (line 339)
+                                                              (line 342)
 * request-origin <1>:                    Esoteric Options.    (line 124)
 * require-cross-certification:           GPG Configuration Options.
-                                                              (line 814)
+                                                              (line 817)
 * require-secmem:                        GPG Configuration Options.
-                                                              (line 809)
+                                                              (line 812)
 * resolver-timeout:                      Dirmngr Options.     (line 117)
 * rfc2440:                               Compliance Options.  (line  37)
 * rfc4880:                               Compliance Options.  (line  25)
@@ -5405,15 +5554,15 @@
 * run:                                   Invoking gpg-connect-agent.
                                                               (line  82)
 * s:                                     Dirmngr Options.     (line  87)
-* s2k-calibration:                       Agent Options.       (line 423)
+* s2k-calibration:                       Agent Options.       (line 428)
 * s2k-cipher-algo:                       OpenPGP Options.     (line  74)
-* s2k-count:                             Agent Options.       (line 430)
+* s2k-count:                             Agent Options.       (line 435)
 * s2k-count <1>:                         OpenPGP Options.     (line  90)
 * s2k-digest-algo:                       OpenPGP Options.     (line  79)
 * s2k-mode:                              OpenPGP Options.     (line  83)
 * scdaemon-program:                      Agent Options.       (line 295)
 * search-keys:                           Operational GPG Commands.
-                                                              (line 314)
+                                                              (line 318)
 * secret-keyring:                        GPG Configuration Options.
                                                               (line 238)
 * send:                                  gpg-wks-client.      (line  65)
@@ -5429,9 +5578,9 @@
 * server <3>:                            Scdaemon Commands.   (line  22)
 * set-filename:                          GPG Esoteric Options.
                                                               (line 178)
-* set-filename <1>:                      gpgtar.              (line  99)
+* set-filename <1>:                      gpgtar.              (line 104)
 * set-filesize:                          GPG Esoteric Options.
-                                                              (line 464)
+                                                              (line 467)
 * set-notation:                          GPG Esoteric Options.
                                                               (line 124)
 * set-policy-url:                        GPG Esoteric Options.
@@ -5445,7 +5594,7 @@
 * show-photos:                           Deprecated Options.  (line   8)
 * show-policy-url:                       Deprecated Options.  (line  33)
 * show-session-key:                      GPG Esoteric Options.
-                                                              (line 468)
+                                                              (line 471)
 * shutdown:                              Dirmngr Commands.    (line  58)
 * sig-keyserver-url:                     GPG Esoteric Options.
                                                               (line 170)
@@ -5463,9 +5612,9 @@
 * skip-hidden-recipients:                GPG Key related Options.
                                                               (line 108)
 * skip-verify:                           GPG Esoteric Options.
-                                                              (line 432)
+                                                              (line 435)
 * squid-mode:                            dirmngr-client.      (line 101)
-* ssh-fingerprint-digest:                Agent Options.       (line 408)
+* ssh-fingerprint-digest:                Agent Options.       (line 413)
 * standard-resolver:                     Dirmngr Options.     (line 107)
 * status-fd:                             GPG Esoteric Options.
                                                               (line  74)
@@ -5482,16 +5631,16 @@
 * supervised <1>:                        Dirmngr Commands.    (line  33)
 * symmetric:                             Operational GPG Commands.
                                                               (line  42)
-* tar-args:                              gpgtar.              (line 111)
+* tar-args:                              gpgtar.              (line 116)
 * textmode:                              OpenPGP Options.     (line   8)
 * throw-keyids:                          GPG Esoteric Options.
                                                               (line 257)
 * time-only:                             watchgnupg.          (line  30)
 * tls-debug:                             Dirmngr Options.     (line  69)
 * tofu-default-policy:                   GPG Configuration Options.
-                                                              (line 700)
+                                                              (line 703)
 * tofu-policy:                           Operational GPG Commands.
-                                                              (line 399)
+                                                              (line 403)
 * trust-model:                           GPG Configuration Options.
                                                               (line 397)
 * trust-model:always:                    GPG Configuration Options.
@@ -5521,11 +5670,11 @@
 * ungroup:                               GPG Key related Options.
                                                               (line  70)
 * update-trustdb:                        Operational GPG Commands.
-                                                              (line 330)
+                                                              (line 334)
 * url:                                   dirmngr-client.      (line  94)
 * url <1>:                               dirmngr-client.      (line  98)
 * use-agent:                             GPG Configuration Options.
-                                                              (line 724)
+                                                              (line 727)
 * use-embedded-filename:                 GPG Esoteric Options.
                                                               (line 194)
 * use-standard-socket:                   Agent Options.       (line 313)
@@ -5533,13 +5682,14 @@
 * use-tor:                               Dirmngr Options.     (line  98)
 * utf8-strings:                          GPG Configuration Options.
                                                               (line 302)
+* utf8-strings <1>:                      gpgtar.              (line  90)
 * v:                                     Dirmngr Options.     (line  25)
 * v <1>:                                 Configuration Options.
                                                               (line  38)
 * v <2>:                                 Scdaemon Options.    (line  35)
 * v <3>:                                 dirmngr-client.      (line  53)
 * validate:                              dirmngr-client.      (line  76)
-* validation-model:                      Certificate Options. (line  61)
+* validation-model:                      Certificate Options. (line  73)
 * verbose:                               Agent Options.       (line  39)
 * verbose <1>:                           Dirmngr Options.     (line  25)
 * verbose <2>:                           GPG Configuration Options.
@@ -5598,7 +5748,7 @@
 * version <4>:                           Scdaemon Commands.   (line  10)
 * version <5>:                           watchgnupg.          (line  36)
 * version <6>:                           dirmngr-client.      (line  40)
-* version <7>:                           gpgtar.              (line 117)
+* version <7>:                           gpgtar.              (line 122)
 * version <8>:                           gpg-wks-client.      (line 125)
 * version <9>:                           gpg-wks-server.      (line  84)
 * warranty:                              General GPG Commands.
@@ -5606,7 +5756,7 @@
 * warranty <1>:                          General GPGSM Commands.
                                                               (line  15)
 * weak-digest:                           GPG Esoteric Options.
-                                                              (line 408)
+                                                              (line 411)
 * weak-digest <1>:                       gpgv.                (line  90)
 * with-colons:                           GPG Input and Output.
                                                               (line 276)
@@ -5619,7 +5769,7 @@
 * with-icao-spelling:                    GPG Input and Output.
                                                               (line 307)
 * with-key-data:                         GPG Esoteric Options.
-                                                              (line 436)
+                                                              (line 439)
 * with-key-data <1>:                     Input and Output.    (line  54)
 * with-key-origin:                       GPG Input and Output.
                                                               (line 315)
@@ -5646,10 +5796,10 @@
 [index]
 * Menu:
 
-* .gpg-v21-migrated:                     GPG Configuration.   (line  52)
+* .gpg-v21-migrated:                     GPG Configuration.   (line  77)
 * ~/.gnupg:                              GPG Configuration.   (line  27)
 * ASSUAN_DEBUG:                          Scdaemon Options.    (line 122)
-* COLUMNS:                               GPG Configuration.   (line  93)
+* COLUMNS:                               GPG Configuration.   (line 118)
 * com-certs.pem:                         GPGSM Configuration. (line  84)
 * dirmngr.conf:                          Dirmngr Configuration.
                                                               (line  12)
@@ -5657,7 +5807,7 @@
 * GNUPGHOME:                             Agent Options.       (line  17)
 * GNUPGHOME <1>:                         GPG Configuration Options.
                                                               (line 255)
-* GNUPGHOME <2>:                         GPG Configuration.   (line  81)
+* GNUPGHOME <2>:                         GPG Configuration.   (line 106)
 * GNUPGHOME <3>:                         Configuration Options.
                                                               (line  16)
 * GNUPGHOME <4>:                         Scdaemon Options.    (line  13)
@@ -5698,31 +5848,31 @@
                                                               (line  21)
 * HKCU\Software\GNU\GnuPG:HomeDir <7>:   Invoking symcryptrun.
                                                               (line  36)
-* HOME:                                  GPG Configuration.   (line  78)
-* http_proxy:                            Dirmngr Options.     (line 208)
-* LANGUAGE:                              GPG Configuration.   (line  96)
+* HOME:                                  GPG Configuration.   (line 103)
+* http_proxy:                            Dirmngr Options.     (line 225)
+* LANGUAGE:                              GPG Configuration.   (line 121)
 * LC_CTYPE:                              GPGSM OPTION.        (line  27)
 * LC_MESSAGES:                           GPGSM OPTION.        (line  29)
-* LINES:                                 GPG Configuration.   (line  93)
-* openpgp-revocs.d:                      GPG Configuration.   (line  66)
+* LINES:                                 GPG Configuration.   (line 118)
+* openpgp-revocs.d:                      GPG Configuration.   (line  91)
 * PATH:                                  GPG Configuration Options.
                                                               (line 220)
-* PINENTRY_USER_DATA:                    GPG Configuration.   (line  88)
+* PINENTRY_USER_DATA:                    GPG Configuration.   (line 113)
 * PINENTRY_USER_DATA <1>:                GPGSM OPTION.        (line  33)
 * policies.txt:                          GPGSM Configuration. (line  18)
 * private-keys-v1.d:                     Agent Configuration. (line 104)
 * pubring.gpg:                           GPG Configuration.   (line  32)
-* pubring.kbx:                           GPG Configuration.   (line  38)
+* pubring.kbx:                           GPG Configuration.   (line  50)
 * pubring.kbx <1>:                       GPGSM Configuration. (line 100)
 * qualified.txt:                         GPGSM Configuration. (line  33)
-* random_seed:                           GPG Configuration.   (line  63)
+* random_seed:                           GPG Configuration.   (line  88)
 * random_seed <1>:                       GPGSM Configuration. (line 106)
 * S.gpg-agent:                           GPGSM Configuration. (line 111)
-* secring.gpg:                           GPG Configuration.   (line  45)
+* secring.gpg:                           GPG Configuration.   (line  69)
 * SHELL:                                 Agent Options.       (line 138)
 * sshcontrol:                            Agent Configuration. (line  74)
 * TERM:                                  GPGSM OPTION.        (line  25)
-* trustdb.gpg:                           GPG Configuration.   (line  55)
+* trustdb.gpg:                           GPG Configuration.   (line  80)
 * trustlist.txt:                         Agent Configuration. (line  20)
 * XAUTHORITY:                            GPGSM OPTION.        (line  31)
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/doc/gnupg-module-overview.pdf et /tmp/xF6ffeaI4R/gnupg2-2.2.27/doc/gnupg-module-overview.pdf sont différents
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/doc/gnupg-module-overview.png et /tmp/xF6ffeaI4R/gnupg2-2.2.27/doc/gnupg-module-overview.png sont différents
diff -Nru gnupg2-2.2.20/doc/gpg-agent.texi gnupg2-2.2.27/doc/gpg-agent.texi
--- gnupg2-2.2.20/doc/gpg-agent.texi	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/doc/gpg-agent.texi	2020-08-27 12:53:10.000000000 +0200
@@ -403,7 +403,7 @@
 Set the time a cache entry is valid to @var{n} seconds.  The default
 is 600 seconds.  Each time a cache entry is accessed, the entry's
 timer is reset.  To set an entry's maximum lifetime, use
-@command{max-cache-ttl}.  Note that a cached passphrase may not
+@command{max-cache-ttl}.  Note that a cached passphrase may not be
 evicted immediately from memory if no client requests a cache
 operation.  This is due to an internal housekeeping function which is
 only run every few seconds.
@@ -585,16 +585,20 @@
 signing data on a remote machine without exposing the private keys to the
 remote machine.
 
-@anchor{option --enable-extended-key-format}
 @item --enable-extended-key-format
+@itemx --disable-extended-key-format
 @opindex enable-extended-key-format
-This option creates keys in the extended private key format.  Changing
-the passphrase of a key will also convert the key to that new format.
-Using this option makes the private keys unreadable for gpg-agent
-versions before 2.1.12.  The advantage of the extended private key
-format is that it is text based and can carry additional meta data.
-Note that this option also changes the key protection format to use
-OCB mode.
+@opindex disable-extended-key-format
+Since version 2.2.22 keys are created in the extended private key
+format by default.  Changing the passphrase of a key will also convert
+the key to that new format.  This key format is supported since GnuPG
+version 2.1.12 and thus there should be no need to disable it.
+Anyway, the disable option still allows to revert to the old behavior
+for new keys; be aware that keys are never migrated back to the old
+format.  If the enable option has been used the disable option won't
+have an effect.  The advantage of the extended private key format is
+that it is text based and can carry additional meta data.  In extended
+key format the OCB mode is used for key protection.
 
 @anchor{option --enable-ssh-support}
 @item --enable-ssh-support
diff -Nru gnupg2-2.2.20/doc/gpgsm.texi gnupg2-2.2.27/doc/gpgsm.texi
--- gnupg2-2.2.20/doc/gpgsm.texi	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/doc/gpgsm.texi	2020-11-23 12:12:21.000000000 +0100
@@ -409,9 +409,14 @@
 @itemx --disable-crl-checks
 @opindex enable-crl-checks
 @opindex disable-crl-checks
-By default the @acronym{CRL} checks are enabled and the DirMngr is used
-to check for revoked certificates.  The disable option is most useful
-with an off-line network connection to suppress this check.
+By default the @acronym{CRL} checks are enabled and the DirMngr is
+used to check for revoked certificates.  The disable option is most
+useful with an off-line network connection to suppress this check and
+also to avoid that new certificates introduce a web bug by including a
+certificate specific CRL DP.  The disable option also disables an
+issuer certificate lookup via the authorityInfoAccess property of the
+certificate; the @option{--enable-issuer-key-retrieve} can be used
+to make use of that property anyway.
 
 @item  --enable-trusted-cert-crl-check
 @itemx --disable-trusted-cert-crl-check
@@ -438,6 +443,14 @@
 along with the option @option{--with-validation} for a key listing
 command.  This option should not be used in a configuration file.
 
+@item --enable-issuer-based-crl-check
+@opindex enable-issuer-based-crl-check
+Run a CRL check even for certificates which do not have any CRL
+distribution point.  This requires that a suitable LDAP server has
+been configured in Dirmngr and that the CRL can be found using the
+issuer.  This option reverts to what GnuPG did up to version 2.2.20.
+This option is in general not useful.
+
 @item  --enable-ocsp
 @itemx --disable-ocsp
 @opindex enable-ocsp
@@ -1224,9 +1237,9 @@
 @xref{fun-assuan_sendfd, ,the assuan_sendfd function,assuan,the Libassuan
 manual}, on how to do descriptor passing.
 
-The @code{--armor} option may be used to advice the server that the
-input data is in @acronym{PEM} format, @code{--base64} advices that a
-raw base-64 encoding is used, @code{--binary} advices of raw binary
+The @code{--armor} option may be used to advise the server that the
+input data is in @acronym{PEM} format, @code{--base64} advises that a
+raw base-64 encoding is used, @code{--binary} advises of raw binary
 input (@acronym{BER}).  If none of these options is used, the server
 tries to figure out the used encoding, but this may not always be
 correct.
diff -Nru gnupg2-2.2.20/doc/gpg.texi gnupg2-2.2.27/doc/gpg.texi
--- gnupg2-2.2.20/doc/gpg.texi	2020-03-18 13:58:41.000000000 +0100
+++ gnupg2-2.2.27/doc/gpg.texi	2020-12-18 11:22:00.000000000 +0100
@@ -421,7 +421,7 @@
 @opindex delete-secret-keys
 Remove key from the secret keyring. In batch mode the key must be
 specified by fingerprint.  The option @option{--yes} can be used to
-advice gpg-agent not to request a confirmation.  This extra
+advise gpg-agent not to request a confirmation.  This extra
 pre-caution is done because @command{@gpgname} can't be sure that the
 secret key (as controlled by gpg-agent) is only used for the given
 OpenPGP public key.  If the exclamation mark syntax is used with the
@@ -434,7 +434,7 @@
 @opindex delete-secret-and-public-key
 Same as @option{--delete-key}, but if a secret key exists, it will be
 removed first. In batch mode the key must be specified by fingerprint.
-The option @option{--yes} can be used to advice gpg-agent not to
+The option @option{--yes} can be used to advise gpg-agent not to
 request a confirmation.
 
 @item --export
@@ -453,6 +453,11 @@
 only those keys which are new or changed by you.  If no @var{keyIDs}
 are given, @command{@gpgname} does nothing.
 
+Take care: Keyservers are by design write only systems and thus it is
+not possible to ever delete keys once they have been send to a
+keyserver.
+
+
 @item --export-secret-keys
 @itemx --export-secret-subkeys
 @opindex export-secret-keys
@@ -1133,6 +1138,17 @@
 supplementary revocation text, you should use the interactive
 sub-command @code{revuid} of @option{--edit-key}.
 
+@item --quick-revoke-sig  @var{fpr} @var{signing-fpr} [@var{names}]
+@opindex quick-revoke-sig
+This command revokes the key signatures made by @var{signing-fpr} from
+the key specified by the fingerprint @var{fpr}.  With @var{names}
+given only the signatures on user ids of the key matching any of the
+given names are affected (see @option{--quick-sign-key}).  If a
+revocation already exists a notice is printed instead of creating a
+new revocation; no error is returned in this case.  Note that key
+signature revocations may be superseded by a newer key signature and
+in turn again revoked.
+
 @item --quick-set-primary-uid  @var{user-id} @var{primary-user-id}
 @opindex quick-set-primary-uid
 This command sets or updates the primary user ID flag on an existing
@@ -1790,6 +1806,9 @@
   keyservers to use.  If this fails, attempt to locate the key using the
   PGP Universal method of checking @samp{ldap://keys.(thedomain)}.
 
+  @item ntds
+  Locate the key using the Active Directory (Windows only).
+
   @item keyserver
   Locate a key using a keyserver.
 
@@ -3165,7 +3184,10 @@
 @opindex passphrase-repeat
 Specify how many times @command{@gpgname} will request a new
 passphrase be repeated.  This is useful for helping memorize a
-passphrase.  Defaults to 1 repetition.
+passphrase.  Defaults to 1 repetition; can be set to 0 to disable any
+passphrase repetition.  Note that a @var{n} greater than 1 will pop up
+the pinentry window @var{n}+1 times even if a modern pinentry with
+two entry fields is used.
 
 @item --passphrase-fd @var{n}
 @opindex passphrase-fd
@@ -3612,26 +3634,54 @@
 
   @item ~/.gnupg/pubring.gpg
   @efindex pubring.gpg
-  The public keyring.  You should backup this file.
+  The public keyring using a legacy format.  You should backup this file.
+
+  If this file is not available, @command{gpg} defaults to the new
+  keybox format and creates a file @file{pubring.kbx} unless that file
+  already exists in which case that file will also be used for OpenPGP
+  keys.
+
+  Note that in the case that both files, @file{pubring.gpg} and
+  @file{pubring.kbx} exists but the latter has no OpenPGP keys, the
+  legacy file @file{pubring.gpg} will be used.  Take care: GnuPG
+  versions before 2.1 will always use the file @file{pubring.gpg}
+  because they do not know about the new keybox format. In the case
+  that you have to use GnuPG 1.4 to decrypt archived data you should
+  keep this file.
 
   @item ~/.gnupg/pubring.gpg.lock
   The lock file for the public keyring.
 
   @item ~/.gnupg/pubring.kbx
   @efindex pubring.kbx
-  The public keyring using a different format.  This file is shared
-  with @command{gpgsm}.  You should backup this file.
+  The public keyring using the new keybox format.  This file is shared
+  with @command{gpgsm}.  You should backup this file.  See above for
+  the relation between this file and it predecessor.
+
+  To convert an existing @file{pubring.gpg} file to the keybox format, you
+  first backup the ownertrust values, then rename @file{pubring.gpg} to
+  @file{publickeys.backup}, so it won’t be recognized by any GnuPG version,
+  run import, and finally restore the ownertrust values:
+
+  @example
+  $ cd ~/.gnupg
+  $ gpg --export-ownertrust >otrust.lst
+  $ mv pubring.gpg publickeys.backup
+  $ gpg --import-options restore --import publickeys.backups
+  $ gpg --import-ownertrust otrust.lst
+  @end example
 
   @item ~/.gnupg/pubring.kbx.lock
   The lock file for @file{pubring.kbx}.
 
   @item ~/.gnupg/secring.gpg
   @efindex secring.gpg
-  A secret keyring as used by GnuPG versions before 2.1.  It is not
-  used by GnuPG 2.1 and later.
+  The legacy secret keyring as used by GnuPG versions before 2.1.  It is not
+  used by GnuPG 2.1 and later.  You may want to keep it in case you
+  have to use GnuPG 1.4 to decrypt archived data.
 
   @item ~/.gnupg/secring.gpg.lock
-  The lock file for the secret keyring.
+  The lock file for the legacy secret keyring.
 
   @item ~/.gnupg/.gpg-v21-migrated
   @efindex .gpg-v21-migrated
@@ -4160,6 +4210,11 @@
 @item Key-Length: @var{nbits}
 The requested length of the generated key in bits.  The default is
 returned by running the command @samp{@gpgname --gpgconf-list}.
+For ECC keys this parameter is ignored.
+
+@item Key-Curve: @var{curve}
+The requested elliptic curve of the generated key.  This is a required
+parameter for ECC keys.  It is ignored for non-ECC keys.
 
 @item Key-Grip: @var{hexstring}
 This is optional and used to generate a CSR or certificate for an
@@ -4184,6 +4239,9 @@
 Length of the secondary key (subkey) in bits.  The default is returned
 by running the command @samp{@gpgname --gpgconf-list}.
 
+@item Subkey-Curve: @var{curve}
+Key curve for a subkey; similar to @samp{Key-Curve}.
+
 @item Subkey-Usage: @var{usage-list}
 Key usage lists for a subkey; similar to @samp{Key-Usage}.
 
diff -Nru gnupg2-2.2.20/doc/Makefile.am gnupg2-2.2.27/doc/Makefile.am
--- gnupg2-2.2.20/doc/Makefile.am	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/doc/Makefile.am	2020-11-04 16:32:20.000000000 +0100
@@ -22,7 +22,8 @@
 include $(top_srcdir)/am/cmacros.am
 
 examples = examples/README examples/scd-event examples/trustlist.txt	\
-	   examples/vsnfd.prf examples/debug.prf                        \
+	   examples/VS-NfD.prf examples/Automatic.prf                   \
+           examples/debug.prf                                           \
 	   examples/systemd-user/README 				\
 	   examples/systemd-user/dirmngr.service 			\
 	   examples/systemd-user/dirmngr.socket				\
@@ -182,6 +183,8 @@
 	if test -e $(top_srcdir)/.git; then \
 	  (cd $(srcdir) && git log -1 --format='%ct' \
                -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+        elif test x"$$SOURCE_DATE_EPOCH" != x; then   \
+	   echo "$$SOURCE_DATE_EPOCH" >>defsincdate ; \
 	fi
 
 defs.inc : defsincdate Makefile mkdefsinc
diff -Nru gnupg2-2.2.20/doc/Makefile.in gnupg2-2.2.27/doc/Makefile.in
--- gnupg2-2.2.20/doc/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/doc/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -275,6 +275,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -441,6 +442,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -473,7 +475,8 @@
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
 examples = examples/README examples/scd-event examples/trustlist.txt	\
-	   examples/vsnfd.prf examples/debug.prf                        \
+	   examples/VS-NfD.prf examples/Automatic.prf                   \
+           examples/debug.prf                                           \
 	   examples/systemd-user/README 				\
 	   examples/systemd-user/dirmngr.service 			\
 	   examples/systemd-user/dirmngr.socket				\
@@ -1235,6 +1238,8 @@
 	if test -e $(top_srcdir)/.git; then \
 	  (cd $(srcdir) && git log -1 --format='%ct' \
                -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+        elif test x"$$SOURCE_DATE_EPOCH" != x; then   \
+	   echo "$$SOURCE_DATE_EPOCH" >>defsincdate ; \
 	fi
 
 defs.inc : defsincdate Makefile mkdefsinc
diff -Nru gnupg2-2.2.20/doc/tools.texi gnupg2-2.2.27/doc/tools.texi
--- gnupg2-2.2.20/doc/tools.texi	2019-08-21 09:50:55.000000000 +0200
+++ gnupg2-2.2.27/doc/tools.texi	2020-08-22 14:38:20.000000000 +0200
@@ -2033,6 +2033,12 @@
 Modify option @option{--files-from} to use a binary nul instead of a
 linefeed to separate file names.
 
+@item --utf8-strings
+@opindex utf8-strings
+Assume that the file names read by @option{--files-from} are UTF-8
+encoded.  This option has an effect only on Windows where the active
+code page is otherwise assumed.
+
 @item --openpgp
 @opindex openpgp
 This option has no effect because OpenPGP encryption and signing is
diff -Nru gnupg2-2.2.20/g10/call-agent.c gnupg2-2.2.27/g10/call-agent.c
--- gnupg2-2.2.20/g10/call-agent.c	2019-08-21 14:01:03.000000000 +0200
+++ gnupg2-2.2.27/g10/call-agent.c	2020-12-04 09:28:04.000000000 +0100
@@ -484,6 +484,7 @@
     return;
 
   xfree (info->reader); info->reader = NULL;
+  xfree (info->manufacturer_name); info->manufacturer_name = NULL;
   xfree (info->serialno); info->serialno = NULL;
   xfree (info->apptype); info->apptype = NULL;
   xfree (info->disp_name); info->disp_name = NULL;
@@ -507,6 +508,7 @@
   const char *keyword = line;
   int keywordlen;
   int i;
+  char *endp;
 
   for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
     ;
@@ -706,6 +708,16 @@
       xfree (parm->private_do[no]);
       parm->private_do[no] = unescape_status_string (line);
     }
+  else if (keywordlen == 12 && !memcmp (keyword, "MANUFACTURER", 12))
+    {
+      xfree (parm->manufacturer_name);
+      parm->manufacturer_name = NULL;
+      parm->manufacturer_id = strtoul (line, &endp, 0);
+      while (endp && spacep (endp))
+        endp++;
+      if (endp && *endp)
+        parm->manufacturer_name = xstrdup (endp);
+    }
   else if (keywordlen == 3 && !memcmp (keyword, "KDF", 3))
     {
       unsigned char *data = unescape_status_string (line);
@@ -854,8 +866,14 @@
 
 /* Send an APDU to the current card.  On success the status word is
  * stored at R_SW.  With HEXAPDU being NULL only a RESET command is
- * send to scd.  With HEXAPDU being the string "undefined" the command
- * "SERIALNO undefined" is send to scd.
+ * send to scd.  HEXAPDU may also be one of these special strings:
+ *
+ *   "undefined"       :: Send the command "SCD SERIALNO undefined"
+ *   "lock"            :: Send the command "SCD LOCK --wait"
+ *   "trylock"         :: Send the command "SCD LOCK"
+ *   "unlock"          :: Send the command "SCD UNLOCK"
+ *   "reset-keep-lock" :: Send the command "SCD RESET --keep-lock"
+ *
  * Used by:
  *  card-util.c
  */
@@ -876,6 +894,26 @@
                              NULL, NULL, NULL, NULL, NULL, NULL);
 
     }
+  else if (!strcmp (hexapdu, "reset-keep-lock"))
+    {
+      err = assuan_transact (agent_ctx, "SCD RESET --keep-lock",
+                             NULL, NULL, NULL, NULL, NULL, NULL);
+    }
+  else if (!strcmp (hexapdu, "lock"))
+    {
+      err = assuan_transact (agent_ctx, "SCD LOCK --wait",
+                             NULL, NULL, NULL, NULL, NULL, NULL);
+    }
+  else if (!strcmp (hexapdu, "trylock"))
+    {
+      err = assuan_transact (agent_ctx, "SCD LOCK",
+                             NULL, NULL, NULL, NULL, NULL, NULL);
+    }
+  else if (!strcmp (hexapdu, "unlock"))
+    {
+      err = assuan_transact (agent_ctx, "SCD UNLOCK",
+                             NULL, NULL, NULL, NULL, NULL, NULL);
+    }
   else if (!strcmp (hexapdu, "undefined"))
     {
       err = assuan_transact (agent_ctx, "SCD SERIALNO undefined",
@@ -1518,13 +1556,15 @@
 
 /* Note: All strings shall be UTF-8. On success the caller needs to
    free the string stored at R_PASSPHRASE. On error NULL will be
-   stored at R_PASSPHRASE and an appropriate fpf error code
-   returned. */
+   stored at R_PASSPHRASE and an appropriate error code returned.
+   Only called from passphrase.c:passphrase_get - see there for more
+   comments on this ugly API. */
 gpg_error_t
 agent_get_passphrase (const char *cache_id,
                       const char *err_msg,
                       const char *prompt,
                       const char *desc_msg,
+                      int newsymkey,
                       int repeat,
                       int check,
                       char **r_passphrase)
@@ -1537,6 +1577,7 @@
   char *arg4 = NULL;
   membuf_t data;
   struct default_inq_parm_s dfltparm;
+  int have_newsymkey;
 
   memset (&dfltparm, 0, sizeof dfltparm);
 
@@ -1552,6 +1593,10 @@
                        "GETINFO cmd_has_option GET_PASSPHRASE repeat",
                        NULL, NULL, NULL, NULL, NULL, NULL))
     return gpg_error (GPG_ERR_NOT_SUPPORTED);
+  have_newsymkey = !(assuan_transact
+                     (agent_ctx,
+                      "GETINFO cmd_has_option GET_PASSPHRASE newsymkey",
+                      NULL, NULL, NULL, NULL, NULL, NULL));
 
   if (cache_id && *cache_id)
     if (!(arg1 = percent_plus_escape (cache_id)))
@@ -1566,10 +1611,14 @@
     if (!(arg4 = percent_plus_escape (desc_msg)))
       goto no_mem;
 
+  /* CHECK && REPEAT or NEWSYMKEY is here an indication that a new
+   * passphrase for symmetric encryption is requested; if the agent
+   * supports this we enable the modern API by also passing --newsymkey.  */
   snprintf (line, DIM(line),
-            "GET_PASSPHRASE --data --repeat=%d%s -- %s %s %s %s",
+            "GET_PASSPHRASE --data --repeat=%d%s%s -- %s %s %s %s",
             repeat,
-            check? " --check --qualitybar":"",
+            ((repeat && check) || newsymkey)? " --check":"",
+            (have_newsymkey && newsymkey)? " --newsymkey":"",
             arg1? arg1:"X",
             arg2? arg2:"X",
             arg3? arg3:"X",
@@ -1923,11 +1972,12 @@
    gcry_pk_genkey.  If NO_PROTECTION is true the agent is advised not
    to protect the generated key.  If NO_PROTECTION is not set and
    PASSPHRASE is not NULL the agent is requested to protect the key
-   with that passphrase instead of asking for one.  */
+   with that passphrase instead of asking for one.  TIMESTAMP is the
+   creation time of the key or zero.  */
 gpg_error_t
 agent_genkey (ctrl_t ctrl, char **cache_nonce_addr, char **passwd_nonce_addr,
               const char *keyparms, int no_protection,
-              const char *passphrase, gcry_sexp_t *r_pubkey)
+              const char *passphrase, time_t timestamp, gcry_sexp_t *r_pubkey)
 {
   gpg_error_t err;
   struct genkey_parm_s gk_parm;
@@ -1936,6 +1986,7 @@
   membuf_t data;
   size_t len;
   unsigned char *buf;
+  char timestamparg[16 + 16];  /* The 2nd 16 is sizeof(gnupg_isotime_t) */
   char line[ASSUAN_LINELENGTH];
 
   memset (&dfltparm, 0, sizeof dfltparm);
@@ -1947,6 +1998,14 @@
     return err;
   dfltparm.ctx = agent_ctx;
 
+  if (timestamp)
+    {
+      strcpy (timestamparg, " --timestamp=");
+      epoch2isotime (timestamparg+13, timestamp);
+    }
+  else
+    *timestamparg = 0;
+
   if (passwd_nonce_addr && *passwd_nonce_addr)
     ; /* A RESET would flush the passwd nonce cache.  */
   else
@@ -1961,7 +2020,8 @@
   gk_parm.dflt     = &dfltparm;
   gk_parm.keyparms = keyparms;
   gk_parm.passphrase = passphrase;
-  snprintf (line, sizeof line, "GENKEY%s%s%s%s%s",
+  snprintf (line, sizeof line, "GENKEY%s%s%s%s%s%s",
+            *timestamparg? timestamparg : "",
             no_protection? " --no-protection" :
             passphrase   ? " --inq-passwd" :
             /*          */ "",
@@ -2365,11 +2425,12 @@
 gpg_error_t
 agent_import_key (ctrl_t ctrl, const char *desc, char **cache_nonce_addr,
                   const void *key, size_t keylen, int unattended, int force,
-		  u32 *keyid, u32 *mainkeyid, int pubkey_algo)
+		  u32 *keyid, u32 *mainkeyid, int pubkey_algo, u32 timestamp)
 {
   gpg_error_t err;
   struct import_key_parm_s parm;
   struct cache_nonce_parm_s cn_parm;
+  char timestamparg[16 + 16];  /* The 2nd 16 is sizeof(gnupg_isotime_t) */
   char line[ASSUAN_LINELENGTH];
   struct default_inq_parm_s dfltparm;
 
@@ -2384,6 +2445,14 @@
     return err;
   dfltparm.ctx = agent_ctx;
 
+  if (timestamp)
+    {
+      strcpy (timestamparg, " --timestamp=");
+      epoch2isotime (timestamparg+13, timestamp);
+    }
+  else
+    *timestamparg = 0;
+
   if (desc)
     {
       snprintf (line, DIM(line), "SETKEYDESC %s", desc);
@@ -2397,7 +2466,8 @@
   parm.key    = key;
   parm.keylen = keylen;
 
-  snprintf (line, sizeof line, "IMPORT_KEY%s%s%s%s",
+  snprintf (line, sizeof line, "IMPORT_KEY%s%s%s%s%s",
+            *timestamparg? timestamparg : "",
             unattended? " --unattended":"",
             force? " --force":"",
             cache_nonce_addr && *cache_nonce_addr? " ":"",
diff -Nru gnupg2-2.2.20/g10/call-agent.h gnupg2-2.2.27/g10/call-agent.h
--- gnupg2-2.2.20/g10/call-agent.h	2019-08-21 14:01:03.000000000 +0200
+++ gnupg2-2.2.27/g10/call-agent.h	2020-08-23 12:28:56.000000000 +0200
@@ -32,6 +32,8 @@
   int error;         /* private. */
   char *reader;      /* Reader information.  */
   char *apptype;     /* Malloced application type string.  */
+  unsigned int manufacturer_id;
+  char *manufacturer_name; /* malloced.  */
   char *serialno;    /* malloced hex string. */
   char *disp_name;   /* malloced. */
   char *disp_lang;   /* malloced. */
@@ -133,6 +135,7 @@
                                   const char *err_msg,
                                   const char *prompt,
                                   const char *desc_msg,
+                                  int newsymkey,
                                   int repeat,
                                   int check,
                                   char **r_passphrase);
@@ -163,7 +166,7 @@
 gpg_error_t agent_genkey (ctrl_t ctrl,
                           char **cache_nonce_addr, char **passwd_nonce_addr,
                           const char *keyparms, int no_protection,
-                          const char *passphrase,
+                          const char *passphrase, time_t timestamp,
                           gcry_sexp_t *r_pubkey);
 
 /* Read a public key.  */
@@ -193,7 +196,8 @@
 gpg_error_t agent_import_key (ctrl_t ctrl, const char *desc,
                               char **cache_nonce_addr, const void *key,
                               size_t keylen, int unattended, int force,
-                              u32 *keyid, u32 *mainkeyid, int pubkey_algo);
+                              u32 *keyid, u32 *mainkeyid, int pubkey_algo,
+                              u32 timestamp);
 
 /* Receive a key from the agent.  */
 gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip,
diff -Nru gnupg2-2.2.20/g10/call-dirmngr.c gnupg2-2.2.27/g10/call-dirmngr.c
--- gnupg2-2.2.20/g10/call-dirmngr.c	2019-12-07 11:50:05.000000000 +0100
+++ gnupg2-2.2.27/g10/call-dirmngr.c	2020-12-18 11:22:00.000000000 +0100
@@ -963,6 +963,7 @@
     {
       kbnode_t node;
       estream_t fp;
+      char hexfpr[2*MAX_FINGERPRINT_LEN+1];
 
       /* Parse the keyblock and send info lines back to the server.  */
       fp = es_fopenmem (0, "rw,samethread");
@@ -1020,6 +1021,8 @@
 			       nbits_from_pk (pk), pk->pubkey_algo,
 			       pk->keyid, pk->timestamp, pk->expiredate,
 			       NULL);
+                es_fprintf (fp, "fpr:::::::::%s:\n",
+                            hexfingerprint (pk, hexfpr, sizeof hexfpr));
               }
               break;
 
@@ -1047,21 +1050,6 @@
               }
               break;
 
-              /* This bit is really for the benefit of people who
-                 store their keys in LDAP servers.  It makes it easy
-                 to do queries for things like "all keys signed by
-                 Isabella".  */
-            case PKT_SIGNATURE:
-              {
-                PKT_signature *sig = node->pkt->pkt.signature;
-
-                if (IS_UID_SIG (sig))
-		  record_output (fp, node->pkt->pkttype, NULL,
-				 -1, -1, sig->keyid,
-				 sig->timestamp, sig->expiredate, NULL);
-              }
-              break;
-
             default:
               continue;
             }
diff -Nru gnupg2-2.2.20/g10/card-util.c gnupg2-2.2.27/g10/card-util.c
--- gnupg2-2.2.20/g10/card-util.c	2020-03-03 13:33:22.000000000 +0100
+++ gnupg2-2.2.27/g10/card-util.c	2020-11-09 12:59:23.000000000 +0100
@@ -192,46 +192,6 @@
   agent_release_card_info (&info);
 }
 
-static const char *
-get_manufacturer (unsigned int no)
-{
-  /* Note:  Make sure that there is no colon or linefeed in the string. */
-  switch (no)
-    {
-    case 0x0001: return "PPC Card Systems";
-    case 0x0002: return "Prism";
-    case 0x0003: return "OpenFortress";
-    case 0x0004: return "Wewid";
-    case 0x0005: return "ZeitControl";
-    case 0x0006: return "Yubico";
-    case 0x0007: return "OpenKMS";
-    case 0x0008: return "LogoEmail";
-    case 0x0009: return "Fidesmo";
-    case 0x000A: return "Dangerous Things";
-    case 0x000B: return "Feitian Technologies";
-
-    case 0x002A: return "Magrathea";
-    case 0x0042: return "GnuPG e.V.";
-
-    case 0x1337: return "Warsaw Hackerspace";
-    case 0x2342: return "warpzone"; /* hackerspace Muenster.  */
-    case 0x4354: return "Confidential Technologies";   /* cotech.de */
-    case 0x5443: return "TIF-IT e.V.";
-    case 0x63AF: return "Trustica";
-    case 0xBA53: return "c-base e.V.";
-    case 0xBD0E: return "Paranoidlabs";
-    case 0xF517: return "FSIJ";
-    case 0xF5EC: return "F-Secure";
-
-      /* 0x0000 and 0xFFFF are defined as test cards per spec,
-         0xFF00 to 0xFFFE are assigned for use with randomly created
-         serial numbers.  */
-    case 0x0000:
-    case 0xffff: return "test card";
-    default: return (no & 0xff00) == 0xff00? "unmanaged S/N range":"unknown";
-    }
-}
-
 
 static void
 print_sha1_fpr (estream_t fp, const unsigned char *fpr)
@@ -393,6 +353,7 @@
   unsigned int uval;
   const unsigned char *thefpr;
   int i;
+  char *pesc;
 
   if (serialno && serialnobuflen)
     *serialno = 0;
@@ -479,7 +440,10 @@
     {
       es_fprintf (fp, "version:%.4s:\n", info.serialno+12);
       uval = xtoi_2(info.serialno+16)*256 + xtoi_2 (info.serialno+18);
-      es_fprintf (fp, "vendor:%04x:%s:\n", uval, get_manufacturer (uval));
+      pesc = (info.manufacturer_name
+              ? percent_escape (info.manufacturer_name, NULL) : NULL);
+      es_fprintf (fp, "vendor:%04x:%s:\n", uval, pesc? pesc:"");
+      xfree (pesc);
       es_fprintf (fp, "serial:%.8s:\n", info.serialno+20);
 
       print_isoname (fp, "Name of cardholder: ", "name", info.disp_name);
@@ -572,8 +536,7 @@
                    info.serialno[14] == '0'?"":info.serialno+14,
                    info.serialno[15]);
       tty_fprintf (fp, "Manufacturer .....: %s\n",
-                   get_manufacturer (xtoi_2(info.serialno+16)*256
-                                     + xtoi_2 (info.serialno+18)));
+                   info.manufacturer_name? info.manufacturer_name : "?");
       tty_fprintf (fp, "Serial number ....: %.8s\n", info.serialno+20);
 
       print_isoname (fp, "Name of cardholder: ", "name", info.disp_name);
@@ -1871,8 +1834,13 @@
   if (err)
     tty_printf ("sending card command %s failed: %s\n", desc,
                 gpg_strerror (err));
-  else if (!hexapdu || !strcmp (hexapdu, "undefined"))
-    ;
+  else if (!hexapdu
+           || !strcmp (hexapdu, "undefined")
+           || !strcmp (hexapdu, "reset-keep-lock")
+           || !strcmp (hexapdu, "lock")
+           || !strcmp (hexapdu, "trylock")
+           || !strcmp (hexapdu, "unlock"))
+    ; /* Ignore pseudo APDUs.  */
   else if (ignore == 0xffff)
     ; /* Ignore all status words.  */
   else if (sw != 0x9000)
@@ -1901,6 +1869,7 @@
   char *answer = NULL;
   int termstate = 0;
   int i;
+  int locked = 0;
 
   /*  The code below basically does the same what this
       gpg-connect-agent script does:
@@ -1962,8 +1931,14 @@
         goto leave;
 
       /* We need to select a card application before we can send APDUs
-         to the card without scdaemon doing anything on its own.  */
-      err = send_apdu (NULL, "RESET", 0);
+         to the card without scdaemon doing anything on its own.  We
+         then lock the connection so that other tools (e.g. Kleopatra)
+         don't try a new select.  */
+      err = send_apdu ("lock", "locking connection ", 0);
+      if (err)
+        goto leave;
+      locked = 1;
+      err = send_apdu ("reset-keep-lock", "reset", 0);
       if (err)
         goto leave;
       err = send_apdu ("undefined", "dummy select ", 0);
@@ -2005,7 +1980,7 @@
     goto leave;
 
   /* Finally we reset the card reader once more.  */
-  err = send_apdu (NULL, "RESET", 0);
+  err = send_apdu ("reset-keep-lock", "reset", 0);
 
   /* Then, connect the card again.  */
   if (!err)
@@ -2018,6 +1993,8 @@
     }
 
  leave:
+  if (locked)
+    send_apdu ("unlock", "unlocking connection ", 0);
   xfree (answer);
   agent_release_card_info (&info);
 }
diff -Nru gnupg2-2.2.20/g10/decrypt-data.c gnupg2-2.2.27/g10/decrypt-data.c
--- gnupg2-2.2.20/g10/decrypt-data.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/decrypt-data.c	2020-05-12 18:24:45.000000000 +0200
@@ -1,6 +1,7 @@
 /* decrypt-data.c - Decrypt an encrypted data packet
- * Copyright (C) 1998, 1999, 2000, 2001, 2005,
- *               2006, 2009 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2001, 2005-2006, 2009 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2001, 2005-2006, 2009, 2018 Werner Koch
+ * Copyright (C) 2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -32,22 +34,71 @@
 #include "../common/compliance.h"
 
 
+static int aead_decode_filter (void *opaque, int control, iobuf_t a,
+                               byte *buf, size_t *ret_len);
 static int mdc_decode_filter ( void *opaque, int control, IOBUF a,
                                byte *buf, size_t *ret_len);
 static int decode_filter ( void *opaque, int control, IOBUF a,
 					byte *buf, size_t *ret_len);
 
-typedef struct decode_filter_context_s
+/* Our context object.  */
+struct decode_filter_context_s
 {
+  /* Recounter (max value is 2).  We need it because we do not know
+   * whether the iobuf or the outer control code frees this object
+   * first.  */
+  int  refcount;
+
+  /* The cipher handle.  */
   gcry_cipher_hd_t cipher_hd;
+
+  /* The hash handle for use in MDC mode.  */
   gcry_md_hd_t mdc_hash;
-  char defer[22];
-  int  defer_filled;
-  int  eof_seen;
-  int  refcount;
-  int  partial;   /* Working on a partial length packet.  */
-  size_t length;  /* If !partial: Remaining bytes in the packet.  */
-} *decode_filter_ctx_t;
+
+  /* The start IV for AEAD encryption.   */
+  byte startiv[16];
+
+  /* The holdback buffer and its used length.  For AEAD we need 32+1
+   * bytes but we use 48 byte.  For MDC we need 22 bytes; here
+   * holdbacklen will either 0 or 22.  */
+  char holdback[48];
+  unsigned int holdbacklen;
+
+  /* Working on a partial length packet.  */
+  unsigned int partial : 1;
+
+  /* EOF indicator with these true values:
+   *   1 = normal EOF
+   *   2 = premature EOF (tag or hash incomplete)
+   *   3 = premature EOF (general)       */
+  unsigned int eof_seen : 2;
+
+  /* The actually used cipher algo for AEAD.  */
+  byte cipher_algo;
+
+  /* The AEAD algo.  */
+  byte aead_algo;
+
+  /* The encoded chunk byte for AEAD.  */
+  byte chunkbyte;
+
+  /* The decoded CHUNKBYTE.  */
+  uint64_t chunksize;
+
+  /* The chunk index for AEAD.  */
+  uint64_t chunkindex;
+
+  /* The number of bytes in the current chunk.  */
+  uint64_t chunklen;
+
+  /* The total count of decrypted plaintext octets.  */
+  uint64_t total;
+
+  /* Remaining bytes in the packet according to the packet header.
+   * Not used if PARTIAL is true.  */
+  size_t length;
+};
+typedef struct decode_filter_context_s *decode_filter_ctx_t;
 
 
 /* Helper to release the decode context.  */
@@ -69,6 +120,99 @@
 }
 
 
+/* Set the nonce and the additional data for the current chunk.  This
+ * also reset the decryption machinery so that the handle can be
+ * used for a new chunk.  If FINAL is set the final AEAD chunk is
+ * processed.  */
+static gpg_error_t
+aead_set_nonce_and_ad (decode_filter_ctx_t dfx, int final)
+{
+  gpg_error_t err;
+  unsigned char ad[21];
+  unsigned char nonce[16];
+  int i;
+
+  switch (dfx->aead_algo)
+    {
+    case AEAD_ALGO_OCB:
+      memcpy (nonce, dfx->startiv, 15);
+      i = 7;
+      break;
+
+    case AEAD_ALGO_EAX:
+      memcpy (nonce, dfx->startiv, 16);
+      i = 8;
+      break;
+
+    default:
+      BUG ();
+    }
+  nonce[i++] ^= dfx->chunkindex >> 56;
+  nonce[i++] ^= dfx->chunkindex >> 48;
+  nonce[i++] ^= dfx->chunkindex >> 40;
+  nonce[i++] ^= dfx->chunkindex >> 32;
+  nonce[i++] ^= dfx->chunkindex >> 24;
+  nonce[i++] ^= dfx->chunkindex >> 16;
+  nonce[i++] ^= dfx->chunkindex >>  8;
+  nonce[i++] ^= dfx->chunkindex;
+
+  if (DBG_CRYPTO)
+    log_printhex (nonce, i, "nonce:");
+  err = gcry_cipher_setiv (dfx->cipher_hd, nonce, i);
+  if (err)
+    return err;
+
+  ad[0] = (0xc0 | PKT_ENCRYPTED_AEAD);
+  ad[1] = 1;
+  ad[2] = dfx->cipher_algo;
+  ad[3] = dfx->aead_algo;
+  ad[4] = dfx->chunkbyte;
+  ad[5] = dfx->chunkindex >> 56;
+  ad[6] = dfx->chunkindex >> 48;
+  ad[7] = dfx->chunkindex >> 40;
+  ad[8] = dfx->chunkindex >> 32;
+  ad[9] = dfx->chunkindex >> 24;
+  ad[10]= dfx->chunkindex >> 16;
+  ad[11]= dfx->chunkindex >>  8;
+  ad[12]= dfx->chunkindex;
+  if (final)
+    {
+      ad[13] = dfx->total >> 56;
+      ad[14] = dfx->total >> 48;
+      ad[15] = dfx->total >> 40;
+      ad[16] = dfx->total >> 32;
+      ad[17] = dfx->total >> 24;
+      ad[18] = dfx->total >> 16;
+      ad[19] = dfx->total >>  8;
+      ad[20] = dfx->total;
+    }
+  if (DBG_CRYPTO)
+    log_printhex (ad, final? 21 : 13, "authdata:");
+  return gcry_cipher_authenticate (dfx->cipher_hd, ad, final? 21 : 13);
+}
+
+
+/* Helper to check the 16 byte tag in TAGBUF.  The FINAL flag is only
+ * for debug messages.  */
+static gpg_error_t
+aead_checktag (decode_filter_ctx_t dfx, int final, const void *tagbuf)
+{
+  gpg_error_t err;
+
+  if (DBG_FILTER)
+    log_printhex (tagbuf, 16, "tag:");
+  err = gcry_cipher_checktag (dfx->cipher_hd, tagbuf, 16);
+  if (err)
+    {
+      log_error ("gcry_cipher_checktag%s failed: %s\n",
+                 final? " (final)":"", gpg_strerror (err));
+      return err;
+    }
+  if (DBG_FILTER)
+    log_debug ("%stag is valid\n", final?"final ":"");
+  return 0;
+}
+
 
 /****************
  * Decrypt the data, specified by ED with the key DEK.
@@ -77,6 +221,8 @@
 decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
 {
   decode_filter_ctx_t dfx;
+  enum gcry_cipher_modes ciphermode;
+  unsigned int startivlen;
   byte *p;
   int rc=0, c, i;
   byte temp[32];
@@ -98,9 +244,18 @@
       dek->algo_info_printed = 1;
     }
 
+  if (ed->aead_algo)
+    {
+      rc = openpgp_aead_algo_info (ed->aead_algo, &ciphermode, &startivlen);
+      if (rc)
+        goto leave;
+      log_assert (startivlen <= sizeof dfx->startiv);
+    }
+  else
+    ciphermode = GCRY_CIPHER_MODE_CFB;
+
   /* Check compliance.  */
-  if (! gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo,
-                                 GCRY_CIPHER_MODE_CFB))
+  if (!gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo, ciphermode))
     {
       log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
 		 openpgp_cipher_algo_name (dek->algo),
@@ -109,12 +264,8 @@
       goto leave;
     }
 
-  {
-    char buf[20];
-
-    snprintf (buf, sizeof buf, "%d %d", ed->mdc_method, dek->algo);
-    write_status_text (STATUS_DECRYPTION_INFO, buf);
-  }
+  write_status_printf (STATUS_DECRYPTION_INFO, "%d %d %d",
+                       ed->mdc_method, dek->algo, 0);
 
   if (opt.show_session_key)
     {
@@ -139,95 +290,181 @@
   blocksize = openpgp_cipher_get_algo_blklen (dek->algo);
   if ( !blocksize || blocksize > 16 )
     log_fatal ("unsupported blocksize %u\n", blocksize );
-  nprefix = blocksize;
-  if ( ed->len && ed->len < (nprefix+2) )
-    {
-       /* An invalid message.  We can't check that during parsing
-          because we may not know the used cipher then.  */
-      rc = gpg_error (GPG_ERR_INV_PACKET);
-      goto leave;
-    }
 
-  if ( ed->mdc_method )
+  if (ed->aead_algo)
     {
-      if (gcry_md_open (&dfx->mdc_hash, ed->mdc_method, 0 ))
-        BUG ();
-      if ( DBG_HASHING )
-        gcry_md_debug (dfx->mdc_hash, "checkmdc");
-    }
+      if (blocksize != 16)
+        {
+          rc = gpg_error (GPG_ERR_CIPHER_ALGO);
+          goto leave;
+        }
 
-  rc = openpgp_cipher_open (&dfx->cipher_hd, dek->algo,
-			    GCRY_CIPHER_MODE_CFB,
-			    (GCRY_CIPHER_SECURE
-			     | ((ed->mdc_method || dek->algo >= 100)?
-				0 : GCRY_CIPHER_ENABLE_SYNC)));
-  if (rc)
-    {
-      /* We should never get an error here cause we already checked
-       * that the algorithm is available.  */
-      BUG();
-    }
+      if (ed->chunkbyte > 56)
+        {
+          log_error ("invalid AEAD chunkbyte %u\n", ed->chunkbyte);
+          rc = gpg_error (GPG_ERR_INV_PACKET);
+          goto leave;
+        }
 
+      /* Read the Start-IV. */
+      if (ed->len)
+        {
+          for (i=0; i < startivlen && ed->len; i++, ed->len--)
+            {
+              if ((c=iobuf_get (ed->buf)) == -1)
+                break;
+              dfx->startiv[i] = c;
+            }
+        }
+      else
+        {
+          for (i=0; i < startivlen; i++ )
+            if ( (c=iobuf_get (ed->buf)) == -1 )
+              break;
+            else
+              dfx->startiv[i] = c;
+        }
+      if (i != startivlen)
+        {
+          log_error ("Start-IV in AEAD packet too short (%d/%u)\n",
+                     i, startivlen);
+          rc = gpg_error (GPG_ERR_TOO_SHORT);
+          goto leave;
+        }
+
+      dfx->cipher_algo = ed->cipher_algo;
+      dfx->aead_algo = ed->aead_algo;
+      dfx->chunkbyte = ed->chunkbyte;
+      dfx->chunksize = (uint64_t)1 << (dfx->chunkbyte + 6);
+
+      if (dek->algo != dfx->cipher_algo)
+        log_info ("Note: different cipher algorithms used (%s/%s)\n",
+                  openpgp_cipher_algo_name (dek->algo),
+                  openpgp_cipher_algo_name (dfx->cipher_algo));
+
+      rc = openpgp_cipher_open (&dfx->cipher_hd,
+                                dfx->cipher_algo,
+                                ciphermode,
+                                GCRY_CIPHER_SECURE);
+      if (rc)
+        goto leave; /* Should never happen.  */
+
+      if (DBG_CRYPTO)
+        log_printhex (dek->key, dek->keylen, "thekey:");
+      rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen);
+      if (gpg_err_code (rc) == GPG_ERR_WEAK_KEY)
+        {
+          log_info (_("WARNING: message was encrypted with"
+                      " a weak key in the symmetric cipher.\n"));
+          rc = 0;
+        }
+      else if (rc)
+        {
+          log_error("key setup failed: %s\n", gpg_strerror (rc));
+          goto leave;
+        }
+
+      if (!ed->buf)
+        {
+          log_error(_("problem handling encrypted packet\n"));
+          goto leave;
+        }
 
-  /* log_hexdump( "thekey", dek->key, dek->keylen );*/
-  rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen);
-  if ( gpg_err_code (rc) == GPG_ERR_WEAK_KEY )
-    {
-      log_info(_("WARNING: message was encrypted with"
-                 " a weak key in the symmetric cipher.\n"));
-      rc=0;
     }
-  else if( rc )
+  else /* CFB encryption.  */
     {
-      log_error("key setup failed: %s\n", gpg_strerror (rc) );
-      goto leave;
-    }
+      nprefix = blocksize;
+      if ( ed->len && ed->len < (nprefix+2) )
+        {
+          /* An invalid message.  We can't check that during parsing
+           * because we may not know the used cipher then.  */
+          rc = gpg_error (GPG_ERR_INV_PACKET);
+          goto leave;
+        }
 
-  if (!ed->buf)
-    {
-      log_error(_("problem handling encrypted packet\n"));
-      goto leave;
-    }
+      if ( ed->mdc_method )
+        {
+          if (gcry_md_open (&dfx->mdc_hash, ed->mdc_method, 0 ))
+            BUG ();
+          if ( DBG_HASHING )
+            gcry_md_debug (dfx->mdc_hash, "checkmdc");
+        }
+
+      rc = openpgp_cipher_open (&dfx->cipher_hd, dek->algo,
+                                GCRY_CIPHER_MODE_CFB,
+                                (GCRY_CIPHER_SECURE
+                                 | ((ed->mdc_method || dek->algo >= 100)?
+                                    0 : GCRY_CIPHER_ENABLE_SYNC)));
+      if (rc)
+        {
+          /* We should never get an error here cause we already checked
+           * that the algorithm is available.  */
+          BUG();
+        }
 
-  gcry_cipher_setiv (dfx->cipher_hd, NULL, 0);
 
-  if ( ed->len )
-    {
-      for (i=0; i < (nprefix+2) && ed->len; i++, ed->len-- )
+      /* log_hexdump( "thekey", dek->key, dek->keylen );*/
+      rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen);
+      if ( gpg_err_code (rc) == GPG_ERR_WEAK_KEY )
+        {
+          log_info (_("WARNING: message was encrypted with"
+                      " a weak key in the symmetric cipher.\n"));
+          rc = 0;
+        }
+      else if (rc)
         {
-          if ( (c=iobuf_get(ed->buf)) == -1 )
-            break;
-          else
-            temp[i] = c;
+          log_error("key setup failed: %s\n", gpg_strerror (rc) );
+          goto leave;
         }
-    }
-  else
-    {
-      for (i=0; i < (nprefix+2); i++ )
-        if ( (c=iobuf_get(ed->buf)) == -1 )
-          break;
-        else
-          temp[i] = c;
-    }
 
-  gcry_cipher_decrypt (dfx->cipher_hd, temp, nprefix+2, NULL, 0);
-  gcry_cipher_sync (dfx->cipher_hd);
-  p = temp;
-  /* log_hexdump( "prefix", temp, nprefix+2 ); */
-  if (dek->symmetric
-      && (p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1]) )
-    {
-      rc = gpg_error (GPG_ERR_BAD_KEY);
-      goto leave;
-    }
+      if (!ed->buf)
+        {
+          log_error (_("problem handling encrypted packet\n"));
+          goto leave;
+        }
+
+      gcry_cipher_setiv (dfx->cipher_hd, NULL, 0);
+
+      if ( ed->len )
+        {
+          for (i=0; i < (nprefix+2) && ed->len; i++, ed->len-- )
+            {
+              if ( (c=iobuf_get(ed->buf)) == -1 )
+                break;
+              else
+                temp[i] = c;
+            }
+        }
+      else
+        {
+          for (i=0; i < (nprefix+2); i++ )
+            if ( (c=iobuf_get(ed->buf)) == -1 )
+              break;
+            else
+              temp[i] = c;
+        }
+
+      gcry_cipher_decrypt (dfx->cipher_hd, temp, nprefix+2, NULL, 0);
+      gcry_cipher_sync (dfx->cipher_hd);
+      p = temp;
+      /* log_hexdump( "prefix", temp, nprefix+2 ); */
+      if (dek->symmetric
+          && (p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1]) )
+        {
+          rc = gpg_error (GPG_ERR_BAD_KEY);
+          goto leave;
+        }
 
-  if ( dfx->mdc_hash )
-    gcry_md_write (dfx->mdc_hash, temp, nprefix+2);
+      if ( dfx->mdc_hash )
+        gcry_md_write (dfx->mdc_hash, temp, nprefix+2);
+    }
 
   dfx->refcount++;
-  dfx->partial = ed->is_partial;
+  dfx->partial = !!ed->is_partial;
   dfx->length = ed->len;
-  if ( ed->mdc_method )
+  if (ed->aead_algo)
+    iobuf_push_filter ( ed->buf, aead_decode_filter, dfx );
+  else if (ed->mdc_method)
     iobuf_push_filter ( ed->buf, mdc_decode_filter, dfx );
   else
     iobuf_push_filter ( ed->buf, decode_filter, dfx );
@@ -287,26 +524,359 @@
 
       log_assert (dfx->cipher_hd);
       log_assert (dfx->mdc_hash);
-      gcry_cipher_decrypt (dfx->cipher_hd, dfx->defer, 22, NULL, 0);
-      gcry_md_write (dfx->mdc_hash, dfx->defer, 2);
+      gcry_cipher_decrypt (dfx->cipher_hd, dfx->holdback, 22, NULL, 0);
+      gcry_md_write (dfx->mdc_hash, dfx->holdback, 2);
       gcry_md_final (dfx->mdc_hash);
 
-      if (   dfx->defer[0] != '\xd3'
-          || dfx->defer[1] != '\x14'
+      if (   dfx->holdback[0] != '\xd3'
+          || dfx->holdback[1] != '\x14'
           || datalen != 20
-          || memcmp (gcry_md_read (dfx->mdc_hash, 0), dfx->defer+2, datalen))
+          || memcmp (gcry_md_read (dfx->mdc_hash, 0), dfx->holdback+2, datalen))
         rc = gpg_error (GPG_ERR_BAD_SIGNATURE);
-      /* log_printhex("MDC message:", dfx->defer, 22); */
-      /* log_printhex("MDC calc:", gcry_md_read (dfx->mdc_hash,0), datalen); */
+      /* log_printhex(dfx->holdback, 22, "MDC message:"); */
+      /* log_printhex(gcry_md_read (dfx->mdc_hash,0), datalen, "MDC calc:"); */
     }
 
-
  leave:
   release_dfx_context (dfx);
   return rc;
 }
 
 
+/* Fill BUFFER with up to NBYTES-OFFSET from STREAM utilizing
+ * information from the context DFX.  Returns the new offset which is
+ * the number of bytes read plus the original offset.  On EOF the
+ * respective flag in DFX is set. */
+static size_t
+fill_buffer (decode_filter_ctx_t dfx, iobuf_t stream,
+             byte *buffer, size_t nbytes, size_t offset)
+{
+  size_t nread = offset;
+  size_t curr;
+  int ret;
+
+  if (dfx->partial)
+    {
+      while (nread < nbytes)
+        {
+          curr = nbytes - nread;
+
+          ret = iobuf_read (stream, &buffer[nread], curr);
+          if (ret == -1)
+            {
+              dfx->eof_seen = 1; /* Normal EOF. */
+              break;
+            }
+
+          nread += ret;
+        }
+    }
+  else
+    {
+      while (nread < nbytes && dfx->length)
+        {
+          curr = nbytes - nread;
+          if (curr > dfx->length)
+            curr = dfx->length;
+
+          ret = iobuf_read (stream, &buffer[nread], curr);
+          if (ret == -1)
+            {
+              dfx->eof_seen = 3; /* Premature EOF. */
+              break;
+            }
+
+          nread += ret;
+          dfx->length -= ret;
+        }
+      if (!dfx->length)
+        dfx->eof_seen = 1; /* Normal EOF.  */
+    }
+
+  return nread;
+}
+
+
+/* The core of the AEAD decryption.  This is the underflow function of
+ * the aead_decode_filter.  */
+static gpg_error_t
+aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
+{
+  const size_t size = *ret_len; /* The allocated size of BUF.  */
+  gpg_error_t err;
+  size_t totallen = 0; /* The number of bytes to return on success or EOF.  */
+  size_t off = 0;      /* The offset into the buffer.  */
+  size_t len;          /* The current number of bytes in BUF+OFF.  */
+
+  log_assert (size > 48); /* Our code requires at least this size.  */
+
+  /* Copy the rest from the last call of this function into BUF.  */
+  len = dfx->holdbacklen;
+  dfx->holdbacklen = 0;
+  memcpy (buf, dfx->holdback, len);
+
+  if (DBG_FILTER)
+    log_debug ("aead_underflow: size=%zu len=%zu%s%s\n", size, len,
+               dfx->partial? " partial":"", dfx->eof_seen? " eof":"");
+
+  /* Read and fill up BUF.  We need to watch out for an EOF so that we
+   * can detect the last chunk which is commonly shorter than the
+   * chunksize.  After the last data byte from the last chunk 32 more
+   * bytes are expected for the last chunk's tag and the following
+   * final chunk's tag.  To detect the EOF we need to try reading at least
+   * one further byte; however we try to read 16 extra bytes to avoid
+   * single byte reads in some lower layers.  The outcome is that we
+   * have up to 48 extra extra octets which we will later put into the
+   * holdback buffer for the next invocation (which handles the EOF
+   * case).  */
+  len = fill_buffer (dfx, a, buf, size, len);
+  if (len < 32)
+    {
+      /* Not enough data for the last two tags.  */
+      err = gpg_error (GPG_ERR_TRUNCATED);
+      goto leave;
+    }
+  if (dfx->eof_seen)
+    {
+      /* If have seen an EOF we copy only the last two auth tags into
+       * the holdback buffer.  */
+      dfx->holdbacklen = 32;
+      memcpy (dfx->holdback, buf+len-32, 32);
+      len -= 32;
+    }
+  else
+    {
+      /* If have not seen an EOF we copy the entire extra 48 bytes
+       * into the holdback buffer for processing at the next call of
+       * this function.  */
+      dfx->holdbacklen = len > 48? 48 : len;
+      memcpy (dfx->holdback, buf+len-dfx->holdbacklen, dfx->holdbacklen);
+      len -= dfx->holdbacklen;
+    }
+  /* log_printhex (dfx->holdback, dfx->holdbacklen, "holdback:"); */
+
+  /* Decrypt the buffer.  This first requires a loop to handle the
+   * case when a chunk ends within the buffer.  */
+  if (DBG_FILTER)
+    log_debug ("decrypt: chunklen=%ju total=%ju size=%zu len=%zu%s\n",
+               dfx->chunklen, dfx->total, size, len,
+               dfx->eof_seen? " eof":"");
+
+  while (len && dfx->chunklen + len >= dfx->chunksize)
+    {
+      size_t n = dfx->chunksize - dfx->chunklen;
+      byte tagbuf[16];
+
+      if (DBG_FILTER)
+        log_debug ("chunksize will be reached: n=%zu\n", n);
+
+      if (!dfx->chunklen)
+        {
+          /* First data for this chunk - prepare.  */
+          err = aead_set_nonce_and_ad (dfx, 0);
+          if (err)
+            goto leave;
+        }
+
+      /* log_printhex (buf, n, "ciph:"); */
+      gcry_cipher_final (dfx->cipher_hd);
+      err = gcry_cipher_decrypt (dfx->cipher_hd, buf+off, n, NULL, 0);
+      if (err)
+        {
+          log_error ("gcry_cipher_decrypt failed (1): %s\n",
+                     gpg_strerror (err));
+          goto leave;
+        }
+      /* log_printhex (buf, n, "plai:"); */
+      totallen += n;
+      dfx->chunklen += n;
+      dfx->total += n;
+      off += n;
+      len -= n;
+
+      if (DBG_FILTER)
+        log_debug ("ndecrypted: %zu (nchunk=%ju) bytes left: %zu at off=%zu\n",
+                   totallen, dfx->chunklen, len, off);
+
+      /* Check the tag.  */
+      if (len < 16)
+        {
+          /* The tag is not entirely in the buffer.  Read the rest of
+           * the tag from the holdback buffer.  Then shift the holdback
+           * buffer and fill it up again.  */
+          memcpy (tagbuf, buf+off, len);
+          memcpy (tagbuf + len, dfx->holdback, 16 - len);
+          dfx->holdbacklen -= 16-len;
+          memmove (dfx->holdback, dfx->holdback + (16-len), dfx->holdbacklen);
+
+          if (dfx->eof_seen)
+            {
+              /* We should have the last chunk's tag in TAGBUF and the
+               * final tag in HOLDBACKBUF.  */
+              if (len || dfx->holdbacklen != 16)
+                {
+                  /* Not enough data for the last two tags.  */
+                  err = gpg_error (GPG_ERR_TRUNCATED);
+                  goto leave;
+                }
+            }
+          else
+            {
+              len = 0;
+              dfx->holdbacklen = fill_buffer (dfx, a, dfx->holdback, 48,
+                                              dfx->holdbacklen);
+              if (dfx->holdbacklen < 32)
+                {
+                  /* Not enough data for the last two tags.  */
+                  err = gpg_error (GPG_ERR_TRUNCATED);
+                  goto leave;
+                }
+            }
+        }
+      else /* We already have the full tag.  */
+        {
+          memcpy (tagbuf, buf+off, 16);
+          /* Remove that tag from the output.  */
+          memmove (buf + off, buf + off + 16, len - 16);
+          len -= 16;
+        }
+      err = aead_checktag (dfx, 0, tagbuf);
+      if (err)
+        goto leave;
+      dfx->chunklen = 0;
+      dfx->chunkindex++;
+
+      continue;
+    }
+
+  /* The bulk decryption of our buffer.  */
+  if (len)
+    {
+      if (!dfx->chunklen)
+        {
+          /* First data for this chunk - prepare.  */
+          err = aead_set_nonce_and_ad (dfx, 0);
+          if (err)
+            goto leave;
+        }
+
+      if (dfx->eof_seen)
+        {
+          /* This is the last block of the last chunk.  Its length may
+           * not be a multiple of the block length.  */
+          gcry_cipher_final (dfx->cipher_hd);
+        }
+      err = gcry_cipher_decrypt (dfx->cipher_hd, buf + off, len, NULL, 0);
+      if (err)
+        {
+          log_error ("gcry_cipher_decrypt failed (2): %s\n",
+                     gpg_strerror (err));
+          goto leave;
+        }
+      totallen += len;
+      dfx->chunklen += len;
+      dfx->total += len;
+      if (DBG_FILTER)
+        log_debug ("ndecrypted: %zu (nchunk=%ju)\n", totallen, dfx->chunklen);
+    }
+
+  if (dfx->eof_seen)
+    {
+
+      if (dfx->chunklen)
+        {
+          if (DBG_FILTER)
+            log_debug ("eof seen: holdback has the last and final tag\n");
+          log_assert (dfx->holdbacklen >= 32);
+          err = aead_checktag (dfx, 0, dfx->holdback);
+          if (err)
+            goto leave;
+          dfx->chunklen = 0;
+          dfx->chunkindex++;
+          off = 16;
+        }
+      else
+        {
+          if (DBG_FILTER)
+            log_debug ("eof seen: holdback has the final tag\n");
+          log_assert (dfx->holdbacklen >= 16);
+          off = 0;
+        }
+
+      /* Check the final chunk.  */
+      err = aead_set_nonce_and_ad (dfx, 1);
+      if (err)
+        goto leave;
+      gcry_cipher_final (dfx->cipher_hd);
+      /* Decrypt an empty string (using HOLDBACK as a dummy).  */
+      err = gcry_cipher_decrypt (dfx->cipher_hd, dfx->holdback, 0, NULL, 0);
+      if (err)
+        {
+          log_error ("gcry_cipher_decrypt failed (final): %s\n",
+                     gpg_strerror (err));
+          goto leave;
+        }
+      err = aead_checktag (dfx, 1, dfx->holdback+off);
+      if (err)
+        goto leave;
+      err = gpg_error (GPG_ERR_EOF);
+    }
+
+ leave:
+  if (DBG_FILTER)
+    log_debug ("aead_underflow: returning %zu (%s)\n",
+               totallen, gpg_strerror (err));
+
+  /* In case of an auth error we map the error code to the same as
+   * used by the MDC decryption.  */
+  if (gpg_err_code (err) == GPG_ERR_CHECKSUM)
+    err = gpg_error (GPG_ERR_BAD_SIGNATURE);
+
+  /* In case of an error we better wipe out the buffer than to convey
+   * partly decrypted data.  */
+  if (err && gpg_err_code (err) != GPG_ERR_EOF)
+    memset (buf, 0, size);
+
+  *ret_len = totallen;
+
+  return err;
+}
+
+
+/* The IOBUF filter used to decrypt AEAD encrypted data.  */
+static int
+aead_decode_filter (void *opaque, int control, IOBUF a,
+                    byte *buf, size_t *ret_len)
+{
+  decode_filter_ctx_t dfx = opaque;
+  int rc = 0;
+
+  if ( control == IOBUFCTRL_UNDERFLOW && dfx->eof_seen )
+    {
+      *ret_len = 0;
+      rc = -1;
+    }
+  else if ( control == IOBUFCTRL_UNDERFLOW )
+    {
+      log_assert (a);
+
+      rc = aead_underflow (dfx, a, buf, ret_len);
+      if (gpg_err_code (rc) == GPG_ERR_EOF)
+        rc = -1; /* We need to use the old convention in the filter.  */
+
+    }
+  else if ( control == IOBUFCTRL_FREE )
+    {
+      release_dfx_context (dfx);
+    }
+  else if ( control == IOBUFCTRL_DESC )
+    {
+      mem2str (buf, "aead_decode_filter", *ret_len);
+    }
+
+  return rc;
+}
+
 
 static int
 mdc_decode_filter (void *opaque, int control, IOBUF a,
@@ -315,7 +885,6 @@
   decode_filter_ctx_t dfx = opaque;
   size_t n, size = *ret_len;
   int rc = 0;
-  int c;
 
   /* Note: We need to distinguish between a partial and a fixed length
      packet.  The first is the usual case as created by GPG.  However
@@ -336,73 +905,29 @@
       log_assert (size > 44); /* Our code requires at least this size.  */
 
       /* Get at least 22 bytes and put it ahead in the buffer.  */
-      if (dfx->partial)
-        {
-          for (n=22; n < 44; n++)
-            {
-              if ( (c = iobuf_get(a)) == -1 )
-                break;
-              buf[n] = c;
-            }
-        }
-      else
-        {
-          for (n=22; n < 44 && dfx->length; n++, dfx->length--)
-            {
-              c = iobuf_get (a);
-              if (c == -1)
-                break; /* Premature EOF.  */
-              buf[n] = c;
-            }
-        }
+      n = fill_buffer (dfx, a, buf, 44, 22);
       if (n == 44)
         {
           /* We have enough stuff - flush the deferred stuff.  */
-          if ( !dfx->defer_filled )  /* First time. */
+          if ( !dfx->holdbacklen )  /* First time. */
             {
               memcpy (buf, buf+22, 22);
               n = 22;
 	    }
           else
             {
-              memcpy (buf, dfx->defer, 22);
+              memcpy (buf, dfx->holdback, 22);
 	    }
           /* Fill up the buffer. */
-          if (dfx->partial)
-            {
-              for (; n < size; n++ )
-                {
-                  if ( (c = iobuf_get(a)) == -1 )
-                    {
-                      dfx->eof_seen = 1; /* Normal EOF. */
-                      break;
-                    }
-                  buf[n] = c;
-                }
-            }
-          else
-            {
-              for (; n < size && dfx->length; n++, dfx->length--)
-                {
-                  c = iobuf_get(a);
-                  if (c == -1)
-                    {
-                      dfx->eof_seen = 3; /* Premature EOF. */
-                      break;
-                    }
-                  buf[n] = c;
-                }
-              if (!dfx->length)
-                dfx->eof_seen = 1; /* Normal EOF.  */
-            }
+          n = fill_buffer (dfx, a, buf, size, n);
 
-          /* Move the trailing 22 bytes back to the defer buffer.  We
+          /* Move the trailing 22 bytes back to the holdback buffer.  We
              have at least 44 bytes thus a memmove is not needed.  */
           n -= 22;
-          memcpy (dfx->defer, buf+n, 22 );
-          dfx->defer_filled = 1;
+          memcpy (dfx->holdback, buf+n, 22 );
+          dfx->holdbacklen = 22;
 	}
-      else if ( !dfx->defer_filled )  /* EOF seen but empty defer buffer. */
+      else if ( !dfx->holdbacklen )  /* EOF seen but empty holdback buffer. */
         {
           /* This is bad because it means an incomplete hash. */
           n -= 22;
@@ -411,9 +936,9 @@
 	}
       else  /* EOF seen (i.e. read less than 22 bytes). */
         {
-          memcpy (buf, dfx->defer, 22 );
+          memcpy (buf, dfx->holdback, 22 );
           n -= 22;
-          memcpy (dfx->defer, buf+n, 22 );
+          memcpy (dfx->holdback, buf+n, 22 );
           dfx->eof_seen = 1; /* Normal EOF. */
 	}
 
@@ -449,7 +974,7 @@
   decode_filter_ctx_t fc = opaque;
   size_t size = *ret_len;
   size_t n;
-  int c, rc = 0;
+  int rc = 0;
 
 
   if ( control == IOBUFCTRL_UNDERFLOW && fc->eof_seen )
@@ -461,34 +986,7 @@
     {
       log_assert (a);
 
-      if (fc->partial)
-        {
-          for (n=0; n < size; n++ )
-            {
-              c = iobuf_get(a);
-              if (c == -1)
-                {
-                  fc->eof_seen = 1; /* Normal EOF. */
-                  break;
-                }
-              buf[n] = c;
-            }
-        }
-      else
-        {
-          for (n=0; n < size && fc->length; n++, fc->length--)
-            {
-              c = iobuf_get(a);
-              if (c == -1)
-                {
-                  fc->eof_seen = 3; /* Premature EOF. */
-                  break;
-                }
-              buf[n] = c;
-            }
-          if (!fc->length)
-            fc->eof_seen = 1; /* Normal EOF.  */
-        }
+      n = fill_buffer (fc, a, buf, size, 0);
       if (n)
         {
           if (fc->cipher_hd)
diff -Nru gnupg2-2.2.20/g10/dek.h gnupg2-2.2.27/g10/dek.h
--- gnupg2-2.2.20/g10/dek.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/dek.h	2020-04-16 08:07:53.000000000 +0200
@@ -19,21 +19,31 @@
 #ifndef G10_DEK_H
 #define G10_DEK_H
 
-
 typedef struct
 {
   /* The algorithm (e.g., CIPHER_ALGO_AES).  */
   int algo;
   /* The length of the key (in bytes).  */
   int keylen;
+
   /* Whether we've already printed information about this key.  This
-     is currently only used in decrypt_data() and only if we are in
-     verbose mode.  */
-  int algo_info_printed;
-  int use_mdc;
+   * is currently only used in decrypt_data() and only if we are in
+   * verbose mode.  */
+  unsigned int algo_info_printed : 1;
+
+  /* AEAD shall be used.  The value is the AEAD algo. */
+  int use_aead : 4;
+
+  /* MDC shall be used.  */
+  unsigned int use_mdc : 1;
+
   /* This key was read from a SK-ESK packet (see proc_symkey_enc).  */
-  int symmetric;
-  byte key[32]; /* This is the largest used keylen (256 bit). */
+  unsigned int symmetric : 1;
+
+  /* This is the largest used keylen (256 bit). */
+  byte key[32];
+
+  /* The cacheid for the S2K. */
   char s2k_cacheid[1+16+1];
 } DEK;
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/g10/distsigkey.gpg et /tmp/xF6ffeaI4R/gnupg2-2.2.27/g10/distsigkey.gpg sont différents
diff -Nru gnupg2-2.2.20/g10/ecdh.c gnupg2-2.2.27/g10/ecdh.c
--- gnupg2-2.2.20/g10/ecdh.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/ecdh.c	2020-05-12 18:26:16.000000000 +0200
@@ -76,7 +76,7 @@
     }
   log_assert (i < DIM (kek_params_table));
   if (DBG_CRYPTO)
-    log_printhex ("ECDH KEK params are", kek_params, sizeof(kek_params) );
+    log_printhex (kek_params, sizeof(kek_params), "ECDH KEK params are");
 
   return gcry_mpi_set_opaque (NULL, kek_params, 4 * 8);
 }
@@ -159,7 +159,7 @@
       memset (secret_x+secret_x_size, 0, nbytes-secret_x_size);
 
     if (DBG_CRYPTO)
-      log_printhex ("ECDH shared secret X is:", secret_x, secret_x_size );
+      log_printhex (secret_x, secret_x_size, "ECDH shared secret X is:");
   }
 
   /*** We have now the shared secret bytes in secret_x. ***/
@@ -179,7 +179,7 @@
   kek_params_size = (nbits+7)/8;
 
   if (DBG_CRYPTO)
-    log_printhex ("ecdh KDF params:", kek_params, kek_params_size);
+    log_printhex (kek_params, kek_params_size, "ecdh KDF params:");
 
   /* Expect 4 bytes  03 01 hash_alg symm_alg.  */
   if (kek_params_size != 4 || kek_params[0] != 3 || kek_params[1] != 1)
@@ -236,7 +236,7 @@
       }
 
     if(DBG_CRYPTO)
-      log_printhex ("ecdh KDF message params are:", message, message_size);
+      log_printhex (message, message_size, "ecdh KDF message params are:");
   }
 
   /* Derive a KEK (key wrapping key) using MESSAGE and SECRET_X. */
@@ -272,7 +272,7 @@
     /* We could have allocated more, so clean the tail before returning.  */
     memset (secret_x+secret_x_size, 0, old_size - secret_x_size);
     if (DBG_CRYPTO)
-      log_printhex ("ecdh KEK is:", secret_x, secret_x_size );
+      log_printhex (secret_x, secret_x_size, "ecdh KEK is:");
   }
 
   /* And, finally, aeswrap with key secret_x.  */
@@ -338,7 +338,7 @@
           }
 
         if (DBG_CRYPTO)
-          log_printhex ("ecdh encrypting  :", in, data_buf_size );
+          log_printhex (in, data_buf_size, "ecdh encrypting  :");
 
         err = gcry_cipher_encrypt (hd, data_buf+1, data_buf_size+8,
                                    in, data_buf_size);
@@ -354,7 +354,7 @@
         data_buf[0] = data_buf_size+8;
 
         if (DBG_CRYPTO)
-          log_printhex ("ecdh encrypted to:", data_buf+1, data_buf[0] );
+          log_printhex (data_buf+1, data_buf[0], "ecdh encrypted to:");
 
         result = gcry_mpi_set_opaque (NULL, data_buf, 8 * (1+data_buf[0]));
         if (!result)
@@ -391,7 +391,7 @@
         data_buf_size = data_buf[0];
 
         if (DBG_CRYPTO)
-          log_printhex ("ecdh decrypting :", data_buf+1, data_buf_size);
+          log_printhex (data_buf+1, data_buf_size, "ecdh decrypting :");
 
         err = gcry_cipher_decrypt (hd, in, data_buf_size, data_buf+1,
                                    data_buf_size);
@@ -407,7 +407,7 @@
         data_buf_size -= 8;
 
         if (DBG_CRYPTO)
-          log_printhex ("ecdh decrypted to :", in, data_buf_size);
+          log_printhex (in, data_buf_size, "ecdh decrypted to :");
 
         /* Padding is removed later.  */
         /* if (in[data_buf_size-1] > 8 ) */
diff -Nru gnupg2-2.2.20/g10/encrypt.c gnupg2-2.2.27/g10/encrypt.c
--- gnupg2-2.2.20/g10/encrypt.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/encrypt.c	2020-11-03 15:42:59.000000000 +0100
@@ -110,7 +110,7 @@
 
 
 /* Shall we use the MDC?  Yes - unless rfc-2440 compatibility is
- * requested. */
+ * requested.  Must return 1 or 0. */
 int
 use_mdc (pk_list_t pk_list,int algo)
 {
@@ -191,20 +191,15 @@
   cfx.dek = NULL;
   if ( mode )
     {
-      int canceled;
-
-      s2k = xmalloc_clear( sizeof *s2k );
-      s2k->mode = opt.s2k_mode;
-      s2k->hash_algo = S2K_DIGEST_ALGO;
-      cfx.dek = passphrase_to_dek (default_cipher_algo (), s2k, 1, 0,
-                                   NULL, &canceled);
-      if ( !cfx.dek || !cfx.dek->keylen )
-        {
-          rc = gpg_error (canceled? GPG_ERR_CANCELED:GPG_ERR_INV_PASSPHRASE);
-          xfree (cfx.dek);
-          xfree (s2k);
+      rc = setup_symkey (&s2k, &cfx.dek);
+      if (rc)
+        {
           iobuf_close (inp);
-          log_error (_("error creating passphrase: %s\n"), gpg_strerror (rc));
+          if (gpg_err_code (rc) == GPG_ERR_CIPHER_ALGO
+              || gpg_err_code (rc) == GPG_ERR_DIGEST_ALGO)
+            ; /* Error has already been printed.  */
+          else
+            log_error (_("error creating passphrase: %s\n"), gpg_strerror (rc));
           release_progress_context (pfx);
           return rc;
         }
@@ -378,22 +373,43 @@
 }
 
 
-int
-setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek)
+gpg_error_t
+setup_symkey (STRING2KEY **symkey_s2k, DEK **symkey_dek)
 {
   int canceled;
+  int defcipher;
+  int s2kdigest;
+
+  defcipher = default_cipher_algo ();
+  if (!gnupg_cipher_is_allowed (opt.compliance, 1, defcipher,
+                                GCRY_CIPHER_MODE_CFB))
+    {
+      log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
+		 openpgp_cipher_algo_name (defcipher),
+		 gnupg_compliance_option_string (opt.compliance));
+      return gpg_error (GPG_ERR_CIPHER_ALGO);
+    }
+
+  s2kdigest = S2K_DIGEST_ALGO;
+  if (!gnupg_digest_is_allowed (opt.compliance, 1, s2kdigest))
+    {
+      log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
+		 gcry_md_algo_name (s2kdigest),
+		 gnupg_compliance_option_string (opt.compliance));
+      return gpg_error (GPG_ERR_DIGEST_ALGO);
+    }
 
-  *symkey_s2k=xmalloc_clear(sizeof(STRING2KEY));
+  *symkey_s2k = xmalloc_clear (sizeof **symkey_s2k);
   (*symkey_s2k)->mode = opt.s2k_mode;
-  (*symkey_s2k)->hash_algo = S2K_DIGEST_ALGO;
+  (*symkey_s2k)->hash_algo = s2kdigest;
 
-  *symkey_dek = passphrase_to_dek (opt.s2k_cipher_algo,
+  *symkey_dek = passphrase_to_dek (defcipher,
                                    *symkey_s2k, 1, 0, NULL, &canceled);
-  if(!*symkey_dek || !(*symkey_dek)->keylen)
+  if (!*symkey_dek || !(*symkey_dek)->keylen)
     {
       xfree(*symkey_dek);
       xfree(*symkey_s2k);
-      return gpg_error (canceled?GPG_ERR_CANCELED:GPG_ERR_BAD_PASSPHRASE);
+      return gpg_error (canceled?GPG_ERR_CANCELED:GPG_ERR_INV_PASSPHRASE);
     }
 
   return 0;
@@ -619,15 +635,15 @@
         PKT_public_key *pk = pkr->pk;
         unsigned int nbits = nbits_from_pk (pk);
 
-        if (!gnupg_pk_is_compliant (opt.compliance,
-                                    pk->pubkey_algo, pk->pkey, nbits, NULL))
+        if (!gnupg_pk_is_compliant (opt.compliance, pk->pubkey_algo, 0,
+                                    pk->pkey, nbits, NULL))
           log_info (_("WARNING: key %s is not suitable for encryption"
                       " in %s mode\n"),
                     keystr_from_pk (pk),
                     gnupg_compliance_option_string (opt.compliance));
 
         if (compliant
-            && !gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, pk->pkey,
+            && !gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0, pk->pkey,
                                        nbits, NULL))
           compliant = 0;
       }
@@ -660,7 +676,7 @@
 
   make_session_key (cfx.dek);
   if (DBG_CRYPTO)
-    log_printhex ("DEK is: ", cfx.dek->key, cfx.dek->keylen );
+    log_printhex (cfx.dek->key, cfx.dek->keylen, "DEK is: ");
 
   rc = write_pubkey_enc_from_list (ctrl, pk_list, cfx.dek, out);
   if (rc)
@@ -854,7 +870,7 @@
 
           make_session_key ( efx->cfx.dek );
           if (DBG_CRYPTO)
-            log_printhex ("DEK is: ", efx->cfx.dek->key, efx->cfx.dek->keylen);
+            log_printhex (efx->cfx.dek->key, efx->cfx.dek->keylen, "DEK is: ");
 
           rc = write_pubkey_enc_from_list (efx->ctrl,
                                            efx->pk_list, efx->cfx.dek, a);
diff -Nru gnupg2-2.2.20/g10/exec.c gnupg2-2.2.27/g10/exec.c
--- gnupg2-2.2.20/g10/exec.c	2019-05-17 12:41:21.000000000 +0200
+++ gnupg2-2.2.27/g10/exec.c	2020-11-10 11:58:58.000000000 +0100
@@ -539,7 +539,7 @@
       gpg_err_set_errno (EPERM);
     }
   else
-    (*info)->tochild=fopen((*info)->tempfile_in,binary?"wb":"w");
+    (*info)->tochild = gnupg_fopen ((*info)->tempfile_in,binary?"wb":"w");
   if((*info)->tochild==NULL)
     {
       ret = gpg_error_from_syserror ();
diff -Nru gnupg2-2.2.20/g10/export.c gnupg2-2.2.27/g10/export.c
--- gnupg2-2.2.20/g10/export.c	2020-03-14 19:15:00.000000000 +0100
+++ gnupg2-2.2.27/g10/export.c	2020-07-16 11:37:15.000000000 +0200
@@ -1028,11 +1028,11 @@
   /* log_debug ("XXX pubkey_algo=%d\n", pubkey_algo); */
   /* log_debug ("XXX is_protected=%d\n", is_protected); */
   /* log_debug ("XXX protect_algo=%d\n", protect_algo); */
-  /* log_printhex ("XXX iv", iv, ivlen); */
+  /* log_printhex (iv, ivlen, "XXX iv"); */
   /* log_debug ("XXX ivlen=%d\n", ivlen); */
   /* log_debug ("XXX s2k_mode=%d\n", s2k_mode); */
   /* log_debug ("XXX s2k_algo=%d\n", s2k_algo); */
-  /* log_printhex ("XXX s2k_salt", s2k_salt, sizeof s2k_salt); */
+  /* log_printhex (s2k_salt, sizeof s2k_salt, "XXX s2k_salt"); */
   /* log_debug ("XXX s2k_count=%lu\n", (unsigned long)s2k_count); */
   /* for (idx=0; skey[idx]; idx++) */
   /*   { */
@@ -1043,7 +1043,7 @@
   /*         void *p; */
   /*         unsigned int nbits; */
   /*         p = gcry_mpi_get_opaque (skey[idx], &nbits); */
-  /*         log_printhex (NULL, p, (nbits+7)/8); */
+  /*         log_printhex ( p, (nbits+7)/8, NULL); */
   /*       } */
   /*     else */
   /*       gcry_mpi_dump (skey[idx]); */
@@ -1110,7 +1110,7 @@
       /*         void *p; */
       /*         unsigned int nbits; */
       /*         p = gcry_mpi_get_opaque (skey[idx], &nbits); */
-      /*         log_printhex (NULL, p, (nbits+7)/8); */
+      /*         log_printhex (p, (nbits+7)/8, NULL); */
       /*       } */
       /*     else */
       /*       gcry_mpi_dump (skey[idx]); */
@@ -2458,7 +2458,7 @@
     err = gpg_error_from_syserror ();
   else
     {
-      if (es_fclose (fp))
+      if (fp != es_stdout && es_fclose (fp))
         err = gpg_error_from_syserror ();
       fp = NULL;
     }
@@ -2467,7 +2467,8 @@
     log_error (_("error writing '%s': %s\n"), fname, gpg_strerror (err));
 
  leave:
-  es_fclose (fp);
+  if (fp != es_stdout)
+    es_fclose (fp);
   xfree (get_membuf (&mb, NULL));
   release_kbnode (keyblock);
   return err;
diff -Nru gnupg2-2.2.20/g10/getkey.c gnupg2-2.2.27/g10/getkey.c
--- gnupg2-2.2.20/g10/getkey.c	2020-03-18 12:43:35.000000000 +0100
+++ gnupg2-2.2.27/g10/getkey.c	2020-12-18 11:22:00.000000000 +0100
@@ -1202,6 +1202,13 @@
 	      glo_ctrl.in_auto_key_retrieve--;
 	      break;
 
+	    case AKL_NTDS:
+	      mechanism_string = "NTDS";
+	      glo_ctrl.in_auto_key_retrieve++;
+	      rc = keyserver_import_ntds (ctrl, name, &fpr, &fpr_len);
+	      glo_ctrl.in_auto_key_retrieve--;
+	      break;
+
 	    case AKL_KEYSERVER:
 	      /* Strictly speaking, we don't need to only use a valid
 	       * mailbox for the getname search, but it helps cut down
@@ -2414,8 +2421,8 @@
 {
   PKT_user_id *uid = uidnode->pkt->pkt.user_id;
   PKT_signature *sig = signode->pkt->pkt.signature;
-  const byte *p, *sym, *hash, *zip;
-  size_t n, nsym, nhash, nzip;
+  const byte *p, *sym, *aead, *hash, *zip;
+  size_t n, nsym, naead, nhash, nzip;
 
   sig->flags.chosen_selfsig = 1;/* We chose this one. */
   uid->created = 0;		/* Not created == invalid. */
@@ -2470,6 +2477,9 @@
   p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_PREF_SYM, &n);
   sym = p;
   nsym = p ? n : 0;
+  p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_PREF_AEAD, &n);
+  aead = p;
+  naead = p ? n : 0;
   p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_PREF_HASH, &n);
   hash = p;
   nhash = p ? n : 0;
@@ -2478,7 +2488,7 @@
   nzip = p ? n : 0;
   if (uid->prefs)
     xfree (uid->prefs);
-  n = nsym + nhash + nzip;
+  n = nsym + naead + nhash + nzip;
   if (!n)
     uid->prefs = NULL;
   else
@@ -2490,6 +2500,11 @@
 	  uid->prefs[n].type = PREFTYPE_SYM;
 	  uid->prefs[n].value = *sym++;
 	}
+      for (; naead; naead--, n++)
+	{
+	  uid->prefs[n].type = PREFTYPE_AEAD;
+	  uid->prefs[n].value = *aead++;
+	}
       for (; nhash; nhash--, n++)
 	{
 	  uid->prefs[n].type = PREFTYPE_HASH;
@@ -2510,6 +2525,12 @@
   if (p && n && (p[0] & 0x01))
     uid->flags.mdc = 1;
 
+  /* See whether we have the AEAD feature.  */
+  uid->flags.aead = 0;
+  p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_FEATURES, &n);
+  if (p && n && (p[0] & 0x02))
+    uid->flags.aead = 1;
+
   /* And the keyserver modify flag.  */
   uid->flags.ks_modify = 1;
   p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KS_FLAGS, &n);
@@ -3332,6 +3353,7 @@
   PKT_public_key *main_pk;
   prefitem_t *prefs;
   unsigned int mdc_feature;
+  unsigned int aead_feature;
 
   if (keyblock->pkt->pkttype != PKT_PUBLIC_KEY)
     {
@@ -3393,7 +3415,7 @@
    * all preferences.
    * Do a similar thing for the MDC feature flag.  */
   prefs = NULL;
-  mdc_feature = 0;
+  mdc_feature = aead_feature = 0;
   for (k = keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next)
     {
       if (k->pkt->pkttype == PKT_USER_ID
@@ -3402,6 +3424,7 @@
 	{
 	  prefs = k->pkt->pkt.user_id->prefs;
 	  mdc_feature = k->pkt->pkt.user_id->flags.mdc;
+	  aead_feature = k->pkt->pkt.user_id->flags.aead;
 	  break;
 	}
     }
@@ -3415,6 +3438,7 @@
 	    xfree (pk->prefs);
 	  pk->prefs = copy_prefs (prefs);
 	  pk->flags.mdc = mdc_feature;
+	  pk->flags.aead = aead_feature;
 	}
     }
 }
@@ -4177,6 +4201,8 @@
 	akl->type = AKL_DANE;
       else if (ascii_strcasecmp (tok, "wkd") == 0)
 	akl->type = AKL_WKD;
+      else if (ascii_strcasecmp (tok, "ntds") == 0)
+	akl->type = AKL_NTDS;
       else if ((akl->spec = parse_keyserver_uri (tok, 1)))
 	akl->type = AKL_SPEC;
       else
diff -Nru gnupg2-2.2.20/g10/gpg.c gnupg2-2.2.27/g10/gpg.c
--- gnupg2-2.2.20/g10/gpg.c	2020-03-14 19:59:14.000000000 +0100
+++ gnupg2-2.2.27/g10/gpg.c	2021-01-08 14:02:41.000000000 +0100
@@ -1,7 +1,7 @@
 /* gpg.c - The GnuPG utility (main for gpg)
- * Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2020 Free Software Foundation, Inc.
  * Copyright (C) 1997-2019 Werner Koch
- * Copyright (C) 2015-2019 g10 Code GmbH
+ * Copyright (C) 2015-2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -125,6 +126,7 @@
     aLSignKey,
     aQuickSignKey,
     aQuickLSignKey,
+    aQuickRevSig,
     aQuickAddUid,
     aQuickAddKey,
     aQuickRevUid,
@@ -489,6 +491,8 @@
               N_("quickly sign a key")),
   ARGPARSE_c (aQuickLSignKey, "quick-lsign-key",
               N_("quickly sign a key locally")),
+  ARGPARSE_c (aQuickRevSig,   "quick-revoke-sig" ,
+              N_("quickly revoke a key signature")),
   ARGPARSE_c (aSignKey,  "sign-key"   ,N_("sign a key")),
   ARGPARSE_c (aLSignKey, "lsign-key"  ,N_("sign a key locally")),
   ARGPARSE_c (aEditKey,  "edit-key"   ,N_("sign or edit a key")),
@@ -631,7 +635,7 @@
 
   ARGPARSE_s_s (oDisplayCharset, "display-charset", "@"),
   ARGPARSE_s_s (oDisplayCharset, "charset", "@"),
-  ARGPARSE_s_s (oOptions, "options", "@"),
+  ARGPARSE_conffile (oOptions, "options", "@"),
 
   ARGPARSE_s_s (oDebug, "debug", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level", "@"),
@@ -734,7 +738,7 @@
   ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
   ARGPARSE_s_n (oNoKeyring, "no-keyring", "@"),
   ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
-  ARGPARSE_s_n (oNoOptions, "no-options", "@"),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
   ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
   ARGPARSE_s_n (oWithColons, "with-colons", "@"),
@@ -893,6 +897,7 @@
   ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
   ARGPARSE_s_n (oNoSymkeyCache, "no-symkey-cache", "@"),
   ARGPARSE_s_n (oIncludeKeyBlock, "include-key-block", "@"),
+  ARGPARSE_s_n (oNoIncludeKeyBlock, "no-include-key-block", "@"),
   ARGPARSE_s_n (oAutoKeyImport,   "auto-key-import", "@"),
   ARGPARSE_s_n (oNoAutoKeyImport, "no-auto-key-import", "@"),
 
@@ -1054,10 +1059,13 @@
   static char *digests, *pubkeys, *ciphers, *zips, *ver_gcry;
   const char *p;
 
-    switch( level ) {
+  switch (level)
+    {
+      case  9: p = "GPL-3.0-or-later"; break;
       case 11: p = "@GPG@ (@GNUPG@)";
 	break;
       case 13: p = VERSION; break;
+      case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
       case 17: p = PRINTABLE_OS_NAME; break;
       case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -1333,10 +1341,10 @@
       do
         {
           if (for_write)
-            fd = open (fname, O_CREAT | O_TRUNC | O_WRONLY | binary,
-                        S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+            fd = gnupg_open (fname, O_CREAT | O_TRUNC | O_WRONLY | binary,
+                             S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
           else
-            fd = open (fname, O_RDONLY | binary);
+            fd = gnupg_open (fname, O_RDONLY | binary, 0);
         }
       while (fd == -1 && errno == EINTR);
 /*     } */
@@ -1500,7 +1508,7 @@
     }
 
   /* It's okay if the file or directory doesn't exist */
-  if(stat(tmppath,&statbuf)!=0)
+  if (gnupg_stat (tmppath,&statbuf))
     {
       ret=0;
       goto end;
@@ -1511,7 +1519,7 @@
      I'm stopping at one level down. */
   dir=make_dirname(tmppath);
 
-  if(stat(dir,&dirbuf)!=0 || !S_ISDIR(dirbuf.st_mode))
+  if (gnupg_stat (dir,&dirbuf) || !S_ISDIR (dirbuf.st_mode))
     {
       /* Weird error */
       ret=1;
@@ -2184,7 +2192,9 @@
     case oDE_VS:
       set_compliance_option (oOpenPGP);
       opt.compliance = CO_DE_VS;
-      /* Fixme: Change other options.  */
+      /* We divert here from the backward compatible rfc4880 algos.  */
+      opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
+      opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
       break;
 
     default:
@@ -2221,63 +2231,6 @@
 }
 
 
-char *
-get_default_configname (void)
-{
-  char *configname = NULL;
-  char *name = xstrdup (GPG_NAME EXTSEP_S "conf-" SAFE_VERSION);
-  char *ver = &name[strlen (GPG_NAME EXTSEP_S "conf-")];
-
-  do
-    {
-      if (configname)
-	{
-	  char *tok;
-
-	  xfree (configname);
-	  configname = NULL;
-
-	  if ((tok = strrchr (ver, SAFE_VERSION_DASH)))
-	    *tok='\0';
-	  else if ((tok = strrchr (ver, SAFE_VERSION_DOT)))
-	    *tok='\0';
-	  else
-	    break;
-	}
-
-      configname = make_filename (gnupg_homedir (), name, NULL);
-    }
-  while (access (configname, R_OK));
-
-  xfree(name);
-
-  if (! configname)
-    configname = make_filename (gnupg_homedir (),
-                                GPG_NAME EXTSEP_S "conf", NULL);
-  if (! access (configname, R_OK))
-    {
-      /* Print a warning when both config files are present.  */
-      char *p = make_filename (gnupg_homedir (), "options", NULL);
-      if (! access (p, R_OK))
-	log_info (_("Note: old default options file '%s' ignored\n"), p);
-      xfree (p);
-    }
-  else
-    {
-      /* Use the old default only if it exists.  */
-      char *p = make_filename (gnupg_homedir (), "options", NULL);
-      if (!access (p, R_OK))
-	{
-	  xfree (configname);
-	  configname = p;
-	}
-      else
-	xfree (p);
-    }
-
-  return configname;
-}
-
 int
 main (int argc, char **argv)
 {
@@ -2295,13 +2248,11 @@
     strlist_t nrings = NULL;
     armor_filter_context_t *afx = NULL;
     int detached_sig = 0;
-    FILE *configfp = NULL;
-    char *configname = NULL;
-    char *save_configname = NULL;
-    char *default_configname = NULL;
-    unsigned configlineno;
-    int parse_debug = 0;
-    int default_config = 1;
+    char *last_configname = NULL;
+    const char *configname = NULL; /* NULL or points to last_configname.
+                                    * NULL also indicates that we are
+                                    * processing options from the cmdline.  */
+    int debug_argparser = 0;
     int default_keyring = 1;
     int greeting = 0;
     int nogreeting = 0;
@@ -2424,41 +2375,42 @@
     opt.emit_version = 0;
     opt.weak_digests = NULL;
 
-    /* Check whether we have a config file on the command line.  */
+    /* Check special options given on the command line.  */
     orig_argc = argc;
     orig_argv = argv;
     pargs.argc = &argc;
     pargs.argv = &argv;
     pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
-    while( arg_parse( &pargs, opts) ) {
-	if( pargs.r_opt == oDebug || pargs.r_opt == oDebugAll )
-	    parse_debug++;
-	else if (pargs.r_opt == oDebugIOLBF)
-            es_setvbuf (es_stdout, NULL, _IOLBF, 0);
-	else if( pargs.r_opt == oOptions ) {
-	    /* yes there is one, so we do not try the default one, but
-	     * read the option file when it is encountered at the commandline
-	     */
-	    default_config = 0;
-	}
-	else if( pargs.r_opt == oNoOptions )
+    while (gnupg_argparse (NULL, &pargs, opts))
+      {
+	switch (pargs.r_opt)
           {
-	    default_config = 0; /* --no-options */
+          case oDebug:
+          case oDebugAll:
+            debug_argparser++;
+            break;
+
+          case oDebugIOLBF:
+            es_setvbuf (es_stdout, NULL, _IOLBF, 0);
+            break;
+
+          case oNoOptions:
+            /* Set here here because the homedir would otherwise be
+             * created before main option parsing starts.  */
             opt.no_homedir_creation = 1;
+            break;
+
+          case oHomedir:
+            gnupg_set_homedir (pargs.r.ret_str);
+            break;
+
+          case oNoPermissionWarn:
+            opt.no_perm_warn = 1;
+            break;
           }
-        else if( pargs.r_opt == oHomedir )
-	    gnupg_set_homedir (pargs.r.ret_str);
-	else if( pargs.r_opt == oNoPermissionWarn )
-	    opt.no_perm_warn=1;
-	else if (pargs.r_opt == oStrict )
-	  {
-	    /* Not used */
-	  }
-	else if (pargs.r_opt == oNoStrict )
-	  {
-	    /* Not used */
-	  }
-    }
+      }
+    /* Reset the flags.  */
+    pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
 #ifdef HAVE_DOSISH_SYSTEM
     if ( strchr (gnupg_homedir (), '\\') ) {
@@ -2502,64 +2454,67 @@
     additional_weak_digest ("MD5");
     parse_auto_key_locate (DEFAULT_AKL_LIST);
 
-    /* Try for a version specific config file first */
-    default_configname = get_default_configname ();
-    if (default_config)
-      configname = xstrdup (default_configname);
-
     argc = orig_argc;
     argv = orig_argv;
     pargs.argc = &argc;
     pargs.argv = &argv;
-    pargs.flags= ARGPARSE_FLAG_KEEP;
+    /* We are re-using the struct, thus the reset flag.  We OR the
+     * flags so that the internal intialized flag won't be cleared. */
+    pargs.flags |= (ARGPARSE_FLAG_RESET
+                    | ARGPARSE_FLAG_KEEP
+                    | ARGPARSE_FLAG_SYS
+                    | ARGPARSE_FLAG_USER
+                    | ARGPARSE_FLAG_USERVERS);
 
     /* By this point we have a homedir, and cannot change it. */
     check_permissions (gnupg_homedir (), 0);
 
-  next_pass:
-    if( configname ) {
-      if(check_permissions(configname,1))
-	{
-	  /* If any options file is unsafe, then disable any external
-	     programs for keyserver calls or photo IDs.  Since the
-	     external program to call is set in the options file, a
-	     unsafe options file can lead to an arbitrary program
-	     being run. */
-
-	  opt.exec_disable=1;
-	}
-
-	configlineno = 0;
-	configfp = fopen( configname, "r" );
-        if (configfp && is_secured_file (fileno (configfp)))
-          {
-            fclose (configfp);
-            configfp = NULL;
-            gpg_err_set_errno (EPERM);
-          }
-	if( !configfp ) {
-	    if( default_config ) {
-		if( parse_debug )
-		    log_info(_("Note: no default option file '%s'\n"),
-							    configname );
-	    }
-	    else {
-		log_error(_("option file '%s': %s\n"),
-				    configname, strerror(errno) );
-		g10_exit(2);
-	    }
-	    xfree(configname); configname = NULL;
-	}
-	if( parse_debug && configname )
-	    log_info(_("reading options from '%s'\n"), configname );
-	default_config = 0;
-    }
+    /* The configuraton directories for use by gpgrt_argparser.  */
+    gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+    gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
 
-    while( optfile_parse( configfp, configname, &configlineno,
-						&pargs, opts) )
+    while (gnupg_argparser (&pargs, opts, GPG_NAME EXTSEP_S "conf"))
       {
-	switch( pargs.r_opt )
+	switch (pargs.r_opt)
 	  {
+          case ARGPARSE_CONFFILE:
+            if (debug_argparser)
+              log_info (_("reading options from '%s'\n"),
+                         pargs.r_type? pargs.r.ret_str: "[cmdline]");
+            if (pargs.r_type)
+              {
+                xfree (last_configname);
+                last_configname = xstrdup (pargs.r.ret_str);
+                configname = last_configname;
+                if (is_secured_filename (configname))
+                  {
+                    pargs.r_opt = ARGPARSE_PERMISSION_ERROR;
+                    pargs.err = ARGPARSE_PRINT_ERROR;
+                  }
+                else if (strncmp (configname, gnupg_sysconfdir (),
+                                  strlen (gnupg_sysconfdir ())))
+                  {
+                    /* This is not the global config file and thus we
+                     * need to check the permissions: If the file is
+                     * unsafe, then disable any external programs for
+                     * keyserver calls or photo IDs.  Since the
+                     * external program to call is set in the options
+                     * file, a unsafe options file can lead to an
+                     * arbitrary program being run. */
+                    if (check_permissions (configname, 1))
+                      opt.exec_disable=1;
+                  }
+              }
+            else
+              configname = NULL;
+            break;
+
+            /* case oOptions:
+             * case oNoOptions:
+             * We will never see these options here because
+             * gpgrt_argparse handles them for us.
+             */
+
 	  case aListConfig:
 	  case aListGcryptConfig:
           case aGPGConfList:
@@ -2609,6 +2564,7 @@
 	  case aSign:
 	  case aQuickSignKey:
 	  case aQuickLSignKey:
+	  case aQuickRevSig:
 	  case aSignKey:
 	  case aLSignKey:
 	  case aStore:
@@ -2695,25 +2651,25 @@
             break;
 
           case oNoUseAgent:
-	    obsolete_option (configname, configlineno, "no-use-agent");
+	    obsolete_option (configname, pargs.lineno, "no-use-agent");
             break;
 	  case oGpgAgentInfo:
-	    obsolete_option (configname, configlineno, "gpg-agent-info");
+	    obsolete_option (configname, pargs.lineno, "gpg-agent-info");
             break;
           case oReaderPort:
-	    obsolete_scdaemon_option (configname, configlineno, "reader-port");
+	    obsolete_scdaemon_option (configname, pargs.lineno, "reader-port");
             break;
           case octapiDriver:
-	    obsolete_scdaemon_option (configname, configlineno, "ctapi-driver");
+	    obsolete_scdaemon_option (configname, pargs.lineno, "ctapi-driver");
             break;
           case opcscDriver:
-	    obsolete_scdaemon_option (configname, configlineno, "pcsc-driver");
+	    obsolete_scdaemon_option (configname, pargs.lineno, "pcsc-driver");
             break;
           case oDisableCCID:
-	    obsolete_scdaemon_option (configname, configlineno, "disable-ccid");
+	    obsolete_scdaemon_option (configname, pargs.lineno, "disable-ccid");
             break;
           case oHonorHttpProxy:
-	    obsolete_option (configname, configlineno, "honor-http-proxy");
+	    obsolete_option (configname, pargs.lineno, "honor-http-proxy");
             break;
 
 	  case oAnswerYes: opt.answer_yes = 1; break;
@@ -2724,7 +2680,7 @@
 	    sl->flags = KEYDB_RESOURCE_FLAG_PRIMARY;
 	    break;
 	  case oShowKeyring:
-	    deprecated_warning(configname,configlineno,"--show-keyring",
+	    deprecated_warning(configname,pargs.lineno,"--show-keyring",
 			       "--list-options ","show-keyring");
 	    opt.list_options|=LIST_SHOW_KEYRING;
 	    break;
@@ -2796,14 +2752,6 @@
             /* Ignore this old option.  */
             break;
 
-	  case oOptions:
-	    /* config files may not be nested (silently ignore them) */
-	    if( !configfp ) {
-		xfree(configname);
-		configname = xstrdup(pargs.r.ret_str);
-		goto next_pass;
-	    }
-	    break;
 	  case oNoArmor: opt.no_armor=1; opt.armor=0; break;
 
 	  case oNoDefKeyring:
@@ -2836,7 +2784,7 @@
 	  case oDefaultKey:
             sl = add_to_strlist (&opt.def_secret_key, pargs.r.ret_str);
             sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
-            if (configfp)
+            if (configname)
               sl->flags |= PK_LIST_CONFIG;
             break;
 	  case oDefRecipient:
@@ -2854,7 +2802,6 @@
             xfree(opt.def_recipient); opt.def_recipient = NULL;
             opt.def_recipient_self = 0;
             break;
-	  case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */
 	  case oHomedir: break;
 	  case oNoBatch: opt.batch = 0; break;
 
@@ -2886,7 +2833,7 @@
 	    opt.tofu_default_policy = parse_tofu_policy (pargs.r.ret_str);
 	    break;
 	  case oTOFUDBFormat:
-	    obsolete_option (configname, configlineno, "tofu-db-format");
+	    obsolete_option (configname, pargs.lineno, "tofu-db-format");
 	    break;
 
 	  case oForceOwnertrust:
@@ -2944,17 +2891,17 @@
 	  case oSigPolicyURL: add_policy_url(pargs.r.ret_str,0); break;
 	  case oCertPolicyURL: add_policy_url(pargs.r.ret_str,1); break;
           case oShowPolicyURL:
-	    deprecated_warning(configname,configlineno,"--show-policy-url",
+	    deprecated_warning(configname,pargs.lineno,"--show-policy-url",
 			       "--list-options ","show-policy-urls");
-	    deprecated_warning(configname,configlineno,"--show-policy-url",
+	    deprecated_warning(configname,pargs.lineno,"--show-policy-url",
 			       "--verify-options ","show-policy-urls");
 	    opt.list_options|=LIST_SHOW_POLICY_URLS;
 	    opt.verify_options|=VERIFY_SHOW_POLICY_URLS;
 	    break;
 	  case oNoShowPolicyURL:
-	    deprecated_warning(configname,configlineno,"--no-show-policy-url",
+	    deprecated_warning(configname,pargs.lineno,"--no-show-policy-url",
 			       "--list-options ","no-show-policy-urls");
-	    deprecated_warning(configname,configlineno,"--no-show-policy-url",
+	    deprecated_warning(configname,pargs.lineno,"--no-show-policy-url",
 			       "--verify-options ","no-show-policy-urls");
 	    opt.list_options&=~LIST_SHOW_POLICY_URLS;
 	    opt.verify_options&=~VERIFY_SHOW_POLICY_URLS;
@@ -2971,7 +2918,7 @@
 	      append_to_strlist(&opt.comments,pargs.r.ret_str);
 	    break;
 	  case oDefaultComment:
-	    deprecated_warning(configname,configlineno,
+	    deprecated_warning(configname,pargs.lineno,
 			       "--default-comment","--no-comments","");
 	    /* fall through */
 	  case oNoComments:
@@ -2981,17 +2928,17 @@
 	  case oThrowKeyids: opt.throw_keyids = 1; break;
 	  case oNoThrowKeyids: opt.throw_keyids = 0; break;
 	  case oShowPhotos:
-	    deprecated_warning(configname,configlineno,"--show-photos",
+	    deprecated_warning(configname,pargs.lineno,"--show-photos",
 			       "--list-options ","show-photos");
-	    deprecated_warning(configname,configlineno,"--show-photos",
+	    deprecated_warning(configname,pargs.lineno,"--show-photos",
 			       "--verify-options ","show-photos");
 	    opt.list_options|=LIST_SHOW_PHOTOS;
 	    opt.verify_options|=VERIFY_SHOW_PHOTOS;
 	    break;
 	  case oNoShowPhotos:
-	    deprecated_warning(configname,configlineno,"--no-show-photos",
+	    deprecated_warning(configname,pargs.lineno,"--no-show-photos",
 			       "--list-options ","no-show-photos");
-	    deprecated_warning(configname,configlineno,"--no-show-photos",
+	    deprecated_warning(configname,pargs.lineno,"--no-show-photos",
 			       "--verify-options ","no-show-photos");
 	    opt.list_options&=~LIST_SHOW_PHOTOS;
 	    opt.verify_options&=~VERIFY_SHOW_PHOTOS;
@@ -3022,7 +2969,7 @@
              * enough space for the flags.  */
 	    sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
 	    sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
-            if (configfp)
+            if (configname)
               sl->flags |= PK_LIST_CONFIG;
             if (pargs.r_opt == oHiddenRecipient
                 || pargs.r_opt == oHiddenRecipientFile)
@@ -3038,7 +2985,7 @@
             /* Store an additional recipient.  */
 	    sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
 	    sl->flags = ((pargs.r_opt << PK_LIST_SHIFT) | PK_LIST_ENCRYPT_TO);
-            if (configfp)
+            if (configname)
               sl->flags |= PK_LIST_CONFIG;
             if (pargs.r_opt == oHiddenEncryptTo)
               sl->flags |= PK_LIST_HIDDEN;
@@ -3048,7 +2995,7 @@
             opt.no_encrypt_to = 1;
             break;
           case oEncryptToDefaultKey:
-            opt.encrypt_to_default_key = configfp ? 2 : 1;
+            opt.encrypt_to_default_key = configname ? 2 : 1;
             break;
 
 	  case oTrySecretKey:
@@ -3094,7 +3041,7 @@
 	  case oLocalUser: /* store the local users */
 	    sl = add_to_strlist2( &locusr, pargs.r.ret_str, utf8_strings );
             sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
-            if (configfp)
+            if (configname)
               sl->flags |= PK_LIST_CONFIG;
 	    break;
 	  case oSender:
@@ -3234,7 +3181,7 @@
 	      {
 		if(configname)
 		  log_error(_("%s:%d: invalid keyserver options\n"),
-			    configname,configlineno);
+			    configname,pargs.lineno);
 		else
 		  log_error(_("invalid keyserver options\n"));
 	      }
@@ -3244,7 +3191,7 @@
 	      {
 		if(configname)
 		  log_error(_("%s:%d: invalid import options\n"),
-			    configname,configlineno);
+			    configname,pargs.lineno);
 		else
 		  log_error(_("invalid import options\n"));
 	      }
@@ -3259,7 +3206,7 @@
 	      {
 		if(configname)
 		  log_error(_("%s:%d: invalid export options\n"),
-			    configname,configlineno);
+			    configname,pargs.lineno);
 		else
 		  log_error(_("invalid export options\n"));
 	      }
@@ -3274,7 +3221,7 @@
 	      {
 		if(configname)
 		  log_error(_("%s:%d: invalid list options\n"),
-			    configname,configlineno);
+			    configname,pargs.lineno);
 		else
 		  log_error(_("invalid list options\n"));
 	      }
@@ -3314,7 +3261,7 @@
 		{
 		  if(configname)
 		    log_error(_("%s:%d: invalid verify options\n"),
-			      configname,configlineno);
+			      configname,pargs.lineno);
 		  else
 		    log_error(_("invalid verify options\n"));
 		}
@@ -3335,17 +3282,17 @@
 	  case oCertNotation: add_notation_data( pargs.r.ret_str, 1 ); break;
           case oKnownNotation: register_known_notation (pargs.r.ret_str); break;
 	  case oShowNotation:
-	    deprecated_warning(configname,configlineno,"--show-notation",
+	    deprecated_warning(configname,pargs.lineno,"--show-notation",
 			       "--list-options ","show-notations");
-	    deprecated_warning(configname,configlineno,"--show-notation",
+	    deprecated_warning(configname,pargs.lineno,"--show-notation",
 			       "--verify-options ","show-notations");
 	    opt.list_options|=LIST_SHOW_NOTATIONS;
 	    opt.verify_options|=VERIFY_SHOW_NOTATIONS;
 	    break;
 	  case oNoShowNotation:
-	    deprecated_warning(configname,configlineno,"--no-show-notation",
+	    deprecated_warning(configname,pargs.lineno,"--no-show-notation",
 			       "--list-options ","no-show-notations");
-	    deprecated_warning(configname,configlineno,"--no-show-notation",
+	    deprecated_warning(configname,pargs.lineno,"--no-show-notation",
 			       "--verify-options ","no-show-notations");
 	    opt.list_options&=~LIST_SHOW_NOTATIONS;
 	    opt.verify_options&=~VERIFY_SHOW_NOTATIONS;
@@ -3401,7 +3348,7 @@
                 ovrseskeyfd = translate_sys2libc_fd_int (pargs.r.ret_int, 0);
 		break;
 	  case oMergeOnly:
-	        deprecated_warning(configname,configlineno,"--merge-only",
+	        deprecated_warning(configname,pargs.lineno,"--merge-only",
 				   "--import-options ","merge-only");
 		opt.import_options|=IMPORT_MERGE_ONLY;
 	    break;
@@ -3529,7 +3476,7 @@
 	      {
 		if(configname)
 		  log_error(_("%s:%d: invalid auto-key-locate list\n"),
-			    configname,configlineno);
+			    configname,pargs.lineno);
 		else
 		  log_error(_("invalid auto-key-locate list\n"));
 	      }
@@ -3551,7 +3498,7 @@
             if (configname)
               log_info("%s:%d: WARNING: gpg not built with large secure "
                          "memory buffer.  Ignoring enable-large-rsa\n",
-                        configname,configlineno);
+                        configname,pargs.lineno);
             else
               log_info("WARNING: gpg not built with large secure "
                          "memory buffer.  Ignoring --enable-large-rsa\n");
@@ -3613,7 +3560,7 @@
 	  case oNoop: break;
 
 	  default:
-            if (configfp)
+            if (configname)
               pargs.err = ARGPARSE_PRINT_WARNING;
             else
               {
@@ -3627,19 +3574,8 @@
 	  }
       }
 
-    if (configfp)
-      {
-	fclose( configfp );
-	configfp = NULL;
-        /* Remember the first config file name. */
-        if (!save_configname)
-          save_configname = configname;
-        else
-          xfree(configname);
-        configname = NULL;
-	goto next_pass;
-      }
-    xfree(configname); configname = NULL;
+    gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
     if (log_get_errorcount (0))
       {
         write_status_failure ("option-parser", gpg_error(GPG_ERR_GENERAL));
@@ -3650,11 +3586,17 @@
        directly after the option parsing. */
     if (cmd == aGPGConfList)
       {
-        gpgconf_list (save_configname ? save_configname : default_configname);
+        /* Note: Here in gpg 2.2 we need to provide a proper config
+         * file even if that file does not exist.  This is because
+         * gpgconf checks that an absolute filename is provided.  */
+        if (!last_configname)
+          last_configname= make_filename (gnupg_homedir (),
+                                          GPG_NAME EXTSEP_S "conf", NULL);
+        gpgconf_list (last_configname);
         g10_exit (0);
       }
-    xfree (save_configname);
-    xfree (default_configname);
+    xfree (last_configname);
+    last_configname = NULL;
 
     if (print_dane_records)
       log_error ("invalid option \"%s\"; use \"%s\" instead\n",
@@ -4020,13 +3962,14 @@
       }
 
     /* Set the random seed file. */
-    if( use_random_seed ) {
-      char *p = make_filename (gnupg_homedir (), "random_seed", NULL );
-	gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
-        if (!access (p, F_OK))
+    if (use_random_seed)
+      {
+        char *p = make_filename (gnupg_homedir (), "random_seed", NULL );
+        gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
+        if (!gnupg_access (p, F_OK))
           register_secured_file (p);
 	xfree(p);
-    }
+      }
 
     /* If there is no command but the --fingerprint is given, default
        to the --list-keys command.  */
@@ -4380,6 +4323,22 @@
         }
 	break;
 
+      case aQuickRevSig:
+        {
+          const char *userid, *siguserid;
+
+          if (argc < 2)
+            wrong_args ("--quick-revoke-sig USER-ID SIG-USER-ID [userids]");
+          userid = *argv++; argc--;
+          siguserid = *argv++; argc--;
+          sl = NULL;
+          for( ; argc; argc--, argv++)
+	    append_to_strlist2 (&sl, *argv, utf8_strings);
+          keyedit_quick_revsig (ctrl, userid, siguserid, sl);
+          free_strlist (sl);
+        }
+	break;
+
       case aSignKey:
 	if( argc != 1 )
 	  wrong_args("--sign-key user-id");
@@ -4436,7 +4395,10 @@
       case aDeleteSecretKeys:
       case aDeleteSecretAndPublicKeys:
 	sl = NULL;
-	/* I'm adding these in reverse order as add_to_strlist2
+        /* Print a note if the user did not specify any key.  */
+        if (!argc && !opt.quiet)
+          log_info (_("Note: %s\n"), gpg_strerror (GPG_ERR_NO_KEY));
+        /* I'm adding these in reverse order as add_to_strlist2
            reverses them again, and it's easier to understand in the
            proper order :) */
 	for( ; argc; argc-- )
diff -Nru gnupg2-2.2.20/g10/gpgv.c gnupg2-2.2.27/g10/gpgv.c
--- gnupg2-2.2.20/g10/gpgv.c	2020-03-14 19:38:47.000000000 +0100
+++ gnupg2-2.2.27/g10/gpgv.c	2020-12-18 11:22:45.000000000 +0100
@@ -1,6 +1,7 @@
 /* gpgv.c - The GnuPG signature verify utility
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006,
- *               2008, 2009, 2012 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2020 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2019 Werner Koch
+ * Copyright (C) 2015-2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -138,9 +140,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@GPG@v (GnuPG)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -172,7 +176,6 @@
   int rc=0;
   strlist_t sl;
   strlist_t nrings = NULL;
-  unsigned configlineno;
   ctrl_t ctrl;
 
   early_system_init ();
@@ -206,11 +209,13 @@
 
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* do not remove the args */
-  while (optfile_parse( NULL, NULL, &configlineno, &pargs, opts))
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparser (&pargs, opts, NULL))
     {
       switch (pargs.r_opt)
         {
+        case ARGPARSE_CONFFILE: break;
+
         case oQuiet: opt.quiet = 1; break;
         case oVerbose:
           opt.verbose++;
@@ -250,6 +255,8 @@
 	}
     }
 
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
   if (log_get_errorcount (0))
     g10_exit(2);
 
@@ -468,6 +475,17 @@
   return -1;
 }
 
+int
+keyserver_import_ntds (ctrl_t ctrl, const char *mbox,
+                       unsigned char **fpr, size_t *fprlen)
+{
+  (void)ctrl;
+  (void)mbox;
+  (void)fpr;
+  (void)fprlen;
+  return -1;
+}
+
 int
 keyserver_import_ldap (const char *name)
 {
diff -Nru gnupg2-2.2.20/g10/gpgv-w32info.rc gnupg2-2.2.27/g10/gpgv-w32info.rc
--- gnupg2-2.2.20/g10/gpgv-w32info.rc	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/g10/gpgv-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,52 @@
+/* gpgv-w32info.rc                                           -*- c -*-
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s OpenPGP verify tool\0"
+            VALUE "InternalName", "gpgv\0"
+            VALUE "OriginalFilename", "gpgv.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "gpgv.w32-manifest"
diff -Nru gnupg2-2.2.20/g10/gpgv.w32-manifest.in gnupg2-2.2.27/g10/gpgv.w32-manifest.in
--- gnupg2-2.2.20/g10/gpgv.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/g10/gpgv.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (OpenPGP verify tool)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpgv"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/g10/gpg.w32-manifest.in gnupg2-2.2.27/g10/gpg.w32-manifest.in
--- gnupg2-2.2.20/g10/gpg.w32-manifest.in	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g10/gpg.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -8,10 +8,11 @@
     />
 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
   <application>
-    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
-    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
-    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
     <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
   </application>
 </compatibility>
 </assembly>
diff -Nru gnupg2-2.2.20/g10/import.c gnupg2-2.2.27/g10/import.c
--- gnupg2-2.2.20/g10/import.c	2020-03-14 19:38:47.000000000 +0100
+++ gnupg2-2.2.27/g10/import.c	2020-08-25 11:17:06.000000000 +0200
@@ -2630,7 +2630,8 @@
         char *desc = gpg_format_keydesc (ctrl, pk, FORMAT_KEYDESC_IMPORT, 1);
         err = agent_import_key (ctrl, desc, &cache_nonce,
                                 wrappedkey, wrappedkeylen, batch, force,
-				pk->keyid, pk->main_keyid, pk->pubkey_algo);
+				pk->keyid, pk->main_keyid, pk->pubkey_algo,
+                                pk->timestamp);
         xfree (desc);
       }
       if (!err)
diff -Nru gnupg2-2.2.20/g10/key-check.c gnupg2-2.2.27/g10/key-check.c
--- gnupg2-2.2.20/g10/key-check.c	2018-06-07 18:43:16.000000000 +0200
+++ gnupg2-2.2.27/g10/key-check.c	2020-09-02 16:06:46.000000000 +0200
@@ -367,8 +367,11 @@
               if (only_selfsigs)
                 continue;
 
-              issuer = xmalloc (sizeof (*issuer));
-              err = get_pubkey (ctrl, issuer, sig->keyid);
+              issuer = xtrycalloc (1, sizeof *issuer);
+              if (!issuer)
+                err = gpg_error_from_syserror ();
+              else
+                err = get_pubkey (ctrl, issuer, sig->keyid);
               if (err)
                 {
                   xfree (issuer);
diff -Nru gnupg2-2.2.20/g10/keydb.c gnupg2-2.2.27/g10/keydb.c
--- gnupg2-2.2.20/g10/keydb.c	2019-08-23 16:12:55.000000000 +0200
+++ gnupg2-2.2.27/g10/keydb.c	2020-11-10 11:59:13.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include "gpg.h"
 #include "../common/util.h"
+#include "../common/sysutils.h"
 #include "options.h"
 #include "main.h" /*try_make_homedir ()*/
 #include "packet.h"
@@ -293,6 +294,7 @@
 static gpg_error_t
 maybe_create_keyring_or_box (char *filename, int is_box, int force_create)
 {
+  gpg_err_code_t ec;
   dotlock_t lockhd = NULL;
   IOBUF iobuf;
   int rc;
@@ -303,8 +305,8 @@
   int save_slash;
 
   /* A quick test whether the filename already exists. */
-  if (!access (filename, F_OK))
-    return !access (filename, R_OK)? 0 : gpg_error (GPG_ERR_EACCES);
+  if (!gnupg_access (filename, F_OK))
+    return !gnupg_access (filename, R_OK)? 0 : gpg_error (GPG_ERR_EACCES);
 
   /* If we don't want to create a new file at all, there is no need to
      go any further - bail out right here.  */
@@ -330,7 +332,7 @@
                                            not happen though.  */
   save_slash = *last_slash_in_filename;
   *last_slash_in_filename = 0;
-  if (access(filename, F_OK))
+  if (gnupg_access(filename, F_OK))
     {
       static int tried;
 
@@ -339,9 +341,9 @@
           tried = 1;
           try_make_homedir (filename);
         }
-      if (access (filename, F_OK))
+      if ((ec = gnupg_access (filename, F_OK)))
         {
-          rc = gpg_error_from_syserror ();
+          rc = gpg_error (ec);
           *last_slash_in_filename = save_slash;
           goto leave;
         }
@@ -398,12 +400,12 @@
   if (rc)
     goto leave;
 
-  if (!access (filename, F_OK))
+  if (!gnupg_access (filename, F_OK))
     {
       rc = 0;  /* Okay, we may access the file now.  */
       goto leave;
     }
-  if (!access (bak_fname, F_OK) && !access (tmp_fname, F_OK))
+  if (!gnupg_access (bak_fname, F_OK) && !gnupg_access (tmp_fname, F_OK))
     {
       /* Very likely another process is updating a pubring.gpg and we
          should not create a pubring.kbx.  */
@@ -442,13 +444,13 @@
      that the detection magic will work the next time it is used.  */
   if (is_box)
     {
-      FILE *fp = fopen (filename, "wb");
+      estream_t fp = es_fopen (filename, "wb");
       if (!fp)
         rc = gpg_error_from_syserror ();
       else
         {
           rc = _keybox_write_header_blob (fp, 1);
-          fclose (fp);
+          es_fclose (fp);
         }
       if (rc)
         {
@@ -502,7 +504,7 @@
   KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
 
   *r_found = *r_openpgp = 0;
-  fp = fopen (filename, "rb");
+  fp = gnupg_fopen (filename, "rb");
   if (fp)
     {
       *r_found = 1;
diff -Nru gnupg2-2.2.20/g10/keydb.h gnupg2-2.2.27/g10/keydb.h
--- gnupg2-2.2.20/g10/keydb.h	2020-03-14 19:38:47.000000000 +0100
+++ gnupg2-2.2.27/g10/keydb.h	2020-11-13 11:19:42.000000000 +0100
@@ -128,9 +128,10 @@
 
 
 /* Helper type for preference functions. */
-union pref_hint
+struct pref_hint
 {
-  int digest_length;
+  int digest_length;  /* We want at least this digest length.  */
+  int exact;          /* We need to use exactly this length.   */
 };
 
 
@@ -262,9 +263,9 @@
                                 pk_list_t *pk_list_addr);
 
 int  algo_available( preftype_t preftype, int algo,
-		     const union pref_hint *hint );
+		     const struct pref_hint *hint );
 int  select_algo_from_prefs( PK_LIST pk_list, int preftype,
-			     int request, const union pref_hint *hint);
+			     int request, const struct pref_hint *hint);
 int  select_mdc_from_pklist (PK_LIST pk_list);
 void warn_missing_mdc_from_pklist (PK_LIST pk_list);
 void warn_missing_aes_from_pklist (PK_LIST pk_list);
diff -Nru gnupg2-2.2.20/g10/keyedit.c gnupg2-2.2.27/g10/keyedit.c
--- gnupg2-2.2.20/g10/keyedit.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/keyedit.c	2020-11-02 17:37:15.000000000 +0100
@@ -2275,7 +2275,7 @@
  * Returns on success the key database handle at R_KDBHD and the
  * keyblock at R_KEYBLOCK.  */
 static gpg_error_t
-quick_find_keyblock (ctrl_t ctrl, const char *username,
+quick_find_keyblock (ctrl_t ctrl, const char *username, int want_secret,
                      KEYDB_HANDLE *r_kdbhd, kbnode_t *r_keyblock)
 {
   gpg_error_t err;
@@ -2318,7 +2318,7 @@
         err = 0;
       keydb_pop_found_state (kdbhd);
 
-      if (!err)
+      if (!err && want_secret)
         {
           /* We require the secret primary key to set the primary UID.  */
           node = find_kbnode (keyblock, PKT_PUBLIC_KEY);
@@ -2375,7 +2375,7 @@
 #endif
 
   /* Search the key; we don't want the whole getkey stuff here.  */
-  err = quick_find_keyblock (ctrl, username, &kdbhd, &keyblock);
+  err = quick_find_keyblock (ctrl, username, 1, &kdbhd, &keyblock);
   if (err)
     goto leave;
 
@@ -2418,7 +2418,7 @@
 #endif
 
   /* Search the key; we don't want the whole getkey stuff here.  */
-  err = quick_find_keyblock (ctrl, username, &kdbhd, &keyblock);
+  err = quick_find_keyblock (ctrl, username, 1, &kdbhd, &keyblock);
   if (err)
     goto leave;
 
@@ -2498,7 +2498,7 @@
   check_trustdb_stale (ctrl);
 #endif
 
-  err = quick_find_keyblock (ctrl, username, &kdbhd, &keyblock);
+  err = quick_find_keyblock (ctrl, username, 1, &kdbhd, &keyblock);
   if (err)
     goto leave;
 
@@ -2771,6 +2771,240 @@
 }
 
 
+/* Unattended revocation of a key signatures.  USERNAME specifies the
+ * key; this should best be a fingerprint. SIGTOREV is the user-id of
+ * the key for which the key signature shall be removed.  Only
+ * non-self-signatures can be removed with this functions.  If
+ * AFFECTED_UIDS is not NULL only the key signatures on these user-ids
+ * are revoked. */
+void
+keyedit_quick_revsig (ctrl_t ctrl, const char *username, const char *sigtorev,
+                      strlist_t affected_uids)
+{
+  gpg_error_t err;
+  int no_signing_key = 0;
+  KEYDB_HANDLE kdbhd = NULL;
+  kbnode_t keyblock = NULL;
+  PKT_public_key *primarypk;  /* Points into KEYBLOCK.  */
+  u32 *primarykid;
+  PKT_public_key *pksigtorev = NULL;
+  u32 *pksigtorevkid;
+  kbnode_t node, n;
+  int skip_remaining;
+  int consider_sig;
+  strlist_t sl;
+  struct sign_attrib attrib = { 0 };
+
+#ifdef HAVE_W32_SYSTEM
+  /* See keyedit_menu for why we need this.  */
+  check_trustdb_stale (ctrl);
+#endif
+
+  /* Search the key; we don't want the whole getkey stuff here.  Noet
+   * that we are looking for the public key here.  */
+  err = quick_find_keyblock (ctrl, username, 0, &kdbhd, &keyblock);
+  if (err)
+    goto leave;
+  log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY
+              || keyblock->pkt->pkttype == PKT_SECRET_KEY);
+  primarypk = keyblock->pkt->pkt.public_key;
+  primarykid = pk_keyid (primarypk);
+
+  /* Get the signing key we want to revoke.  This must be one of our
+   * signing keys.  We will compare only the keyid because we don't
+   * assume that we have duplicated keyids on our own secret keys.  If
+   * a there is a duplicated one we will notice this when creating the
+   * revocation.  */
+  pksigtorev = xtrycalloc (1, sizeof *pksigtorev);
+  if (!pksigtorev)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  pksigtorev->req_usage = PUBKEY_USAGE_CERT;
+  err = getkey_byname (ctrl, NULL, pksigtorev, sigtorev, 1, NULL);
+  if (err)
+    {
+      no_signing_key = 1;
+      goto leave;
+    }
+  pksigtorevkid = pk_keyid (pksigtorev);
+
+  /* Find the signatures we want to revoke and set a mark.  */
+  skip_remaining = consider_sig = 0;
+  for (node = keyblock; node; node = node->next)
+    {
+      node->flag &= ~NODFLG_MARK_A;
+      if (skip_remaining)
+        ;
+      else if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
+        skip_remaining = 1;
+      else if (node->pkt->pkttype == PKT_USER_ID)
+	{
+          PKT_user_id *uid = node->pkt->pkt.user_id;
+
+          consider_sig = !affected_uids;
+          for (sl = affected_uids; !consider_sig && sl; sl = sl->next)
+            {
+              const char *name = sl->d;
+
+              if (uid->attrib_data)
+                ;
+              else if (*name == '='
+                       && strlen (name+1) == uid->len
+                       && !memcmp (uid->name, name + 1, uid->len))
+                { /* Exact match.  */
+                  consider_sig = 1;
+                }
+              else if (ascii_memistr (uid->name, uid->len,
+                                      *name == '*'? name+1:name))
+                { /* Case-insensitive substring match.  */
+                  consider_sig = 1;
+                }
+            }
+	}
+      else if (node->pkt->pkttype == PKT_SIGNATURE)
+	{
+          /* We need to sort the signatures so that we can figure out
+           * whether the key signature has been revoked or the
+           * revocation has been superseded by a new key
+           * signature.  */
+          PKT_signature *sig;
+          unsigned int sigcount = 0;
+          kbnode_t *sigarray;
+
+          /* Allocate an array large enogh for all signatures.  */
+          for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
+            sigcount++;
+          sigarray = xtrycalloc (sigcount, sizeof *sigarray);
+          if (!sigarray)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+
+          /* Now fill the array with signatures we are interested in.
+           * We also move NODE forward to the end.  */
+          sigcount = 0;
+          for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; node=n, n=n->next)
+            {
+              sig = n->pkt->pkt.signature;
+              if (!keyid_cmp (primarykid, sig->keyid))
+                continue;  /* Ignore self-signatures.  */
+
+              if (keyid_cmp (pksigtorevkid, sig->keyid))
+                continue; /* Ignore non-matching signatures.  */
+
+              n->flag &= ~NODFLG_MARK_B; /* Clear flag used by cmp_signode. */
+              sigarray[sigcount++] = n;
+            }
+
+          if (sigcount)
+            {
+              qsort (sigarray, sigcount, sizeof *sigarray, cmp_signodes);
+
+              /* log_debug ("Sorted signatures:\n"); */
+              /* for (idx=0; idx < sigcount; idx++) */
+              /*   { */
+              /*     sig = sigarray[idx]->pkt->pkt.signature; */
+              /*     log_debug ("%s 0x%02x %s\n", keystr (sig->keyid), */
+              /*                sig->sig_class, datestr_from_sig (sig)); */
+              /*   } */
+              sig = sigarray[sigcount-1]->pkt->pkt.signature;
+              if ((consider_sig || !affected_uids) && IS_UID_REV (sig))
+                {
+                  if (!opt.quiet)
+                    log_info ("sig by %s already revoked at %s\n",
+                              keystr (sig->keyid), datestr_from_sig (sig));
+                }
+              else if ((consider_sig && IS_UID_SIG (sig))
+                       || (!affected_uids && IS_KEY_SIG (sig)))
+                node->flag |= NODFLG_MARK_A;  /* Select signature.  */
+            }
+
+          xfree (sigarray);
+	}
+    }
+
+  /* Check whether any signatures were done by the given key.  We do
+   * not return an error if none were found.  */
+  for (node = keyblock; node; node = node->next)
+    if ((node->flag & NODFLG_MARK_A))
+      break;
+  if (!node)
+    {
+      if (opt.verbose)
+        log_info (_("Not signed by you.\n"));
+      err = 0;
+      goto leave;
+    }
+
+  /* Revoke all marked signatures.  */
+  attrib.reason = get_default_sig_revocation_reason ();
+
+ reloop: /* (we must repeat because we are modifying the list) */
+  for (node = keyblock; node; node = node->next)
+    {
+      kbnode_t unode;
+      PKT_signature *sig;
+      PACKET *pkt;
+
+      if (!(node->flag & NODFLG_MARK_A))
+	continue;
+      node->flag &= ~NODFLG_MARK_A;
+
+      if (IS_KEY_SIG (node->pkt->pkt.signature))
+        unode = NULL;
+      else
+        {
+          unode = find_prev_kbnode (keyblock, node, PKT_USER_ID);
+          log_assert (unode);
+        }
+
+      attrib.non_exportable = !node->pkt->pkt.signature->flags.exportable;
+
+      err = make_keysig_packet (ctrl, &sig, primarypk,
+                                unode? unode->pkt->pkt.user_id : NULL,
+                                NULL, pksigtorev, 0x30, 0, 0, 0,
+                                sign_mk_attrib, &attrib, NULL);
+      if (err)
+        {
+          log_error ("signing failed: %s\n", gpg_strerror (err));
+          goto leave;
+        }
+
+      pkt = xmalloc_clear (sizeof *pkt);
+      pkt->pkttype = PKT_SIGNATURE;
+      pkt->pkt.signature = sig;
+      if (unode)
+        insert_kbnode (unode, new_kbnode (pkt), 0);
+      goto reloop;
+    }
+
+  err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+  if (err)
+    {
+      log_error (_("update failed: %s\n"), gpg_strerror (err));
+      goto leave;
+    }
+  revalidation_mark (ctrl);
+
+ leave:
+  if (err)
+    {
+      log_error (_("revoking the key signature failed: %s\n"),
+                 gpg_strerror (err));
+      if (no_signing_key)
+        print_further_info ("error getting key used to make the key signature");
+      write_status_error ("keyedit.revoke.sig", err);
+    }
+  release_revocation_reason_info (attrib.reason);
+  free_public_key (pksigtorev);
+  release_kbnode (keyblock);
+  keydb_release (kdbhd);
+}
+
+
 /* Unattended subkey creation function.
  *
  */
@@ -3069,6 +3303,23 @@
 	  tty_printf ("%s", openpgp_cipher_algo_name (CIPHER_ALGO_3DES));
 	}
       tty_printf ("\n     ");
+      tty_printf (_("AEAD: "));
+      for (i = any = 0; prefs[i].type; i++)
+	{
+	  if (prefs[i].type == PREFTYPE_AEAD)
+	    {
+	      if (any)
+		tty_printf (", ");
+	      any = 1;
+	      /* We don't want to display strings for experimental algos */
+	      if (!openpgp_aead_test_algo (prefs[i].value)
+		  && prefs[i].value < 100)
+		tty_printf ("%s", openpgp_aead_algo_name (prefs[i].value));
+	      else
+		tty_printf ("[%d]", prefs[i].value);
+	    }
+	}
+      tty_printf ("\n     ");
       tty_printf (_("Digest: "));
       for (i = any = 0; prefs[i].type; i++)
 	{
@@ -3123,7 +3374,7 @@
 	    }
 	  tty_printf ("%s", compress_algo_to_string (COMPRESS_ALGO_NONE));
 	}
-      if (uid->flags.mdc || !uid->flags.ks_modify)
+      if (uid->flags.mdc || uid->flags.aead || !uid->flags.ks_modify)
 	{
 	  tty_printf ("\n     ");
 	  tty_printf (_("Features: "));
@@ -3133,6 +3384,12 @@
 	      tty_printf ("MDC");
 	      any = 1;
 	    }
+	  if (!uid->flags.aead)
+	    {
+	      if (any)
+		tty_printf (", ");
+	      tty_printf ("AEAD");
+	    }
 	  if (!uid->flags.ks_modify)
 	    {
 	      if (any)
@@ -3171,12 +3428,15 @@
       for (i = 0; prefs[i].type; i++)
 	{
 	  tty_printf (" %c%d", prefs[i].type == PREFTYPE_SYM ? 'S' :
+		      prefs[i].type == PREFTYPE_AEAD ? 'A' :
 		      prefs[i].type == PREFTYPE_HASH ? 'H' :
 		      prefs[i].type == PREFTYPE_ZIP ? 'Z' : '?',
 		      prefs[i].value);
 	}
       if (uid->flags.mdc)
 	tty_printf (" [mdc]");
+      if (uid->flags.aead)
+	tty_printf (" [aead]");
       if (!uid->flags.ks_modify)
 	tty_printf (" [no-ks-modify]");
       tty_printf ("\n");
@@ -5964,7 +6224,7 @@
           memset (&attrib, 0, sizeof attrib);
           /* should not need to cast away const here; but
              revocation_reason_build_cb needs to take a non-const
-             void* in order to meet the function signtuare for the
+             void* in order to meet the function signature for the
              mksubpkt argument to make_keysig_packet */
           attrib.reason = (struct revocation_reason_info *)reason;
 
diff -Nru gnupg2-2.2.20/g10/keyedit.h gnupg2-2.2.27/g10/keyedit.h
--- gnupg2-2.2.20/g10/keyedit.h	2019-03-18 13:13:14.000000000 +0100
+++ gnupg2-2.2.27/g10/keyedit.h	2020-10-28 18:04:27.000000000 +0100
@@ -33,6 +33,8 @@
 #define NODFLG_SELKEY (1<<9)	/* Indicate the selected key.  */
 #define NODFLG_SELSIG (1<<10)	/* Indicate a selected signature.  */
 
+#define NODFLG_MARK_B (1<<11)   /* Temporary mark in key listing code.  */
+
 /*-- keyedit.c --*/
 void keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 		   strlist_t commands, int quiet, int seckey_check );
@@ -45,6 +47,8 @@
                            const char *uidtorev);
 void keyedit_quick_sign (ctrl_t ctrl, const char *fpr,
                          strlist_t uids, strlist_t locusr, int local);
+void keyedit_quick_revsig (ctrl_t ctrl, const char *username,
+                           const char *sigtorev, strlist_t affected_uids);
 void keyedit_quick_set_expire (ctrl_t ctrl,
                                const char *fpr, const char *expirestr,
                                char **subkeyfprs);
diff -Nru gnupg2-2.2.20/g10/keygen.c gnupg2-2.2.27/g10/keygen.c
--- gnupg2-2.2.20/g10/keygen.c	2019-10-15 11:54:10.000000000 +0200
+++ gnupg2-2.2.27/g10/keygen.c	2020-11-11 12:26:44.000000000 +0100
@@ -46,11 +46,10 @@
 #include "../common/mbox-util.h"
 
 
-/* The default algorithms.  If you change them remember to change them
-   also in gpg.c:gpgconf_list.  You should also check that the value
+/* The default algorithms. You should also check that the value
    is inside the bounds enforced by ask_keysize and gen_xxx.  See also
    get_keysize_range which encodes the allowed ranges.  */
-#define DEFAULT_STD_KEY_PARAM  "rsa2048/cert,sign+rsa2048/encr"
+#define DEFAULT_STD_KEY_PARAM  "rsa3072/cert,sign+rsa3072/encr"
 #define FUTURE_STD_KEY_PARAM   "ed25519/cert,sign+cv25519/encr"
 
 /* When generating keys using the streamlined key generation dialog,
@@ -1367,7 +1366,7 @@
 
   err = agent_genkey (NULL, cache_nonce_addr, passwd_nonce_addr, keyparms,
                       !!(keygen_flags & KEYGEN_FLAG_NO_PROTECTION),
-                      passphrase,
+                      passphrase, timestamp,
                       &s_key);
   if (err)
     {
@@ -1653,7 +1652,7 @@
 
   if (nbits < 1024)
     {
-      nbits = 2048;
+      nbits = 3072;
       log_info (_("keysize invalid; using %u bits\n"), nbits );
     }
   else if (nbits > maxsize)
@@ -2148,6 +2147,10 @@
                       && !(sl->flags & GCRY_PK_USAGE_ENCR))
                     sl->flags |= (PUBKEY_ALGO_ECDSA << 8);
                   else if (algoid == GCRY_PK_ECC
+                      && algostr && !strncmp (algostr, "brainpool", 9)
+                      && !(sl->flags & GCRY_PK_USAGE_ENCR))
+                    sl->flags |= (PUBKEY_ALGO_ECDSA << 8);
+                  else if (algoid == GCRY_PK_ECC
                            && algostr && !strcmp (algostr, "ed25519")
                            && !(sl->flags & GCRY_PK_USAGE_ENCR))
                     sl->flags = (PUBKEY_ALGO_EDDSA << 8);
@@ -2264,7 +2267,7 @@
     default:
       *min = opt.compliance == CO_DE_VS ? 2048: 1024;
       *max = 4096;
-      def = 2048;
+      def = 3072;
       break;
     }
 
@@ -4040,6 +4043,7 @@
     para = NULL;
     maxlen = 1024;
     line = NULL;
+    nline = 0;
     while ( iobuf_read_line (fp, &line, &nline, &maxlen) ) {
 	char *keyword, *value;
 
diff -Nru gnupg2-2.2.20/g10/keyid.c gnupg2-2.2.27/g10/keyid.c
--- gnupg2-2.2.20/g10/keyid.c	2019-10-03 17:44:52.000000000 +0200
+++ gnupg2-2.2.27/g10/keyid.c	2020-05-12 18:27:35.000000000 +0200
@@ -953,7 +953,7 @@
   else
     {
       if (DBG_PACKET)
-        log_printhex ("keygrip=", array, 20);
+        log_printhex (array, 20, "keygrip=");
       /* FIXME: Save the keygrip in PK.  */
     }
   gcry_sexp_release (s_pkey);
diff -Nru gnupg2-2.2.20/g10/keylist.c gnupg2-2.2.27/g10/keylist.c
--- gnupg2-2.2.20/g10/keylist.c	2019-12-23 12:44:00.000000000 +0100
+++ gnupg2-2.2.27/g10/keylist.c	2020-10-28 17:24:53.000000000 +0100
@@ -893,6 +893,51 @@
 }
 
 
+/* Order two signatures.  We first order by keyid and then by creation
+ * time.  This is currently only used in keyedit.c  */
+int
+cmp_signodes (const void *av, const void *bv)
+{
+  const kbnode_t an = *(const kbnode_t *)av;
+  const kbnode_t bn = *(const kbnode_t *)bv;
+  const PKT_signature *a;
+  const PKT_signature *b;
+  int i;
+
+  /* log_assert (an->pkt->pkttype == PKT_SIGNATURE); */
+  /* log_assert (bn->pkt->pkttype == PKT_SIGNATURE); */
+
+  a = an->pkt->pkt.signature;
+  b = bn->pkt->pkt.signature;
+
+  /* Self-signatures are ordered first.  */
+  if ((an->flag & NODFLG_MARK_B) && !(bn->flag & NODFLG_MARK_B))
+    return -1;
+  if (!(an->flag & NODFLG_MARK_B) && (bn->flag & NODFLG_MARK_B))
+    return 1;
+
+  /* then the keyids.  (which are or course the same for self-sigs). */
+  i = keyid_cmp (a->keyid, b->keyid);
+  if (i)
+    return i;
+
+  /* Followed by creation time */
+  if (a->timestamp > b->timestamp)
+    return 1;
+  if (a->timestamp < b->timestamp)
+    return -1;
+
+  /* followed by the class in a way that a rev comes first.  */
+  if (a->sig_class > b->sig_class)
+    return 1;
+  if (a->sig_class < b->sig_class)
+    return -1;
+
+  /* To make the sort stable we compare the entire structure as last resort.  */
+  return memcmp (a, b, sizeof *a);
+}
+
+
 static void
 list_keyblock_print (ctrl_t ctrl, kbnode_t keyblock, int secret, int fpr,
                      struct keylist_context *listctx)
@@ -1340,7 +1385,7 @@
       es_fputs (gnupg_status_compliance_flag (CO_GNUPG), es_stdout);
       any++;
     }
-  if (gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, pk->pkey,
+  if (gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0, pk->pkey,
 			     keylength, curvename))
     {
       es_fprintf (es_stdout, any ? " %s" : "%s",
diff -Nru gnupg2-2.2.20/g10/keyring.c gnupg2-2.2.27/g10/keyring.c
--- gnupg2-2.2.20/g10/keyring.c	2019-08-21 09:50:55.000000000 +0200
+++ gnupg2-2.2.27/g10/keyring.c	2020-10-23 20:08:54.000000000 +0200
@@ -228,7 +228,7 @@
 {
   KR_RESOURCE r = token;
 
-  return r? (r->read_only || !access (r->fname, W_OK)) : 0;
+  return r? (r->read_only || !gnupg_access (r->fname, W_OK)) : 0;
 }
 
 
@@ -1371,7 +1371,7 @@
 
     statbuf.st_mode=S_IRUSR | S_IWUSR;
 
-    if (!stat (bakfname, &statbuf) && !chmod (fname, statbuf.st_mode))
+    if (!gnupg_stat (bakfname, &statbuf) && !chmod (fname, statbuf.st_mode))
       ;
     else
       log_error ("WARNING: unable to restore permissions to '%s': %s",
@@ -1606,6 +1606,7 @@
 do_copy (int mode, const char *fname, KBNODE root,
          off_t start_offset, unsigned int n_packets )
 {
+    gpg_err_code_t ec;
     IOBUF fp, newfp;
     int rc=0;
     char *bakfname = NULL;
@@ -1613,8 +1614,8 @@
 
     /* Open the source file. Because we do a rename, we have to check the
        permissions of the file */
-    if (access (fname, W_OK))
-      return gpg_error_from_syserror ();
+    if ((ec = gnupg_access (fname, W_OK)))
+      return gpg_error (ec);
 
     fp = iobuf_open (fname);
     if (mode == 1 && !fp && errno == ENOENT) {
diff -Nru gnupg2-2.2.20/g10/keyserver.c gnupg2-2.2.27/g10/keyserver.c
--- gnupg2-2.2.20/g10/keyserver.c	2020-03-14 19:15:00.000000000 +0100
+++ gnupg2-2.2.27/g10/keyserver.c	2020-12-18 11:22:00.000000000 +0100
@@ -1159,6 +1159,21 @@
 }
 
 
+/* Import the keys that match exactly MBOX */
+int
+keyserver_import_ntds (ctrl_t ctrl, const char *mbox,
+                       unsigned char **fpr, size_t *fprlen)
+{
+  KEYDB_SEARCH_DESC desc = { 0 };
+  struct keyserver_spec keyserver = { NULL, "ldap:///" };
+
+  desc.mode = KEYDB_SEARCH_MODE_MAIL;
+  desc.u.name = mbox;
+
+  return keyserver_get (ctrl, &desc, 1, &keyserver, 0, fpr, fprlen);
+}
+
+
 int
 keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
 			 struct keyserver_spec *keyserver, int quick)
@@ -1685,6 +1700,25 @@
           if (!pattern[npat])
             err = gpg_error_from_syserror ();
           else
+            {
+              npat++;
+              quiet = 1;
+            }
+        }
+      else if(desc[idx].mode == KEYDB_SEARCH_MODE_MAIL)
+        {
+          n = 1 + strlen (desc[idx].u.name) + 1 + 1;
+          if (idx && linelen + n > MAX_KS_GET_LINELEN)
+            break; /* Declare end of this chunk.  */
+          linelen += n;
+
+          if (desc[idx].u.name[0] == '<')
+            pattern[npat] = xtrystrdup (desc[idx].u.name);
+          else
+            pattern[npat] = strconcat ("<", desc[idx].u.name, ">", NULL);
+          if (!pattern[npat])
+            err = gpg_error_from_syserror ();
+          else
             {
               npat++;
               quiet = 1;
diff -Nru gnupg2-2.2.20/g10/keyserver-internal.h gnupg2-2.2.27/g10/keyserver-internal.h
--- gnupg2-2.2.20/g10/keyserver-internal.h	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g10/keyserver-internal.h	2020-12-18 11:22:00.000000000 +0100
@@ -47,6 +47,8 @@
                                   unsigned char **fpr,size_t *fpr_len);
 gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
                                   unsigned char **fpr, size_t *fpr_len);
+int keyserver_import_ntds (ctrl_t ctrl, const char *name,
+                           unsigned char **fpr,size_t *fpr_len);
 int keyserver_import_name (ctrl_t ctrl,
                            const char *name,unsigned char **fpr,size_t *fpr_len,
                            struct keyserver_spec *keyserver);
diff -Nru gnupg2-2.2.20/g10/main.h gnupg2-2.2.27/g10/main.h
--- gnupg2-2.2.20/g10/main.h	2020-03-14 19:38:47.000000000 +0100
+++ gnupg2-2.2.27/g10/main.h	2020-11-02 17:41:39.000000000 +0100
@@ -95,6 +95,7 @@
 void print_reported_error (gpg_error_t err, gpg_err_code_t skip_if_ec);
 void print_further_info (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
 void additional_weak_digest (const char* digestname);
+int  is_weak_digest (digest_algo_t algo);
 
 /*-- armor.c --*/
 char *make_radix64_string( const byte *data, size_t len );
@@ -122,6 +123,12 @@
 int openpgp_cipher_test_algo(cipher_algo_t algo);
 const char *openpgp_cipher_algo_name (cipher_algo_t algo);
 
+gpg_error_t openpgp_aead_test_algo (aead_algo_t algo);
+const char *openpgp_aead_algo_name (aead_algo_t algo);
+gpg_error_t openpgp_aead_algo_info (aead_algo_t algo,
+                                    enum gcry_cipher_modes *r_mode,
+                                    unsigned int *r_noncelen);
+
 pubkey_algo_t map_pk_gcry_to_openpgp (enum gcry_pk_algos algo);
 int openpgp_pk_test_algo (pubkey_algo_t algo);
 int openpgp_pk_test_algo2 (pubkey_algo_t algo, unsigned int use);
@@ -223,7 +230,7 @@
 void display_online_help( const char *keyword );
 
 /*-- encode.c --*/
-int setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek);
+gpg_error_t setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek);
 void encrypt_seskey (DEK *dek, DEK **seskey, byte *enckey);
 int use_mdc (pk_list_t pk_list,int algo);
 int encrypt_symmetric (const char *filename );
@@ -441,8 +448,9 @@
 int revocation_reason_build_cb( PKT_signature *sig, void *opaque );
 struct revocation_reason_info *
 		ask_revocation_reason( int key_rev, int cert_rev, int hint );
-struct revocation_reason_info * get_default_uid_revocation_reason(void);
-void release_revocation_reason_info( struct revocation_reason_info *reason );
+struct revocation_reason_info * get_default_uid_revocation_reason (void);
+struct revocation_reason_info * get_default_sig_revocation_reason (void);
+void release_revocation_reason_info (struct revocation_reason_info *reason);
 
 /*-- keylist.c --*/
 void public_key_list (ctrl_t ctrl, strlist_t list,
@@ -452,6 +460,7 @@
 void reorder_keyblock (KBNODE keyblock);
 void list_keyblock_direct (ctrl_t ctrl, kbnode_t keyblock, int secret,
                            int has_secret, int fpr, int no_validity);
+int  cmp_signodes (const void *av, const void *bv);
 void print_fingerprint (ctrl_t ctrl, estream_t fp,
                         PKT_public_key *pk, int mode);
 void print_revokers (estream_t fp, PKT_public_key *pk);
diff -Nru gnupg2-2.2.20/g10/mainproc.c gnupg2-2.2.27/g10/mainproc.c
--- gnupg2-2.2.20/g10/mainproc.c	2020-03-14 19:54:05.000000000 +0100
+++ gnupg2-2.2.27/g10/mainproc.c	2020-11-13 15:56:53.000000000 +0100
@@ -97,6 +97,7 @@
   int trustletter;  /* Temporary usage in list_node. */
   ulong symkeys;    /* Number of symmetrically encrypted session keys.  */
   struct kidlist_item *pkenc_list; /* List of encryption packets. */
+  int seen_pkt_encrypted_aead; /* PKT_ENCRYPTED_AEAD packet seen. */
   struct {
     unsigned int sig_seen:1;      /* Set to true if a signature packet
                                      has been seen. */
@@ -145,6 +146,7 @@
   c->any.data = 0;
   c->any.uncompress_failed = 0;
   c->last_was_session_key = 0;
+  c->seen_pkt_encrypted_aead = 0;
   xfree (c->dek);
   c->dek = NULL;
 }
@@ -252,47 +254,111 @@
   return 1;
 }
 
-static int
+
+static gpg_error_t
 symkey_decrypt_seskey (DEK *dek, byte *seskey, size_t slen)
 {
+  gpg_error_t err;
   gcry_cipher_hd_t hd;
+  enum gcry_cipher_modes ciphermode;
+  unsigned int noncelen, keylen;
+
+  if (dek->use_aead)
+    {
+      err = openpgp_aead_algo_info (dek->use_aead, &ciphermode, &noncelen);
+      if (err)
+        return err;
+    }
+  else
+    {
+      ciphermode = GCRY_CIPHER_MODE_CFB;
+      noncelen = 0;
+    }
 
-  if(slen < 17 || slen > 33)
+  /* Check that the session key has a size of 16 to 32 bytes.  */
+  if ((dek->use_aead && (slen < (noncelen + 16 + 16)
+                         || slen > (noncelen + 32 + 16)))
+      || (!dek->use_aead && (slen < 17 || slen > 33)))
     {
       log_error ( _("weird size for an encrypted session key (%d)\n"),
 		  (int)slen);
-      return GPG_ERR_BAD_KEY;
+      return gpg_error (GPG_ERR_BAD_KEY);
     }
 
-  if (openpgp_cipher_open (&hd, dek->algo, GCRY_CIPHER_MODE_CFB, 1))
-      BUG ();
-  if (gcry_cipher_setkey ( hd, dek->key, dek->keylen ))
-    BUG ();
-  gcry_cipher_setiv ( hd, NULL, 0 );
-  gcry_cipher_decrypt ( hd, seskey, slen, NULL, 0 );
-  gcry_cipher_close ( hd );
-
-  /* Here we can only test whether the algo given in decrypted
-   * session key is a valid OpenPGP algo.  With 11 defined
-   * symmetric algorithms we will miss 4.3% of wrong passphrases
-   * here.  The actual checking is done later during bulk
-   * decryption; we can't bring this check forward easily.  */
-  if (openpgp_cipher_test_algo (seskey[0]))
-    return gpg_error (GPG_ERR_BAD_KEY);
-
-  /* Now we replace the dek components with the real session key to
-     decrypt the contents of the sequencing packet. */
-
-  dek->keylen=slen-1;
-  dek->algo=seskey[0];
-
-  if(dek->keylen > DIM(dek->key))
-    BUG ();
+  err = openpgp_cipher_open (&hd, dek->algo, ciphermode, 1);
+  if (!err)
+    err = gcry_cipher_setkey (hd, dek->key, dek->keylen);
+  if (!err)
+    err = gcry_cipher_setiv (hd, noncelen? seskey : NULL, noncelen);
+  if (err)
+    goto leave;
+
+  if (dek->use_aead)
+    {
+      byte ad[4];
+
+      ad[0] = (0xc0 | PKT_SYMKEY_ENC);
+      ad[1] = 5;
+      ad[2] = dek->algo;
+      ad[3] = dek->use_aead;
+      err = gcry_cipher_authenticate (hd, ad, 4);
+      if (err)
+        goto leave;
+      gcry_cipher_final (hd);
+      keylen = slen - noncelen - 16;
+      err = gcry_cipher_decrypt (hd, seskey+noncelen, keylen, NULL, 0);
+      if (err)
+        goto leave;
+      err = gcry_cipher_checktag (hd, seskey+noncelen+keylen, 16);
+      if (err)
+        goto leave;
+      /* Now we replace the dek components with the real session key to
+       * decrypt the contents of the sequencing packet. */
+      if (keylen > DIM(dek->key))
+        {
+          err = gpg_error (GPG_ERR_TOO_LARGE);
+          goto leave;
+        }
+      dek->keylen = keylen;
+      memcpy (dek->key, seskey + noncelen, dek->keylen);
+    }
+  else
+    {
+      gcry_cipher_decrypt (hd, seskey, slen, NULL, 0);
 
-  memcpy(dek->key, seskey + 1, dek->keylen);
+      /* Here we can only test whether the algo given in decrypted
+       * session key is a valid OpenPGP algo.  With 11 defined
+       * symmetric algorithms we will miss 4.3% of wrong passphrases
+       * here.  The actual checking is done later during bulk
+       * decryption; we can't bring this check forward easily.  We
+       * need to use the GPG_ERR_CHECKSUM so that we won't run into
+       * the gnupg < 2.2 bug compatible case which would terminate the
+       * process on GPG_ERR_CIPHER_ALGO.  Note that with AEAD (above)
+       * we will have a reliable test here.  */
+      if (openpgp_cipher_test_algo (seskey[0])
+          || openpgp_cipher_get_algo_keylen (seskey[0]) != slen - 1)
+        {
+          err = gpg_error (GPG_ERR_CHECKSUM);
+          goto leave;
+        }
+
+      /* Now we replace the dek components with the real session key to
+       * decrypt the contents of the sequencing packet. */
+      keylen = slen-1;
+      if (keylen > DIM(dek->key))
+        {
+          err = gpg_error (GPG_ERR_TOO_LARGE);
+          goto leave;
+        }
+      dek->algo = seskey[0];
+      dek->keylen = slen-1;
+      memcpy (dek->key, seskey + 1, dek->keylen);
+    }
 
   /*log_hexdump( "thekey", dek->key, dek->keylen );*/
 
+ leave:
+  gcry_cipher_close (hd);
   return 0;
 }
 
@@ -300,6 +366,7 @@
 static void
 proc_symkey_enc (CTX c, PACKET *pkt)
 {
+  gpg_error_t err;
   PKT_symkey_enc *enc;
 
   enc = pkt->pkt.symkey_enc;
@@ -309,15 +376,20 @@
     {
       int algo = enc->cipher_algo;
       const char *s = openpgp_cipher_algo_name (algo);
+      const char *a = (enc->aead_algo ? openpgp_aead_algo_name (enc->aead_algo)
+                       /**/           : "CFB");
 
       if (!openpgp_cipher_test_algo (algo))
         {
           if (!opt.quiet)
             {
+              /* Note: TMPSTR is only used to avoid i18n changes.  */
+              char *tmpstr = xstrconcat (s, ".", a, NULL);
               if (enc->seskeylen)
-                log_info (_("%s encrypted session key\n"), s );
+                log_info (_("%s encrypted session key\n"), tmpstr);
               else
-                log_info (_("%s encrypted data\n"), s );
+                log_info (_("%s encrypted data\n"), tmpstr);
+              xfree (tmpstr);
             }
         }
       else
@@ -349,6 +421,7 @@
           if (c->dek)
             {
               c->dek->symmetric = 1;
+              c->dek->use_aead = enc->aead_algo;
 
               /* FIXME: This doesn't work perfectly if a symmetric key
                  comes before a public key in the message - if the
@@ -359,9 +432,16 @@
                  come later. */
               if (enc->seskeylen)
                 {
-                  if (symkey_decrypt_seskey (c->dek,
-                                             enc->seskey, enc->seskeylen))
+                  err = symkey_decrypt_seskey (c->dek,
+                                               enc->seskey, enc->seskeylen);
+                  if (err)
                     {
+                      log_info ("decryption of the symmetrically encrypted"
+                                 " session key failed: %s\n",
+                                 gpg_strerror (err));
+                      if (gpg_err_code (err) != GPG_ERR_BAD_KEY
+                          && gpg_err_code (err) != GPG_ERR_CHECKSUM)
+                        log_fatal ("process terminated to be bug compatible\n");
                       if (c->dek->s2k_cacheid[0])
                         {
                           if (opt.debug)
@@ -538,6 +618,9 @@
         {
           log_info (_("public key decryption failed: %s\n"),
                     gpg_strerror (list->reason));
+          if (gpg_err_source (list->reason) == GPG_ERR_SOURCE_SCD
+              && gpg_err_code (list->reason) == GPG_ERR_INV_ID)
+            print_further_info ("a reason might be a card with replaced keys");
           write_status_error ("pkdecrypt_failed", list->reason);
         }
     }
@@ -550,6 +633,9 @@
   int result = 0;
   int early_plaintext = literals_seen;
 
+  if (pkt->pkttype == PKT_ENCRYPTED_AEAD)
+    c->seen_pkt_encrypted_aead = 1;
+
   if (early_plaintext)
     {
       log_info (_("WARNING: multiple plaintexts seen\n"));
@@ -656,8 +742,8 @@
           memset (pk, 0, sizeof *pk);
           pk->pubkey_algo = i->pubkey_algo;
           if (get_pubkey (c->ctrl, pk, i->kid) != 0
-              || ! gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, pk->pkey,
-                                          nbits_from_pk (pk), NULL))
+              || ! gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0,
+                                          pk->pkey, nbits_from_pk (pk), NULL))
             compliant = 0;
           release_public_key_parts (pk);
         }
@@ -683,7 +769,8 @@
     ;
   else if (!result
            && !opt.ignore_mdc_error
-           && !pkt->pkt.encrypted->mdc_method)
+           && !pkt->pkt.encrypted->mdc_method
+           && !pkt->pkt.encrypted->aead_algo)
     {
       /* The message has been decrypted but does not carry an MDC.
        * The option --ignore-mdc-error has also not been used.  To
@@ -712,17 +799,25 @@
       write_status (STATUS_DECRYPTION_FAILED);
     }
   else if (!result || (gpg_err_code (result) == GPG_ERR_BAD_SIGNATURE
+                       && !pkt->pkt.encrypted->aead_algo
                        && opt.ignore_mdc_error))
     {
+      /* All is fine or for an MDC message the MDC failed but the
+       * --ignore-mdc-error option is active.  For compatibility
+       * reasons we issue GOODMDC also for AEAD messages.  */
       write_status (STATUS_DECRYPTION_OKAY);
       if (opt.verbose > 1)
         log_info(_("decryption okay\n"));
-      if (pkt->pkt.encrypted->mdc_method && !result)
+
+      if (pkt->pkt.encrypted->aead_algo)
+        write_status (STATUS_GOODMDC);
+      else if (pkt->pkt.encrypted->mdc_method && !result)
         write_status (STATUS_GOODMDC);
       else
         log_info (_("WARNING: message was not integrity protected\n"));
     }
-  else if (gpg_err_code (result) == GPG_ERR_BAD_SIGNATURE)
+  else if (gpg_err_code (result) == GPG_ERR_BAD_SIGNATURE
+           || gpg_err_code (result) == GPG_ERR_TRUNCATED)
     {
       glo_ctrl.lasterr = result;
       log_error (_("WARNING: encrypted message has been manipulated!\n"));
@@ -732,6 +827,7 @@
   else
     {
       if ((gpg_err_code (result) == GPG_ERR_BAD_KEY
+	   || gpg_err_code (result) == GPG_ERR_CHECKSUM
 	   || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
           && *c->dek->s2k_cacheid != '\0')
         {
@@ -761,6 +857,21 @@
 }
 
 
+static int
+have_seen_pkt_encrypted_aead( CTX c )
+{
+  CTX cc;
+
+  for (cc = c; cc; cc = cc->anchor)
+    {
+      if (cc->seen_pkt_encrypted_aead)
+	return 1;
+    }
+
+  return 0;
+}
+
+
 static void
 proc_plaintext( CTX c, PACKET *pkt )
 {
@@ -836,7 +947,7 @@
         }
     }
 
-  if (!any && !opt.skip_verify)
+  if (!any && !opt.skip_verify && !have_seen_pkt_encrypted_aead(c))
     {
       /* This is for the old GPG LITERAL+SIG case.  It's not legal
          according to 2440, so hopefully it won't come up that often.
@@ -1467,7 +1578,8 @@
             case PKT_PUBKEY_ENC:    proc_pubkey_enc (ctrl, c, pkt); break;
             case PKT_SYMKEY_ENC:    proc_symkey_enc (c, pkt); break;
             case PKT_ENCRYPTED:
-            case PKT_ENCRYPTED_MDC: proc_encrypted (c, pkt); break;
+            case PKT_ENCRYPTED_MDC:
+            case PKT_ENCRYPTED_AEAD:proc_encrypted (c, pkt); break;
             case PKT_COMPRESSED:    rc = proc_compressed (c, pkt); break;
             default: newpkt = 0; break;
 	    }
@@ -1483,6 +1595,7 @@
             case PKT_PUBKEY_ENC:
             case PKT_ENCRYPTED:
             case PKT_ENCRYPTED_MDC:
+            case PKT_ENCRYPTED_AEAD:
               write_status_text( STATUS_UNEXPECTED, "0" );
               rc = GPG_ERR_UNEXPECTED;
               goto leave;
@@ -1510,7 +1623,8 @@
             case PKT_SYMKEY_ENC:  proc_symkey_enc (c, pkt); break;
             case PKT_PUBKEY_ENC:  proc_pubkey_enc (ctrl, c, pkt); break;
             case PKT_ENCRYPTED:
-            case PKT_ENCRYPTED_MDC: proc_encrypted (c, pkt); break;
+            case PKT_ENCRYPTED_MDC:
+            case PKT_ENCRYPTED_AEAD: proc_encrypted (c, pkt); break;
             case PKT_PLAINTEXT:   proc_plaintext (c, pkt); break;
             case PKT_COMPRESSED:  rc = proc_compressed (c, pkt); break;
             case PKT_ONEPASS_SIG: newpkt = add_onepass_sig (c, pkt); break;
@@ -1537,7 +1651,8 @@
             case PKT_PUBKEY_ENC:  proc_pubkey_enc (ctrl, c, pkt); break;
             case PKT_SYMKEY_ENC:  proc_symkey_enc (c, pkt); break;
             case PKT_ENCRYPTED:
-            case PKT_ENCRYPTED_MDC: proc_encrypted (c, pkt); break;
+            case PKT_ENCRYPTED_MDC:
+            case PKT_ENCRYPTED_AEAD: proc_encrypted (c, pkt); break;
             case PKT_PLAINTEXT:   proc_plaintext (c, pkt); break;
             case PKT_COMPRESSED:  rc = proc_compressed (c, pkt); break;
             case PKT_ONEPASS_SIG: newpkt = add_onepass_sig (c, pkt); break;
@@ -2317,7 +2432,7 @@
 
       /* Print compliance warning for Good signatures.  */
       if (!rc && pk && !opt.quiet
-          && !gnupg_pk_is_compliant (opt.compliance, pk->pubkey_algo,
+          && !gnupg_pk_is_compliant (opt.compliance, pk->pubkey_algo, 0,
                                      pk->pkey, nbits_from_pk (pk), NULL))
         {
           log_info (_("WARNING: This key is not suitable for signing"
@@ -2401,7 +2516,7 @@
 
       /* Compute compliance with CO_DE_VS.  */
       if (pk && is_status_enabled ()
-          && gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, pk->pkey,
+          && gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0, pk->pkey,
                                     nbits_from_pk (pk), NULL)
           && gnupg_digest_is_compliant (CO_DE_VS, sig->digest_algo))
         write_status_strings (STATUS_VERIFICATION_COMPLIANCE_MODE,
diff -Nru gnupg2-2.2.20/g10/Makefile.am gnupg2-2.2.27/g10/Makefile.am
--- gnupg2-2.2.20/g10/Makefile.am	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/Makefile.am	2020-10-23 20:08:54.000000000 +0200
@@ -19,8 +19,10 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = distsigkey.gpg \
-	     ChangeLog-2011 gpg-w32info.rc \
-	     gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
+	     ChangeLog-2011 \
+             gpg-w32info.rc gpg.w32-manifest.in \
+             gpgv-w32info.rc gpgv.w32-manifest.in \
+	     test.c t-keydb-keyring.kbx \
 	     t-keydb-get-keyblock.gpg t-stutter-data.asc \
 	     all-tests.scm
 
@@ -31,7 +33,7 @@
 AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
-needed_libs = ../kbx/libkeybox.a $(libcommon)
+needed_libs = ../kbx/libkeybox.a $(libcommon) ../regexp/libregexp.a
 
 # Because there are no program specific transform macros we need to
 # work around that to allow installing gpg as gpg2.
@@ -54,7 +56,11 @@
 noinst_PROGRAMS += gpgcompose
 endif
 noinst_PROGRAMS += $(module_tests)
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = $(module_tests)
+endif
 TESTS_ENVIRONMENT = \
 	abs_top_srcdir=$(abs_top_srcdir)
 
@@ -84,10 +90,13 @@
 
 
 if HAVE_W32_SYSTEM
-resource_objs += gpg-w32info.o
-
+gpg_robjs = $(resource_objs) gpg-w32info.o
+gpgv_robjs = $(resource_objs) gpgv-w32info.o
 gpg-w32info.o : gpg.w32-manifest
-
+gpgv-w32info.o : gpgv.w32-manifest
+else
+gpg_robjs =
+gpgv_robjs =
 endif
 
 common_source =  \
@@ -174,16 +183,16 @@
          $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
 gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-	     $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	     $(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
 gpg_LDFLAGS = $(extra_bin_ldflags)
 gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
               $(GPG_ERROR_LIBS) \
-	      $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	      $(LIBICONV) $(gpgv_robjs) $(extra_sys_libs)
 gpgv_LDFLAGS = $(extra_bin_ldflags)
 
 gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-	     $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	     $(LIBICONV) $(extra_sys_libs)
 gpgcompose_LDFLAGS = $(extra_bin_ldflags)
 
 t_common_ldadd =
diff -Nru gnupg2-2.2.20/g10/Makefile.in gnupg2-2.2.27/g10/Makefile.in
--- gnupg2-2.2.20/g10/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/g10/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -145,8 +145,7 @@
 	$(am__EXEEXT_3)
 @HAVE_W32CE_SYSTEM_FALSE@am__append_8 = gpgv
 @MAINTAINER_MODE_TRUE@am__append_9 = gpgcompose
-TESTS = $(am__EXEEXT_3)
-@HAVE_W32_SYSTEM_TRUE@am__append_10 = gpg-w32info.o
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_3)
 subdir = g10
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -168,7 +167,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gpg.w32-manifest
+CONFIG_CLEAN_FILES = gpg.w32-manifest gpgv.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 @HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 = gpgv$(EXEEXT)
 @MAINTAINER_MODE_TRUE@am__EXEEXT_2 = gpgcompose$(EXEEXT)
@@ -221,10 +220,13 @@
 am__DEPENDENCIES_2 = $(needed_libs) ../common/libgpgrl.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpg-w32info.o
 gpg_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(resource_objs) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
 gpg_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpg_LDFLAGS) $(LDFLAGS) -o \
 	$@
 am__gpgcompose_SOURCES_DIST = gpgcompose.c server.c gpg.h dek.h \
@@ -247,7 +249,7 @@
 gpgcompose_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(resource_objs) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 gpgcompose_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgcompose_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__gpgv_SOURCES_DIST = gpgv.c gpg.h dek.h build-packet.c compress.c \
@@ -259,9 +261,11 @@
 	ecdh.c verify.c
 am_gpgv_OBJECTS = gpgv.$(OBJEXT) $(am__objects_2) verify.$(OBJEXT)
 gpgv_OBJECTS = $(am_gpgv_OBJECTS)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpgv-w32info.o
 gpgv_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(resource_objs) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1)
 gpgv_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgv_LDFLAGS) $(LDFLAGS) \
 	-o $@
 am__t_keydb_SOURCES_DIST = t-keydb.c test-stubs.c gpg.h dek.h \
@@ -423,7 +427,8 @@
   fi; \
 }
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gpg.w32-manifest.in \
-	$(top_srcdir)/am/cmacros.am $(top_srcdir)/build-aux/depcomp \
+	$(srcdir)/gpgv.w32-manifest.in $(top_srcdir)/am/cmacros.am \
+	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -434,6 +439,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -600,6 +606,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -609,8 +616,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = distsigkey.gpg \
-	     ChangeLog-2011 gpg-w32info.rc \
-	     gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
+	     ChangeLog-2011 \
+             gpg-w32info.rc gpg.w32-manifest.in \
+             gpgv-w32info.rc gpgv.w32-manifest.in \
+	     test.c t-keydb-keyring.kbx \
 	     t-keydb-get-keyblock.gpg t-stutter-data.asc \
 	     all-tests.scm
 
@@ -630,7 +639,7 @@
 @HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
 @HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags = 
 @HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
-resource_objs = $(am__append_10)
+resource_objs = 
 
 # Convenience macros
 libcommon = ../common/libcommon.a
@@ -640,7 +649,7 @@
 AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
-needed_libs = ../kbx/libkeybox.a $(libcommon)
+needed_libs = ../kbx/libkeybox.a $(libcommon) ../regexp/libregexp.a
 
 # Because there are no program specific transform macros we need to
 # work around that to allow installing gpg as gpg2.
@@ -660,6 +669,10 @@
 @NO_TRUST_MODELS_TRUE@trust_source = 
 @USE_TOFU_FALSE@tofu_source = 
 @USE_TOFU_TRUE@tofu_source = tofu.h tofu.c gpgsql.c gpgsql.h
+@HAVE_W32_SYSTEM_FALSE@gpg_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpg_robjs = $(resource_objs) gpg-w32info.o
+@HAVE_W32_SYSTEM_FALSE@gpgv_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpgv_robjs = $(resource_objs) gpgv-w32info.o
 common_source = \
 	      gpg.h             \
 	      dek.h             \
@@ -745,17 +758,17 @@
 
 gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-	     $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	     $(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
 
 gpg_LDFLAGS = $(extra_bin_ldflags)
 gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
               $(GPG_ERROR_LIBS) \
-	      $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	      $(LIBICONV) $(gpgv_robjs) $(extra_sys_libs)
 
 gpgv_LDFLAGS = $(extra_bin_ldflags)
 gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-	     $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	     $(LIBICONV) $(extra_sys_libs)
 
 gpgcompose_LDFLAGS = $(extra_bin_ldflags)
 t_common_ldadd = 
@@ -814,6 +827,8 @@
 $(am__aclocal_m4_deps):
 gpg.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpg.w32-manifest.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpgv.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpgv.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
@@ -1376,8 +1391,8 @@
 
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
-
 @HAVE_W32_SYSTEM_TRUE@gpg-w32info.o : gpg.w32-manifest
+@HAVE_W32_SYSTEM_TRUE@gpgv-w32info.o : gpgv.w32-manifest
 
 $(PROGRAMS): $(needed_libs) ../common/libgpgrl.a
 
diff -Nru gnupg2-2.2.20/g10/migrate.c gnupg2-2.2.27/g10/migrate.c
--- gnupg2-2.2.20/g10/migrate.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g10/migrate.c	2020-10-23 20:08:54.000000000 +0200
@@ -50,10 +50,10 @@
   char *agent_version = NULL;
 
   secring = make_filename (gnupg_homedir (), "secring" EXTSEP_S "gpg", NULL);
-  if (access (secring, F_OK))
+  if (gnupg_access (secring, F_OK))
     goto leave; /* Does not exist or is not readable.  */
   flagfile = make_filename (gnupg_homedir (), V21_MIGRATION_FNAME, NULL);
-  if (!access (flagfile, F_OK))
+  if (!gnupg_access (flagfile, F_OK))
     goto leave; /* Does exist - fine.  */
 
   log_info ("starting migration from earlier GnuPG versions\n");
@@ -99,8 +99,8 @@
   log_info ("porting secret keys from '%s' to gpg-agent\n", secring);
   if (!import_old_secring (ctrl, secring))
     {
-      FILE *fp = fopen (flagfile, "w");
-      if (!fp || fclose (fp))
+      estream_t fp = es_fopen (flagfile, "w");
+      if (!fp || es_fclose (fp))
         log_error ("error creating flag file '%s': %s\n",
                    flagfile, gpg_strerror (gpg_error_from_syserror ()));
       else
diff -Nru gnupg2-2.2.20/g10/misc.c gnupg2-2.2.27/g10/misc.c
--- gnupg2-2.2.20/g10/misc.c	2019-11-11 12:25:05.000000000 +0100
+++ gnupg2-2.2.27/g10/misc.c	2020-11-09 08:34:24.000000000 +0100
@@ -70,6 +70,10 @@
 #include "../common/i18n.h"
 #include "../common/zb32.h"
 
+/* FIXME: Libgcrypt 1.9 will support EAX.  Until we name this a
+ * requirement we hardwire the enum used for EAX.  */
+#define MY_GCRY_CIPHER_MODE_EAX 14
+
 
 #ifdef ENABLE_SELINUX_HACKS
 /* A object and a global variable to keep track of files marked as
@@ -98,7 +102,7 @@
   struct secured_file_item *sf;
 
   /* Note that we stop immediately if something goes wrong here. */
-  if (stat (fname, &buf))
+  if (gnupg_stat (fname, &buf))
     log_fatal (_("fstat of '%s' failed in %s: %s\n"), fname,
                "register_secured_file", strerror (errno));
 /*   log_debug ("registering '%s' i=%lu.%lu\n", fname, */
@@ -127,7 +131,7 @@
   struct stat buf;
   struct secured_file_item *sf, *sfprev;
 
-  if (stat (fname, &buf))
+  if (gnupg_stat (fname, &buf))
     {
       log_error (_("fstat of '%s' failed in %s: %s\n"), fname,
                  "unregister_secured_file", strerror (errno));
@@ -201,7 +205,7 @@
 
   /* Note that we print out a error here and claim that a file is
      secure if something went wrong. */
-  if (stat (fname, &buf))
+  if (gnupg_stat (fname, &buf))
     {
       if (errno == ENOENT || errno == EPERM || errno == EACCES)
         return 0;
@@ -307,12 +311,11 @@
 void
 print_digest_algo_note (digest_algo_t algo)
 {
-  const enum gcry_md_algos galgo = map_md_openpgp_to_gcry (algo);
-  const struct weakhash *weak;
-
   if(algo >= 100 && algo <= 110)
     {
       static int warn=0;
+      const enum gcry_md_algos galgo = map_md_openpgp_to_gcry (algo);
+
       if(!warn)
 	{
 	  warn=1;
@@ -321,14 +324,13 @@
                     gcry_md_algo_name (galgo));
 	}
     }
-  else
-      for (weak = opt.weak_digests; weak != NULL; weak = weak->next)
-        if (weak->algo == galgo)
-          {
-            es_fflush (es_stdout);
-            log_info (_("WARNING: digest algorithm %s is deprecated\n"),
-                      gcry_md_algo_name (galgo));
-          }
+  else if (is_weak_digest (algo))
+    {
+      const enum gcry_md_algos galgo = map_md_openpgp_to_gcry (algo);
+      es_fflush (es_stdout);
+      log_info (_("WARNING: digest algorithm %s is deprecated\n"),
+                gcry_md_algo_name (galgo));
+    }
 }
 
 
@@ -337,6 +339,10 @@
 {
   struct weakhash* weak;
   int show = 1;
+
+  if (opt.quiet)
+    return;
+
   for (weak = opt.weak_digests; weak; weak = weak->next)
     if (weak->algo == algo)
       {
@@ -362,7 +368,7 @@
 {
   static int shown;
 
-  if (shown)
+  if (shown || opt.quiet)
     return;
 
   shown = 1;
@@ -602,6 +608,80 @@
 }
 
 
+/* Return 0 if ALGO is supported.  Return an error if not. */
+gpg_error_t
+openpgp_aead_test_algo (aead_algo_t algo)
+{
+  /* FIXME: We currently have no easy way to test whether libgcrypt
+   * implements a mode.  The only way we can do this is to open a
+   * cipher context with that mode and close it immediately.  That is
+   * a bit costly.  So we look at the libgcrypt version and assume
+   * nothing has been patched out.  */
+  switch (algo)
+    {
+    case AEAD_ALGO_NONE:
+      break;
+
+    case AEAD_ALGO_EAX:
+#if GCRYPT_VERSION_NUMBER < 0x010900
+      break;
+#else
+      return 0;
+#endif
+
+    case AEAD_ALGO_OCB:
+      return 0;
+    }
+
+  return gpg_error (GPG_ERR_INV_CIPHER_MODE);
+}
+
+
+/* Map the OpenPGP AEAD algorithm with ID ALGO to a string
+ * representation of the algorithm name.  For unknown algorithm IDs
+ * this function returns "?".  */
+const char *
+openpgp_aead_algo_name (aead_algo_t algo)
+{
+  switch (algo)
+    {
+    case AEAD_ALGO_NONE:  break;
+    case AEAD_ALGO_EAX:   return "EAX";
+    case AEAD_ALGO_OCB:   return "OCB";
+    }
+
+  return "?";
+}
+
+
+/* Return information for the AEAD algorithm ALGO.  The corresponding
+ * Libgcrypt ciphermode is stored at R_MODE and the required number of
+ * octets for the nonce at R_NONCELEN.  On error and error code is
+ * returned.  Note that the taglen is always 128 bits.  */
+gpg_error_t
+openpgp_aead_algo_info (aead_algo_t algo, enum gcry_cipher_modes *r_mode,
+                        unsigned int *r_noncelen)
+{
+  switch (algo)
+    {
+    case AEAD_ALGO_OCB:
+      *r_mode = GCRY_CIPHER_MODE_OCB;
+      *r_noncelen = 15;
+      break;
+
+    case AEAD_ALGO_EAX:
+      *r_mode = MY_GCRY_CIPHER_MODE_EAX;
+      *r_noncelen = 16;
+      break;
+
+    default:
+      log_error ("unsupported AEAD algo %d\n", algo);
+      return gpg_error (GPG_ERR_INV_CIPHER_MODE);
+    }
+  return 0;
+}
+
+
 /* Return 0 if ALGO is a supported OpenPGP public key algorithm.  */
 int
 openpgp_pk_test_algo (pubkey_algo_t algo)
@@ -841,6 +921,11 @@
   u32 pk_keyid[2]={0,0},sk_keyid[2]={0,0};
   char *ret=NULL;
 
+  /* The parser below would return NULL for an empty string, thus we
+   * catch it here.  Also catch NULL here. */
+  if (!string || !*string)
+    return xstrdup ("");
+
   if(args->pk)
     keyid_from_pk(args->pk,pk_keyid);
 
@@ -1782,3 +1867,17 @@
   weak->next = opt.weak_digests;
   opt.weak_digests = weak;
 }
+
+
+/* Return true if ALGO is in the list of weak digests.  */
+int
+is_weak_digest (digest_algo_t algo)
+{
+  const enum gcry_md_algos galgo = map_md_openpgp_to_gcry (algo);
+  const struct weakhash *weak;
+
+  for (weak = opt.weak_digests; weak; weak = weak->next)
+    if (weak->algo == galgo)
+      return 1;
+  return 0;
+}
diff -Nru gnupg2-2.2.20/g10/openfile.c gnupg2-2.2.27/g10/openfile.c
--- gnupg2-2.2.20/g10/openfile.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/openfile.c	2020-11-04 16:25:57.000000000 +0100
@@ -324,7 +324,7 @@
 
       fname = xstrdup (sigfilename);
       fname[len-(fname[len-1]=='n'?5:4)] = 0 ;
-      if (access (fname, R_OK ))
+      if (gnupg_access (fname, R_OK ))
         {
           /* Not found or other error.  */
           xfree (fname);
@@ -367,36 +367,18 @@
 }
 
 
+/* Create the directory only if the supplied directory name is the
+   same as the default one.  This way we avoid to create arbitrary
+   directories when a non-default home directory is used.  To cope
+   with HOME, we do compare only the suffix if we see that the default
+   homedir does start with a tilde.  */
 void
 try_make_homedir (const char *fname)
 {
-  const char *defhome = standard_homedir ();
-
-  /* Create the directory only if the supplied directory name is the
-     same as the default one.  This way we avoid to create arbitrary
-     directories when a non-default home directory is used.  To cope
-     with HOME, we do compare only the suffix if we see that the
-     default homedir does start with a tilde.  */
   if ( opt.dry_run || opt.no_homedir_creation )
     return;
 
-  if (
-#ifdef HAVE_W32_SYSTEM
-      ( !compare_filenames (fname, defhome) )
-#else
-      ( *defhome == '~'
-        && (strlen(fname) >= strlen (defhome+1)
-            && !strcmp(fname+strlen(fname)-strlen(defhome+1), defhome+1 ) ))
-      || (*defhome != '~'  && !compare_filenames( fname, defhome ) )
-#endif
-      )
-    {
-      if (gnupg_mkdir (fname, "-rwx"))
-        log_fatal ( _("can't create directory '%s': %s\n"),
-                    fname, strerror(errno) );
-      else if (!opt.quiet )
-        log_info ( _("directory '%s' created\n"), fname );
-    }
+  gnupg_maybe_make_homedir (fname, opt.quiet);
 }
 
 
@@ -409,7 +391,7 @@
   struct stat statbuf;
 
   fname = make_filename (home, GNUPG_OPENPGP_REVOC_DIR, NULL);
-  if (stat (fname, &statbuf) && errno == ENOENT)
+  if (gnupg_stat (fname, &statbuf) && errno == ENOENT)
     {
       if (gnupg_mkdir (fname, "-rwx"))
         log_error (_("can't create directory '%s': %s\n"),
diff -Nru gnupg2-2.2.20/g10/options.h gnupg2-2.2.27/g10/options.h
--- gnupg2-2.2.20/g10/options.h	2020-03-14 19:54:05.000000000 +0100
+++ gnupg2-2.2.27/g10/options.h	2020-12-18 11:22:00.000000000 +0100
@@ -255,6 +255,7 @@
       AKL_DANE,
       AKL_WKD,
       AKL_LDAP,
+      AKL_NTDS,
       AKL_KEYSERVER,
       AKL_SPEC
     } type;
diff -Nru gnupg2-2.2.20/g10/packet.h gnupg2-2.2.27/g10/packet.h
--- gnupg2-2.2.20/g10/packet.h	2020-03-14 19:44:55.000000000 +0100
+++ gnupg2-2.2.27/g10/packet.h	2020-04-16 08:22:39.000000000 +0200
@@ -77,7 +77,8 @@
     PREFTYPE_NONE = 0,
     PREFTYPE_SYM = 1,
     PREFTYPE_HASH = 2,
-    PREFTYPE_ZIP = 3
+    PREFTYPE_ZIP = 3,
+    PREFTYPE_AEAD = 4
 } preftype_t;
 
 typedef struct {
@@ -104,6 +105,8 @@
      be different from the algorithm that is used to encrypt the SED
      packet.)  */
   byte cipher_algo;
+  /* The AEAD algorithm or 0 for CFB encryption.  */
+  byte aead_algo;
   /* The string-to-key specifier.  */
   STRING2KEY s2k;
   /* The length of SESKEY in bytes or 0 if this packet does not
@@ -111,7 +114,8 @@
      S2K function on the password is the session key. See RFC 4880,
      Section 5.3.)  */
   byte seskeylen;
-  /* The session key as encrypted by the S2K specifier.  */
+  /* The session key as encrypted by the S2K specifier.  For AEAD this
+   * includes the nonce and the authentication tag.  */
   byte seskey[1];
 } PKT_symkey_enc;
 
@@ -297,6 +301,7 @@
   struct
   {
     unsigned int mdc:1;
+    unsigned int aead:1;
     unsigned int ks_modify:1;
     unsigned int compacted:1;
     unsigned int primary:2; /* 2 if set via the primary flag, 1 if calculated */
@@ -393,6 +398,7 @@
   struct
   {
     unsigned int mdc:1;           /* MDC feature set.  */
+    unsigned int aead:1;          /* AEAD feature set.  */
     unsigned int disabled_valid:1;/* The next flag is valid.  */
     unsigned int disabled:1;      /* The key has been disabled.  */
     unsigned int primary:1;       /* This is a primary key.  */
@@ -463,12 +469,13 @@
 typedef struct {
   /* Remaining length of encrypted data. */
   u32  len;
-  /* When encrypting, the first block size bytes of data are random
-     data and the following 2 bytes are copies of the last two bytes
-     of the random data (RFC 4880, Section 5.7).  This provides a
-     simple check that the key is correct.  extralen is the size of
-     this extra data.  This is used by build_packet when writing out
-     the packet's header. */
+  /* When encrypting in CFB mode, the first block size bytes of data
+   * are random data and the following 2 bytes are copies of the last
+   * two bytes of the random data (RFC 4880, Section 5.7).  This
+   * provides a simple check that the key is correct.  EXTRALEN is the
+   * size of this extra data or, in AEAD mode, the length of the
+   * headers and the tags.  This is used by build_packet when writing
+   * out the packet's header. */
   int  extralen;
   /* Whether the serialized version of the packet used / should use
      the new format.  */
@@ -480,6 +487,15 @@
   /* If 0, MDC is disabled.  Otherwise, the MDC method that was used
      (currently, only DIGEST_ALGO_SHA1 is supported).  */
   byte mdc_method;
+  /* If 0, AEAD is not used.  Otherwise, the used AEAD algorithm.
+   * MDC_METHOD (above) shall be zero if AEAD is used.  */
+  byte aead_algo;
+  /* The cipher algo for/from the AEAD packet.  0 for other encryption
+   * packets. */
+  byte cipher_algo;
+  /* The chunk byte from the AEAD packet.  */
+  byte chunkbyte;
+
   /* An iobuf holding the data to be decrypted.  (This is not used for
      encryption!)  */
   iobuf_t buf;
diff -Nru gnupg2-2.2.20/g10/parse-packet.c gnupg2-2.2.27/g10/parse-packet.c
--- gnupg2-2.2.20/g10/parse-packet.c	2020-03-14 19:44:08.000000000 +0100
+++ gnupg2-2.2.27/g10/parse-packet.c	2020-04-15 21:59:40.000000000 +0200
@@ -81,6 +81,9 @@
 			     PACKET * packet, int new_ctb);
 static int parse_encrypted (IOBUF inp, int pkttype, unsigned long pktlen,
 			    PACKET * packet, int new_ctb, int partial);
+static gpg_error_t parse_encrypted_aead (IOBUF inp, int pkttype,
+                                         unsigned long pktlen, PACKET *packet,
+                                         int partial);
 static int parse_mdc (IOBUF inp, int pkttype, unsigned long pktlen,
 		      PACKET * packet, int new_ctb);
 static int parse_gpg_control (IOBUF inp, int pkttype, unsigned long pktlen,
@@ -665,6 +668,7 @@
             case PKT_PLAINTEXT:
             case PKT_ENCRYPTED:
             case PKT_ENCRYPTED_MDC:
+            case PKT_ENCRYPTED_AEAD:
             case PKT_COMPRESSED:
               iobuf_set_partial_body_length_mode (inp, c & 0xff);
               pktlen = 0;	/* To indicate partial length.  */
@@ -852,6 +856,9 @@
     case PKT_MDC:
       rc = parse_mdc (inp, pkttype, pktlen, pkt, new_ctb);
       break;
+    case PKT_ENCRYPTED_AEAD:
+      rc = parse_encrypted_aead (inp, pkttype, pktlen, pkt, partial);
+      break;
     case PKT_GPG_CONTROL:
       rc = parse_gpg_control (inp, pkttype, pktlen, pkt, partial);
       break;
@@ -1127,19 +1134,17 @@
 {
   PKT_symkey_enc *k;
   int rc = 0;
-  int i, version, s2kmode, cipher_algo, hash_algo, seskeylen, minlen;
+  int i, version, s2kmode, cipher_algo, aead_algo, hash_algo, seskeylen, minlen;
 
   if (pktlen < 4)
-    {
-      log_error ("packet(%d) too short\n", pkttype);
-      if (list_mode)
-        es_fprintf (listfp, ":symkey enc packet: [too short]\n");
-      rc = gpg_error (GPG_ERR_INV_PACKET);
-      goto leave;
-    }
+    goto too_short;
   version = iobuf_get_noeof (inp);
   pktlen--;
-  if (version != 4)
+  if (version == 4)
+    ;
+  else if (version == 5)
+    ;
+  else
     {
       log_error ("packet(%d) with unknown version %d\n", pkttype, version);
       if (list_mode)
@@ -1157,6 +1162,15 @@
     }
   cipher_algo = iobuf_get_noeof (inp);
   pktlen--;
+  if (version == 5)
+    {
+      aead_algo = iobuf_get_noeof (inp);
+      pktlen--;
+    }
+  else
+    aead_algo = 0;
+  if (pktlen < 2)
+    goto too_short;
   s2kmode = iobuf_get_noeof (inp);
   pktlen--;
   hash_algo = iobuf_get_noeof (inp);
@@ -1191,6 +1205,7 @@
 					      + seskeylen - 1);
   k->version = version;
   k->cipher_algo = cipher_algo;
+  k->aead_algo = aead_algo;
   k->s2k.mode = s2kmode;
   k->s2k.hash_algo = hash_algo;
   if (s2kmode == 1 || s2kmode == 3)
@@ -1221,10 +1236,20 @@
   if (list_mode)
     {
       es_fprintf (listfp,
-                  ":symkey enc packet: version %d, cipher %d, s2k %d, hash %d",
-                  version, cipher_algo, s2kmode, hash_algo);
+                  ":symkey enc packet: version %d, cipher %d, aead %d,"
+                  "s2k %d, hash %d",
+                  version, cipher_algo, aead_algo, s2kmode, hash_algo);
       if (seskeylen)
-	es_fprintf (listfp, ", seskey %d bits", (seskeylen - 1) * 8);
+        {
+          /* To compute the size of the session key we need to know
+           * the size of the AEAD nonce which we may not know.  Thus
+           * we show only the size of the entire encrypted session
+           * key.  */
+          if (aead_algo)
+            es_fprintf (listfp, ", encrypted seskey %d bytes", seskeylen);
+          else
+            es_fprintf (listfp, ", seskey %d bits", (seskeylen - 1) * 8);
+        }
       es_fprintf (listfp, "\n");
       if (s2kmode == 1 || s2kmode == 3)
 	{
@@ -1241,6 +1266,13 @@
  leave:
   iobuf_skip_rest (inp, pktlen, 0);
   return rc;
+
+ too_short:
+  log_error ("packet(%d) too short\n", pkttype);
+  if (list_mode)
+    es_fprintf (listfp, ":symkey enc packet: [too short]\n");
+  rc = gpg_error (GPG_ERR_INV_PACKET);
+  goto leave;
 }
 
 
@@ -1421,6 +1453,11 @@
       for (i = 0; i < length; i++)
 	es_fprintf (listfp, " %d", buffer[i]);
       break;
+    case SIGSUBPKT_PREF_AEAD:
+      es_fputs ("pref-aead-algos:", listfp);
+      for (i = 0; i < length; i++)
+        es_fprintf (listfp, " %d", buffer[i]);
+      break;
     case SIGSUBPKT_REV_KEY:
       es_fputs ("revocation key: ", listfp);
       if (length < 22)
@@ -1601,6 +1638,7 @@
     case SIGSUBPKT_KEY_FLAGS:
     case SIGSUBPKT_KS_FLAGS:
     case SIGSUBPKT_PREF_SYM:
+    case SIGSUBPKT_PREF_AEAD:
     case SIGSUBPKT_PREF_HASH:
     case SIGSUBPKT_PREF_COMPR:
     case SIGSUBPKT_POLICY:
@@ -3253,6 +3291,9 @@
   ed->buf = NULL;
   ed->new_ctb = new_ctb;
   ed->is_partial = partial;
+  ed->aead_algo = 0;
+  ed->cipher_algo = 0; /* Only used with AEAD.  */
+  ed->chunkbyte = 0;   /* Only used with AEAD.  */
   if (pkttype == PKT_ENCRYPTED_MDC)
     {
       /* Fixme: add some pktlen sanity checks.  */
@@ -3341,6 +3382,81 @@
 
  leave:
   return rc;
+}
+
+
+static gpg_error_t
+parse_encrypted_aead (iobuf_t inp, int pkttype, unsigned long pktlen,
+                      PACKET *pkt, int partial)
+{
+  int rc = 0;
+  PKT_encrypted *ed;
+  unsigned long orig_pktlen = pktlen;
+  int version;
+
+  ed = pkt->pkt.encrypted = xtrymalloc (sizeof *pkt->pkt.encrypted);
+  if (!ed)
+    return gpg_error_from_syserror ();
+  ed->len = 0;
+  ed->extralen = 0;  /* (only used in build_packet.)  */
+  ed->buf = NULL;
+  ed->new_ctb = 1;   /* (packet number requires a new CTB anyway.)  */
+  ed->is_partial = partial;
+  ed->mdc_method = 0;
+  /* A basic sanity check.  We need one version byte, one algo byte,
+   * one aead algo byte, one chunkbyte, at least 15 byte IV.  */
+  if (orig_pktlen && pktlen < 19)
+    {
+      log_error ("packet(%d) too short\n", pkttype);
+      if (list_mode)
+        es_fputs (":aead encrypted packet: [too short]\n", listfp);
+      rc = gpg_error (GPG_ERR_INV_PACKET);
+      iobuf_skip_rest (inp, pktlen, partial);
+      goto leave;
+    }
+
+  version = iobuf_get_noeof (inp);
+  if (orig_pktlen)
+    pktlen--;
+  if (version != 1)
+    {
+      log_error ("aead encrypted packet with unknown version %d\n",
+                 version);
+      if (list_mode)
+        es_fputs (":aead encrypted packet: [unknown version]\n", listfp);
+      /*skip_rest(inp, pktlen); should we really do this? */
+      rc = gpg_error (GPG_ERR_INV_PACKET);
+      goto leave;
+    }
+
+  ed->cipher_algo = iobuf_get_noeof (inp);
+  if (orig_pktlen)
+    pktlen--;
+  ed->aead_algo = iobuf_get_noeof (inp);
+  if (orig_pktlen)
+    pktlen--;
+  ed->chunkbyte = iobuf_get_noeof (inp);
+  if (orig_pktlen)
+    pktlen--;
+
+  /* Store the remaining length of the encrypted data.  We read the
+   * rest during decryption.  */
+  ed->len = pktlen;
+
+  if (list_mode)
+    {
+      es_fprintf (listfp, ":aead encrypted packet: cipher=%u aead=%u cb=%u\n",
+                  ed->cipher_algo, ed->aead_algo, ed->chunkbyte);
+      if (orig_pktlen)
+	es_fprintf (listfp, "\tlength: %lu\n", orig_pktlen);
+      else
+	es_fprintf (listfp, "\tlength: unknown\n");
+    }
+
+  ed->buf = inp;
+
+ leave:
+  return rc;
 }
 
 
diff -Nru gnupg2-2.2.20/g10/passphrase.c gnupg2-2.2.27/g10/passphrase.c
--- gnupg2-2.2.20/g10/passphrase.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/passphrase.c	2020-11-09 11:53:33.000000000 +0100
@@ -212,6 +212,10 @@
  * Ask the GPG Agent for the passphrase.
  * If NOCACHE is set the symmetric passpharse caching will not be used.
  *
+ * If REPEAT is positive, a new passphrase is requested and the agent
+ * shall require REPEAT times repetitions of the entered passphrase.
+ * This is used for symmetric encryption.
+ *
  * Note that TRYAGAIN_TEXT must not be translated.  If CANCELED is not
  * NULL, the function does set it to 1 if the user canceled the
  * operation.  If CACHEID is not NULL, it will be used as the cacheID
@@ -219,7 +223,7 @@
  * computed, this will be used as the cacheid.
  */
 static char *
-passphrase_get (int nocache, const char *cacheid, int repeat,
+passphrase_get (int newsymkey, int nocache, const char *cacheid, int repeat,
                 const char *tryagain_text, int *canceled)
 {
   int rc;
@@ -240,9 +244,19 @@
   if (tryagain_text)
     tryagain_text = _(tryagain_text);
 
+  /* Here we have:
+   * REPEAT is set in create mode and if opt.passphrase_repeat is set.
+   * (Thus it is not a clean indication that we want a new passphrase).
+   * NOCACHE is set in create mode or if --no-symkey-cache is used.
+   * CACHEID is only set if caching shall be used.
+   * NEWSYMKEY has been added latter to make it clear that a new key
+   * is requested.  The whole chain of API is a bit too complex since
+   * we we stripped things out over time; however, there is no time
+   * for a full state analysis and thus this new parameter.
+   */
   rc = agent_get_passphrase (my_cacheid, tryagain_text, NULL,
                              _("Enter passphrase\n"),
-                             repeat, nocache, &pw);
+                             newsymkey, repeat, nocache, &pw);
 
   i18n_switchback (orig_codeset);
 
@@ -318,7 +332,7 @@
   *canceled = 0;
 
   if (opt.no_symkey_cache)
-    nocache = 1;  /* Force no symmtric key caching.  */
+    nocache = 1;  /* Force no symmetric key caching.  */
 
   if ( !s2k )
     {
@@ -389,13 +403,13 @@
         }
 
       /* Divert to the gpg-agent. */
-      pw = passphrase_get (create && nocache, s2k_cacheid,
+      pw = passphrase_get (create, create && nocache, s2k_cacheid,
                            create? opt.passphrase_repeat : 0,
                            tryagain_text, canceled);
       if (*canceled)
         {
           xfree (pw);
-	  write_status( STATUS_MISSING_PASSPHRASE );
+	  write_status( STATUS_CANCELED_BY_USER );
           return NULL;
         }
     }
diff -Nru gnupg2-2.2.20/g10/photoid.c gnupg2-2.2.27/g10/photoid.c
--- gnupg2-2.2.20/g10/photoid.c	2019-05-17 12:18:21.000000000 +0200
+++ gnupg2-2.2.27/g10/photoid.c	2020-11-02 17:48:39.000000000 +0100
@@ -341,6 +341,11 @@
 	command=pct_expando(opt.photo_viewer,&args);
 	if(!command)
 	  goto fail;
+        if (!*command)
+          {
+            xfree (command);
+            goto fail;
+          }
 
 	name=xmalloc(16+strlen(EXTSEP_S)+
 		     strlen(image_type_to_string(args.imagetype,0))+1);
diff -Nru gnupg2-2.2.20/g10/pkclist.c gnupg2-2.2.27/g10/pkclist.c
--- gnupg2-2.2.20/g10/pkclist.c	2020-03-14 19:38:47.000000000 +0100
+++ gnupg2-2.2.27/g10/pkclist.c	2020-11-13 15:56:53.000000000 +0100
@@ -1369,7 +1369,7 @@
    preference list, so I'm including it. -dms */
 
 int
-algo_available( preftype_t preftype, int algo, const union pref_hint *hint)
+algo_available( preftype_t preftype, int algo, const struct pref_hint *hint)
 {
   if( preftype == PREFTYPE_SYM )
     {
@@ -1395,16 +1395,26 @@
     {
       if (hint && hint->digest_length)
 	{
-	  if (hint->digest_length!=20 || opt.flags.dsa2)
+          unsigned int n = gcry_md_get_algo_dlen (algo);
+
+          if (hint->exact)
+            {
+              /* For example ECDSA requires an exact hash value so
+               * that we do not truncate.  For DSA we allow truncation
+               * and thus exact is not set.  */
+              if (hint->digest_length != n)
+                return 0;
+            }
+	  else if (hint->digest_length!=20 || opt.flags.dsa2)
 	    {
 	      /* If --enable-dsa2 is set or the hash isn't 160 bits
 		 (which implies DSA2), then we'll accept a hash that
 		 is larger than we need.  Otherwise we won't accept
 		 any hash that isn't exactly the right size. */
-	      if (hint->digest_length > gcry_md_get_algo_dlen (algo))
+	      if (hint->digest_length > n)
 		return 0;
 	    }
-	  else if (hint->digest_length != gcry_md_get_algo_dlen (algo))
+	  else if (hint->digest_length != n)
 	    return 0;
 	}
 
@@ -1441,7 +1451,7 @@
  */
 int
 select_algo_from_prefs(PK_LIST pk_list, int preftype,
-		       int request, const union pref_hint *hint)
+		       int request, const struct pref_hint *hint)
 {
   PK_LIST pkr;
   u32 bits[8];
diff -Nru gnupg2-2.2.20/g10/plaintext.c gnupg2-2.2.27/g10/plaintext.c
--- gnupg2-2.2.20/g10/plaintext.c	2019-05-17 13:42:42.000000000 +0200
+++ gnupg2-2.2.27/g10/plaintext.c	2020-11-10 11:59:17.000000000 +0100
@@ -185,7 +185,7 @@
          want to port it again to riscos we should do most of the suff
          in estream.  FIXME: Consider to remove all riscos special
          cases.  */
-      fp = fopen (fname, "wb");
+      fp = gnupg_fopen (fname, "wb");
       if (!fp)
 	{
 	  log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err));
diff -Nru gnupg2-2.2.20/g10/pubkey-enc.c gnupg2-2.2.27/g10/pubkey-enc.c
--- gnupg2-2.2.20/g10/pubkey-enc.c	2019-11-29 17:33:17.000000000 +0100
+++ gnupg2-2.2.27/g10/pubkey-enc.c	2020-07-13 14:22:17.000000000 +0200
@@ -92,7 +92,7 @@
         {
           /* Check compliance.  */
           if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_DECRYPTION,
-                                     sk->pubkey_algo,
+                                     sk->pubkey_algo, 0,
                                      sk->pkey, nbits_from_pk (sk), NULL))
             {
               log_info (_("key %s is not suitable for decryption"
@@ -133,7 +133,7 @@
 
           /* Check compliance.  */
           if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_DECRYPTION,
-                                     sk->pubkey_algo,
+                                     sk->pubkey_algo, 0,
                                      sk->pkey, nbits_from_pk (sk), NULL))
             {
               log_info (_("key %s is not suitable for decryption"
@@ -259,7 +259,7 @@
    * CSUM
    */
   if (DBG_CRYPTO)
-    log_printhex ("DEK frame:", frame, nframe);
+    log_printhex (frame, nframe, "DEK frame:");
   n = 0;
 
   if (sk->pubkey_algo == PUBKEY_ALGO_ECDH)
@@ -288,10 +288,7 @@
         goto leave;
 
       /* Now the frame are the bytes decrypted but padded session key.  */
-
-      /* Allow double padding for the benefit of DEK size concealment.
-         Higher than this is wasteful. */
-      if (!nframe || frame[nframe-1] > 8*2 || nframe <= 8
+      if (!nframe || nframe <= 8
           || frame[nframe-1] > nframe)
         {
           err = gpg_error (GPG_ERR_WRONG_SECKEY);
@@ -375,7 +372,7 @@
   if (DBG_CLOCK)
     log_clock ("decryption ready");
   if (DBG_CRYPTO)
-    log_printhex ("DEK is:", dek->key, dek->keylen);
+    log_printhex (dek->key, dek->keylen, "DEK is:");
 
   /* Check that the algo is in the preferences and whether it has
    * expired.  Also print a status line with the key's fingerprint.  */
diff -Nru gnupg2-2.2.20/g10/revoke.c gnupg2-2.2.27/g10/revoke.c
--- gnupg2-2.2.20/g10/revoke.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/revoke.c	2020-10-28 17:22:17.000000000 +0100
@@ -891,6 +891,16 @@
   return reason;
 }
 
+struct revocation_reason_info *
+get_default_sig_revocation_reason(void)
+{
+  struct revocation_reason_info *reason;
+  reason = xmalloc( sizeof *reason );
+  reason->code = 0; /* No specific reason given. */
+  reason->desc = strdup(""); /* no text */
+  return reason;
+}
+
 void
 release_revocation_reason_info( struct revocation_reason_info *reason )
 {
diff -Nru gnupg2-2.2.20/g10/sig-check.c gnupg2-2.2.27/g10/sig-check.c
--- gnupg2-2.2.20/g10/sig-check.c	2020-03-14 19:42:02.000000000 +0100
+++ gnupg2-2.2.27/g10/sig-check.c	2020-11-02 17:41:39.000000000 +0100
@@ -164,7 +164,7 @@
   else if (get_pubkey_for_sig (ctrl, pk, sig, forced_pk))
     rc = gpg_error (GPG_ERR_NO_PUBKEY);
   else if (!gnupg_pk_is_allowed (opt.compliance, PK_USE_VERIFICATION,
-                                 pk->pubkey_algo, pk->pkey,
+                                 pk->pubkey_algo, 0, pk->pkey,
                                  nbits_from_pk (pk),
                                  NULL))
     {
@@ -457,16 +457,14 @@
 {
   gcry_mpi_t result = NULL;
   int rc = 0;
-  const struct weakhash *weak;
 
   if (!opt.flags.allow_weak_digest_algos)
     {
-      for (weak = opt.weak_digests; weak; weak = weak->next)
-        if (sig->digest_algo == weak->algo)
-          {
-            print_digest_rejected_note(sig->digest_algo);
-            return GPG_ERR_DIGEST_ALGO;
-          }
+      if (is_weak_digest (sig->digest_algo))
+        {
+          print_digest_rejected_note (sig->digest_algo);
+          return GPG_ERR_DIGEST_ALGO;
+        }
     }
 
   /* For key signatures check that the key has a cert usage.  We may
diff -Nru gnupg2-2.2.20/g10/sign.c gnupg2-2.2.27/g10/sign.c
--- gnupg2-2.2.20/g10/sign.c	2020-03-14 19:35:46.000000000 +0100
+++ gnupg2-2.2.27/g10/sign.c	2020-12-23 16:03:52.000000000 +0100
@@ -395,7 +395,8 @@
       goto leave;
     }
 
-  if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_SIGNING, pksk->pubkey_algo,
+  if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_SIGNING,
+                             pksk->pubkey_algo, 0,
                              pksk->pkey, nbits_from_pk (pksk), NULL))
     {
       log_error (_("key %s may not be used for signing in %s mode\n"),
@@ -461,7 +462,12 @@
 
  leave:
   if (err)
-    log_error (_("signing failed: %s\n"), gpg_strerror (err));
+    {
+      log_error (_("signing failed: %s\n"), gpg_strerror (err));
+      if (gpg_err_source (err) == GPG_ERR_SOURCE_SCD
+          && gpg_err_code (err) == GPG_ERR_INV_ID)
+        print_further_info ("a reason might be a card with replaced keys");
+    }
   else
     {
       if (opt.verbose)
@@ -533,7 +539,7 @@
 }
 
 
-
+/* Get a matching hash algorithm for DSA and ECDSA.  */
 static int
 match_dsa_hash (unsigned int qbytes)
 {
@@ -582,7 +588,7 @@
     {
       return opt.def_digest_algo;
     }
-  else if (recipient_digest_algo)
+  else if (recipient_digest_algo && !is_weak_digest (recipient_digest_algo))
     {
       return recipient_digest_algo;
     }
@@ -608,9 +614,13 @@
 	 160-bit hash unless --enable-dsa2 is set, in which case act
 	 like a new DSA key that just happens to have a 160-bit q
 	 (i.e. allow truncation).  If q is not 160, by definition it
-	 must be a new DSA key. */
+	 must be a new DSA key.  We ignore the personal_digest_prefs
+	 for ECDSA because they should always macth the curve and
+	 truncated hashes are not useful either.  Even worse,
+	 smartcards may reject non matching hash lengths for curves
+	 (e.g. using SHA-512 with brainpooolP385r1 on a Yubikey).  */
 
-      if (opt.personal_digest_prefs)
+      if (pk->pubkey_algo == PUBKEY_ALGO_DSA && opt.personal_digest_prefs)
 	{
 	  prefitem_t *prefs;
 
@@ -860,6 +870,8 @@
           else
             err = 0;
         }
+      else
+        err = 0;  /* Actually never reached.  */
       hash_sigversion_to_magic (md, sig);
       gcry_md_final (md);
 
@@ -900,7 +912,8 @@
  * and ignore the detached mode.  Sign the file with all secret keys
  * which can be taken from LOCUSR, if this is NULL, use the default one
  * If ENCRYPTFLAG is true, use REMUSER (or ask if it is NULL) to encrypt the
- * signed data for these users.
+ * signed data for these users.  If ENCRYPTFLAG is 2 symmetric encryption
+ * is also used.
  * If OUTFILE is not NULL; this file is used for output and the function
  * does not ask for overwrite permission; output is then always
  * uncompressed, non-armored and in binary mode.
@@ -1030,17 +1043,16 @@
 	       select_algo_from_prefs(pk_list,PREFTYPE_HASH,
 				      opt.def_digest_algo,
 				      NULL)!=opt.def_digest_algo)
-	  log_info(_("WARNING: forcing digest algorithm %s (%d)"
-		     " violates recipient preferences\n"),
-		   gcry_md_algo_name (opt.def_digest_algo),
-		   opt.def_digest_algo );
+              log_info(_("WARNING: forcing digest algorithm %s (%d)"
+                         " violates recipient preferences\n"),
+                       gcry_md_algo_name (opt.def_digest_algo),
+                       opt.def_digest_algo );
 	  }
 	else
 	  {
-	    int algo, smartcard=0;
-	    union pref_hint hint;
-
-            hint.digest_length = 0;
+	    int algo;
+            int conflict = 0;
+	    struct pref_hint hint = { 0 };
 
 	    /* Of course, if the recipient asks for something
 	       unreasonable (like the wrong hash for a DSA key) then
@@ -1068,32 +1080,44 @@
                                         (sk_rover->pk->pkey[1]));
 
 		    if (sk_rover->pk->pubkey_algo == PUBKEY_ALGO_ECDSA)
-		      temp_hashlen = ecdsa_qbits_from_Q (temp_hashlen);
-		    temp_hashlen = (temp_hashlen+7)/8;
+                      {
+                        temp_hashlen = ecdsa_qbits_from_Q (temp_hashlen);
+                        if (!temp_hashlen)
+                          conflict = 1;  /* Better don't use the prefs. */
+                        temp_hashlen = (temp_hashlen+7)/8;
+                        /* Fixup for that funny nistp521 (yes, 521)
+                         * were we need to use a 512 bit hash algo.  */
+                        if (temp_hashlen == 66)
+                          temp_hashlen = 64;
+                      }
+                    else
+                      temp_hashlen = (temp_hashlen+7)/8;
 
 		    /* Pick a hash that is large enough for our
-		       largest q */
-
-		    if (hint.digest_length<temp_hashlen)
-		      hint.digest_length=temp_hashlen;
+		       largest q or matches our Q but if tehreare
+		       several of them we run into a conflict and
+		       don't use the preferences.  */
+
+		    if (hint.digest_length < temp_hashlen)
+                      {
+                        if (sk_rover->pk->pubkey_algo == PUBKEY_ALGO_ECDSA)
+                          {
+                            if (hint.exact)
+                              conflict = 1;
+                            hint.exact = 1;
+                          }
+                        hint.digest_length = temp_hashlen;
+                      }
 		  }
-                /* FIXME: need to check gpg-agent for this. */
-		/* else if (sk_rover->pk->is_protected */
-                /*          && sk_rover->pk->protect.s2k.mode == 1002) */
-		/*   smartcard = 1;  */
 	      }
 
-	    /* Current smartcards only do 160-bit hashes.  If we have
-	       to have a >160-bit hash, then we can't use the
-	       recipient prefs as we'd need both =160 and >160 at the
-	       same time and recipient prefs currently require a
-	       single hash for all signatures.  All this may well have
-	       to change as the cards add algorithms. */
-
-	    if (!smartcard || (smartcard && hint.digest_length==20))
-	      if ( (algo=
-                   select_algo_from_prefs(pk_list,PREFTYPE_HASH,-1,&hint)) > 0)
-		recipient_digest_algo=algo;
+	    if (!conflict
+                && (algo = select_algo_from_prefs (pk_list,PREFTYPE_HASH,
+                                                   -1,&hint)) > 0)
+                {
+                  /* Note that we later check that the algo is not weak.  */
+                  recipient_digest_algo = algo;
+                }
 	  }
       }
 
diff -Nru gnupg2-2.2.20/g10/tdbio.c gnupg2-2.2.27/g10/tdbio.c
--- gnupg2-2.2.20/g10/tdbio.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/tdbio.c	2020-10-23 20:08:54.000000000 +0200
@@ -681,7 +681,7 @@
    * trustdb.gpg.  This check is not required in theory, but it helps
    * in practice avoiding costly operations of preparing and taking
    * the lock.  */
-  if (!stat (fname, &statbuf) && statbuf.st_size > 0)
+  if (!gnupg_stat (fname, &statbuf) && statbuf.st_size > 0)
     {
       /* OK, we have the valid trustdb.gpg already.  */
       return 0;
@@ -711,19 +711,21 @@
   log_assert (p);
   save_slash = *p;
   *p = 0;
-  if (access (fname, F_OK))
+  if (gnupg_access (fname, F_OK))
     {
       try_make_homedir (fname);
-      if (access (fname, F_OK))
+      if (gnupg_access (fname, F_OK))
         log_fatal (_("%s: directory does not exist!\n"), fname);
     }
   *p = save_slash;
 
   take_write_lock ();
 
-  if (access (fname, R_OK) || stat (fname, &statbuf) || statbuf.st_size == 0)
+  if (gnupg_access (fname, R_OK)
+      || gnupg_stat (fname, &statbuf)
+      || statbuf.st_size == 0)
     {
-      FILE *fp;
+      estream_t fp;
       TRUSTREC rec;
       int rc;
       mode_t oldmask;
@@ -745,13 +747,13 @@
           gpg_err_set_errno (EPERM);
         }
       else
-        fp = fopen (fname, "wb");
+        fp = es_fopen (fname, "wb");
       umask(oldmask);
       if (!fp)
         log_fatal (_("can't create '%s': %s\n"), fname, strerror (errno));
-      fclose (fp);
+      es_fclose (fp);
 
-      db_fd = open (db_name, O_RDWR | MY_O_BINARY);
+      db_fd = gnupg_open (db_name, O_RDWR | MY_O_BINARY, 0);
       if (db_fd == -1)
         log_fatal (_("can't open '%s': %s\n"), db_name, strerror (errno));
 
@@ -811,7 +813,7 @@
                  (int)prevrc, (int)GetLastError ());
   }
 #else /*!HAVE_W32CE_SYSTEM*/
-  db_fd = open (db_name, O_RDWR | MY_O_BINARY );
+  db_fd = gnupg_open (db_name, O_RDWR | MY_O_BINARY, 0);
   if (db_fd == -1 && (errno == EACCES
 #ifdef EROFS
                       || errno == EROFS
@@ -819,7 +821,7 @@
                       )
       ) {
       /* Take care of read-only trustdbs.  */
-      db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
+      db_fd = gnupg_open (db_name, O_RDONLY | MY_O_BINARY, 0);
       if (db_fd != -1 && !opt.quiet)
           log_info (_("Note: trustdb not writable\n"));
   }
diff -Nru gnupg2-2.2.20/g10/test-stubs.c gnupg2-2.2.27/g10/test-stubs.c
--- gnupg2-2.2.20/g10/test-stubs.c	2020-03-14 19:38:47.000000000 +0100
+++ gnupg2-2.2.27/g10/test-stubs.c	2020-12-18 11:22:00.000000000 +0100
@@ -234,6 +234,17 @@
 }
 
 int
+keyserver_import_ntds (ctrl_t ctrl, const char *mbox,
+                       unsigned char **fpr, size_t *fprlen)
+{
+  (void)ctrl;
+  (void)mbox;
+  (void)fpr;
+  (void)fprlen;
+  return -1;
+}
+
+int
 keyserver_import_ldap (const char *name)
 {
   (void)name;
diff -Nru gnupg2-2.2.20/g10/textfilter.c gnupg2-2.2.27/g10/textfilter.c
--- gnupg2-2.2.20/g10/textfilter.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g10/textfilter.c	2020-10-23 20:08:54.000000000 +0200
@@ -163,8 +163,8 @@
 		    int escape_dash, int escape_from)
 {
     unsigned int maxlen;
-    byte *buffer = NULL;    /* malloced buffer */
-    unsigned int bufsize;   /* and size of this buffer */
+    byte *buffer = NULL;      /* malloced buffer */
+    unsigned int bufsize = 0; /* and size of this buffer */
     unsigned int n;
     int truncated = 0;
     int pending_lf = 0;
diff -Nru gnupg2-2.2.20/g10/tofu.c gnupg2-2.2.27/g10/tofu.c
--- gnupg2-2.2.20/g10/tofu.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g10/tofu.c	2020-10-23 20:08:54.000000000 +0200
@@ -197,7 +197,7 @@
       /* Check if another process wants to run.  (We just ignore any
        * stat failure.  A waiter might have to wait a bit longer, but
        * otherwise there should be no impact.)  */
-      if (stat (dbs->want_lock_file, &statbuf) == 0
+      if (gnupg_stat (dbs->want_lock_file, &statbuf) == 0
           && statbuf.st_ctime != dbs->want_lock_file_ctime)
         {
           end_transaction (ctrl, 2);
@@ -237,7 +237,7 @@
       dbs->in_batch_transaction = 1;
       dbs->batch_update_started = gnupg_get_time ();
 
-      if (stat (dbs->want_lock_file, &statbuf) == 0)
+      if (gnupg_stat (dbs->want_lock_file, &statbuf) == 0)
         dbs->want_lock_file_ctime = statbuf.st_ctime;
     }
 
diff -Nru gnupg2-2.2.20/g10/trustdb.c gnupg2-2.2.27/g10/trustdb.c
--- gnupg2-2.2.20/g10/trustdb.c	2020-03-18 14:00:35.000000000 +0100
+++ gnupg2-2.2.27/g10/trustdb.c	2020-12-18 17:05:54.000000000 +0100
@@ -23,14 +23,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef DISABLE_REGEX
-#include <sys/types.h>
-#include <regex.h>
-#endif /* !DISABLE_REGEX */
-
 #include "gpg.h"
 #include "../common/status.h"
 #include "../common/iobuf.h"
+#include "../regexp/jimregexp.h"
 #include "keydb.h"
 #include "../common/util.h"
 #include "options.h"
@@ -221,7 +217,8 @@
           register_trusted_keyid (desc.u.kid);
           return;
         }
-      if (desc.mode == KEYDB_SEARCH_MODE_FPR)
+      if (desc.mode == KEYDB_SEARCH_MODE_FPR
+          || desc.mode == KEYDB_SEARCH_MODE_FPR20)
         {
           kid[0] = buf32_to_u32 (desc.u.fpr+12);
           kid[1] = buf32_to_u32 (desc.u.fpr+16);
@@ -1519,8 +1516,7 @@
 
 /* Returns a sanitized copy of the regexp (which might be "", but not
    NULL). */
-#ifndef DISABLE_REGEX
-/* Operator charactors except '.' and backslash.
+/* Operator characters except '.' and backslash.
    See regex(7) on BSD.  */
 #define REGEXP_OPERATOR_CHARS "^[$()|*+?{"
 
@@ -1584,7 +1580,6 @@
 
   return new;
 }
-#endif /*!DISABLE_REGEX*/
 
 /* Used by validate_one_keyblock to confirm a regexp within a trust
    signature.  Returns 1 for match, and 0 for no match or regex
@@ -1592,25 +1587,15 @@
 static int
 check_regexp(const char *expr,const char *string)
 {
-#ifdef DISABLE_REGEX
-  (void)expr;
-  (void)string;
-  /* When DISABLE_REGEX is defined, assume all regexps do not
-     match. */
-  return 0;
-#else
   int ret;
   char *regexp;
 
   regexp=sanitize_regexp(expr);
 
-#ifdef __riscos__
-  ret=riscos_check_regexp(expr, string, DBG_TRUST);
-#else
   {
     regex_t pat;
 
-    ret=regcomp(&pat,regexp,REG_ICASE|REG_NOSUB|REG_EXTENDED);
+    ret=regcomp(&pat,regexp,REG_ICASE|REG_EXTENDED);
     if(ret==0)
       {
 	ret=regexec(&pat,string,0,NULL,0);
@@ -1618,7 +1603,6 @@
       }
     ret=(ret==0);
   }
-#endif
 
   if(DBG_TRUST)
     log_debug("regexp '%s' ('%s') on '%s': %s\n",
@@ -1627,7 +1611,6 @@
   xfree(regexp);
 
   return ret;
-#endif
 }
 
 /*
diff -Nru gnupg2-2.2.20/g13/backend.c gnupg2-2.2.27/g13/backend.c
--- gnupg2-2.2.20/g13/backend.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g13/backend.c	2020-10-23 20:08:54.000000000 +0200
@@ -27,6 +27,7 @@
 
 #include "g13.h"
 #include "../common/i18n.h"
+#include "../common/sysutils.h"
 #include "keyblob.h"
 #include "backend.h"
 #include "be-encfs.h"
@@ -116,7 +117,7 @@
 
   /* A quick check to see that no container with that name already
      exists.  */
-  if (!access (fname, F_OK))
+  if (!gnupg_access (fname, F_OK))
     {
       err = gpg_error (GPG_ERR_EEXIST);
       goto leave;
@@ -138,7 +139,7 @@
     }
 
   /* Check again that the file does not exist.  */
-  err = stat (fname, &sb)? 0 : gpg_error (GPG_ERR_EEXIST);
+  err = gnupg_stat (fname, &sb)? 0 : gpg_error (GPG_ERR_EEXIST);
 
  leave:
   if (!err)
diff -Nru gnupg2-2.2.20/g13/call-syshelp.c gnupg2-2.2.27/g13/call-syshelp.c
--- gnupg2-2.2.20/g13/call-syshelp.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g13/call-syshelp.c	2020-05-12 18:28:27.000000000 +0200
@@ -366,7 +366,7 @@
           void *ciphertext;
           size_t ciphertextlen;
 
-          log_printhex ("plain", plaintext, plaintextlen);
+          log_printhex (plaintext, plaintextlen, "plain");
           err = g13_encrypt_keyblob (parm->ctrl,
                                      plaintext, plaintextlen,
                                      &ciphertext, &ciphertextlen);
diff -Nru gnupg2-2.2.20/g13/create.c gnupg2-2.2.27/g13/create.c
--- gnupg2-2.2.20/g13/create.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g13/create.c	2020-11-04 16:31:47.000000000 +0100
@@ -33,6 +33,7 @@
 #include "keyblob.h"
 #include "backend.h"
 #include "g13tuple.h"
+#include "../common/sysutils.h"
 #include "../common/call-gpg.h"
 
 /* Create a new blob with all the session keys and other meta
@@ -250,7 +251,7 @@
     {
       struct stat sb;
 
-      if (!stat (detachedname, &sb))
+      if (!gnupg_stat (detachedname, &sb))
         {
           err = gpg_error (GPG_ERR_EEXIST);
           goto leave;
diff -Nru gnupg2-2.2.20/g13/g13.c gnupg2-2.2.27/g13/g13.c
--- gnupg2-2.2.20/g13/g13.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/g13/g13.c	2020-12-18 11:22:45.000000000 +0100
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -138,7 +139,7 @@
 
   ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
 
-  ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
 
   ARGPARSE_s_s (oDebug, "debug", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level",
@@ -163,7 +164,7 @@
   ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
   ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
   ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
-  ARGPARSE_s_n (oNoOptions, "no-options", "@"),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
   ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
   ARGPARSE_s_s (oGpgProgram, "gpg-program", "@"),
@@ -235,9 +236,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@G13@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
       break;
@@ -343,12 +346,10 @@
   gpg_error_t err = 0;
   /* const char *fname; */
   int may_coredump;
-  FILE *configfp = NULL;
-  char *configname = NULL;
-  unsigned configlineno;
-  int parse_debug = 0;
+  char *last_configname = NULL;
+  const char *configname = NULL;
+  int debug_argparser = 0;
   int no_more_options = 0;
-  int default_config =1;
   char *logfile = NULL;
   int greeting = 0;
   int nogreeting = 0;
@@ -360,8 +361,6 @@
   struct server_control_s ctrl;
   strlist_t recipients = NULL;
 
-  /*mtrace();*/
-
   early_system_init ();
   gnupg_reopen_std (G13_NAME);
   set_strusage (my_strusage);
@@ -395,29 +394,31 @@
   pargs.argc = &argc;
   pargs.argv = &argv;
   pargs.flags= 1|(1<<6);  /* Do not remove the args, ignore version.  */
-  while (arg_parse( &pargs, opts))
+  pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
-      if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
-        parse_debug++;
-      else if (pargs.r_opt == oOptions)
-        { /* Yes, there is one, so we do not try the default one but
-             read the config file when it is encountered at the
-             commandline.  */
-          default_config = 0;
-	}
-      else if (pargs.r_opt == oNoOptions)
-        default_config = 0; /* --no-options */
-      else if (pargs.r_opt == oHomedir)
-        gnupg_set_homedir (pargs.r.ret_str);
+      switch (pargs.r_opt)
+        {
+        case oDebug:
+        case oDebugAll:
+          debug_argparser++;
+          break;
+
+        case oHomedir:
+          gnupg_set_homedir (pargs.r.ret_str);
+          break;
+        }
     }
+  /* Reset the flags.  */
+  pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
   /* Initialize the secure memory. */
   gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
   maybe_setuid = 0;
 
   /*
-     Now we are now working under our real uid
-  */
+   * Now we are now working under our real uid
+   */
 
   /* Setup malloc hooks. */
   {
@@ -440,47 +441,39 @@
   ctrl.no_server = 1;
   ctrl.status_fd = -1; /* No status output. */
 
-  /* Set the default option file */
-  if (default_config )
-    configname = make_filename (gnupg_homedir (), G13_NAME".conf", NULL);
+  /* The configuraton directories for use by gpgrt_argparser.  */
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
 
   argc        = orig_argc;
   argv        = orig_argv;
   pargs.argc  = &argc;
   pargs.argv  = &argv;
-  pargs.flags =  1;  /* Do not remove the args.  */
-
- next_pass:
-  if (configname)
-    {
-      configlineno = 0;
-      configfp = fopen (configname, "r");
-      if (!configfp)
-        {
-          if (default_config)
-            {
-              if (parse_debug)
-                log_info (_("Note: no default option file '%s'\n"), configname);
-            }
-          else
-            {
-              log_error (_("option file '%s': %s\n"),
-                         configname, strerror(errno));
-              g13_exit(2);
-            }
-          xfree (configname);
-          configname = NULL;
-        }
-      if (parse_debug && configname)
-        log_info (_("reading options from '%s'\n"), configname);
-      default_config = 0;
-    }
-
+  pargs.flags |=  (ARGPARSE_FLAG_RESET
+                   | ARGPARSE_FLAG_KEEP
+                   | ARGPARSE_FLAG_SYS
+                   | ARGPARSE_FLAG_USER);
   while (!no_more_options
-         && optfile_parse (configfp, configname, &configlineno, &pargs, opts))
+         && gnupg_argparser (&pargs, opts, G13_NAME EXTSEP_S "conf"))
     {
       switch (pargs.r_opt)
         {
+        case ARGPARSE_CONFFILE:
+          {
+            if (debug_argparser)
+              log_info (_("reading options from '%s'\n"),
+                        pargs.r_type? pargs.r.ret_str: "[cmdline]");
+            if (pargs.r_type)
+              {
+                xfree (last_configname);
+                last_configname = xstrdup (pargs.r.ret_str);
+                configname = last_configname;
+              }
+            else
+              configname = NULL;
+          }
+          break;
+
 	case aGPGConfList:
 	case aGPGConfTest:
           set_cmd (&cmd, pargs.r_opt);
@@ -538,17 +531,6 @@
         case oStatusFD: ctrl.status_fd = pargs.r.ret_int; break;
         case oLoggerFD: log_set_fd (pargs.r.ret_int ); break;
 
-        case oNoOptions: break; /* no-options */
-        case oOptions:
-          /* Config files may not be nested (silently ignore them).  */
-          if (!configfp)
-            {
-              xfree(configname);
-              configname = xstrdup (pargs.r.ret_str);
-              goto next_pass;
-	    }
-          break;
-
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
 
         case oAgentProgram: opt.agent_program = pargs.r.ret_str;  break;
@@ -592,12 +574,16 @@
           break;
 
         default:
-          pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
+          if (configname)
+            pargs.err = ARGPARSE_PRINT_WARNING;
+          else
+            pargs.err = ARGPARSE_PRINT_ERROR;
           break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
-  /* XXX Construct GPG arguments.  */
+  /* Construct GPG arguments.  */
   {
     strlist_t last;
     last = append_to_strlist (&opt.gpg_arguments, "-z");
@@ -607,21 +593,15 @@
     (void) last;
   }
 
-  if (configfp)
+  if (!last_configname)
+    opt.config_filename = make_filename (gnupg_homedir (),
+                                         G13_NAME EXTSEP_S "conf",
+                                         NULL);
+  else
     {
-      fclose (configfp);
-      configfp = NULL;
-      /* Keep a copy of the config filename. */
-      opt.config_filename = configname;
-      configname = NULL;
-      goto next_pass;
+      opt.config_filename = last_configname;
+      last_configname = NULL;
     }
-  xfree (configname);
-  configname = NULL;
-
-  if (!opt.config_filename)
-    opt.config_filename = make_filename (gnupg_homedir (),
-                                         G13_NAME".conf", NULL);
 
   if (log_get_errorcount(0))
     g13_exit(2);
@@ -659,7 +639,9 @@
   if (logfile)
     {
       log_set_file (logfile);
-      log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
+      log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
+                             | GPGRT_LOG_WITH_TIME
+                             | GPGRT_LOG_WITH_PID ));
     }
 
   if (gnupg_faked_time_p ())
diff -Nru gnupg2-2.2.20/g13/g13-syshelp.c gnupg2-2.2.27/g13/g13-syshelp.c
--- gnupg2-2.2.20/g13/g13-syshelp.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/g13/g13-syshelp.c	2020-12-18 11:22:45.000000000 +0100
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -145,9 +146,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@G13@-syshelp (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
       break;
@@ -225,12 +228,10 @@
   gpg_error_t err = 0;
   /* const char *fname; */
   int may_coredump;
-  FILE *configfp = NULL;
-  char *configname = NULL;
-  unsigned configlineno;
-  int parse_debug = 0;
+  char *last_configname = NULL;
+  const char *configname = NULL;
+  int debug_argparser = 0;
   int no_more_options = 0;
-  int default_config =1;
   char *logfile = NULL;
   /* int debug_wait = 0; */
   int use_random_seed = 1;
@@ -265,30 +266,32 @@
     log_fatal ("error allocating session environment block: %s\n",
                strerror (errno));
 
-  /* Fixme: We enable verbose mode here because there is currently no
-     way to do this when starting g13-syshelp.  To fix that we should
-     add a g13-syshelp.conf file in /etc/gnupg.  */
-  opt.verbose = 1;
-
   /* First check whether we have a debug option on the commandline.  */
   orig_argc = argc;
   orig_argv = argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
   pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
-  while (arg_parse( &pargs, opts))
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
-      if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
-        parse_debug++;
+      switch (pargs.r_opt)
+        {
+        case oDebug:
+        case oDebugAll:
+          debug_argparser++;
+          break;
+        }
     }
+  /* Reset the flags.  */
+  pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
   /* Initialize the secure memory. */
   gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
   maybe_setuid = 0;
 
   /*
-     Now we are now working under our real uid
-  */
+   * Now we are now working under our real uid
+   */
 
   /* Setup malloc hooks. */
   {
@@ -311,47 +314,40 @@
   ctrl.no_server = 1;
   ctrl.status_fd = -1; /* No status output. */
 
-  if (default_config )
-    configname = make_filename (gnupg_sysconfdir (),
-                                G13_NAME"-syshelp.conf", NULL);
+  /* The configuraton directories for use by gpgrt_argparser.  */
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
 
   argc        = orig_argc;
   argv        = orig_argv;
   pargs.argc  = &argc;
   pargs.argv  = &argv;
-  pargs.flags =  1;  /* Do not remove the args.  */
-
- next_pass:
-  if (configname)
-    {
-      configlineno = 0;
-      configfp = fopen (configname, "r");
-      if (!configfp)
-        {
-          if (default_config)
-            {
-              if (parse_debug)
-                log_info (_("NOTE: no default option file '%s'\n"), configname);
-            }
-          else
-            {
-              log_error (_("option file '%s': %s\n"),
-                         configname, strerror(errno));
-              g13_exit(2);
-            }
-          xfree (configname);
-          configname = NULL;
-        }
-      if (parse_debug && configname)
-        log_info (_("reading options from '%s'\n"), configname);
-      default_config = 0;
-    }
+  pargs.flags |=  (ARGPARSE_FLAG_RESET
+                   | ARGPARSE_FLAG_KEEP
+                   | ARGPARSE_FLAG_SYS
+                   | ARGPARSE_FLAG_USER);
 
   while (!no_more_options
-         && optfile_parse (configfp, configname, &configlineno, &pargs, opts))
+         && gnupg_argparser (&pargs, opts, G13_NAME"-syshelp" EXTSEP_S "conf"))
     {
       switch (pargs.r_opt)
         {
+        case ARGPARSE_CONFFILE:
+          {
+            if (debug_argparser)
+              log_info (_("reading options from '%s'\n"),
+                        pargs.r_type? pargs.r.ret_str: "[cmdline]");
+            if (pargs.r_type)
+              {
+                xfree (last_configname);
+                last_configname = xstrdup (pargs.r.ret_str);
+                configname = last_configname;
+              }
+            else
+              configname = NULL;
+          }
+          break;
+
         case oQuiet: opt.quiet = 1; break;
 
         case oDryRun: opt.dry_run = 1; break;
@@ -404,26 +400,21 @@
         case oNoRandomSeedFile: use_random_seed = 0; break;
 
         default:
-          pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
+          pargs.err = configname? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
           break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
-  if (configfp)
-    {
-      fclose (configfp);
-      configfp = NULL;
-      /* Keep a copy of the config filename. */
-      opt.config_filename = configname;
-      configname = NULL;
-      goto next_pass;
-    }
-  xfree (configname);
-  configname = NULL;
-
-  if (!opt.config_filename)
+  if (!last_configname)
     opt.config_filename = make_filename (gnupg_homedir (),
-                                         G13_NAME".conf", NULL);
+                                         G13_NAME"-syshelp" EXTSEP_S "conf",
+                                         NULL);
+  else
+    {
+      opt.config_filename = last_configname;
+      last_configname = NULL;
+     }
 
   if (log_get_errorcount(0))
     g13_exit(2);
@@ -588,7 +579,7 @@
   char *fname;
 
   fname = make_filename (gnupg_sysconfdir (), yesfile, NULL);
-  if (access (fname, F_OK))
+  if (gnupg_access (fname, F_OK))
     {
       log_info ("*******************************************************\n");
       log_info ("* The G13 support for DM-Crypt is new and not matured.\n");
diff -Nru gnupg2-2.2.20/g13/g13tuple.c gnupg2-2.2.27/g13/g13tuple.c
--- gnupg2-2.2.20/g13/g13tuple.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/g13/g13tuple.c	2020-05-12 18:28:49.000000000 +0200
@@ -318,7 +318,7 @@
               if (n < 100 && all_printable (value, n))
                 log_printf ("%.*s\n", (int)n, (const char*)value);
               else
-                log_printhex ("", value, n);
+                log_printhex (value, n, "");
               break;
 
             case KEYBLOB_TAG_CONT_NSEC:
@@ -327,11 +327,11 @@
               if (!convert_uint (value, n, &uint))
                 log_printf ("%llu\n", uint);
               else
-                log_printhex ("", value, n);
+                log_printhex (value, n, "");
               break;
 
             default:
-              log_printhex ("", value, n);
+              log_printhex (value, n, "");
               break;
             }
         }
diff -Nru gnupg2-2.2.20/g13/Makefile.am gnupg2-2.2.27/g13/Makefile.am
--- gnupg2-2.2.20/g13/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g13/Makefile.am	2020-08-20 10:55:36.000000000 +0200
@@ -24,7 +24,11 @@
 sbin_PROGRAMS = g13-syshelp
 
 noinst_PROGRAMS = $(module_tests)
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = $(module_tests)
+endif
 
 AM_CPPFLAGS =
 
diff -Nru gnupg2-2.2.20/g13/Makefile.in gnupg2-2.2.27/g13/Makefile.in
--- gnupg2-2.2.20/g13/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/g13/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -127,7 +127,7 @@
 bin_PROGRAMS = g13$(EXEEXT)
 sbin_PROGRAMS = g13-syshelp$(EXEEXT)
 noinst_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(am__EXEEXT_1)
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_1)
 @HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\""            \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""    \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\""  \
@@ -293,6 +293,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -459,6 +460,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru gnupg2-2.2.20/g13/mount.c gnupg2-2.2.27/g13/mount.c
--- gnupg2-2.2.20/g13/mount.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g13/mount.c	2020-10-23 20:08:54.000000000 +0200
@@ -76,7 +76,7 @@
   else
     {
       /* A quick check to see whether we can the container exists.  */
-      if (access (filename, R_OK))
+      if (gnupg_access (filename, R_OK))
         return gpg_error_from_syserror ();
     }
 
@@ -121,7 +121,7 @@
     {
       struct stat sb;
 
-      if (stat (filename, &sb))
+      if (gnupg_stat (filename, &sb))
         {
           err = gpg_error_from_syserror ();
           goto leave;
diff -Nru gnupg2-2.2.20/g13/sh-dmcrypt.c gnupg2-2.2.27/g13/sh-dmcrypt.c
--- gnupg2-2.2.20/g13/sh-dmcrypt.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g13/sh-dmcrypt.c	2020-11-04 16:31:48.000000000 +0100
@@ -41,6 +41,7 @@
 #include "../common/i18n.h"
 #include "g13tuple.h"
 #include "../common/exectool.h"
+#include "../common/sysutils.h"
 #include "keyblob.h"
 
 /* The standard disk block size (logical).  */
@@ -94,7 +95,7 @@
   char **fields = NULL;
   int lno, count;
 
-  if (stat (devname, &sb))
+  if (gnupg_stat (devname, &sb))
     {
       err = gpg_error_from_syserror ();
       log_error ("error stating '%s': %s\n", devname, gpg_strerror (err));
diff -Nru gnupg2-2.2.20/g13/suspend.c gnupg2-2.2.27/g13/suspend.c
--- gnupg2-2.2.20/g13/suspend.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/g13/suspend.c	2020-10-23 20:08:54.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include "g13.h"
 #include "../common/i18n.h"
+#include "../common/sysutils.h"
 #include "suspend.h"
 
 #include "keyblob.h"
@@ -45,7 +46,7 @@
   int needs_syshelp;
 
   /* A quick check to see whether the container exists.  */
-  if (access (filename, R_OK))
+  if (gnupg_access (filename, R_OK))
     return gpg_error_from_syserror ();
 
   /* Decide whether we need to use the g13-syshelp because we can't
@@ -80,7 +81,7 @@
   char *mountpoint_buffer = NULL;
 
   /* A quick check to see whether the container exists.  */
-  if (access (filename, R_OK))
+  if (gnupg_access (filename, R_OK))
     return gpg_error_from_syserror ();
 
   /* Decide whether we need to use the g13-syshelp because we can't
diff -Nru gnupg2-2.2.20/kbx/kbxutil.c gnupg2-2.2.27/kbx/kbxutil.c
--- gnupg2-2.2.20/kbx/kbxutil.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/kbx/kbxutil.c	2020-12-18 11:22:45.000000000 +0100
@@ -272,7 +272,7 @@
     {
       struct stat st;
 
-      fp = fopen (fname, "rb");
+      fp = gnupg_fopen (fname, "rb");
       if (!fp)
         {
           log_error ("can't open '%s': %s\n", fname, strerror (errno));
@@ -418,7 +418,7 @@
             }
           else
             {
-              fflush (stdout);
+              es_fflush (es_stdout);
               log_info ("%s: failed to parse OpenPGP keyblock: %s\n",
                         filename, gpg_strerror (err));
             }
@@ -432,17 +432,17 @@
               err = _keybox_create_openpgp_blob (&blob, &info, p, nparsed, 0);
               if (err)
                 {
-                  fflush (stdout);
+                  es_fflush (es_stdout);
                   log_error ("%s: failed to create OpenPGP keyblock: %s\n",
                              filename, gpg_strerror (err));
                 }
               else
                 {
-                  err = _keybox_write_blob (blob, stdout);
+                  err = _keybox_write_blob (blob, es_stdout, NULL);
                   _keybox_release_blob (blob);
                   if (err)
                     {
-                      fflush (stdout);
+                      es_fflush (es_stdout);
                       log_error ("%s: failed to write OpenPGP keyblock: %s\n",
                                  filename, gpg_strerror (err));
                     }
@@ -465,7 +465,8 @@
 {
   ARGPARSE_ARGS pargs;
   enum cmd_and_opt_values cmd = 0;
-  unsigned long from = 0, to = ULONG_MAX;
+  unsigned long from = 0;
+  unsigned long to = ULONG_MAX;
   int dry_run = 0;
 
   early_system_init ();
@@ -487,8 +488,8 @@
 
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* do not remove the args */
-  while (arg_parse( &pargs, opts) )
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -524,6 +525,8 @@
 	}
     }
 
+  gnupg_argparse (NULL, &pargs, NULL);
+
   if (to < from)
     log_error ("record number of \"--to\" is lower than \"--from\" one\n");
 
diff -Nru gnupg2-2.2.20/kbx/keybox-defs.h gnupg2-2.2.27/kbx/keybox-defs.h
--- gnupg2-2.2.20/kbx/keybox-defs.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox-defs.h	2020-10-23 20:08:54.000000000 +0200
@@ -80,7 +80,7 @@
 struct keybox_handle {
   KB_NAME kb;
   int secret;             /* this is for a secret keybox */
-  FILE *fp;
+  estream_t fp;
   int eof;
   int error;
   int ephemeral;
@@ -169,8 +169,8 @@
 
 
 /*-- keybox-file.c --*/
-int _keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp, int *skipped_deleted);
-int _keybox_write_blob (KEYBOXBLOB blob, FILE *fp);
+int _keybox_read_blob (KEYBOXBLOB *r_blob, estream_t fp, int *skipped_deleted);
+int _keybox_write_blob (KEYBOXBLOB blob, estream_t fp, FILE *outfp);
 
 /*-- keybox-search.c --*/
 gpg_err_code_t _keybox_get_flag_location (const unsigned char *buffer,
diff -Nru gnupg2-2.2.20/kbx/keybox-dump.c gnupg2-2.2.27/kbx/keybox-dump.c
--- gnupg2-2.2.20/kbx/keybox-dump.c	2019-08-23 15:59:06.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox-dump.c	2020-10-23 20:08:54.000000000 +0200
@@ -84,6 +84,7 @@
     }
   else
     hashlen = 20;
+
   if (length < 5+unhashed)
     {
       fputs ("[blob too short for a checksum]\n", fp);
@@ -170,6 +171,8 @@
   ulong nserial;
   ulong unhashed;
   const byte *p;
+  const byte *pend;
+  int is_fpr32;  /* blob version 2 */
 
   buffer = _keybox_get_blob_image (blob, &length);
 
@@ -207,7 +210,9 @@
       fprintf (fp, "[can't dump this blob type]\n");
       return 0;
     }
+  /* Here we have either BLOGTYPE_X509 or BLOBTYPE_OPENPGP */
   fprintf (fp, "Version: %d\n", buffer[5]);
+  is_fpr32 = buffer[5] == 2;
 
   if (length < 40)
     {
@@ -247,7 +252,18 @@
       || rawdata_off+rawdata_len > length
       || rawdata_len + 4 > length
       || rawdata_off+rawdata_len + 4 > length)
-    fprintf (fp, "[Error: raw data larger than blob]\n");
+    {
+      fprintf (fp, "[Error: raw data larger than blob]\n");
+      return -1;
+    }
+
+  if (rawdata_off > length
+      || rawdata_len > length
+      || rawdata_off + rawdata_len > length)
+    {
+      fprintf (fp, "[Error: unhashed data larger than blob]\n");
+      return -1;
+    }
   unhashed = length - rawdata_off - rawdata_len;
   fprintf (fp, "Unhashed: %lu\n", unhashed);
 
@@ -260,26 +276,66 @@
 
   keyinfolen = get16 (buffer + 18 );
   fprintf (fp, "Key-Info-Length: %lu\n", keyinfolen);
-  /* fixme: check bounds */
   p = buffer + 20;
+  pend = buffer + length;
   for (n=0; n < nkeys; n++, p += keyinfolen)
     {
       ulong kidoff, kflags;
 
+      if (p + keyinfolen >= pend)
+        {
+          fprintf (fp, "[Error: key data larger than blob]\n");
+          return -1;
+        }
+
       fprintf (fp, "Key-Fpr[%lu]: ", n );
-      for (i=0; i < 20; i++ )
-        fprintf (fp, "%02X", p[i]);
-      kidoff = get32 (p + 20);
-      fprintf (fp, "\nKey-Kid-Off[%lu]: %lu\n", n, kidoff );
-      fprintf (fp, "Key-Kid[%lu]: ", n );
-      /* fixme: check bounds */
-      for (i=0; i < 8; i++ )
-        fprintf (fp, "%02X", buffer[kidoff+i] );
-      kflags = get16 (p + 24 );
+      if (is_fpr32)
+        {
+          if (p + 32 + 2 >= pend)
+            {
+              fprintf (fp, "[Error: fingerprint data larger than blob]\n");
+              return -1;
+            }
+          kflags = get16 (p + 32 );
+          for (i=0; i < ((kflags & 0x80)?32:20); i++ )
+            fprintf (fp, "%02X", p[i]);
+        }
+      else
+        {
+          if (p + 20 + 4 >= pend)
+            {
+              fprintf (fp, "[Error: fingerprint data larger than blob]\n");
+              return -1;
+            }
+          for (i=0; i < 20; i++ )
+            fprintf (fp, "%02X", p[i]);
+          kidoff = get32 (p + 20);
+          fprintf (fp, "\nKey-Kid-Off[%lu]: %lu\n", n, kidoff );
+          fprintf (fp, "Key-Kid[%lu]: ", n );
+
+          if (p + kidoff + 8 >= pend)
+            {
+              fprintf (fp, "[Error: fingerprint data larger than blob]\n");
+              return -1;
+            }
+          for (i=0; i < 8; i++ )
+            fprintf (fp, "%02X", buffer[kidoff+i] );
+          if (p + 24 >= pend)
+            {
+              fprintf (fp, "[Error: fingerprint data larger than blob]\n");
+              return -1;
+            }
+          kflags = get16 (p + 24);
+        }
       fprintf( fp, "\nKey-Flags[%lu]: %04lX\n", n, kflags);
     }
 
   /* serial number */
+  if (p + 2 >= pend)
+    {
+      fprintf (fp, "[Error: data larger than blob]\n");
+      return -1;
+    }
   fputs ("Serial-No: ", fp);
   nserial = get16 (p);
   p += 2;
@@ -287,22 +343,37 @@
     fputs ("none", fp);
   else
     {
+      if (p + nserial >= pend)
+        {
+          fprintf (fp, "[Error: data larger than blob]\n");
+          return -1;
+        }
       for (; nserial; nserial--, p++)
         fprintf (fp, "%02X", *p);
     }
   putc ('\n', fp);
 
   /* user IDs */
+  if (p + 4 >= pend)
+    {
+      fprintf (fp, "[Error: data larger than blob]\n");
+      return -1;
+    }
   nuids = get16 (p);
   fprintf (fp, "Uid-Count: %lu\n", nuids );
   uidinfolen = get16  (p + 2);
   fprintf (fp, "Uid-Info-Length: %lu\n", uidinfolen);
-  /* fixme: check bounds */
   p += 4;
   for (n=0; n < nuids; n++, p += uidinfolen)
     {
       ulong uidoff, uidlen, uflags;
 
+      if (p + uidinfolen >= pend || uidinfolen < 8)
+        {
+          fprintf (fp, "[Error: data larger than blob]\n");
+          return -1;
+        }
+
       uidoff = get32( p );
       uidlen = get32( p+4 );
       if (type == KEYBOX_BLOBTYPE_X509 && !n)
@@ -323,8 +394,21 @@
           fprintf (fp, "Uid-Len[%lu]: %lu\n", n, uidlen );
           fprintf (fp, "Uid[%lu]: \"", n );
         }
+
+      if (uidoff + uidlen > length
+          || uidoff + uidlen < uidoff
+          || uidoff + uidlen < uidlen)
+        {
+          fprintf (fp, "[Error: data larger than blob]\n");
+          return -1;
+        }
       print_string (fp, buffer+uidoff, uidlen, '\"');
       fputs ("\"\n", fp);
+      if (p + 8 + 2 + 1 >= pend)
+        {
+          fprintf (fp, "[Error: data larger than blob]\n");
+          return -1;
+        }
       uflags = get16 (p + 8);
       if (type == KEYBOX_BLOBTYPE_X509 && !n)
         {
@@ -343,11 +427,15 @@
         }
     }
 
+  if (p + 2 + 2 >= pend)
+    {
+      fprintf (fp, "[Error: data larger than blob]\n");
+      return -1;
+    }
   nsigs = get16 (p);
   fprintf (fp, "Sig-Count: %lu\n", nsigs );
   siginfolen = get16 (p + 2);
   fprintf (fp, "Sig-Info-Length: %lu\n", siginfolen );
-  /* fixme: check bounds  */
   p += 4;
   {
     int in_range = 0;
@@ -357,6 +445,11 @@
       {
         ulong sflags;
 
+        if (p + siginfolen >= pend || siginfolen < 4)
+          {
+            fprintf (fp, "[Error: data larger than blob]\n");
+            return -1;
+          }
         sflags = get32 (p);
         if (!in_range && !sflags)
           {
@@ -390,6 +483,12 @@
     if (in_range)
       fprintf (fp, "Sig-Expire[%lu-%lu]: [not checked]\n", first, n-1);
   }
+
+  if (p + 16 >= pend)
+    {
+      fprintf (fp, "[Error: data larger than blob]\n");
+      return -1;
+    }
   fprintf (fp, "Ownertrust: %d\n", p[0] );
   fprintf (fp, "All-Validity: %d\n", p[1] );
   p += 4;
@@ -402,6 +501,12 @@
   n = get32 (p );
   p += 4;
   fprintf (fp, "Created-At: %lu\n", n );
+
+  if (p + 4 >= pend)
+    {
+      fprintf (fp, "[Error: data larger than blob]\n");
+      return -1;
+    }
   n = get32 (p );
   fprintf (fp, "Reserved-Space: %lu\n", n );
 
@@ -542,18 +647,18 @@
 
 
 
-static FILE *
+static estream_t
 open_file (const char **filename, FILE *outfp)
 {
-  FILE *fp;
+  estream_t fp;
 
   if (!*filename)
     {
       *filename = "-";
-      fp = stdin;
+      fp = es_stdin;
     }
   else
-    fp = fopen (*filename, "rb");
+    fp = es_fopen (*filename, "rb");
   if (!fp)
     {
       int save_errno = errno;
@@ -568,7 +673,7 @@
 int
 _keybox_dump_file (const char *filename, int stats_only, FILE *outfp)
 {
-  FILE *fp;
+  estream_t fp;
   KEYBOXBLOB blob;
   int rc;
   unsigned long count = 0;
@@ -621,8 +726,8 @@
   if (rc)
     fprintf (outfp, "# error reading '%s': %s\n", filename, gpg_strerror (rc));
 
-  if (fp != stdin)
-    fclose (fp);
+  if (fp != es_stdin)
+    es_fclose (fp);
 
   if (stats_only)
     {
@@ -682,7 +787,7 @@
 int
 _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp)
 {
-  FILE *fp;
+  estream_t fp;
   KEYBOXBLOB blob;
   int rc;
   unsigned long recno = 0;
@@ -744,8 +849,8 @@
     rc = 0;
   if (rc)
     fprintf (outfp, "error reading '%s': %s\n", filename, gpg_strerror (rc));
-  if (fp != stdin)
-    fclose (fp);
+  if (fp != es_stdin)
+    es_fclose (fp);
 
   qsort (dupitems, dupitems_count, sizeof *dupitems, cmp_dupitems);
 
@@ -775,7 +880,7 @@
 _keybox_dump_cut_records (const char *filename, unsigned long from,
                           unsigned long to, FILE *outfp)
 {
-  FILE *fp;
+  estream_t fp;
   KEYBOXBLOB blob;
   int rc;
   unsigned long recno = 0;
@@ -789,7 +894,7 @@
         break; /* Ready.  */
       if (recno >= from)
         {
-          if ((rc = _keybox_write_blob (blob, outfp)))
+          if ((rc = _keybox_write_blob (blob, NULL, outfp)))
             {
               fprintf (stderr, "error writing output: %s\n",
                        gpg_strerror (rc));
@@ -804,7 +909,7 @@
   if (rc)
     fprintf (stderr, "error reading '%s': %s\n", filename, gpg_strerror (rc));
  leave:
-  if (fp != stdin)
-    fclose (fp);
+  if (fp != es_stdin)
+    es_fclose (fp);
   return rc;
 }
diff -Nru gnupg2-2.2.20/kbx/keybox-file.c gnupg2-2.2.27/kbx/keybox-file.c
--- gnupg2-2.2.20/kbx/keybox-file.c	2017-12-29 20:07:47.000000000 +0100
+++ gnupg2-2.2.27/kbx/keybox-file.c	2020-10-23 20:08:54.000000000 +0200
@@ -48,7 +48,7 @@
 /* Read a block at the current position and return it in R_BLOB.
    R_BLOB may be NULL to simply skip the current block.  */
 int
-_keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp, int *skipped_deleted)
+_keybox_read_blob (KEYBOXBLOB *r_blob, estream_t fp, int *skipped_deleted)
 {
   unsigned char *image;
   size_t imagelen = 0;
@@ -61,19 +61,19 @@
  again:
   if (r_blob)
     *r_blob = NULL;
-  off = ftello (fp);
+  off = es_ftello (fp);
   if (off == (off_t)-1)
     return gpg_error_from_syserror ();
 
-  if ((c1 = getc (fp)) == EOF
-      || (c2 = getc (fp)) == EOF
-      || (c3 = getc (fp)) == EOF
-      || (c4 = getc (fp)) == EOF
-      || (type = getc (fp)) == EOF)
+  if ((c1 = es_getc (fp)) == EOF
+      || (c2 = es_getc (fp)) == EOF
+      || (c3 = es_getc (fp)) == EOF
+      || (c4 = es_getc (fp)) == EOF
+      || (type = es_getc (fp)) == EOF)
     {
-      if ( c1 == EOF && !ferror (fp) )
+      if ( c1 == EOF && !es_ferror (fp) )
         return -1; /* eof */
-      if (!ferror (fp))
+      if (!es_ferror (fp))
         return gpg_error (GPG_ERR_TOO_SHORT);
       return gpg_error_from_syserror ();
     }
@@ -85,7 +85,7 @@
   if (!type)
     {
       /* Special treatment for empty blobs. */
-      if (fseek (fp, imagelen-5, SEEK_CUR))
+      if (es_fseek (fp, imagelen-5, SEEK_CUR))
         return gpg_error_from_syserror ();
       if (skipped_deleted)
         *skipped_deleted = 1;
@@ -96,7 +96,7 @@
     {
       /* Seek forward so that the caller may choose to ignore this
          record.  */
-      if (fseek (fp, imagelen-5, SEEK_CUR))
+      if (es_fseek (fp, imagelen-5, SEEK_CUR))
         return gpg_error_from_syserror ();
       return gpg_error (GPG_ERR_TOO_LARGE);
     }
@@ -104,7 +104,7 @@
   if (!r_blob)
     {
       /* This blob shall be skipped.  */
-      if (fseek (fp, imagelen-5, SEEK_CUR))
+      if (es_fseek (fp, imagelen-5, SEEK_CUR))
         return gpg_error_from_syserror ();
       return 0;
     }
@@ -114,7 +114,7 @@
     return gpg_error_from_syserror ();
 
   image[0] = c1; image[1] = c2; image[2] = c3; image[3] = c4; image[4] = type;
-  if (fread (image+5, imagelen-5, 1, fp) != 1)
+  if (es_fread (image+5, imagelen-5, 1, fp) != 1)
     {
       gpg_error_t tmperr = gpg_error_from_syserror ();
       xfree (image);
@@ -130,7 +130,7 @@
 
 /* Write the block to the current file position */
 int
-_keybox_write_blob (KEYBOXBLOB blob, FILE *fp)
+_keybox_write_blob (KEYBOXBLOB blob, estream_t fp, FILE *outfp)
 {
   const unsigned char *image;
   size_t length;
@@ -140,15 +140,24 @@
   if (length > IMAGELEN_LIMIT)
     return gpg_error (GPG_ERR_TOO_LARGE);
 
-  if (fwrite (image, length, 1, fp) != 1)
-    return gpg_error_from_syserror ();
+  if (fp)
+    {
+      if (es_fwrite (image, length, 1, fp) != 1)
+        return gpg_error_from_syserror ();
+    }
+  else
+    {
+      if (fwrite (image, length, 1, outfp) != 1)
+        return gpg_error_from_syserror ();
+    }
+
   return 0;
 }
 
 
 /* Write a fresh header type blob. */
 int
-_keybox_write_header_blob (FILE *fp, int for_openpgp)
+_keybox_write_header_blob (estream_t fp, int for_openpgp)
 {
   unsigned char image[32];
   u32 val;
@@ -174,7 +183,8 @@
   image[20+2] = (val >>  8);
   image[20+3] = (val      );
 
-  if (fwrite (image, 32, 1, fp) != 1)
+  if (es_fwrite (image, 32, 1, fp) != 1)
     return gpg_error_from_syserror ();
+
   return 0;
 }
diff -Nru gnupg2-2.2.20/kbx/keybox.h gnupg2-2.2.27/kbx/keybox.h
--- gnupg2-2.2.20/kbx/keybox.h	2019-08-23 16:13:17.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox.h	2020-10-23 20:08:54.000000000 +0200
@@ -81,7 +81,7 @@
 /*-- keybox-file.c --*/
 /* Fixme: This function does not belong here: Provide a better
    interface to create a new keybox file.  */
-int _keybox_write_header_blob (FILE *fp, int openpgp_flag);
+int _keybox_write_header_blob (estream_t fp, int openpgp_flag);
 
 /*-- keybox-search.c --*/
 gpg_error_t keybox_get_keyblock (KEYBOX_HANDLE hd, iobuf_t *r_iobuf,
diff -Nru gnupg2-2.2.20/kbx/keybox-init.c gnupg2-2.2.27/kbx/keybox-init.c
--- gnupg2-2.2.20/kbx/keybox-init.c	2019-08-23 16:12:04.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox-init.c	2020-10-23 20:08:54.000000000 +0200
@@ -25,6 +25,7 @@
 #include <assert.h>
 
 #include "keybox-defs.h"
+#include "../common/sysutils.h"
 #include "../common/mischelp.h"
 
 static KB_NAME kb_names;
@@ -80,7 +81,7 @@
 {
   KB_NAME r = token;
 
-  return r? !access (r->fname, W_OK) : 0;
+  return r? !gnupg_access (r->fname, W_OK) : 0;
 }
 
 
@@ -179,7 +180,7 @@
   _keybox_release_blob (hd->saved_found.blob);
   if (hd->fp)
     {
-      fclose (hd->fp);
+      es_fclose (hd->fp);
       hd->fp = NULL;
     }
   xfree (hd->word_match.name);
@@ -252,11 +253,11 @@
       {
         if (roverhd->fp)
           {
-            fclose (roverhd->fp);
+            es_fclose (roverhd->fp);
             roverhd->fp = NULL;
           }
       }
-  assert (!hd->fp);
+  log_assert (!hd->fp);
 }
 
 
diff -Nru gnupg2-2.2.20/kbx/keybox-openpgp.c gnupg2-2.2.27/kbx/keybox-openpgp.c
--- gnupg2-2.2.20/kbx/keybox-openpgp.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox-openpgp.c	2020-12-18 11:22:00.000000000 +0100
@@ -240,8 +240,16 @@
 
   if (!err && !gcry_pk_get_keygrip (s_pkey, grip))
     {
-      log_info ("kbx: error computing keygrip\n");
-      err = gpg_error (GPG_ERR_GENERAL);
+      /* Some Linux distributions remove certain curves from Libgcrypt
+       * but not from GnuPG and thus the keygrip can't be computed.
+       * Emit a better error message for this case.  */
+      if (!gcry_pk_get_curve (s_pkey, 0, NULL))
+        err = gpg_error (GPG_ERR_UNKNOWN_CURVE);
+      else
+        {
+          log_info ("kbx: error computing keygrip\n");
+          err = gpg_error (GPG_ERR_GENERAL);
+        }
     }
 
   gcry_sexp_release (s_pkey);
diff -Nru gnupg2-2.2.20/kbx/keybox-search.c gnupg2-2.2.27/kbx/keybox-search.c
--- gnupg2-2.2.20/kbx/keybox-search.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox-search.c	2020-10-23 20:08:54.000000000 +0200
@@ -782,7 +782,7 @@
 open_file (KEYBOX_HANDLE hd)
 {
 
-  hd->fp = fopen (hd->kb->fname, "rb");
+  hd->fp = es_fopen (hd->kb->fname, "rb");
   if (!hd->fp)
     {
       hd->error = gpg_error_from_syserror ();
@@ -814,11 +814,11 @@
 
   if (hd->fp)
     {
-      if (fseeko (hd->fp, 0, SEEK_SET))
+      if (es_fseeko (hd->fp, 0, SEEK_SET))
         {
           /* Ooops.  Seek did not work.  Close so that the search will
            * open the file again.  */
-          fclose (hd->fp);
+          es_fclose (hd->fp);
           hd->fp = NULL;
         }
     }
@@ -909,7 +909,7 @@
            * returned a blob which also was not the first one.  We now
            * need to skip over that blob and hope that the file has
            * not changed.  */
-          if (fseeko (hd->fp, lastfoundoff, SEEK_SET))
+          if (es_fseeko (hd->fp, lastfoundoff, SEEK_SET))
             {
               rc = gpg_error_from_syserror ();
               log_debug ("%s: seeking to last found offset failed: %s\n",
@@ -1285,7 +1285,7 @@
 {
   if (!hd->fp)
     return 0;
-  return ftello (hd->fp);
+  return es_ftello (hd->fp);
 }
 
 gpg_error_t
@@ -1310,7 +1310,7 @@
         return err;
     }
 
-  err = fseeko (hd->fp, offset, SEEK_SET);
+  err = es_fseeko (hd->fp, offset, SEEK_SET);
   hd->error = gpg_error_from_errno (err);
 
   return hd->error;
diff -Nru gnupg2-2.2.20/kbx/keybox-update.c gnupg2-2.2.27/kbx/keybox-update.c
--- gnupg2-2.2.20/kbx/keybox-update.c	2019-08-23 15:55:46.000000000 +0200
+++ gnupg2-2.2.27/kbx/keybox-update.c	2020-10-23 20:08:54.000000000 +0200
@@ -71,14 +71,14 @@
 
 static int
 create_tmp_file (const char *template,
-                 char **r_bakfname, char **r_tmpfname, FILE **r_fp)
+                 char **r_bakfname, char **r_tmpfname, estream_t *r_fp)
 {
   gpg_error_t err;
 
   err = keybox_tmp_names (template, 0, r_bakfname, r_tmpfname);
   if (!err)
     {
-      *r_fp = fopen (*r_tmpfname, "wb");
+      *r_fp = es_fopen (*r_tmpfname, "wb");
       if (!*r_fp)
         {
           err = gpg_error_from_syserror ();
@@ -161,8 +161,9 @@
 blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
                int secret, int for_openpgp, off_t start_offset)
 {
-  FILE *fp, *newfp;
-  int rc=0;
+  gpg_err_code_t ec;
+  estream_t fp, newfp;
+  int rc = 0;
   char *bakfname = NULL;
   char *tmpfname = NULL;
   char buffer[4096];  /* (Must be at least 32 bytes) */
@@ -170,33 +171,33 @@
 
   /* Open the source file. Because we do a rename, we have to check the
      permissions of the file */
-  if (access (fname, W_OK))
-    return gpg_error_from_syserror ();
+  if ((ec = gnupg_access (fname, W_OK)))
+    return gpg_error (ec);
 
-  fp = fopen (fname, "rb");
+  fp = es_fopen (fname, "rb");
   if (mode == FILECOPY_INSERT && !fp && errno == ENOENT)
     {
       /* Insert mode but file does not exist:
          Create a new keybox file. */
-      newfp = fopen (fname, "wb");
+      newfp = es_fopen (fname, "wb");
       if (!newfp )
         return gpg_error_from_syserror ();
 
       rc = _keybox_write_header_blob (newfp, for_openpgp);
       if (rc)
         {
-          fclose (newfp);
+          es_fclose (newfp);
           return rc;
         }
 
-      rc = _keybox_write_blob (blob, newfp);
+      rc = _keybox_write_blob (blob, newfp, NULL);
       if (rc)
         {
-          fclose (newfp);
+          es_fclose (newfp);
           return rc;
         }
 
-      if ( fclose (newfp) )
+      if ( es_fclose (newfp) )
         return gpg_error_from_syserror ();
 
 /*        if (chmod( fname, S_IRUSR | S_IWUSR )) */
@@ -217,7 +218,7 @@
   rc = create_tmp_file (fname, &bakfname, &tmpfname, &newfp);
   if (rc)
     {
-      fclose (fp);
+      es_fclose (fp);
       goto leave;
     }
 
@@ -229,7 +230,7 @@
       /* Copy everything to the new file.  If this is for OpenPGP, we
          make sure that the openpgp flag is set in the header.  (We
          failsafe the blob type.) */
-      while ( (nread = fread (buffer, 1, DIM(buffer), fp)) > 0 )
+      while ( (nread = es_fread (buffer, 1, DIM(buffer), fp)) > 0 )
         {
           if (first_record && for_openpgp
               && buffer[4] == KEYBOX_BLOBTYPE_HEADER)
@@ -238,19 +239,19 @@
               buffer[7] |= 0x02; /* OpenPGP data may be available.  */
             }
 
-          if (fwrite (buffer, nread, 1, newfp) != 1)
+          if (es_fwrite (buffer, nread, 1, newfp) != 1)
             {
               rc = gpg_error_from_syserror ();
-              fclose (fp);
-              fclose (newfp);
+              es_fclose (fp);
+              es_fclose (newfp);
               goto leave;
             }
         }
-      if (ferror (fp))
+      if (es_ferror (fp))
         {
           rc = gpg_error_from_syserror ();
-          fclose (fp);
-          fclose (newfp);
+          es_fclose (fp);
+          es_fclose (newfp);
           goto leave;
         }
     }
@@ -266,24 +267,24 @@
           nbytes = DIM(buffer);
           if (current + nbytes > start_offset)
               nbytes = start_offset - current;
-          nread = fread (buffer, 1, nbytes, fp);
+          nread = es_fread (buffer, 1, nbytes, fp);
           if (!nread)
             break;
           current += nread;
 
-          if (fwrite (buffer, nread, 1, newfp) != 1)
+          if (es_fwrite (buffer, nread, 1, newfp) != 1)
             {
               rc = gpg_error_from_syserror ();
-              fclose (fp);
-              fclose (newfp);
+              es_fclose (fp);
+              es_fclose (newfp);
               goto leave;
             }
         }
-      if (ferror (fp))
+      if (es_ferror (fp))
         {
           rc = gpg_error_from_syserror ();
-          fclose (fp);
-          fclose (newfp);
+          es_fclose (fp);
+          es_fclose (newfp);
           goto leave;
         }
 
@@ -291,8 +292,8 @@
       rc = _keybox_read_blob (NULL, fp, NULL);
       if (rc)
         {
-          fclose (fp);
-          fclose (newfp);
+          es_fclose (fp);
+          es_fclose (newfp);
           return rc;
         }
     }
@@ -300,11 +301,11 @@
   /* Do an insert or update. */
   if ( mode == FILECOPY_INSERT || mode == FILECOPY_UPDATE )
     {
-      rc = _keybox_write_blob (blob, newfp);
+      rc = _keybox_write_blob (blob, newfp, NULL);
       if (rc)
         {
-          fclose (fp);
-          fclose (newfp);
+          es_fclose (fp);
+          es_fclose (newfp);
           return rc;
         }
     }
@@ -312,33 +313,33 @@
   /* Copy the rest of the packet for an delete or update. */
   if (mode == FILECOPY_DELETE || mode == FILECOPY_UPDATE)
     {
-      while ( (nread = fread (buffer, 1, DIM(buffer), fp)) > 0 )
+      while ( (nread = es_fread (buffer, 1, DIM(buffer), fp)) > 0 )
         {
-          if (fwrite (buffer, nread, 1, newfp) != 1)
+          if (es_fwrite (buffer, nread, 1, newfp) != 1)
             {
               rc = gpg_error_from_syserror ();
-              fclose (fp);
-              fclose (newfp);
+              es_fclose (fp);
+              es_fclose (newfp);
               goto leave;
             }
         }
-      if (ferror (fp))
+      if (es_ferror (fp))
         {
           rc = gpg_error_from_syserror ();
-          fclose (fp);
-          fclose (newfp);
+          es_fclose (fp);
+          es_fclose (newfp);
           goto leave;
         }
     }
 
   /* Close both files. */
-  if (fclose(fp))
+  if (es_fclose(fp))
     {
       rc = gpg_error_from_syserror ();
-      fclose (newfp);
+      es_fclose (newfp);
       goto leave;
     }
-  if (fclose(newfp))
+  if (es_fclose(newfp))
     {
       rc = gpg_error_from_syserror ();
       goto leave;
@@ -503,7 +504,7 @@
 {
   off_t off;
   const char *fname;
-  FILE *fp;
+  estream_t fp;
   gpg_err_code_t ec;
   size_t flag_pos, flag_size;
   const unsigned char *buffer;
@@ -535,12 +536,12 @@
   off += flag_pos;
 
   _keybox_close_file (hd);
-  fp = fopen (hd->kb->fname, "r+b");
+  fp = es_fopen (hd->kb->fname, "r+b");
   if (!fp)
     return gpg_error_from_syserror ();
 
   ec = 0;
-  if (fseeko (fp, off, SEEK_SET))
+  if (es_fseeko (fp, off, SEEK_SET))
     ec = gpg_err_code_from_syserror ();
   else
     {
@@ -556,7 +557,7 @@
         case 1:
         case 2:
         case 4:
-          if (fwrite (tmp+4-flag_size, flag_size, 1, fp) != 1)
+          if (es_fwrite (tmp+4-flag_size, flag_size, 1, fp) != 1)
             ec = gpg_err_code_from_syserror ();
           break;
         default:
@@ -565,7 +566,7 @@
         }
     }
 
-  if (fclose (fp))
+  if (es_fclose (fp))
     {
       if (!ec)
         ec = gpg_err_code_from_syserror ();
@@ -581,7 +582,7 @@
 {
   off_t off;
   const char *fname;
-  FILE *fp;
+  estream_t fp;
   int rc;
 
   if (!hd)
@@ -600,18 +601,18 @@
   off += 4;
 
   _keybox_close_file (hd);
-  fp = fopen (hd->kb->fname, "r+b");
+  fp = es_fopen (hd->kb->fname, "r+b");
   if (!fp)
     return gpg_error_from_syserror ();
 
-  if (fseeko (fp, off, SEEK_SET))
+  if (es_fseeko (fp, off, SEEK_SET))
     rc = gpg_error_from_syserror ();
-  else if (putc (0, fp) == EOF)
+  else if (es_fputc (0, fp) == EOF)
     rc = gpg_error_from_syserror ();
   else
     rc = 0;
 
-  if (fclose (fp))
+  if (es_fclose (fp))
     {
       if (!rc)
         rc = gpg_error_from_syserror ();
@@ -626,9 +627,10 @@
 int
 keybox_compress (KEYBOX_HANDLE hd)
 {
+  gpg_err_code_t ec;
   int read_rc, rc;
   const char *fname;
-  FILE *fp, *newfp;
+  estream_t fp, newfp;
   char *bakfname = NULL;
   char *tmpfname = NULL;
   int first_blob;
@@ -651,10 +653,10 @@
 
   /* Open the source file. Because we do a rename, we have to check the
      permissions of the file */
-  if (access (fname, W_OK))
-    return gpg_error_from_syserror ();
+  if ((ec = gnupg_access (fname, W_OK)))
+    return gpg_error (ec);
 
-  fp = fopen (fname, "rb");
+  fp = es_fopen (fname, "rb");
   if (!fp && errno == ENOENT)
     return 0; /* Ready. File has been deleted right after the access above. */
   if (!fp)
@@ -677,21 +679,21 @@
 
           if ( (last_maint + 3*3600) > make_timestamp () )
             {
-              fclose (fp);
+              es_fclose (fp);
               _keybox_release_blob (blob);
               return 0; /* Compress run not yet needed. */
             }
         }
       _keybox_release_blob (blob);
-      fseek (fp, 0, SEEK_SET);
-      clearerr (fp);
+      es_fseek (fp, 0, SEEK_SET);
+      es_clearerr (fp);
     }
 
   /* Create the new file. */
   rc = create_tmp_file (fname, &bakfname, &tmpfname, &newfp);
   if (rc)
     {
-      fclose (fp);
+      es_fclose (fp);
       return rc;;
     }
 
@@ -723,7 +725,7 @@
                  stamp and if needed (ie. used by gpg) set the openpgp
                  flag.  */
               _keybox_update_header_blob (blob, hd->for_openpgp);
-              rc = _keybox_write_blob (blob, newfp);
+              rc = _keybox_write_blob (blob, newfp, NULL);
               if (rc)
                 break;
               continue;
@@ -767,7 +769,7 @@
             }
         }
 
-      rc = _keybox_write_blob (blob, newfp);
+      rc = _keybox_write_blob (blob, newfp, NULL);
       if (rc)
         break;
     }
@@ -780,9 +782,9 @@
     rc = read_rc;
 
   /* Close both files. */
-  if (fclose(fp) && !rc)
+  if (es_fclose(fp) && !rc)
     rc = gpg_error_from_syserror ();
-  if (fclose(newfp) && !rc)
+  if (es_fclose(newfp) && !rc)
     rc = gpg_error_from_syserror ();
 
   /* Rename or remove the temporary file. */
diff -Nru gnupg2-2.2.20/kbx/Makefile.in gnupg2-2.2.27/kbx/Makefile.in
--- gnupg2-2.2.20/kbx/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/kbx/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -311,6 +311,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -477,6 +478,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru gnupg2-2.2.20/m4/Makefile.in gnupg2-2.2.27/m4/Makefile.in
--- gnupg2-2.2.20/m4/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/m4/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -141,6 +141,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -307,6 +308,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru gnupg2-2.2.20/Makefile.am gnupg2-2.2.27/Makefile.am
--- gnupg2-2.2.20/Makefile.am	2019-12-23 12:43:39.000000000 +0100
+++ gnupg2-2.2.27/Makefile.am	2020-12-21 17:24:44.000000000 +0100
@@ -18,20 +18,19 @@
 
 ## Process this file with automake to produce Makefile.in
 
-# Location of the released tarball archives.  Note that this is an
-# internal archive and before uploading this to the public server,
-# manual tests should be run and the git release tat set and pushed.
-# Adjust as needed.
-RELEASE_ARCHIVE_DIR  = wk@vigenere:tarballs/gnupg/v2.2
-
-# The key used to sign the released sources.  Adjust as needed.
-RELEASE_SIGNING_KEY  = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+# Location of the released tarball archives.  This is prefixed by
+# the variable RELEASE_ARCHIVE in ~/.gnupg-autogen.rc.  For example:
+# RELEASE_ARCHIVE=user@host:archive/tarballs
+RELEASE_ARCHIVE_SUFFIX  = gnupg/v2.2
+# The variable RELEASE_SIGNKEY in ~/.gnupg-autogen.rc is used
+# to specify the key for signing.  For example:
+# RELEASE_SIGNKEY=D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 
 
 # Autoconf flags.
 ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
-  --enable-all-tests --enable-symcryptrun --enable-g13 \
+  --enable-all-tests --enable-g13 \
   --enable-gpgtar --enable-wks-tools --disable-ntbtls
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
@@ -100,10 +99,15 @@
 else
 doc =
 endif
+if DISABLE_TESTS
+tests =
+else
+tests = tests
+endif
 
-SUBDIRS = m4 common kbx \
+SUBDIRS = m4 common regexp kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          tools po ${doc} tests
+          tools po ${doc} ${tests}
 
 dist_doc_DATA = README
 
@@ -199,6 +203,18 @@
 sign-release:
 	 +(set -e; \
 	  cd dist; \
+	  x=$$(grep '^RELEASE_ARCHIVE=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+          if [ -z "$$x" ]; then \
+             echo "error: RELEASE_ARCHIVE missing in ~/.gnupg-autogen.rc">&2; \
+             exit 2;\
+          fi;\
+          myarchive="$$x/$(RELEASE_ARCHIVE_SUFFIX)";\
+	  x=$$(grep '^RELEASE_SIGNKEY=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+          if [ -z "$$x" ]; then \
+             echo "error: RELEASE_SIGNKEY missing in ~/.gnupg-autogen.rc">&2; \
+             exit 2;\
+          fi;\
+	  mysignkey="$$x";\
 	  release_w32_name="$(RELEASE_W32_STEM_NAME)_$$(date -u +%Y%m%d)" ;\
 	  files1="$(RELEASE_NAME).tar.bz2 \
                   $${release_w32_name}.tar.xz \
@@ -212,11 +228,11 @@
 	  files3="$${release_w32_name}.wixlib"; \
 	  $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk w32-sign-installer ;\
 	  echo "/* Signing the source tarball ..." ;\
-	  gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.bz2 ;\
+	  gpg -sbu $$mysignkey $(RELEASE_NAME).tar.bz2 ;\
 	  echo "/* Signing the W32 source tarball ..." ;\
-	  gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.tar.xz ;\
+	  gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\
 	  echo "/* Signing the W32 installer ..." ;\
-	  gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.exe ;\
+	  gpg -sbu $$mysignkey $${release_w32_name}.exe ;\
 	  cat $(RELEASE_NAME).swdb >swdb.snippet;\
 	  echo '#+macro: gnupg22_branch  STABLE-BRANCH-2-2' >>swdb.snippet;\
 	  cat  $${release_w32_name}.exe.swdb >>swdb.snippet;\
@@ -224,8 +240,8 @@
 	  sha1sum $${files1} >>swdb.snippet ;\
           cat "../$(RELEASE_NAME).buildlog" swdb.snippet \
                | gzip >$(RELEASE_NAME).buildlog ;\
-          echo "Release created - copying it to the local archive ..." ;\
-	  scp -p $${files1} $${files2} $${files3} $(RELEASE_ARCHIVE_DIR)/ || true;\
+          echo "Release created - copying it to the archive ..." ;\
+	  scp -p $${files1} $${files2} $${files3} $$myarchive/ || true;\
 	  echo '/*' ;\
 	  echo ' * All done; for checksums see dist/swdb.snippet' ;\
 	  echo ' */' ;\
diff -Nru gnupg2-2.2.20/Makefile.in gnupg2-2.2.27/Makefile.in
--- gnupg2-2.2.20/Makefile.in	2020-03-20 16:37:58.000000000 +0100
+++ gnupg2-2.2.27/Makefile.in	2021-01-11 18:46:54.000000000 +0100
@@ -217,8 +217,8 @@
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = m4 common kbx g10 sm agent scd g13 dirmngr tools po doc \
-	tests
+DIST_SUBDIRS = m4 common regexp kbx g10 sm agent scd g13 dirmngr tools \
+	po doc tests
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
@@ -282,6 +282,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -448,6 +449,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -457,19 +459,18 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
-# Location of the released tarball archives.  Note that this is an
-# internal archive and before uploading this to the public server,
-# manual tests should be run and the git release tat set and pushed.
-# Adjust as needed.
-RELEASE_ARCHIVE_DIR = wk@vigenere:tarballs/gnupg/v2.2
-
-# The key used to sign the released sources.  Adjust as needed.
-RELEASE_SIGNING_KEY = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+# Location of the released tarball archives.  This is prefixed by
+# the variable RELEASE_ARCHIVE in ~/.gnupg-autogen.rc.  For example:
+# RELEASE_ARCHIVE=user@host:archive/tarballs
+RELEASE_ARCHIVE_SUFFIX = gnupg/v2.2
+# The variable RELEASE_SIGNKEY in ~/.gnupg-autogen.rc is used
+# to specify the key for signing.  For example:
+# RELEASE_SIGNKEY=D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 
 # Autoconf flags.
 ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
-  --enable-all-tests --enable-symcryptrun --enable-g13 \
+  --enable-all-tests --enable-g13 \
   --enable-gpgtar --enable-wks-tools --disable-ntbtls
 
 GITLOG_TO_CHANGELOG = gitlog-to-changelog
@@ -514,9 +515,11 @@
 @BUILD_DIRMNGR_TRUE@dirmngr = dirmngr
 @BUILD_DOC_FALSE@doc = 
 @BUILD_DOC_TRUE@doc = doc
-SUBDIRS = m4 common kbx \
+@DISABLE_TESTS_FALSE@tests = tests
+@DISABLE_TESTS_TRUE@tests = 
+SUBDIRS = m4 common regexp kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          tools po ${doc} tests
+          tools po ${doc} ${tests}
 
 dist_doc_DATA = README
 gen_start_date = 2011-12-01T06:00:00
@@ -1111,6 +1114,18 @@
 sign-release:
 	 +(set -e; \
 	  cd dist; \
+	  x=$$(grep '^RELEASE_ARCHIVE=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+          if [ -z "$$x" ]; then \
+             echo "error: RELEASE_ARCHIVE missing in ~/.gnupg-autogen.rc">&2; \
+             exit 2;\
+          fi;\
+          myarchive="$$x/$(RELEASE_ARCHIVE_SUFFIX)";\
+	  x=$$(grep '^RELEASE_SIGNKEY=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+          if [ -z "$$x" ]; then \
+             echo "error: RELEASE_SIGNKEY missing in ~/.gnupg-autogen.rc">&2; \
+             exit 2;\
+          fi;\
+	  mysignkey="$$x";\
 	  release_w32_name="$(RELEASE_W32_STEM_NAME)_$$(date -u +%Y%m%d)" ;\
 	  files1="$(RELEASE_NAME).tar.bz2 \
                   $${release_w32_name}.tar.xz \
@@ -1124,11 +1139,11 @@
 	  files3="$${release_w32_name}.wixlib"; \
 	  $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk w32-sign-installer ;\
 	  echo "/* Signing the source tarball ..." ;\
-	  gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.bz2 ;\
+	  gpg -sbu $$mysignkey $(RELEASE_NAME).tar.bz2 ;\
 	  echo "/* Signing the W32 source tarball ..." ;\
-	  gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.tar.xz ;\
+	  gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\
 	  echo "/* Signing the W32 installer ..." ;\
-	  gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.exe ;\
+	  gpg -sbu $$mysignkey $${release_w32_name}.exe ;\
 	  cat $(RELEASE_NAME).swdb >swdb.snippet;\
 	  echo '#+macro: gnupg22_branch  STABLE-BRANCH-2-2' >>swdb.snippet;\
 	  cat  $${release_w32_name}.exe.swdb >>swdb.snippet;\
@@ -1136,8 +1151,8 @@
 	  sha1sum $${files1} >>swdb.snippet ;\
           cat "../$(RELEASE_NAME).buildlog" swdb.snippet \
                | gzip >$(RELEASE_NAME).buildlog ;\
-          echo "Release created - copying it to the local archive ..." ;\
-	  scp -p $${files1} $${files2} $${files3} $(RELEASE_ARCHIVE_DIR)/ || true;\
+          echo "Release created - copying it to the archive ..." ;\
+	  scp -p $${files1} $${files2} $${files3} $$myarchive/ || true;\
 	  echo '/*' ;\
 	  echo ' * All done; for checksums see dist/swdb.snippet' ;\
 	  echo ' */' ;\
diff -Nru gnupg2-2.2.20/NEWS gnupg2-2.2.27/NEWS
--- gnupg2-2.2.20/NEWS	2020-03-20 15:14:20.000000000 +0100
+++ gnupg2-2.2.27/NEWS	2021-01-11 18:41:38.000000000 +0100
@@ -1,3 +1,239 @@
+Noteworthy changes in version 2.2.27 (2021-01-11)
+-------------------------------------------------
+
+ * gpg: Fix regression in 2.2.24 for gnupg_remove function under
+   Windows.  [#5230]
+
+ * gpgconf: Fix case with neither local nor global gpg.conf.  [9f37d3e6f3]
+
+ * gpgconf: Fix description of two new options.  [#5221]
+
+ * Build Windows installer without timestamps.  Note that the
+   Authenticode signatures still carry a timestamp.
+
+  Release-info: https://dev.gnupg.org/T5234
+  See-also: gnupg-announce/2021q1/000452.html
+
+
+Noteworthy changes in version 2.2.26 (2020-12-21)
+-------------------------------------------------
+
+  * gpg: New AKL method "ntds".  [559efd23e9]
+
+  * gpg: Fix --trusted-key with fingerprint arg.  [8a2e5025eb]
+
+  * scd: Fix writing of ECC keys to an OpenPGP card.  [#5163]
+
+  * scd: Make an USB error fix specific to SPR532 readers.  [#5167]
+
+  * dirmngr: With new LDAP keyservers store the new attributes.  Never
+    store the useless pgpSignerID.  Fix a long standing bug storing
+    some keys on an ldap server.  [0e88c73bc9,e47de85382]
+
+  * dirmngr: Support the new Active Direcory LDAP schema for
+    keyservers.  [ac8ece9266]
+
+  * dirmngr: Allow LDAP OpenPGP searches via fingerprint.
+    [c75fd75532]
+
+  * dirmngr: Do not block other threads during keyserver LDAP calls.
+    [15bfd189c0]
+
+  * Support global configuration files.  [#4788,a028f24136]
+
+  * Fix the iconv fallback handling to UTF-8.  [#5038]
+
+  Release-info: https://dev.gnupg.org/T5153
+  See-also: gnupg-announce/2020q4/000451.html
+
+
+Noteworthy changes in version 2.2.25 (2020-11-23)
+-------------------------------------------------
+
+  * scd: Fix regression in 2.2.24 requiring gpg --card-status before
+    signing or decrypting.  [#5065]
+
+  * gpgsm: Using Libksba 1.5.0 signatures with a rarely used
+    combination of attributes can now be verified.  [#5146]
+
+  Release-info: https://dev.gnupg.org/T5140
+  See-also: gnupg-announce/2020q4/000450.html
+
+
+Noteworthy changes in version 2.2.24 (2020-11-17)
+-------------------------------------------------
+
+  * Allow Unicode file names on Windows almost everywhere.  Note that
+    it is still not possible to use Unicode strings on the command
+    line.  This change also fixes a regression in 2.2.22 related to
+    non-ascii file names.  [#5098]
+
+  * Fix localized time printing on Windows.  [#5073]
+
+  * gpg: New command --quick-revoke-sig.  [#5093]
+
+  * gpg: Do not use weak digest algos if selected by recipient
+    preference during sign+encrypt.  [4c181d51a6]
+
+  * gpg: Switch to AES256 for symmetric encryption in de-vs mode.
+    [166e779634]
+
+  * gpg: Silence weak digest warnings with --quiet.  [#4893]
+
+  * gpg: Print new status line CANCELED_BY_USER for a cancel during
+    symmetric encryption.  [f05d1772c4]
+
+  * gpg: Fix the encrypt+sign hash algo preference selection for
+    ECDSA.  This is in particular needed for keys created from
+    existing smartcard based keys.  [aeed0b93ff]
+
+  * agent: Fix secret key import of GnuPG 2.3 generated Ed25519 keys.
+    [#5114]
+
+  * agent: Keep some permissions of private-keys-v1.d.  [#2312]
+
+  * dirmngr: Align sks-keyservers.netCA.pem use between ntbtls and
+    gnutls builds.  [e4f3b74c91]
+
+  * dirmngr: Fix the pool keyserver case for a single host in the
+    pool.  [72e04b03b1a7]
+
+  * scd: Fix the use case of verify_chv2 by CHECKPIN.  [61aea64b3c]
+
+  * scd: Various improvements to the ccid-driver.  [#4616,#5065]
+
+  * scd: Minor fixes for Yubikey [25bec16d0b]
+
+  * gpgconf: New option --show-versions.
+
+  * w32: Install gpg-check-pattern and example profiles.  Install
+    Windows subsystem variant of gpgconf (gpgconf-w32).
+
+  * i18n: Complete overhaul and completion of the Italian translation.
+    Thanks to Denis Renzi.
+
+  * Require Libgcrypt 1.8 because 1.7 has long reached end-of-life.
+
+  Release-info: https://dev.gnupg.org/T5052
+  See-also: gnupg-announce/2020q4/000449.html
+
+
+Noteworthy changes in version 2.2.23 (2020-09-03)
+-------------------------------------------------
+
+  * gpg: Fix AEAD preference list overflow.  [#5050]
+
+  * gpg: Fix a possible segv in the key cleaning code.
+
+  * gpgsm: Fix a minor RFC2253 parser bug.  [#5037]
+
+  * scdaemon: Fix a PIN verify failure on certain OpenPGP card
+    implementations.  Regression in 2.2.22.  [#5039]
+
+  * po: Fix bug in the Hungarian translation.  Updates for the Czech,
+    Polish, and Ukrainian translations.
+
+  Release-info: https://dev.gnupg.org/T5045
+  See-also: gnupg-announce/2020q3/000448.html
+
+
+Noteworthy changes in version 2.2.22 (2020-08-27)
+-------------------------------------------------
+
+  * gpg: Change the default key algorithm to rsa3072.
+
+  * gpg: Add regular expression support for Trust Signatures on all
+    platforms.  [#4843]
+
+  * gpg: Fix regression in 2.2.21 with non-default --passphrase-repeat
+    option.  [#4991]
+
+  * gpg: Ignore --personal-digest-prefs for ECDSA keys.  [#5021]
+
+  * gpgsm: Make rsaPSS a de-vs compliant scheme.
+
+  * gpgsm: Show also the SHA256 fingerprint in key listings.
+
+  * gpgsm: Do not require a default keyring for --gpgconf-list.  [#4867]
+
+  * gpg-agent: Default to extended key format and record the creation
+    time of keys.  Add new option --disable-extended-key-format.
+
+  * gpg-agent: Support the WAYLAND_DISPLAY envvar.  [#5016]
+
+  * gpg-agent: Allow using --gpgconf-list even if HOME does not
+    exist.  [#4866]
+
+  * gpg-agent: Make the Pinentry work even if the envvar TERM is set
+    to the empty string.  [#4137]
+
+  * scdaemon: Add a workaround for Gnuk tokens <= 2.15 which wrongly
+    incremented the error counter when using the "verify" command of
+    "gpg --edit-key" with only the signature key being present.
+
+  * dirmngr: Better handle systems with disabled IPv6.  [#4977]
+
+  * gpgpslit: Install tool.  It was not installed in the past to avoid
+    conflicts with the version installed by GnuPG 1.4.  [#5023]
+
+  * gpgtar: Handle Unicode file names on Windows correctly (requires
+    libgpg-error 1.39).  [#4083]
+
+  * gpgtar: Make --files-from and --null work as documented.  [#5027]
+
+  * Build the Windows installer with the new Ntbtls 0.2.0 so that TLS
+    connections succeed for servers demanding GCM.
+
+  Release-info: https://dev.gnupg.org/T5030
+  See-also: gnupg-announce/2020q3/000447.html
+
+
+Noteworthy changes in version 2.2.21 (2020-07-09)
+-------------------------------------------------
+
+  * gpg: Improve symmetric decryption speed by about 25%.
+    See commit 144b95cc9d.
+
+  * gpg: Support decryption of AEAD encrypted data packets.
+
+  * gpg: Add option --no-include-key-block. [#4856]
+
+  * gpg: Allow for extra padding in ECDH.  [#4908]
+
+  * gpg: Only a single pinentry is shown for symmetric encryption if
+    the pinentry supports this.  [#4971]
+
+  * gpg: Print a note if no keys are given to --delete-key.  [#4959]
+
+  * gpg,gpgsm: The ridiculous passphrase quality bar is not anymore
+    shown.  [#2103]
+
+  * gpgsm: Certificates without a CRL distribution point are now
+    considered valid without looking up a CRL.  The new option
+    --enable-issuer-based-crl-check can be used to revert to the
+    former behaviour.
+
+  * gpgsm: Support rsaPSS signature verification.  [#4538]
+
+  * gpgsm: Unless CRL checking is disabled lookup a missing issuer
+    certificate using the certificate's authorityInfoAccess.  [#4898]
+
+  * gpgsm: Print the certificate's serial number also in decimal
+    notation.
+
+  * gpgsm: Fix possible NULL-deref in messages of --gen-key.  [#4895]
+
+  * scd: Support the CardOS 5 based D-Trust Card 3.1.
+
+  * dirmngr: Allow http URLs with "LOOKUP --url".
+
+  * wkd: Take name of sendmail from configure.  Fixes an OpenBSD
+    specific bug.  [#4886]
+
+  Release-info: https://dev.gnupg.org/T4897
+  See-also: gnupg-announce/2020q3/000446.html
+
+
 Noteworthy changes in version 2.2.20 (2020-03-20)
 -------------------------------------------------
 
@@ -549,12 +785,17 @@
 
   * gpg: Print the keygrips in the --card-status.
 
+  * gpg: Improve the OpenPGP card's factory-reset.  [7f765a98fd]
+
   * scd: Support KDF DO setup.  [#3823]
 
   * scd: Fix some issues with PC/SC on Windows.  [#3825]
 
   * scd: Fix suspend/resume handling in the CCID driver.
 
+  * scd: Fix a race condition in the CCID driver leading to a segv for
+    some readers.  [#5121]
+
   * agent: Evict cached passphrases also via a timer.  [#3829]
 
   * agent: Use separate passphrase caches depending on the request
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/ca.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/ca.gmo sont différents
diff -Nru gnupg2-2.2.20/po/ca.po gnupg2-2.2.27/po/ca.po
--- gnupg2-2.2.20/po/ca.po	2020-03-20 15:40:32.000000000 +0100
+++ gnupg2-2.2.27/po/ca.po	2021-01-11 18:47:17.000000000 +0100
@@ -27,7 +27,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -36,7 +36,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@ -47,41 +47,41 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to create a sign and encrypt key? "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Segur que voleu crear una clau de signatura i xifratge? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -89,7 +89,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -99,35 +99,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -135,40 +135,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
@@ -178,33 +182,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -264,7 +268,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
@@ -397,20 +401,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -420,131 +424,131 @@
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "La clau ha estat substituïda"
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -553,180 +557,166 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "fitxer d'opcions «%s»: %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -734,9 +724,9 @@
 "@Ordres:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -746,52 +736,52 @@
 "Opcions:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -801,33 +791,33 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -840,19 +830,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -865,7 +855,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -875,59 +865,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "activa una clau"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -937,7 +927,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@ -948,7 +938,7 @@
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -980,7 +970,7 @@
 msgstr "error en la creació de la contrasenya: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1028,28 +1018,28 @@
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
 # bolcats de memòria?  ivb
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
 # Indi. ivb
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -1111,7 +1101,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
@@ -1247,7 +1237,7 @@
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1336,44 +1326,44 @@
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificat correcte"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificat invàlid"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "la versió és desconeguda"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "No hi ha ajuda disponible per a `%s'"
@@ -1383,7 +1373,7 @@
 msgid "ignoring garbage line"
 msgstr "error en l'última línia\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "[no establert]"
@@ -1393,99 +1383,127 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr ""
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "error de lectura"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "la línia és massa llarga\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "l'argument és invàlid"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "l'armadura és invàlida"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "les ordres entren en conflicte\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opcions d'importació no vàlides\n"
 
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: common/argparse.c:379
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "no forçat"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "les ordres entren en conflicte\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "dades inesperades"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "opcions d'importació no vàlides\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-# Gènere?  Nombre?  Passat, futur?  ivb
-# Probablement és una clau, femení. jm
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "no forçat"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "fitxer d'opcions «%s»: %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1501,42 +1519,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1731,14 +1748,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@ -1781,26 +1798,26 @@
 msgid "server uses an invalid certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
@@ -1811,27 +1828,27 @@
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
 # Parts?  Peces?  ivb
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
@@ -1839,221 +1856,221 @@
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2061,183 +2078,183 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2302,8 +2319,8 @@
 msgstr "Clau pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
@@ -2328,58 +2345,64 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2388,36 +2411,36 @@
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2425,7 +2448,7 @@
 "ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "simètric.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
@@ -2529,7 +2552,7 @@
 msgstr "%s: es descarta: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2569,289 +2592,295 @@
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Empremta digital:"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "genera un nou parell de claus"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2862,7 +2891,7 @@
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2892,13 +2921,13 @@
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2918,7 +2947,7 @@
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2926,591 +2955,579 @@
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3710,7 +3727,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
@@ -3720,7 +3737,7 @@
 msgid "key %s: %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3744,7 +3761,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
@@ -3759,7 +3776,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3830,18 +3847,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -3854,69 +3871,69 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clau %08lX: falta la clau pública: no es pot aplicar el certificat\n"
 "de revocació\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
@@ -3924,22 +3941,22 @@
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -3947,153 +3964,217 @@
 "«%s»\n"
 "\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació "
 "%08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Signatura correcta de \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "es descarta «%s»: %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "L'ID d'usuari «%s» està revocat."
+msgstr[1] "L'ID d'usuari «%s» està revocat."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 signatura no comprovada per falta de clau\n"
+msgstr[1] "1 signatura no comprovada per falta de clau\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d signatures errònies\n"
+msgstr[1] "%d signatures errònies\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Signatura correcta de \""
+msgstr[1] "Signatura correcta de \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
@@ -4357,8 +4438,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -4581,7 +4662,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
@@ -4639,7 +4720,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
@@ -4727,7 +4808,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
@@ -4775,110 +4856,125 @@
 msgid "Nothing to sign.\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr ""
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4886,19 +4982,19 @@
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4908,19 +5004,19 @@
 "      causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4929,38 +5025,38 @@
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4968,37 +5064,37 @@
 msgstr[0] "S'ha esborrat %d signatura.\n"
 msgstr[1] "S'ha esborrat %d signatura.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "L'ID d'usuari «%s» està revocat."
 msgstr[1] "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5007,43 +5103,43 @@
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5051,273 +5147,269 @@
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr ""
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, 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:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5331,169 +5423,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notació de signatura: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva una clau"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5509,7 +5601,7 @@
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5525,42 +5617,42 @@
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, 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:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5568,12 +5660,12 @@
 "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:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5584,7 +5676,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5601,50 +5693,50 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 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:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5655,7 +5747,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5672,35 +5764,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5712,13 +5804,13 @@
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5726,70 +5818,70 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, 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:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 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:5209
+#: g10/keygen.c:5213
 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:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5799,7 +5891,7 @@
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5808,7 +5900,7 @@
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5816,23 +5908,23 @@
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
@@ -5869,22 +5961,6 @@
 msgstr[0] "%d signatures errònies\n"
 msgstr[1] "%d signatures errònies\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d signatures errònies\n"
-msgstr[1] "%d signatures errònies\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 signatura no comprovada per falta de clau\n"
-msgstr[1] "1 signatura no comprovada per falta de clau\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5904,30 +5980,30 @@
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5961,7 +6037,7 @@
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
@@ -6014,424 +6090,424 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "s'està sol·licitant la clau %08lX de %s\n"
 msgstr[1] "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6440,7 +6516,7 @@
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -6448,32 +6524,32 @@
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "la classe de signatura és desconeguda"
@@ -6510,78 +6586,78 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6634,7 +6710,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
@@ -6950,12 +7026,12 @@
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
@@ -7013,27 +7089,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari anònim.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificació antiga del DEK no està suportada\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7224,7 +7300,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7297,32 +7373,32 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -7353,24 +7429,24 @@
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -7399,7 +7475,7 @@
 "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
 "a signatures!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -7447,12 +7523,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
@@ -7462,12 +7538,12 @@
 msgid "can't lock '%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -7485,104 +7561,104 @@
 msgstr "%s: el directori no existeix!\n"
 
 # No em passe! ;)  ivb
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, 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:878
+#: g10/tdbio.c:880
 #, 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:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, 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:983
+#: g10/tdbio.c:985
 #, 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:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, 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:1591
+#: g10/tdbio.c:1593
 #, 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:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, 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:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
@@ -7959,113 +8035,113 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "fins ara s'han processat %lu claus\n"
 msgstr[1] "fins ara s'han processat %lu claus\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8073,24 +8149,24 @@
 msgstr[0] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 msgstr[1] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -8206,110 +8282,125 @@
 "List, export, import Keybox data\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "canvia la contrasenya"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "canvia la contrasenya"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, 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:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "elimina claus de l'anell públic"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -8317,55 +8408,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, 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:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8375,27 +8454,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8403,124 +8482,124 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 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:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, 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"
 
 # Ídem.  ivb
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "l'URI no és suportada"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "La generació de claus ha fallat: %s\n"
 msgstr[1] "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8538,378 +8617,400 @@
 msgid "|N|Initial New PIN"
 msgstr "Introduïu el nom d'usuari: "
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "ajuda"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: no s'ha pogut accedir: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        signatures noves: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, fuzzy, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+# Gènere?  Nombre?  Passat, futur?  ivb
+# Probablement és una clau, femení. jm
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "no forçat"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "error: l'empremta digital és invàlida\n"
@@ -8925,7 +9026,7 @@
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8938,137 +9039,137 @@
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9211,7 +9312,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -9236,135 +9337,135 @@
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9375,48 +9476,48 @@
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omet aquesta clau\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9436,7 +9537,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error en crear «%s»: %s\n"
@@ -9446,42 +9547,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9511,7 +9607,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9541,38 +9637,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "error en la creació de la contrasenya: %s\n"
+msgid "algorithm:"
+msgstr "armadura: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9643,548 +9739,549 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Certificat invàlid"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "error en l'última línia\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "certificat duplicat: esborrat"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 # No em passe! ;)  ivb
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "error reading dir record for LID %lu: %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "error al llegir el registre de directori per al LID %lu: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "l'algoritme de dispersió és invàlid «%s»\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "la resposta de l'agent és invàlida\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "converting S-expression failed: %s\n"
 msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "lid ?: la inserció ha fallat: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "lid ?: la inserció ha fallat: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -10223,66 +10320,66 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 #| msgid "bad certificate"
 msgid "validate a certificate"
 msgstr "el certificat és incorrecte"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 #| msgid "bad certificate"
 msgid "lookup a certificate"
 msgstr "el certificat és incorrecte"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "Certificat invàlid"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "Certificat correcte"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10290,70 +10387,70 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "no es pot fer stat de «%s»: %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
@@ -10364,19 +10461,19 @@
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10402,95 +10499,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Voleu eixir sense desar? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10503,80 +10600,80 @@
 "@\n"
 "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
@@ -10585,225 +10682,219 @@
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "no forçat"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "                sense ID: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          host '%s'\n"
 msgstr "                sense ID: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "              importades: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "AVÍS: esteu usant memòria insegura!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "error en crear l'anell «%s»: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10854,7 +10945,7 @@
 msgid "malloc failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10987,12 +11078,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: no s'ha pogut accedir: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -11062,7 +11147,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -11092,33 +11177,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11159,101 +11244,101 @@
 msgid "certificate chain is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -11453,302 +11538,238 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualitza la base de dades de confiança"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr ""
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Ordres:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "desxifratge correcte\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "desxifratge correcte\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Ordres:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [nom_del_fitxer]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "desxifratge correcte\n"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#, fuzzy
+#~ msgid "encryption modus"
+#~ msgstr "desxifratge correcte\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+#~ msgid "program filename"
+#~ msgstr "--store [nom_del_fitxer]"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s no és permés amb %s!\n"
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s no és permés amb %s!\n"
 
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "no es pot crear el directori «%s»: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "no s'ha pogut obrir %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "error en la lectura de «%s»: %s\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "no hi ha suport per a l'execució remota de programes\n"
-
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
-
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
-
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
-
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "no s'ha pogut crear «%s»: %s\n"
-
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "no s'ha pogut crear «%s»: %s\n"
-
-#: tools/symcryptrun.c:566
-#, fuzzy, c-format
-msgid "could not fork: %s\n"
-msgstr "%s: no s'ha trobat l'usuari: %s\n"
-
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "could not fork: %s\n"
+#~ msgstr "%s: no s'ha trobat l'usuari: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "%s: no s'ha creat l'anell: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "no s'ha pogut crear «%s»: %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "%s: no s'ha creat l'anell: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "l'algoritme de protecció %d%s no està suportat\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "error en la creació de la contrasenya: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11839,36 +11860,6 @@
 #~ msgstr "ha fallat l'actualització: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "signatura %s, algorisme de resum %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Signatura correcta de \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "es descarta «%s»: %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "L'ID d'usuari «%s» està revocat."
-#~ msgstr[1] "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Signatura correcta de \""
-#~ msgstr[1] "Signatura correcta de \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
@@ -13015,9 +13006,6 @@
 #~ msgid "file delete error"
 #~ msgstr "error en l'eliminació del fitxer"
 
-#~ msgid "unexpected data"
-#~ msgstr "dades inesperades"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflicte de data"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/cs.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/cs.gmo sont différents
diff -Nru gnupg2-2.2.20/po/cs.po gnupg2-2.2.27/po/cs.po
--- gnupg2-2.2.20/po/cs.po	2020-03-20 15:40:32.000000000 +0100
+++ gnupg2-2.2.27/po/cs.po	2021-01-11 18:47:17.000000000 +0100
@@ -4,7 +4,7 @@
 # Magda Procházková <magda@math.muni.cz> 2001,
 # Roman Pavlik <rp@tns.cz> 2001, 2002, 2003, 2004, 2005.
 # Petr Pisar <petr.pisar@atlas.cz>, 2009, 2010, 2011, 2013, 2014, 2015, 2016.
-# Petr Pisar <petr.pisar@atlas.cz>, 2017, 2018, 2019.
+# Petr Pisar <petr.pisar@atlas.cz>, 2017, 2018, 2019, 2020.
 #
 # A "%%0A" is used by Pinentry to insert a line break. The double percent
 # sign is actually needed because it is also a printf format string. If you
@@ -36,10 +36,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg2 2.2.16\n"
+"Project-Id-Version: gnupg2 2.2.22\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2019-07-05 20:26+02:00\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-08-31 18:53+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <gnupg-i18n@gnupg.org>\n"
 "Language: cs\n"
@@ -48,7 +48,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@ -59,45 +59,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Zrušit"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ano"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Ne"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Uložit do správce hesel"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Opravdu chcete učinit heslo na obrazovce viditelným?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Zviditelnit heslo"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skrýt heslo"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -107,37 +107,37 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvalita textu zde zadaného.\n"
 "Na podrobnosti ohledně kritérií se zeptejte svého správce."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Prosím, zadejte váš PIN, aby pro tuto relaci mohl být odemknut tajný klíč"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klíč"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
@@ -145,36 +145,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pokus %d z %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Znovu:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN je příliš dlouhý"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Heslo je příliš dlouhé"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak v PINu"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN je příliš krátký"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Špatný PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
@@ -183,31 +187,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "nelze vytvořit „%s“: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nelze otevřít „%s“: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -268,7 +272,7 @@
 "Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klíč%%0A   %s%%0A   %s"
 "%%0Auvnitř úložiště klíčů gpg-agenta"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
@@ -397,17 +401,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Varování: Zadali jste nebezpečné heslo."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Pro ochranu svého nového klíče,%0Aprosím, zadejte heslo"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -415,134 +419,134 @@
 "@Volby:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "poběží v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "poběží v režimu dohledu"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "upovídaný režim"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|načíst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "použít pro server soubor s protokolem"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NÁZEV|přijímat některé příkazy přes NÁZEV"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "nedovolit použít vnější úložiště na hesla"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "znemožnit volajícímu přebít pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "umožnit zadání hesla skrze Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "zapnout podporu pro OpenSSH"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "zapnout podporu pro PuTTY"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
 "připomínky k překladu hlaste na <gnupg-i18n@gnupg.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -550,147 +554,135 @@
 "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
 "Správa tajných klíčů pro @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "soubor s možnostmi „%s“: %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "čtou se možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Poznámka: „%s“ není uvažovaná možnost\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent již běží – nový nebude spuštěn\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba při získávání soli pro socket\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba při přilepování socketu na „%s“: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "přístupová práva „%s“ nelze nastavit: %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "naslouchá se na socketu „%s“\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nelze vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obsluha 0x%lx pro fd %d spuštěna\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obsluha 0x%lx pro fd %d ukončena\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH obsluha 0x%lx pro fd %d spuštěna\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH obsluha 0x%lx pro fd %d ukončena\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "v této relaci neběží žádný gpg-agent\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Použití: gpg-preset-passphrase [volby] KEYGRIP (-h pro nápovědu)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -698,8 +690,8 @@
 "Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
 "Správa dočasné paměti pro hesla\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -707,9 +699,9 @@
 "@Příkazy:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -719,11 +711,11 @@
 "Volby:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Použití: gpg-protect-tool [VOLBY] (-h pro nápovědu)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -731,15 +723,15 @@
 "Syntaxe: gpg-protect-tool [volby] [argumenty]\n"
 "Nástroj na správu tajných klíčů\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Prosím, vložte heslo, abyste zpřístupnili objekt PKCS#12."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Prosím, vložte heslo, abyste ochránili nový objekt PKCS#12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -747,7 +739,7 @@
 "Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
 "GnuPG."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -755,18 +747,18 @@
 "Prosím, vložte heslo nebo PIN\n"
 "potřebný pro dokončení této operace."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "zrušeno\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba při ptaní se na heslo: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba při otevírání „%s“: %s\n"
@@ -776,32 +768,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "soubor „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ignorováno sdělení „%s“ z „%s“, řádku %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systémový důvěryhodný seznam „%s“ není dostupný\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chybný otisk v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "neplatný příznak klíče v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba při čtení „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "chyba při čtení seznamu důvěryhodných kořenových certifikátů\n"
@@ -814,7 +806,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -823,11 +815,11 @@
 "Věříte bezmezně, že%%0A  „%s“%%0Ařádně ověřuje identitu uživatele při "
 "vydávání certifikátu?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Ano"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Ne"
@@ -840,7 +832,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -851,35 +843,35 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "V pořádku"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Špatně"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Poznámka: Toto heslo nikdy nebylo změněno.%0AProsím, nyní jej změňte."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "Toto heslo se nezměnilo%%0Aod %.4s-%.2s-%.2s. Prosím, nyní jej změňte."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Změnit heslo"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Změním jej později"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -887,11 +879,11 @@
 msgstr ""
 "Opravdu chcete smazat klíč určený pomocí keygripu%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Smazat klíč"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -899,12 +891,12 @@
 "Pozor: Tento klíč je též veden jako klíč pro SSH!\n"
 "Smazání tohoto klíče může odebrat schopnost přistupovat ke vzdáleným strojům."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA vyžaduje, aby délka hashe byla násobkem 8 bitů\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s klíč používá nebezpečný (%ubitový) hash\n"
@@ -914,7 +906,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zubitový hash není platný pro %ubitový %s klíč\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
@@ -924,7 +916,7 @@
 msgid "secret key parts are not available\n"
 msgstr "tajné části klíče nejsou dostupné\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algoritmus %d (%s) veřejného klíče není podporován\n"
@@ -953,7 +945,7 @@
 msgstr "chyba při vytváření proudu pro rouru: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
@@ -999,29 +991,29 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problém v nastavování voleb gpg-agenta\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytváření core souborů: %s\n"
 
 # TODO: i18n of first %s
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Varování: vlastnictví %s „%s“ není nastaveno bezpečně\n"
 
 # TODO: i18n of first %s
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "čekání, až se soubor „%s“ stane přístupným…\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
@@ -1081,7 +1073,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "při pokusu alokovat %lu bajtů došla paměť"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba při alokování dostatečného množství paměti: %s\n"
@@ -1194,7 +1186,7 @@
 msgstr "algoritmus: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nepodporovaný algoritmus: %s"
@@ -1269,39 +1261,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Kořenový certifikát je důvěryhodný"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "pro certifikát nebyl nalezen žádný CRL"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "dostupný CRL je příliš starý"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "Kontrola certifikátů proti CRL/OCSP"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Zahrnuté certifikáty"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Žádné položky auditního protokolu."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Neznámá operace"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent je použitelný"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr je použitelný"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Nápověda pro „%s“ není dostupná.'"
@@ -1310,7 +1302,7 @@
 msgid "ignoring garbage line"
 msgstr "ignoruji řádek s nepořádkem"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[neuvedeno]"
 
@@ -1319,83 +1311,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný radix64 znak %02x byl přeskočen\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "argument nebyl očekáván"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "chyba při čtení"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "klíčové slovo je příliš dlouhé"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "postrádám argument"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "neplatný argument"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "neplatný příkaz"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "neplatný definice aliasu"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "nedostatek paměti"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "neplatný příkaz"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "neznámý příkaz „%s“\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "neočekávaná data"
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "neplatný parametr"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "postrádám argument u volby „%.50s“\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný argument u volby „%.50s“\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "volba „%.50s“ nečeká argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "neplatný příkaz „%.50s“\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "volba „%.50s“ není jednoznačná\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "příkaz „%.50s“ není jednoznačný\n"
 
-# Yet another expression for `not enough memory' :)
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "nedostatek paměti\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parametr „%.50s“\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "soubor s možnostmi „%s“: %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1411,43 +1434,42 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "převod z „%s“ na „%s“ se nezdařil: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nebylo možné vytvořit dočasný soubor „%s“: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "odstraňuji starý zamykací soubor (vytvořil %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "čekám na zámek (drží ho %d%s) %s…\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(uváznutí?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "zámek „%s“ nebyl vytvořen: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "čekám na zámek %s…\n"
 
 # První argument je název knihovny
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s je příliš stará (potřeba %s, přítomna %s)\n"
@@ -1630,75 +1652,67 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Poznámka: Restartovat je můžete příkazem „%s“.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s není v souladu s režimem %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "v této relaci neběží žádný dirmngr\n"
 
 #: g10/call-dirmngr.c:243
-#, fuzzy, c-format
-#| msgid "option '%s' may not be used in %s mode\n"
+#, c-format
 msgid "keyserver option \"%s\" may not be used in %s mode\n"
-msgstr "volba „%s“ se nesmí používat v režimu %s\n"
+msgstr "volba serveru s klíči „%s“ se nesmí používat v režimu %s\n"
 
 #: g10/call-dirmngr.c:417
 msgid "WKD uses a cached result"
-msgstr ""
+msgstr "WKD používá zapamatované výsledky"
 
 #: g10/call-dirmngr.c:420
 msgid "Tor is not running"
-msgstr ""
+msgstr "To neběží"
 
 #: g10/call-dirmngr.c:422
-#, fuzzy
-#| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
-msgstr "„%s“ není řádný otisk\n"
+msgstr "Tor není řádně nastaven"
 
 #: g10/call-dirmngr.c:424
-#, fuzzy
-#| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
-msgstr "„%s“ není řádný otisk\n"
+msgstr "DNS není řádně nastaveno"
 
 #: g10/call-dirmngr.c:426
 msgid "unacceptable HTTP redirect from server"
-msgstr ""
+msgstr "nepřijatelné přesměrování HTTP serverem"
 
 #: g10/call-dirmngr.c:428
 msgid "unacceptable HTTP redirect from server was cleaned up"
-msgstr ""
+msgstr "nepřijatelné přesměrování HTTP serverem bylo odklizeno"
 
 #: g10/call-dirmngr.c:430
-#, fuzzy
-#| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
-msgstr "vytvořit revokační certifikát"
+msgstr "server používá neplatný certifikát"
 
-#: g10/call-dirmngr.c:437
-#, fuzzy, c-format
-#| msgid "armor: %s\n"
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
+#, c-format
 msgid "Note: %s\n"
-msgstr "ASCII kódování: %s\n"
+msgstr "Poznámka: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP karta není dostupná: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta číslo %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nelze provést v dávkovém režimu\n"
@@ -1708,136 +1722,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Resetační kód není nebo už není dostupný\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Váš výběr? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[není nastaveno]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
-msgstr ""
+msgstr "Pan"
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
-msgstr ""
+msgstr "Paní"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "není vyžadováno"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "vyžadováno"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V současné verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak „<“ nelze použít.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: Více mezer není povoleno.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Příjmení držitele karty: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Jméno (křestní) držitele karty: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jméno a příjmení je příliš dlouhé (limit je %d znaků).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL pro získání veřejného klíče: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "chyba při čtení „%s“: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Login (jménu účtu): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Privátní DO data: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Jazykové předvolby: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
-msgstr ""
+msgstr "Oslovení (M = Pan, F = Paní, nebo mezera): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatná odpověď.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "Otisk CA: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: chybně utvořené otisk.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s klíčem není možná: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "toto není OpenPGP karta"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba při získání informací o aktuálním klíči: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Přepsat existující klíč? (a/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1848,97 +1862,97 @@
 "dokumentace\n"
 "          své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou délku klíče si přejete? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost klíče %s musí být v intervalu %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Mění se atribut kartového klíče pro: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Podepisovací klíč\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Šifrovací klíč\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Autentizační klíč\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh klíče, který chcete:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Neplatný výběr.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Karta bude nyní přenastavena na generování klíče typu: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "chyba při změně atributu klíče %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "chyba při získání informací o kartě: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Tento příkaz není touto kartou podporován\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvořit zálohu šifrovacího klíče mimo kartu? (A/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Přepsat existující klíče? (a/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1949,168 +1963,166 @@
 "   PIN = „%s“     PIN správce = „%s“\n"
 "Měli byste je změnit příkazem --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosím, vyberte druh klíče, který chcete generovat:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovací klíč\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Šifrovací klíč\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentizační klíč\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Prosím vyberte, kam uložit klíč:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Volání KEYTOCARD selhalo: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Poznámka: Tento příkaz zničí všechny klíče uložené na kartě!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Pokračovat (a/N) "
 
 # The code expects non-localized "yes"
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba při nastavování KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "ukončit toto menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "zobraz příkazy správce"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "vypiš všechna dostupná data"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "změní jméno majitele karty"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "změní URL pro získání klíče"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "získá klíč specifikovaný v URL karty"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "změnit login name"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "změnit jazykové předvolby"
 
-#: g10/card-util.c:2178
-#, fuzzy
-#| msgid "change card holder's sex"
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
-msgstr "změní pohlaví držitele karty"
+msgstr "změní oslovení držitele karty"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "vypsat otisk certifikační autority"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "vytvořit nový pár klíčů"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "nabídka pro změnu anebo odblokování PINu"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "ověř PIN a vypiš všechna data"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokovat PIN pomocí resetačního kódu"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "zničit všechny klíče a data"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "nastavit KDF pro autentizaci kódem PIN"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "změnit atribut klíče"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "pouze příkazy správce\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "příkazy správce jsou povoleny\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "příkazy správce nejsou povoleny\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný příkaz (zkuste „help“)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "„%s“ nelze otevřít\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klíč „%s“ nenalezen: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2174,8 +2186,8 @@
 msgstr "podklíče"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
@@ -2201,55 +2213,61 @@
 msgstr ""
 "abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba při vytváření hesla: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v režimu S2K nelze použít symetrický ESK paket\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "použití šifry: %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "„%s“ je již zkomprimován\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "hashovací algoritmus „%s“ se nesmí používat v režimu %s\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "čte se z „%s“\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROVÁNÍ: klíč %s není vhodný pro šifrování v režimu %s\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2258,38 +2276,38 @@
 "VAROVÁNÍ: vyžádaný komprimační algoritmus %s (%d) nevyhovuje předvolbám "
 "příjemce\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zašifrovaný pro: „%s“\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "volba „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zašifrovaná data\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrováno neznámým algoritmem %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROVÁNÍ: zpráva byla zašifrována slabým klíčem v symetrické šifře.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problém se zašifrovaným paketem\n"
@@ -2384,7 +2402,7 @@
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "zapisuje se do „%s“\n"
@@ -2419,263 +2437,269 @@
 msgid "[User ID not found]"
 msgstr "[ID uživatele nenalezeno]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "„%s“ automaticky získáno přes %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "chyba při získávání „%s“ přes %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Chybí otisk"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "zjišťuje se nová kopie zastaralého klíče skrze %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajný klíč „%s“ nenalezen: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(zkontrolujte argument volby „%s“)\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Pozor: jako výchozí klíč se nepoužije „%s“: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "jako výchozí tajný klíč pro podepisování se použije „%s“\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "všechny hodnoty předány „%s“ se ignorují\n"
 
 # c-format
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatný klíč %s změněn na platný pomocí --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používám podklíč %s místo primárního klíče %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "platné hodnoty pro volbu „%s“:\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "vytvořit podpis v čitelném dokumentu"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "vytvořit podpis oddělený od dokumentu"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "šifrovat data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "šifrování pouze se symetrickou šifrou"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "dešifrovat data (implicitně)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "vypsat seznam klíčů"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "vypsat seznam klíčů a podpisů"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy klíčů"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klíčů a otisků"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klíčů"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "vytvořit nový pár klíčů"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "rychle vytvořit nový pár klíčů"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "rychle přidat novou identitu uživatele"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "rychle odvolat identitu uživatele"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "rychle nastavit nové datum konce platnosti"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "komplexní vytvoření páru klíčů"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "vytvořit revokační certifikát"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "odstranit klíč ze souboru veřejných klíčů"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klíč ze souboru tajných klíčů"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "rychle podepsat klíč"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "rychle lokálně podepsat klíč"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "rychle odvolat identitu uživatele"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "podepsat klíč"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "podepsat klíč lokálně"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klíč"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "změnit heslo"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exportovat klíče"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exportovat klíče na server klíčů"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importovat klíče ze serveru klíčů"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "vyhledat klíče na serveru klíčů"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klíče ze serveru klíčů"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importovat/sloučit klíče"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|HODNOTA|nastavit TOFU politiku klíči"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "vytvořit výstup zapsaný v ASCII"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "použít kanonický textový režim"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "neprovádět žádné změny"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "vyžádat potvrzení před přepsáním"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "použít chování striktně podle OpenPGP"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2683,7 +2707,7 @@
 "@\n"
 "(Pro úplný seznam všech příkazů a voleb nahlédněte do manuálové stránky.)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2703,11 +2727,11 @@
 " --list-keys [jména]        ukázat klíče\n"
 " --fingerprint [jména]      ukázat otisky\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2717,7 +2741,7 @@
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2725,79 +2749,79 @@
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Veřejný klíč: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Šifra: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použití: %s [přepínače] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví domovského adresáře „%s“ není nastaveno bezpečně\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví konfiguračního souboru „%s“ není nastaveno bezpečně\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpečně\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VAROVÁNÍ: přístupová práva pro domovský adresář „%s“ nejsou bezpečná\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva pro konfigurační soubor „%s“ nejsou bezpečná\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VAROVÁNÍ: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpečná\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
 "nebezpečně\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2805,21 +2829,21 @@
 "VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
 "nebezpečně\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
 "nebezpečně\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
 "nastavena bezpečně\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2827,7 +2851,7 @@
 "VAROVÁNÍ: přístupová práva k adresáři „%s“ s konfiguračním souborem nejsou "
 "nastavena bezpečně\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
@@ -2835,480 +2859,469 @@
 "nastavena bezpečně\n"
 
 # c-format
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznámá konfigurační položka „%s“\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klíčů"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při výpisu podpisů"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "ukazovat odvolané a prošlé podklíče při výpisu klíčů"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klíči při výpisu klíčů"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámá TOFU politika „%s“\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Poznámka: %s není pro normální použití!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "„%s“ není správná e-mailová adresa\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný režim pinentry „%s“\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný původ požadavku „%s“\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klíčů\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatná volba filtru: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při ověřování podpisu"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při ověřování podpisů"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "ukazovat jen primární ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "ověřovat podpisy s daty PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s přepíše %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpečnou pamětí vzhledem k %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí být větší než 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí být větší než 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Poznámka: jednoduchý režim S2K (0) je důrazně nedoporučován\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný režim S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funkční s %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "hashovací algoritmus „%s“ se nesmí používat v režimu %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "kompresní algoritmus „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVÁNÍ: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "nelze použít --symmetric --encrypt v režimu %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --sign --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "nelze použít --symmetric --sign --encrypt v režimu %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klíče se nepodařil: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export jako SSH klíč se nepodařil: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba při rozboru názvu klíče „%s“: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "„%s“ nevypadá jako platné ID klíče, otisk klíče nebo keygrip\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "POZOR: nezadán žádný příkaz. Váš záměr bude odhadnut…\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Začněte psát svou zprávu…\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikační politiku je neplatné\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|SOUBOR|brát klíče z klíčenky (keyringu) SOUBOR"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varování při konfliktu časového razítka"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGORITMUS|zamítnout podpisy založené na ALGORITMU"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Použití: gpg [volby] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3359,7 +3372,7 @@
 
 #: g10/import.c:193
 msgid "ignore key-signatures which are not self-signatures"
-msgstr ""
+msgstr "ignorovat podpisy klíče, které nepodepisují samy sebe"
 
 #: g10/import.c:196
 msgid "run import filters and export key immediately"
@@ -3503,7 +3516,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klíč %s: chybí identifikátor uživatele\n"
@@ -3513,7 +3526,7 @@
 msgid "key %s: %s\n"
 msgstr "klíč %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "zamítnut kontrolou při importu"
 
@@ -3538,7 +3551,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "může to být způsobeno chybějícím podpisem klíče jím samým\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
@@ -3553,7 +3566,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
@@ -3623,17 +3636,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klíč %s: „%s“ beze změn\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klíč %s: tajný klíč importován\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "klíč %s: tajný klíč již existuje\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klíč %s: chyba při odesílání dat agentovi: %s\n"
@@ -3646,228 +3659,301 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "tajný klíč %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import tajných klíčů není povolen\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Důvod nebyl specifikován"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Klíč je nahrazen"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Klíč byl zkompromitován"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Klíč se již nepoužívá"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Identifikátor uživatele již neplatí"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "důvod pro revokaci: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "revokační poznámka: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klíč %s: „%s“ revokační certifikát importován\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "klíč %s: nepodporovaný algoritmus veřejného klíče u uživatelského ID „%s“\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klíč %s neplatný podpis klíče jím samým u uživatelského ID „%s“\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "klíč %s: neplatný podpis klíče jím samým (direct key signature)\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klíč %s: neplatná vazba podklíče\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klíč %s: neexistuje podklíč pro odvolání klíče\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klíč %s: neplatný odvolací podklíč\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klíč %s: vícenásobná odvolání podklíče smazáno\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klíč %s: podklíč přeskočen\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klíč %s: podpis není exportovatelný (třída %02X) - přeskočeno\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "klíč %s: revokační certifikát na špatném místě - přeskočeno \n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klíč %s: neplatný revokační certifikát: %s - přeskočen\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klíč %s: podpis podklíče na špatném místě - přeskočeno \n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klíč %s: neočekávaná podpisová třída (0x%02X) - přeskočeno\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VAROVÁNÍ: klíč %s může být odvolán: zkouším získat revokační klíč %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROVÁNÍ: klíč %s může být odvolán: revokační klíč %s nenalezen.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "chyba při alokování paměti: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "karta nepodporuje hashovací algoritmus %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Dobrý podpis od"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "klíč %s: %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+#| msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Uživatelské ID „%s“: odstraněn %d podpis\n"
+msgstr[1] "Uživatelské ID „%s“: odstraněny %d podpisy\n"
+msgstr[2] "Uživatelské ID „%s“: odstraněno %d podpisů\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d podpis neověřen, protože chybí klíč\n"
+msgstr[1] "%d podpisy neověřeny, protože chybí klíče\n"
+msgstr[2] "%d podpisů neověřeno, protože chybí klíče\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d špatný podpis\n"
+msgstr[1] "%d špatné podpisy\n"
+msgstr[2] "%d špatných podpisů\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Dobrý podpis od"
+msgstr[1] "Dobrý podpis od"
+msgstr[2] "Dobrý podpis od"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "chyba při vytváření schránky na klíče (keybox) „%s“: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "schránka na klíče (keybox) „%s“ vytvořena\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "soubor klíčů (keyring) „%s“ vytvořen\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "zdroj bloku klíče „%s“: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "chyba při otevírání databáze klíčů: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
@@ -4109,8 +4195,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Skutečně podepsat? (a/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
@@ -4302,7 +4388,7 @@
 "  s „t“ pro důvěryhodný podpis (tsign) nebo „nr“ pro neodvolatelný\n"
 "  podpis (nrsign) nebo libovolnou jejich kombinací (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Klíč je odvolán."
 
@@ -4355,7 +4441,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu přesunout primární klíč? (a/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právě jeden klíč.\n"
 
@@ -4431,7 +4517,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Ukončit bez uložení? (a/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klíč nebyl změněn, takže není potřeba jej aktualizovat.\n"
@@ -4474,104 +4560,119 @@
 msgid "Nothing to sign.\n"
 msgstr "Nic na podepsání.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Nepodepsáno vámi.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "„%s“ není platná doba expirace\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "„%s“ není řádný otisk\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklíč „%s“ nenalezen\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Uživatelský ID formátu PGP 2.x nemá žádné předvolby\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "V %s byl následující klíč odvolán %s klíčem %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento klíč může být odvolán %s klíčem %s "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "odvolán: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skončila: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skončí: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "číslo karty: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Tento klíč byl označen za neplatný (disabled)"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4580,17 +4681,17 @@
 "být nutně správné, dokud znova nespustíte program.\n"
 
 # status
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "odvolán"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "platnost skončila"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4599,17 +4700,17 @@
 "VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární.  Tento příkaz\n"
 "              může způsobit, že za primární bude považováno jiné user ID.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Dobu platnosti také můžete změnit.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4618,35 +4719,35 @@
 "VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
 "         verzích PGP vést k odmítnutí tohoto klíče.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Neměli by jste přidávat fotografický ID k PGP2 klíči.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4654,20 +4755,20 @@
 msgstr[1] "Smazány %d podpisy.\n"
 msgstr[2] "Smazáno %d podpisů.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4675,17 +4776,17 @@
 msgstr[1] "Uživatelské ID „%s“: odstraněny %d podpisy\n"
 msgstr[2] "Uživatelské ID „%s“: odstraněno %d podpisů\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4694,275 +4795,271 @@
 "VAROVÁNÍ: Toto je PGP2 klíč. Přidání pověřeného odvolatele může v některých\n"
 "          verzích PGP vést k odmítnutí tohoto klíče.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "K PGP2 klíči byste neměli přidávat pověřeného odvolatele.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor pověřeného odvolatele: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klíč formátu PGP 2.x nelze pověřit odvoláním\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "klíč nelze pověřit odvoláním sama sebe\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento klíč již byl určen jako odvolatel\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROVÁNÍ: ustanovení klíče pověřeným odvolatelem je nevratná operace!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jistí, že tento klíč chcete pověřit odvoláním? (a/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Jste si jistí, že chcete změnit dobu expirace více podklíčům? (a/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklíče.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klíče.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemůžete změnit dobu platnosti klíče verze 3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Mění se účel podklíče.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Mění se účel primárního klíče.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podepisovací podklíč %s je již křížově certifikován\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "podklíč %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "přeskočen v3 podpis klíče jím samým u uživatelského id „%s“\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klíčů: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete přepsat? (a/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Pokračovat (a/N)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklíč s indexem %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podepsáno vaším klíčem %s v %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jisti, že jej chcete stále odvolat? (a/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Nepodepsáno vámi.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste následující identifikátory uživatele: %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "odvoláno vaším klíčem %s v %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se odvolat tyto podpisy:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíč\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
-msgstr "pokud odvolat ID neuživatele: %s\n"
+msgstr "pokus odvolat ID neuživatele: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již odvoláno\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVÁNÍ: podpis ID uživatele je datován %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klíč %s je již odvolán.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklíč %s je již odvolán.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "neplatný argument u volby „%s“\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "duplicita předvolby „%s“\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "příliš mnoho předvoleb pro šifrování\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "příliš mnoho předvoleb pro vzorkování\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "příliš mnoho předvoleb pro komprimaci\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisuji podpis klíče sebou samým\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisuji „key-binding“ podpis\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná délka klíče; použiji %u bitů\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "délka klíče zaokrouhlena na %u bitů\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -4970,19 +5067,19 @@
 "VAROVÁNÍ: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
 "dlouhým hashem\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Podepisování"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certifikování"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Šifrování"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Autentizace"
 
@@ -4996,162 +5093,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro klíč %s lze provést: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Aktuálně povolené akce: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost šifrovat\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA a RSA (implicitní)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA a Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (pouze pro šifrování)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro šifrování)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastní použití)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastní použití)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC a ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (pouze pro podpis)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (nastavit si vlastní použití)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (pouze pro šifrování)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Existující klíč\n"
 
-#: g10/keygen.c:1974
-#, fuzzy, c-format
-#| msgid "   (%d) Existing key from card\n"
+#: g10/keygen.c:1973
+#, c-format
 msgid "  (%d) Existing key from card\n"
-msgstr "   (%d) Klíč existující na kartě\n"
+msgstr "  (%d) Klíč existující na kartě\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Vložte keygrip: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Není platným keygripem (očekáváno 40 šestnáctkových číslic)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Klíč s takovým keygripem neexistuje\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "chyba při čtení z karty: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Sériové číslo karty: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Dostupné klíče:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "klíč %s může mít délku v intervalu %u až %u bitů.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Jakou délku podklíče si přejete? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná délka klíče je %u bitů.\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5167,7 +5263,7 @@
 "      <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:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5183,38 +5279,38 @@
 "      <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:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Klíč je platný po? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný pro? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Platnost klíče nikdy neskončí\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskončí\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost klíče skončí v %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skončí v %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5222,11 +5318,11 @@
 "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:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Je to správně (a/N)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5241,7 +5337,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5257,49 +5353,49 @@
 "    „Magda Prochazkova (student) <magda@domena.cz>“\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Jméno a příjmení: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve jméně\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Znaky „%s“ a „%s“ se ve jméně nesmí objevit\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Jméno nemůže začínat číslicí\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Komentář: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentáři\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Používáte znakovou sadu „%s“.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5310,7 +5406,7 @@
 "    „%s“\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5325,33 +5421,33 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Změnit (J)méno, (E)-mail, (P)okračovat dál nebo (U)končit? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Nejdřív, prosím, opravte chybu\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5364,13 +5460,13 @@
 "používat disky); díky tomu má generátor lepší šanci získat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoření klíče se nepodařilo: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5381,64 +5477,64 @@
 "    „%s“\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Pokračovat (A/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Klíč pro „%s“ již existuje\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Přesto vytvořit? (a/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "přesto se vytváří\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Poznámka: Pro komplexní tvorbu klíče použijte „%s %s“.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváření klíče bylo zrušeno.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "záložní soubor „%s“ nelze vytvořit: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, 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"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "veřejný klíč se zapisuje do „%s“\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, 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:5209
+#: g10/keygen.c:5213
 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:5225
+#: g10/keygen.c:5229
 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"
@@ -5446,7 +5542,7 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5454,7 +5550,7 @@
 "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:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5462,22 +5558,22 @@
 "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:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Poznámka: vytvoření podklíčů pro klíče v3 není v souladu s OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajné části primárního klíče nejsou dostupné.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvořit? (a/N) "
 
@@ -5513,22 +5609,6 @@
 msgstr[1] "%d dobré podpisy\n"
 msgstr[2] "%d dobrých podpisů\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d špatný podpis\n"
-msgstr[1] "%d špatné podpisy\n"
-msgstr[2] "%d špatných podpisů\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d podpis neověřen, protože chybí klíč\n"
-msgstr[1] "%d podpisy neověřeny, protože chybí klíče\n"
-msgstr[2] "%d podpisů neověřeno, protože chybí klíče\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5549,29 +5629,29 @@
 msgid "Keyring"
 msgstr "Soubor klíčů (keyring)"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Otisk primárního klíče:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "         Otisk podklíče:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "  Otisk primárního klíče:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "          Otisk podklíče:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "          Otisk klíče ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "  Sériové číslo karty ="
 
@@ -5604,7 +5684,7 @@
 msgstr[1] " (%lu podpisy)\n"
 msgstr[2] " (%lu podpisů)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor klíčů (keyring) vytvořen\n"
@@ -5655,7 +5735,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "„%s“ není ID klíče: přeskočeno\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5663,136 +5743,136 @@
 msgstr[1] "aktualizují se %d klíče z %s\n"
 msgstr[2] "aktualizuje se %d klíčů z %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVÁNÍ: nelze aktualizovat klíč %s prostřednictvím %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klíč „%s“ nebyl na serveru klíčů nalezen\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klíč nebyl na serveru klíčů nalezen\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "požaduji klíč %s z %s serveru %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požaduji klíč %s z %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "není znám žádný server s klíči\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "přeskočen „%s“: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "posílám klíč %s na %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požaduje se klíč z „%s“\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivná velikost šifrovacího klíče pro sezení (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s zašifrovaný klíč sezení\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphrase) generováno s použitím neznámého algoritmu %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "veřejný klíč je %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data zašifrována veřejným klíčem: správný DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zašifrována %u-bitovým %s klíčem, ID %s, vytvořeným %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      „%s“\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrováno %s klíčem, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrování veřejným klíčem selhalo: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrováno s heslem %lu\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrováno jedním heslem\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "předpokládám %s šifrovaných dat\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA není dostupný; optimisticky se jej pokusíme nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVÁNÍ: zpráva nebyla chráněna proti porušení její integrity\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5801,310 +5881,311 @@
 "Pokyn: Pokud tato zpráva byla vytvořena před rokem 2003, je pravděpodobné,\n"
 "že je legitimní. Tehdy se totiž ochrana integrity příliš nepoužívala.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Dešifrování lze vynutit volbou „%s“.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "vynucené dešifrování selhalo!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrování o.k.\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrování selhalo: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Poznámka: odesílatel považoval data za důvěrná („for-your-eyes-only“)\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "původní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatný revokační certifikát – použijte „gpg --import“, chcete-li jej "
 "užít\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "nenalezen žádná podpis\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATNÝ podpis od „%s“"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršenou platností od „%s“"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od „%s“"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potlačena\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvořen %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               použití %s klíče %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvořen %s pomocí klíče %s s ID uživatele %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               vydavatel „%s“\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Klíč k dispozici na: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
-msgstr ""
+msgstr "Poznámka: Použijte „%s“ pro využití těchto údajů\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[nejistý]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias „%s“"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "POZOR: Tento klíč se nehodí na podepisování v režimu %s\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skončila %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skončí %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binární formát"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "neznámý formát"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", algoritmus klíče"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "POZOR: nejedná se o oddělený podpis. Soubor „%s“ NEBYL ověřen!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ověřit podpis: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto není podpis oddělený od dokumentu\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVÁNÍ: detekováno více podpisů. Kontrolován bude pouze první.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis třídy 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "volání fstat nad „%s“ selhalo v %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VAROVÁNÍ: používám experimentální algoritmus veřejného klíče %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "VAROVÁNÍ: Podepisovací a šifrovací klíče Elgamal se nedoporučují\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VAROVÁNÍ: používám experimentální šifrovací algoritmus %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROVÁNÍ: používám experimentální hashovací algoritmus %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROVÁNÍ: vyžádaný algoritmus %s není doporučen\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Poznámka: podpisy používající algoritmus %s jsou zamítány\n"
 
-#: g10/misc.c:370
-#, fuzzy, c-format
-#| msgid "Note: signatures using the %s algorithm are rejected\n"
+#: g10/misc.c:376
+#, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
-msgstr "Poznámka: podpisy používající algoritmus %s jsou zamítány\n"
+msgstr ""
+"Poznámka: podpisy klíče třetí strany používající algoritmus %s jsou "
+"zamítány\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(nahlášená chyba: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(nahlášená chyba: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(podrobnosti: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROVÁNÍ: používání parametru „%s“ se nedoporučuje\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "použijte místo něj „%s%s“ \n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROVÁNÍ: používání příkaz „%s“ se nedoporučuje - nepoužívejte jej\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: „%s“ je v tomto souboru zastaralý – účinkuje pouze v %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje kromě v %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Nezkomprimováno"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "nezkomprimováno|nic"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpráva nemusí být s %s použitelná\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "nejednoznačná volba „%s“\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámá volba „%s“\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "U veřejného klíče ECDSA se očekává, že v kódování SEC bude délka násobkem 8 "
 "bitů\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznámý slabý hashovací algoritmus „%s“\n"
@@ -6137,70 +6218,70 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "v „%s“ se předpokládají podepsaná data\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem veřejného klíče %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROVÁNÍ: potencionálně nebezpečně symetricky zašifrován klíč sezení\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Neznámá kritická notace podpisu: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpacket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problém s agentem: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Vložit heslo\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "zrušeno uživatelem\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID hlavního klíče %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Prosím, zadejte heslo, abyste odemkli tajný klíč OpenPGP:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Prosím, zadejte heslo, abyste mohli importovat tajný klíč OpenPGP:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný podklíč OpenPGP:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klíč OpenPGP:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Opravdu chcete trvale smazat tajný klíč podklíče OpenPGP:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Opravdu chcete trvale smazat tajný klíč OpenPGP:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6256,7 +6337,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie správná (a/N/u)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
@@ -6554,12 +6635,12 @@
 msgid "no valid addressees\n"
 msgstr "žádné platné adresy\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@ -6613,27 +6694,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "dobrá, my jsme anonymní adresát.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "staré kódování DEK není podporováno\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "šifrovací algoritmus %d%s je neznámý nebo je zneplatněn\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "VAROVÁNÍ: v předvolbách příjemce nenalezen šifrovací algoritmus %s\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Poznámka: platnost tajného klíče %s skončila v %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Poznámka: klíč byl odvolán"
@@ -6826,7 +6907,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "klíč %s se nesmí používat v režimu %s\n"
@@ -6903,29 +6984,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Poznámka: podpisový klíč %s byl odvolán\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "špatný podpis klíče klíčem %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "špatný podpis dat klíčem %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "předpokládám špatný podpis klíčem %s, protože je nastaven neznámý kritický "
 "bit\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klíč %s: neexistuje podklíč pro revokaci podklíče\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klíč %s: podklíč který je svázán s podpisem neexistuje\n"
@@ -6954,12 +7035,12 @@
 "VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
 "Použity neexpandované.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: „%s“\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6967,12 +7048,12 @@
 "VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
 "příjemce\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude použito šifrování %s\n"
@@ -7000,7 +7081,7 @@
 "toto je PGP klíč vygenerovaný podle algoritmu Elgamal,\n"
 "podpisy vytvořené tímto klíčem nejsou bezpečné!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "záznam důvěry %lu, typ %d: zápis selhal: %s\n"
@@ -7045,12 +7126,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "chyba při čtení v „%s“: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáze důvěry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "pro „%s“ nelze vytvořit zámek\n"
@@ -7060,12 +7141,12 @@
 msgid "can't lock '%s'\n"
 msgstr "„%s“ nelze zamknout\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, 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"
@@ -7080,103 +7161,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresář neexistuje!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "k „%s“ nelze přistoupit: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvořena neplatná databáze důvěry\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: databáze důvěry vytvořena\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Poznámka: do databáze důvěry nelze zapisovat\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatná databáze důvěry\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodařilo se vytvořit hashovací tabulku: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba při aktualizaci záznamu verze: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba při čtení záznamu verze: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, 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:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "databáze důvěry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: není soubor databáze důvěry\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: záznam verze s číslem %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatná verze souboru %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, 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:1822
+#: g10/tdbio.c:1824
 #, 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:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulování záznamu selhalo: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: přidání záznamu selhalo: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Chyba: Databáze důvěry je poškozena.\n"
@@ -7577,98 +7658,98 @@
 msgstr ""
 "POZOR: Šifruje se pro %s, kterýžto nemá neodvolané identity uživatele\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "„%s“ není platný dlouhý keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klíč %s: akceptován jako důvěryhodný klíč\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klíč %s se v databázi důvěry vyskytuje více než jednou\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "klíč %s: nenalezen veřejný klíč k důvěryhodnému klíči – přeskočeno\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klíč %s označen jako absolutně důvěryhodný.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "záznam důvěry %lu, typ pož. %d: čtení selhalo: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "záznam důvěry %lu není požadovaného typu %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Databázi důvěry můžete zkusit znovu vytvořit pomocí těchto příkazů:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Pokud to nebude fungovat, prosím, nahlédněte do návodu\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze použít neznámý model důvěry (%d) – předpokládáme použití modelu %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "použití modelu důvěry %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "není nutné kontrolovat databázi důvěry\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "další kontrola databáze důvěry v %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "není nutné kontrolovat databázi důvěry s modelem „%s“\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "veřejný klíč %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "prosím proveďte --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontroluji databázi důvěry\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7676,7 +7757,7 @@
 msgstr[1] "zpracovány %d klíče"
 msgstr[2] "zpracováno %d klíčů"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7684,17 +7765,17 @@
 msgstr[1] " (vymazána %d počítadla platnosti)\n"
 msgstr[2] " (vymazáno %d počítadel platnosti)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "veřejný klíč k absolutně důvěryhodnému klíči %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7702,7 +7783,7 @@
 "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat záznam v databázi důvěry: chyba při zápisu: %s\n"
@@ -7813,57 +7894,72 @@
 "Syntaxe: kbxutil [volby] [soubory]\n"
 "Vypisuje, exportuje, importuje schránku na klíče (keybox).\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sČíslo: %s%%0ADržitel: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Zbývá pokusů: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Prosím, zadejte PIN klíče určeného na tvorbu kvalifikovaných podpisů."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Prosím, zadejte PIN pro standardní klíče."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback skončila chybou: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN ještě nebyl změněn\n"
 
 # TRANSLATORS: Do not translate the "|*|" prefixes but keep
 # them verbatim at the start of the string.  */
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Prosím, zadejte nový PIN pro standardní klíče."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Prosím, zadejte PIN pro standardní klíče."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Prosím, zadejte nový kód pro odblokování (PUK) standardních klíčů."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Prosím, zadejte kód pro odblokování (PUK) standardních klíčů."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Prosím, zadejte nový PIN klíče určeného na tvorbu kvalifikovaných podpisů."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-"||Prosím, zadejte PIN klíče určeného na tvorbu kvalifikovaných podpisů."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7871,7 +7967,7 @@
 "|NP|Prosím, zadejte nový kód pro odblokování (PUK) klíče určeného na tvorbu "
 "kvalifikovaných podpisů."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7879,47 +7975,47 @@
 "|NP|Prosím, zadejte kód pro odblokování (PUK) klíče určeného na tvorbu "
 "kvalifikovaných podpisů."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, 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:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "uložení otisku se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "uložení data vytvoření se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba při získání CHV z karty\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpověď neobsahuje modulus RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpověď neobsahuje veřejný exponent RSA\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "odpověď neobsahuje veřejný klíč EC\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpověď neobsahuje veřejný klíč\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "čtení veřejného klíče se nezdařilo: %s\n"
@@ -7927,55 +8023,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sČíslo: %s%%0ADržitel: %s%%0APočítadlo: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sČíslo: %s%%0ADržitel: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Zbývá pokusů: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "použije se výchozí PIN jako %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "použití výchozího PINu jako %s selhalo: %s – vypínám jeho budoucí použití\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Prosím, odemkněte kartu"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "ověření CHV%d se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzamčena!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7989,24 +8073,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Prosím, zadejte PIN správce"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "přístup k příkazům správce není nakonfigurován\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Prosím vložte PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Prosím, zadejte resetační kód karty"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Resetační kód je příliš krátký; minimální délka je %d\n"
@@ -8014,87 +8098,87 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nový resetační kód"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nový PIN správce"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Nový PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Prosím, zadejte PIN správce a nový PIN správce"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Prosím, zadejte PIN a nový PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "chyba při čtení aplikačních dat\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "chyba při čtení otisku DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "klíč již existuje\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existující klíč bude přepsán\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "generování nového klíče\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "nový klíč se zapisuje\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "chybí časové razítko vytvoření\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze uložit klíč: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nepodporovaná křivka\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "prosím počkejte než bude klíč vygenerován…\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "generování klíče se nezdařilo\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8102,33 +8186,33 @@
 msgstr[1] "generování klíče dokončeno (%d sekundy)\n"
 msgstr[2] "generování klíče dokončeno (%d sekund)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "otisk na kartě se neshoduje s požadovaným\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nepodporuje hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvořené podpisy: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "ověření PIN správce je nyní prostřednictvím tohoto příkazu zakázáno\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@ -8144,55 +8228,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Prvotní nový PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "pracovat ve více serverové režimu (na popředí)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|SOUBOR|zapisovat protokol do SOUBORU"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|připojit se na čtečku na portu N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "NÁZEV|použít NÁZEV jako ovladač ct-API"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "NÁZEV|použít NÁZEV jako ovladač PC/SC"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "nepoužívat vnitřní ovladač CCID"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|odpojovat se od karty po N sekundách nečinnosti"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "nepoužívat klávesnici čtečky"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "zakázat používání správcovských příkazů karty"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "používat vstup o proměnné délce na klávesnici čtečky"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8200,282 +8284,300 @@
 "Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
 "Démon pro čipové karty (smartcard) pro @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsluha pro deskriptor %d spuštěna\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukončena\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "certifikátem vyžadovaný ověřovací model: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "řetězený"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "jednovrstvý"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritické rozšířené certifikátu %s není podporováno"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "certifikát vydavatele není označen jako CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "politika označená jako kritická bez nastavených politik"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "„%s“ nebylo možné otevřít: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Poznámka: nekritické certifikační politiky nejsou dovoleny"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certifikační politika není dovolena"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "otisk se nepodařilo získat\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "hledám vydavatele na jiném místě\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "počet odpovídajících vydavatelů: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "authorityInfoAccess nelze získat: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "hledám vydavatele ve vyrovnávací paměti Dirmngr\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "počet odpovídajících certifikátů: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "hledání klíče pouze ve vyrovnávací paměti dirmngr neuspělo: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "alokace popisovače keyDB se nezdařila\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "certifikát byl odvolán"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "status certifikáty není znám"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "prosím, ujistěte se, že „dirmngr“ je správně nainstalován\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola CRL se nezdařila: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikát s chybnou platností: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikát ještě nenabyl platnosti"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "kořenový certifikát ještě nezačal platit"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "mezilehlý certifikát ještě nezačal platit"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikátu vypršela platnost"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "kořenový certifikát je prošlý"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "mezilehlý certifikát je prošlý"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "chybí povinné atributy certifikátu: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certifikát s neplatnou platností"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nebyl vytvořen v době životnosti certifikátu"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikát nebyl vytvořen v době životnosti vydavatele"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mezilehlý certifikát nebyl vytvořen v době životnosti vydavatele"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       podpis vytvořen "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (   certifikát vytvořen "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (   certifikát planý od "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (   vydavatel platný od "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "otisk=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "kořenový certifikát byl nyní označen za důvěryhodný\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "v gpg-agentu není povoleno interaktivní označování za důvěryhodný\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktivní označovaní jako důvěryhodný je pro tuto relaci zakázáno\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "VAROVÁNÍ: datum vytvoření podpisu není známo – předpokládám současnost"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "v certifikátu nebyl nalezen vydavatel"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "certifikát podepsaný sám sebou má ŠPATNÝ podpis"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "kořenový certifikát není označen jako důvěryhodný"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "řetěz certifikátů je příliš dlouhý\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certifikát vydavatele nebyl nalezen"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikát má ŠPATNÝ podpis"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "nalezen jiný možný odpovídající certifikát autority – zkusí se znovu"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "řetěz certifikátů je delší než dovoluje CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikát je v pořádku\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mezilehlý certifikát je v pořádku\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kořenový certifikát je v pořádku\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "přepínám do řetězeného modelu"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "použit ověřovací model: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%ubitový hash není platná pro %ubitový %s klíč\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+# Yet another expression for `not enough memory' :)
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "nedostatek paměti\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(toto je algoritmus MD2)\n"
@@ -8484,27 +8586,27 @@
 # none serial, none date
 # #-#-#-#-#  cs.po (dirmngr 1.0.3)  #-#-#-#-#
 # status
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "žádný"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Chyba – neplatné kódování]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Chyba – nedostatek paměti]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Chyba – Žádné jméno]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Chyba – neplatné DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8518,138 +8620,138 @@
 "sériové číslo %s, ID 0x%08lX,\n"
 "vytvořen %s, platnost vyprší %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "žádné použití klíče není určeno – předpokládají se všechna použití\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "chyba při zjišťování informací o použití klíče: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikát neměl být použit pro certifikování\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikát neměl být použit pro podepsání OCSP odpovědi\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikát neměl použit pro šifrování\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikát neměl být použit pro podepsání\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikát není použitelný pro šifrování\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikát není použitelný pro podepisování\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "řádek %d: neplatný algoritmus\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "řádek %d: neplatná délka klíče %u (platná je %d až %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "řádek %d: nezadán žádný název subjektu\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "řádek %d: neplatný název subjektu „%.*s“\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "řádek %d: neplatný název subjektu „%s“ na pozici %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "řádek %d: neplatná e-mailová adresa\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "řádek %d: neplatné sériové číslo\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "řádek %d: neplatný název vydavatele „%.*s“\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "řádek %d: neplatný název vydavatele „%s“ na pozici %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "řádek %d: zadáno neplatné datum\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr ""
 "řádek %d: chyba při získávání podpisového klíče podle keygripu „%s“: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "řádek %d: zadán neplatný algoritmus hashe\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "řádek %d: neplatný identifikátor klíče autority\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "řádek %d: neplatný identifikátor klíče subjektu\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "řádek %d: neplatná syntaxe rozšíření\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "řádek %d: chyba při čtení klíče „%s“ z karty: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "řádek %d: chyba při získávání klíče podle keygripu „%s“: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "řádek %d: generování klíče se nepodařilo: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8783,7 +8885,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikát „%s“ nebyl nenalezen: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba při zamykání schránky na klíče: %s\n"
@@ -8808,123 +8910,123 @@
 msgid "no valid recipients given\n"
 msgstr "(nebyli zadáni Žádní platní příjemci)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "vypsat seznam externích klíčů"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "vypsat řetěz certifikátů"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "importovat certifikáty"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "exportovat certifikáty"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "zaregistrovat čipovou kartu"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "předat příkaz do dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "vyvolat gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "vytvářet výstup zakódovaný pomocí Base-64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "předpokládat vstup ve formátu PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "předpokládat vstup ve formátu Base-64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "předpokládat vstup v binárním formátu"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "nikdy nenahlížet do CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "kontrolovat platnost pomocí OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|počet certifikátů, které zahrnout"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|SOUBOR|vzít politiky ze SOUBORU"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "nekontrolovat politiky certifikátu"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "stahovat chybějící certifikáty vydavatelů"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "vůbec nepoužívat terminál"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy se neptat"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "předpokládat ano na většinu otázek"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "předpokládat ne na většinu otázek"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|SOUBOR|přidat klíčenku na seznam klíčenek"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klíč"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|použít tento server pro dohledávání klíčů"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NÁZEV|použít šifrovací algoritmus NÁZEV"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NÁZEV|použít hashovací algoritmus NÁZEV"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8934,47 +9036,47 @@
 "Podepisuje, ověřuje, šifruje nebo dešifruje pomocí protokolu S/MIME.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Poznámka: nebude možné šifrovat pro „%s“: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámý model ověřování „%s“\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: nebyl zadán název stroje\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: zadáno heslo bez uživatele\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: přeskakuji tento řádek\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "nelze rozebrat serveru klíčů\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importují se běžné certifikáty „%s“\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nelze podepsat pomocí „%s“: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@ -8994,7 +9096,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "základní kontrola certifikátu selhala – neimportováno\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba při získání uložených příznaků: %s\n"
@@ -9004,42 +9106,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "chyba při importování certifikátu: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba při čtení vstupu: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "otisk se nepodařilo získat\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problém při hledání existujícího certifikátu: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba při hledání zapisovatelné keyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba při ukládání certifikátu: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problém při opakovaném hledání certifikátu: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba při ukládání příznaků: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Chyba – "
 
@@ -9075,7 +9172,7 @@
 "\n"
 "%s%sJste si skutečně jisti, že to chcete udělat?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9111,39 +9208,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola kvalifikovaného certifikátu selhala: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Podpis vytvořen "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[datum neudáno]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " pomocí certifikátu s ID 0x%08lX\n"
+msgid "algorithm:"
+msgstr "algoritmus:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "neplatný podpis: atribut otisku zprávy se neshoduje s vypočteným otiskem\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Dobrý podpis od"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "          alias"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Toto je kvalifikovaný podpis\n"
@@ -9214,277 +9311,277 @@
 msgstr "chyba při zavádění certifikátu „%s“: %s\n"
 
 # XXX: Align with msgid "runtime cached certificates:"
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
-msgstr "   trvale zavedených certifikátů: %u\n"
+msgstr "     trvale zavedených certifikátů: %u\n"
 
 # XXX: Align with msgid "permanently loaded certificates:"
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
-msgstr "za běhu nakešovaných certifikátů: %u\n"
+msgstr "za běhu zapamatovaných certifikátů: %u\n"
 
 # XXX: Align with msgid "permanently loaded certificates:"
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
-msgstr "       důvěryhodných certifikátů: %u (%u,%u,%u,%u)\n"
+msgstr "         důvěryhodných certifikátů: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certifikát již v keši\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "certifikát uložen do keše\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "chyba při ukládání certifikátu do keše: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "neplatný řetězec otisku SHA1 „%s“\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "chyba při stahování certifikátu určeného sériovým číslem: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "chyba při stahovaní certifikátu určeného subjektem: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "v certifikátu nebyl nalezen vydavatel\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "chyba při zjišťování authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "vytváří se adresář „%s“\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "chyba při vytváření adresáře „%s“: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "adresář databáze „%s“ se ignoruje\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "chyba při čtení adresáře „%s“: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "odstraňuje se soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "soubor „%s“ nebude neodstraněn\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba při zavírání souboru keše: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "otevření kešového dir souboru „%s“ selhalo: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "chyba při vytváření nového kešového dir souboru „%s“: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "chyba při zápisu nového kešového dir souboru „%s: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "chyba při uzavírání nového kešového dir souboru „%s“: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "nový kešový dir soubor „%s“ vytvořen\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "znovu otevření kešového dir souboru „%s“ selhalo: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "první záznam „%s“ není verze\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "stará verze adresáře s keší – bude vyčištěna\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "stará verze adresáře s keší – nelze pokračovat\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "nalezena nadbytečná položka v záznamu CRL „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "nalezen neplatný řádek %2$u v „%1$s\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "nalezena duplicitní položka v „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "nepodporovaný typ záznamu v „%s“ na řádku %u přeskočen\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "neplatný haš vydavatele v „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "v „%s“ na řádku %u chybí DN vydavatele\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "neplatné časové razítko v „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "POZOR: neplatný haš souboru keše v „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "v kešovém dir souboru nalezeny chyby\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "prosím, zjistěte příčinu a soubor ručně smažte\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "vytvoření dočasného kešového dir souboru „%s“ selhalo: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "chyba při uzavírání „%s“: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "chyba při přejmenování „%s“ na „%s“: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nelze vypočítat haš „%s“: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "chyba při nastavování hašovacího kontextu MD5: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "chyba při výpočtu haše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "chybně formátovaný kontrolní součet souboru „%s“\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "otevřeno příliš mnoho kešových souborů, další již nelze otevřít\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "otevírá se kešový soubor „%s“\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "chyba při otevírání kešového souboru „%s“: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "chyba při inicializaci kešového souboru „%s pro čtení: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "unlock_db_file zavoláno na zavřený soubor\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "unlock_db_file zavoláno na nezamčeném souboru\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "výroba nového objektu keše selhala: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "pro vydavatele s ID %s není dostupný žádný CRL\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
-"nakešovaný CRL pro vydavatele s ID %s příliš starý; aktualizace vyžadována\n"
+"zapamatovaný CRL pro vydavatele s ID %s příliš starý; aktualizace "
+"vyžadována\n"
 
 # TODO: plural
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9493,7 +9590,7 @@
 "force-crl-refresh je aktivováno a %d minut uplynulo vydavateli s ID %s, "
 "aktualizace je požadována\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
@@ -9502,192 +9599,195 @@
 
 # CRL for issuer překládat jako CRL pro vydavatele, prože CRL může mít jiného
 # vydavatele než je vydavatel odvolaných certifikátů (tzv. indirect CRL)
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "dostupný CRL pro vydavatele ID %s nemůže být použit\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
-"nakešovaný CRL pro vydavatele ID %s je pozměněný, je třeba jej aktualizovat\n"
+"zapamatovaný CRL pro vydavatele ID %s je pozměněný, je třeba jej "
+"aktualizovat\n"
 
 # XXX: The message is followed by the serial number
 # TODO: Use c-format
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "POZOR: neplatná délka záznamu v keši pod sériovým číslem "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "problém se čtením záznamu keše pro sériové číslo %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "sériové číslo %s není platné, důvod=%02X  datum=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "sériové číslo %s je platné, není na seznamu CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "chyba při získávání dat ze souboru keše: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "neznámý hašovací algoritmus „%s“\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "gcry_md_open selhalo na algoritmu %d: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "z libksba obdržen neplatný S-výraz\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "převod S-výrazu se nezdařil: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "neznámý hašovací algoritmus „%s“\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open selhalo na algoritmu %d: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "výroba S-výrazu selhala: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse selhal: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "chyba při zjišťování časů aktualizace CRL %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "časy aktualizace tohoto CRL: tento=%s příští=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate neuvedeno, předpokládaná perioda platnosti bude jeden den\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "chyba při získávání položky CRL: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "chyba vkládání položky do dočasného souboru keše: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "v CRL nebyl nalezen žádný vydavatel CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "certifikát vydavatele CRL bude hledán podle authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "ověřování podpisu CRL selhalo: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "chyba při kontrole platnosti certifikátu vydavatele CRL: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "volání ksba_crl_new selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "volání ksba_crl_set_reader selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "odstraněn zastaralý dočasný soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problém s odstraňováním zastaralého dočasného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "chyba při vytváření dočasného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "volání crl_parse_insert selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "chyba při dokončování dočasného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "chyba při uzavírání dočasného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "POZOR: nový CRL je stále příliš starý; jeho platnost vypršela %s – stejně "
 "bude nahrán\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "nový CRL je stále příliš starý; jeho platnost vypršela %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "neznámé kritické rozšíření CRL %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba při čtení rozšíření CRL: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "vytváří se soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problém s přejmenováním „%s“ na „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9696,66 +9796,66 @@
 "aktualizace souboru DIR selhalo – záznam keše bude při příštím startu "
 "programu ztracen\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Zahajuje se výpis CRL (získán přes %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 " CHYBA: CRL nebude použit, protože i po aktualizaci byl příliš starý!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " CHYBA: CRL nebude použit kvůli neznámému kritickému rozšíření!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " CHYBA: CRL nebude použit\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
-msgstr " CHYBA: Tento nakešovaný CRL byl možná pozměněn!\n"
+msgstr " CHYBA: Tento zapamatovaný CRL byl možná pozměněn!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " POZOR: neplatná délka záznamu keše\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problém se čtením záznamu keše: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problém se čtením klíče keše: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "chyba při čtení položky keše z databáze: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Konec výpisu CRL\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "volání crl_fetch přes DP selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "volání crl_cache_insert přes DP selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
@@ -9795,55 +9895,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "dohledání certifikátu nemožné kvůli vypnutému %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "místo CRL použije OCSP"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "zjistí, jestli dirmngr běží"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "přidá certifikát do keše"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "ověří platnost certifikátu"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "vyhledá certifikát"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "hledá pouze mezi lokálně uloženými certifikáty"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "u --lookup očekává URL"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "zavede CRL do dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "zvláštní režim pro použití se Squidem"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "očekává certifikáty ve formátu PEM"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "vynutí použití výchozího OCSP odpovídače"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Použití: dirmngr-client [volby] [cert_soubor|vzor] (-h pro nápovědu)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9855,82 +9955,82 @@
 "Proces vrátí 0, pokud je certifikát platný, 1, pokud není platný nebo jiný\n"
 "chybový kód značící obecné selhání.\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "chyba při čtení certifikátu ze standardního vstupu: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "chyba při čtení certifikátu z „%s“: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "certifikát je příliš velký, než aby dával smysl\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "k dirmngr se nelze připojit: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "hledání selhalo: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "zavádění CRL „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "démon dirmngr běží\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "ověření platnosti certifikátu selhalo: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "certifikát je platný\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "certifikát byl odvolán\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "kontrola certifikátu selhala: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "obdržen status: „%s“\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "chyba při zápisu kódování base64: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "nepodporovaný dotaz „%s“\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "očekáván absolutní název souboru\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "hledá se „%s“\n"
@@ -9955,92 +10055,92 @@
 msgid "flush the cache"
 msgstr "vyprázdní keš"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "běží bez dotazování se uživatele"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "vynutí zavedení zastaralých CRL"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "povolí odesílání OCSP dotazů"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "povolí kontrolu verze softwaru po síti"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "zakáže použití HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "zakáže použití LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignoruje HTTP distribuční místa CRL "
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignoruje LDAP distribuční místa CRL"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|STROJ|pro LDAP dotazy použije STROJ"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "nepoužije náhradní stroje s --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "na seznam serverů přidá nové servery nalezené v místech distribuce CRL"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|nastaví časový limit pro LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|použije OCSP odpovídače na URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|nevrací více jak N položek na jeden dotaz"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|SOUBOR|pro HKP přes TLS použije certifikáty CA ze SOUBORU"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "směrovat veškerý síťový provoz skrz Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10049,11 +10149,11 @@
 "@\n"
 "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10061,133 +10161,133 @@
 "Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
 "Přístup k serveru s klíči, CRL a OCSP z @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "platné úrovně ladění jsou: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "použití: %s [volby] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "stahování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "zpracování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: řádek je příliš dlouhý – přeskočen\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: zjištěn neplatný otisk\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: chyba čtení: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: nepořádek na konci řádku ignorován\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "přijat SIGHUP – konfigurace bude znovu načtena a keš vyprázdněna\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "přijat SIGTERM – vypíná se…\n"
 
 # TODO: plural
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "vypnutí vynuceno\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "přijat SIGINT – okamžité vypnutí\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "přijat signál č. %d – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "vrátí všechny hodnoty v záznamově orientovaném formátu"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NÁZEV|ignoruje část se strojem a připojí se skrze NÁZEV"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NÁZEV|připojí se ke strojí NÁZEV"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|připojí se na port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|JMÉNO|pro autentizaci použije JMÉNO uživatele"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|HESLO|pro autentizaci použije HESLO"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "heslo získá z $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|ŘETĚZEC|dotáže se na DN ŘETĚZEC"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|ŘETĚZEC|jako filtrující výraz použije ŘETĚZEC"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|ŘETĚZEC|vrátí atribut ŘETĚZEC"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Použití: dirmngr_ldap [volby] [URL] (-h pro nápovědu)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10197,144 +10297,138 @@
 "Vnitřní LDAP pomůcka pro pro Dirmngr.\n"
 "Rozhraní a volby se mohou bez upozornění změnit.\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "neplatné číslo portu %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "ve výsledku se hledá atribut „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "chyba při zápisu na standardní výstup: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          dostupný atribut „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "atribut „%s“ nenalezen\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "nalezen atribut „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "zpracovává se URL „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          uživatel „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          heslo „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          stroj „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        filtr „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          atribut „%s“\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "v „%s“ chybí název stroje\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "u dotazu „%s“ nezadán žádný atribut\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "POZOR: použije se pouze první atribut\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "napojení k „%s:%d“ selhalo: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "hledávání „%s“ neuspělo: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "„%s“ není LDAP URL\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "„%s“ není platné LDAP URL\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba přístupu k „%s“: status HTTP %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "příliš mnoho přesměrování\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "přesměrování změněno na „%s“\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "chyba při alokování paměti: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10385,7 +10479,7 @@
 msgid "malloc failed: %s\n"
 msgstr "funkce malloc selhala: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: chybný vzor „%s“\n"
@@ -10515,11 +10609,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "alokace OCSP kontextu selhala: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "authorityInfoAccess nelze získat: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10589,7 +10678,7 @@
 msgstr "v ID certifikátu chybí serialno (sériové číslo)"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "volání assuan_inquire selhalo: %s\n"
@@ -10619,32 +10708,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies (max. odpovědí) %d překročeno\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "řídící strukturu nelze alokovat: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "alokace kontextu assuan selhala: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "inicializace serveru selhala: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "registrace příkazu u Assuanu selhala: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problém příjmu Assuanu: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@ -10682,56 +10771,56 @@
 msgid "certificate chain is good\n"
 msgstr "řetěz certifikátů je v pořádku\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikát neměl být použit pro podepsání CRL\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "stručný výstup"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "vypisovat data v šestnáctkové soustavě"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "dekódovat přijaté datové řádky"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "připojit se k dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NÁZEV|připojit se na socket Assuanu s NÁZVEM"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADRESA|připojit se na socket Assuanu na ADRESE"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "spustit server Assuan zadaný na příkazové řádce"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "nepoužívat rozšířený režim připojení"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|SOUBOR|spustit příkazy ze SOUBORU při startu"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "spustit /subst při startu"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Použití: @GPG@-connect-agent [volby] (-h pro nápovědu)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10739,43 +10828,43 @@
 "Syntaxe: @GPG@-connect-agent [volby]\n"
 "Připojí se na běžícího agenta a odesílá příkazy\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "volba „%s“ vyžaduje program a volitelné argumenty\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "volba „%s“ ignorovaná kvůli „%s“\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "přijímání řádku se nezdařilo: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "řádek je příliš dlouhý – přeskočen\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "řádek zkrácen, protože obsahoval znak \\0\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "neznámý příkaz „%s“\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "odesílání řádku selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba při odesílání standardního parametru: %s\n"
@@ -10872,16 +10961,12 @@
 msgstr "|METODA|používat METODU pro dohledávání klíčů podle e-mailové adresy"
 
 #: tools/gpgconf-comp.c:760
-#, fuzzy
-#| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
-msgstr "importovat klíče ze serveru klíčů"
+msgstr "importovat chybějící klíč z podpisu"
 
 #: tools/gpgconf-comp.c:763
-#, fuzzy
-#| msgid "list and check key signatures"
 msgid "include the public key in signatures"
-msgstr "vypsat a zkontrolovat podpisy klíčů"
+msgstr "zahrnovat veřejný klíč do podpisů"
 
 #: tools/gpgconf-comp.c:770 tools/gpgconf-comp.c:831
 msgid "disable all access to the dirmngr"
@@ -10965,94 +11050,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Poznámka: Podrobnosti získáte příkazem „%s%s“.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Selhalo externí ověření komponenty %s"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Vezměte na vědomí, že určení skupiny se ignoruje\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba při uzavírání „%s“\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba při rozboru „%s“\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "vypsat všechny komponenty"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "zkontrolovat všechny programy"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTA|vypsat volby"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTA|změnit volby"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENTA|zkontrolovat volby"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "aplikovat globální implicitní hodnoty"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|SOUBOR|aktualizovat konfigurační soubory pomocí SOUBORU"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "získat adresáře s nastavením @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "vypsat globální konfigurační soubor"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "zkontrolovat globální konfigurační soubor"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "dotázat se databázi verzí softwaru"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "znovu načíst všechny nebo zadané komponenty"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "spustit zadanou komponentu"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "zabít zadanou komponentu"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "použít jako výstupní soubor"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "provést změny za běhu, pokud to lze"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11060,208 +11145,146 @@
 "Syntaxe: @GPGCONF@ [volby]\n"
 "Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Potřebuji jeden argument určující komponentu"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Komponenta nenalezena"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Žádné argumenty nejsou povoleny"
 
-#: tools/symcryptrun.c:166
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@\n"
-"Příkazy:\n"
-" "
+"Použití: gpg-check-pattern [volby] soubor_se_vzorem (-h pro nápovědu)\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "dešifrovací modus"
+#: tools/gpg-check-pattern.c:150
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
+"Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "šifrovací modus"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "třída nástrojů (Konfucius)"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Příkazy:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "název souboru s programem"
+#~ msgid "decryption modus"
+#~ msgstr "dešifrovací modus"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "soubor s tajným klíčem (nezbytné)"
+#~ msgid "encryption modus"
+#~ msgstr "šifrovací modus"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "název vstupního souboru (implicitně standardní vstup)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "třída nástrojů (Konfucius)"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Použití: symcryptrun [volby]  (-h pro nápovědu)"
+#~ msgid "program filename"
+#~ msgstr "název souboru s programem"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntaxe: symcryptrun --class TŘÍDA --program PROGRAM --keyfile SOUBOR "
-"[VOLBY…] PŘÍKAZ [VSTUPNÍ_SOUBOR]\n"
+#~ msgid "secret key file (required)"
+#~ msgstr "soubor s tajným klíčem (nezbytné)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s nad %s byl ukončen s kódem %i\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "název vstupního souboru (implicitně standardní vstup)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s nad %s selhal s kódem %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Použití: symcryptrun [volby]  (-h pro nápovědu)"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nelze vytvořit dočasný adresář „%s“: %s\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntaxe: symcryptrun --class TŘÍDA --program PROGRAM --keyfile SOUBOR "
+#~ "[VOLBY…] PŘÍKAZ [VSTUPNÍ_SOUBOR]\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s nelze otevřít pro zápis: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s nad %s byl ukončen s kódem %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "chyba při zápisu do %s: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s nad %s selhal s kódem %i\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "chyba při čtení z %s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nelze vytvořit dočasný adresář „%s“: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "chyba při zavírání chyba %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s nelze otevřít pro zápis: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "nebyla zadána volba --program\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "chyba při zápisu do %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "pouze --decrypt a --encrypt jsou podporovány\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "chyba při čtení z %s': %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "nebyla zadána volba --keyfile\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "chyba při zavírání chyba %s: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "nelze alokovat pole argumentů\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "nebyla zadána volba --program\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "nelze vytvořit rouru: %s\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "pouze --decrypt a --encrypt jsou podporovány\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "nelze vytvořit PTY: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "nebyla zadána volba --keyfile\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "nelze se rozdvojit (fork): %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "nelze alokovat pole argumentů\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv selhalo: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "nelze vytvořit rouru: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "služba select() selhala: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "nelze vytvořit PTY: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "čtení selhalo: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "nelze se rozdvojit (fork): %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "čtení z PTY selhalo: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv selhalo: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "služba waitpid() selhala: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "služba select() selhala: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "potomek byl ukončen s kódem %i\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "čtení selhalo: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nelze alokovat řetězec infile: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "čtení z PTY selhalo: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nelze alokovat řetězec outfile: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "služba waitpid() selhala: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "musí být zadáno buď %s, nebo %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "potomek byl ukončen s kódem %i\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "nezadána žádná třída\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nelze alokovat řetězec infile: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "třída %s není podporována\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nelze alokovat řetězec outfile: %s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Použití: gpg-check-pattern [volby] soubor_se_vzorem (-h pro nápovědu)\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "musí být zadáno buď %s, nebo %s\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
-"Prověří heslo zadané na vstupu proti souboru se vzory\n"
+#~ msgid "no class provided\n"
+#~ msgstr "nezadána žádná třída\n"
 
-#, fuzzy
-#~| msgid "option '%s' may not be used in %s mode\n"
-#~ msgid ""
-#~ "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
-#~ msgstr "volba „%s“ se nesmí používat v režimu %s\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "třída %s není podporována\n"
 
 #~ msgid "male"
 #~ msgstr "muž"
@@ -11275,6 +11298,9 @@
 #~ msgid "Sex ((M)ale, (F)emale or space): "
 #~ msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
 
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " pomocí certifikátu s ID 0x%08lX\n"
+
 #~ msgid "no keyserver known (use option --keyserver)\n"
 #~ msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
 
@@ -11800,7 +11826,7 @@
 #~ msgstr "problém s přejmenováním „%s“ na „%s“: %s\n"
 
 #~ msgid " ERROR: This cached CRL may has been tampered with!\n"
-#~ msgstr " CHYBA: Tento nakešovaný CRL byl možná pozměněn!\n"
+#~ msgstr " CHYBA: Tento zapamatovaný CRL byl možná pozměněn!\n"
 
 #~ msgid "URL `%s' redirected to `%s' (%u)\n"
 #~ msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
@@ -12846,9 +12872,6 @@
 #~ msgid "file delete error"
 #~ msgstr "chyba při mazání souboru"
 
-#~ msgid "unexpected data"
-#~ msgstr "neočekávaná data"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "konflikt časového razítka"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/da.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/da.gmo sont différents
diff -Nru gnupg2-2.2.20/po/da.po gnupg2-2.2.27/po/da.po
--- gnupg2-2.2.20/po/da.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/da.po	2021-01-11 18:47:17.000000000 +0100
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2017-11-02 17:39+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -24,7 +24,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@ -35,47 +35,47 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -83,7 +83,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -93,7 +93,7 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@ -102,7 +102,7 @@
 "specialtegn. Spørg din administrator om mere præcis information om\n"
 "hvordan man anvender sikre adgangskoder."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -110,7 +110,7 @@
 "Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -118,17 +118,17 @@
 "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Adgangsfrase:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "matcher ikke - prøv igen"
 
@@ -136,36 +136,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøg %d af %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN er for lang"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Adgangsfrase er for lang"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige tegn i PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN er for kort"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Ugyldig adgangsfrase"
 
@@ -174,33 +178,33 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "kan ikke oprette »%s«: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "kan ikke åbne »%s«: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -263,7 +267,7 @@
 "Indtast venligst en adgangsfrase for at beskytte den modtaget hemmelige nøgle"
 "%%0A   %s%%0A   %s%%0Ainden i gpg-agentens nøglelager"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
@@ -416,17 +420,17 @@
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "være mindst %u tegn langt."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Indtast venligst adgangsfrasen %0Afor at beskytte din nye nøgle"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Indtast venligst den nye adgangsfrase"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -434,144 +438,144 @@
 "@Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "kør i dæmontilstand (baggrunden)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "kør i servertilstand"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "uddybende"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "vær mindre uddybende"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "kommandoresultat i sh-stil"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "kommandoresultat i csh-stil"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "frakobl ikke fra konsollen"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "brug en logfil for serveren"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|brug PGM som PIN-Entry-program"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "brug ikke SCdaemon'en"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørgsler om at ændre TTY'en"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørgsler om at ændre X-skærmen"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "brug ikke PIN-mellemlageret når der underskrives"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "tillad ikke genbrug af gamle adgangsfraser"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 #, fuzzy
 #| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktiver ssh-agent-emulering"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -583,161 +587,147 @@
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "invalid debug-level '%s' given\n"
 msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "tilvalgsfil »%s«: %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "læser tilvalg fra »%s«\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, fuzzy, c-format
 #| msgid "socket name `%s' is too long\n"
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet »%s« er for langt\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent kører allerede - starter ikke en ny\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved indhentelse af nonce for soklen\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 #| msgid "error binding socket to `%s': %s\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "fejl ved binding af sokkel til »%s«: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 #| msgid "listening on socket `%s'\n"
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel »%s«\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "kan ikke oprette mappe »%s«: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "mappe »%s« oprettet\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislykkedes for »%s«: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 #| msgid "can't use `%s' as home directory\n"
 msgid "can't use '%s' as home directory\n"
 msgstr "kan ikke bruge »%s« som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fejl ved læsning af nonce på fd %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "håndtering 0x%lx for fd %d startet\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "håndtering 0x%lx for fd %d termineret\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh-håndtering 0x%lx for fd %d startet\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh-håndtering 0x%lx for %d termineret\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 #| msgid "pth_select failed: %s - waiting 1s\n"
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "pth_select mislykkeds: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Brug: gpg-preset-passphrase [tilvalg] KEYGRIP (-h for hjælp)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -745,8 +735,8 @@
 "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
 "Adgangskode for mellemlagervedligeholdelse\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -754,9 +744,9 @@
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -766,11 +756,11 @@
 "Tilvalg:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Brug: gpg-protect-tool [tilvalg] (-h for hjælp)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -778,17 +768,17 @@
 "Syntaks: gpg-protect-tool [tilvalg] [parametre]\n"
 "Vedligeholdelsesværktøj for hemmelig nøgle\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
 "objektet."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -796,7 +786,7 @@
 "Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
 "GnuPG-systemet."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -804,18 +794,18 @@
 "Indtast venligst adgangsfrasen eller PIN'en\n"
 "krævet for at færdiggøre denne handling."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "afbrudt\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
@@ -827,37 +817,37 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fil »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "udtryk »%s« ignoreret i »%s«, linje %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "troværdig liste for systemet »%s« er ikke tilgængelig\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldigt fingeraftryk i »%s«, linje %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldigt nøgleflag i »%s«, linje %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "fejl ved læsning af »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
@@ -870,7 +860,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -879,11 +869,11 @@
 "Stoler du fuldstændig på at%%0A  \"%s\"%%0Akorrekt certificerer "
 "brugercertifikater?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -896,7 +886,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -908,20 +898,20 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Forkert"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Bemærk: Denne adgangsfrase er aldrig blevet ændret.%0AÆndr den nu."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -930,15 +920,15 @@
 "Denne adgangsfrase er ikke blevet ændret%%0Asiden %.4s-%.2s-%.2s. Ændr den "
 "nu."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Ændr adgangsfrasen"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Jeg ændrer den senere"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -946,24 +936,24 @@
 "%%0A?"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktiver nøgle"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-nøglen bruger en usikker (%u bit) hash\n"
@@ -974,7 +964,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
@@ -984,7 +974,7 @@
 msgid "secret key parts are not available\n"
 msgstr "hemmelige nøgledele er ikke tilgængelige\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1017,7 +1007,7 @@
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
@@ -1068,28 +1058,28 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem ved angivelse af indstillinger for gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slå kernedump fra: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1150,7 +1140,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "ikke nok kerne under allokering af %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fejl ved allokering af nok hukommelse: %s\n"
@@ -1269,7 +1259,7 @@
 msgstr "algoritme: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ikke understøttet algoritme: %s"
@@ -1344,39 +1334,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Rodcertifikat er troværdigt"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "ingen CRL fundet for certifikat"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "den tilgængelige CRL er for gammel"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP-kontrol af certifikater"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Inkluderede certifikater"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Ingen punkter i revisionslog."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Ukendt handling"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent er brugbar"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr er brugbar"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 #| msgid "No help available for `%s'."
 msgid "No help available for '%s'."
@@ -1386,7 +1376,7 @@
 msgid "ignoring garbage line"
 msgstr "ignorerer affaldslinje"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[ingen]"
 
@@ -1395,85 +1385,119 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64-tegn %02x udeladt\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "parameter var ikke forventet"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "læsefejl"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "nøgleord er for langt"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "manglende parameter"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid value\n"
 msgid "invalid argument"
 msgstr "ugyldig værdi\n"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "ugyldig kommando"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "ugyldig aliasdefinition"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "ikke nok kerne"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "ugyldig kommando"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command `%s'\n"
+msgid "unknown meta command"
+msgstr "ukendt kommando »%s«\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "uventet panser: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "ugyldig indstilling"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "tilvalg »%.50s« forventer ikke et argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "ugyldig kommando »%.50s«\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "tilvalg »%.50s« er tvetydigt\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommando »%.50s« er tvetydig\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "uden for kerne\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldigt tilvalg »%.50s«\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "tilvalgsfil »%s«: %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
@@ -1491,45 +1515,44 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 #| msgid "error writing to `%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "fjerner stale-låsfil (oprettet af %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "venter på lås (holdt af %d%s) %s ...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(baglås?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 #| msgid "lock `%s' not made: %s\n"
 msgid "lock '%s' not made: %s\n"
 msgstr "lås »%s« er ikke udført: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s ...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (kræver %s, har %s)\n"
@@ -1721,14 +1744,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Brug venligst kommandoen »toggle« først.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1774,24 +1797,24 @@
 msgid "server uses an invalid certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgængeligt: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnr. %s detekteret\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke udføre dette i jobtilstand\n"
@@ -1801,138 +1824,138 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[ikke indstillet]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fejl: Kun ren ASCII er tilladt i øjeblikket.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fejl: Tegnet »<« må ikke bruges.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fejl: Dobbelt mellemrum er ikke tilladt.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Kortholders efternavn: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fejl: Kombineret navn er for langt (begrænsningen er på %d tegn).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "Adresse hvor offentlig nøgle skal hentes: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "fejl ved læsning af »%s«: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
 msgid "error writing '%s': %s\n"
 msgstr "fejl ved skrivning af »%s«: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Loginddata (kontonavn): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Private DO-data: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Sprogpræferencer: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fejl: ugyldig længde for præferencestreng.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Fejl: ugyldigt svar.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA-fingeraftryk: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nøglehandling er ikke mulig: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Erstat eksisterende nøgle? (j/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1943,110 +1966,110 @@
 "        dokumentationen for dit kort for at se hvilke størrelser, der\n"
 "        er tilladt.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afrundet op til %u bit\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "fejl ved ændring af størrelsen på nøglen %d til %u bit: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Lav sikkerhedskopi et andet sted end på kortet for krypteringsnøglen? (J/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: keys are already stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstat eksisterende nøgler (j/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2061,175 +2084,175 @@
 "   PIN = »%s«     Admin-PIN = »%s«\n"
 "Du bør ændre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Vælg venligst hvilken slags nøgle der skal oprettes:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "vis administratorkommandoer"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "vis denne hjælpetekst"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "vis alle tilgængelige data"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "ændr kortholders navn"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "ændr adresse for at indhente nøgle"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøglen angivet i kortadressen"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "ændr logindnavnet"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "ændr sprogpræferencerne"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ændr kortholders køn"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "ændr et CA-fingeraftryk"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "skift force PIN-flag for underskriften"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "opret nye nøgler"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "menu til at ændre eller fjerne blokering for PIN'en"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "verificer PIN'en og vis alle data"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern blokering for PIN'en med en nulstillingskode"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Kommandoer kun for administratoren\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Administratorkommandoer er tilladt\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Administratorkommandoer er ikke tilladt\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando (prøv »help«)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "kan ikke åbne »%s«\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2292,8 +2315,8 @@
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "opdatering mislykkedes: %s\n"
@@ -2318,40 +2341,54 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "brug tilvalget »--delete-secret-keys« for at slette den først.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan ikke bruge en symmetrisk ESK-pakke på grund af S2K-tilstanden\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "bruger chiffer %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "»%s« allerede komprimeret\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ADVARSEL: »%s« er en tom fil\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "læser fra »%s«\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2359,20 +2396,13 @@
 "ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2381,34 +2411,34 @@
 "ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: »%s«\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruge %s i tilstanden %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterede data\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypteret med ukendt algoritme %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2416,7 +2446,7 @@
 "ADVARSEL: Besked blev krypteret med en svag nøgle i den symmetriske "
 "chiffer.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved håndtering af krypteret pakke\n"
@@ -2515,7 +2545,7 @@
 msgstr "%s: udelod: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2552,280 +2582,286 @@
 msgid "[User ID not found]"
 msgstr "[Bruger-id blev ikke fundet]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 #| msgid "automatically retrieved `%s' via %s\n"
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hentede automatisk »%s« via %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Ingen fingeraftryk"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "opret en underskrift"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "opret en underskrift i klartekst"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "opret en separat underskrift"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "krypter kun med symmetrisk chiffer"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "afkrypter data (standard)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "godkend en underskrift"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "vis nøgler og underskrifter"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "vis nøgler og fingeraftryk"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgler fra den offentlige nøglering"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgler fra den hemmelige nøglering"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "opret et nyt nøglepar"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "underskriv eller rediger en nøgle"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "ændr en adgangsfrase"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "eksporter nøgler"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "eksporter nøgler til en nøgletjener"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "søg efter nøgler på en nøgleserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "opdater alle nøgler fra en nøgleserver"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importer/sammenføj nøgler"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "udskriv kortstatus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "ændr data på et kort"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "ændr et korts PIN"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "vis beskedsammendrag"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|krypter for BRUGER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "brug kanonisk teksttilstand"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv resultat til FIL"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "spørg før overskrivning"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "brug streng OpenPGP-opførsel"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2833,7 +2869,7 @@
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2863,14 +2899,14 @@
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
 # Skal alt dette oversættes eller er det tilvalgene?
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2885,7 +2921,7 @@
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2893,82 +2929,82 @@
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "brug: gpgsm [tilvalg] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab på udvidelse »%s«\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på udvidelse »%s«\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2977,19 +3013,19 @@
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på udvidelse »%s«\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -2999,503 +3035,490 @@
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mapperettigheder på udvidelse »%s«\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 #| msgid "show user ID validity during key listings"
 msgid "show key usage information during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i nøglevisninger"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "BEMÆRK: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "linje %d: ikke en gyldig e-post-adresse\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid pinentry mode '%s'\n"
 msgstr "ugyldig landekode i »%s«, linje %d\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "»%s« er ikke et gyldigt tegnsæt\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "valider underskrifter med PKA-data"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kører med forfalsket systemtid: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "vil ikke køre med usikker hukommelse på grund af %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed skal være større end 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed skal være større end 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth skal være i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldigt default-cert-level; skal være 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: modtagere (-r) angivet uden brug af offentlig nøglekryptering\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering af »%s« mislykkedes: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruge --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruge --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|tag nøglerne fra nøgleringsFILEN"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "giv kun tidsstempelkonflikter en advarsel"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpgv [tilvalg] [filer] (-h for hjælp)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3701,7 +3724,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøgle %s: ingen bruger-id\n"
@@ -3712,7 +3735,7 @@
 msgid "key %s: %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3736,7 +3759,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende egenunderskrift\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
@@ -3751,7 +3774,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbar nøglering fundet: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3822,18 +3845,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nøgle %s: »%s« ikke ændret\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nøgle %s: hemmelig nøgle importeret\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "udelod: hemmelig nøgle er allerede til stede\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -3847,239 +3870,310 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import af hemmelige nøgler er ikke tilladt\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Nøglen er blevet afløst"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Nøglen er blevet kompromitteret"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Nøglen bruges ikke længere"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Bruger-id er ikke længere gyldigt"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "årsag for tilbagekald: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "tilbagekaldskommentar: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nøgle %s: ingen bruger-id for underskrift\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nøgle %s: ikke understøttet offentlig nøglealgoritme på bruger-id »%s«\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nøgle %s: ugyldig egenunderskrift på bruger-id »%s«\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nøgle %s: ingen undernøgle for nøglebinding\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøgle %s: ugyldig undernøglebinding\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nøgle %s: fjernet flerundernøglebinding\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nøgle %s: ingen undernøgle for nøgletilbagekald\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nøgle %s: udeladt bruger-id »%s«\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøgle %s: udeladt undernøgle\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nøgle %s: underskrift der ikke kan eksporteres (klasse 0x%02X) - udeladt\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nøgle %s: tilbagekaldscertifikat på forkert sted - udeladt\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nøgle %s: undernøgleunderskrift på forkert sted - udeladt\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nøgle %s: uventet underskriftklasse (0x%02X) - udeladt\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: nøgle %s kan tilbagekaldes: henter tilbagekaldsnøgle %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: nøgle %s kan tilbagekaldes: tilbagekaldsnøgle %s er ikke til "
 "stede.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "fejl ved allokering af nok hukommelse: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "God underskrift fra"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "udelod »%s«: %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
+msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
+msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d ugyldige underskrifter\n"
+msgstr[1] "%d ugyldige underskrifter\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "God underskrift fra"
+msgstr[1] "God underskrift fra"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating keybox '%s': %s\n"
 msgstr "fejl ved oprettelse af nøgleboks »%s«: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
 msgstr "nøgleboks »%s« oprettet\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "nøglering »%s« oprettet\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "nøgleblokressource »%s«: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
@@ -4328,8 +4422,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "underskrift mislykkedes: %s\n"
@@ -4541,7 +4635,7 @@
 "tnrsign\n"
 "  etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Nøglen er tilbagekaldt."
 
@@ -4597,7 +4691,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Du skal vælge præcis en nøgle.\n"
 
@@ -4675,7 +4769,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? (j/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
@@ -4728,107 +4822,122 @@
 msgid "Nothing to sign.\n"
 msgstr "Intet at underskrive med nøgle %s\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Ikke underskrevet af dig.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Sammendrag: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Nøgleserver no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Fortrukken nøgleserver: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Der er ingen præferencer på en bruger-id i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Den følgende nøgle blev tilbagekaldt den %s af %s nøgle %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "oprettet: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "tilbagekaldt: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "udløbet: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "udløber: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "brug: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "troværdighed: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "validitet: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Denne nøgle er blevet deaktiveret"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4836,17 +4945,17 @@
 "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
 "korrekt med mindre du genstarter programmet.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "tilbagekaldt"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "udløbet"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4855,18 +4964,18 @@
 "ADVARSEL: Intet bruger-id er blevet markeret som primær. Denne kommando\n"
 "        kan medføre at et anden bruger-id bliver den formodede primære.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4876,35 +4985,35 @@
 "medføre at\n"
 "          nogle version af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slet denne gode underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Slet denne ugyldige underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Slet denne ukendte underskrift? (j/n/a)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Virkelig slette denne egenunderskrift? (j/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4912,20 +5021,20 @@
 msgstr[0] "Slettede %d underskrift.\n"
 msgstr[1] "Slettede %d underskrift.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Intet slettet.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruger-id »%s« komprimeret: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -4933,17 +5042,17 @@
 msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
 msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruger-id »%s«: allerede minimeret\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruger-id »%s«: allerede ryddet\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4953,44 +5062,44 @@
 "tilbagekalder\n"
 "          kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Du må ikke tilføje en dedikeret tilbagekalder til en nøgle i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kan ikke udpege en nøgle i PGP 2.x-stil som dedikeret tilbagekalder\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan ikke udpege en nøgle som dets egen dedikerede tilbagekalder\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "denne nøgle er allerede blevet dedikeret som en tilbagekalder\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ADVARSEL: Udpegning af en nøgle som en dedikeret tilbagekalder kan ikke "
 "fortrydes!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5001,247 +5110,243 @@
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "undernøgle %s underskriver ikke og skal derfor ikke være krydscertificeret\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst præcis en bruger-id.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Indtast din foretrukne nøglerserveradresse: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker på, at du ønsker at erstatte den? (j/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker på, at du ønsker at slette den? (j/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Indtast notationen: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Fortsæt? (j/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "underskrevet af din nøgle %s den %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (kan ikke eksporteres)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne underskrift udløb den %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker på, at du ønsker at tilbagekalde den? (j/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Ikke underskrevet af dig.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har underskrevet disse bruger-id'er på nøgle %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (kan ikke tilbagekaldes)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "tilbagekaldt af din nøgle %s på %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøgle\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ADVARSEL: En bruger-id-underskrift er dateret %d sekunder inde i fremtiden\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Du kan ikke slette den sidste bruger-id!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid value for option '%s'\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "præference »%s« duplikeret\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "for mange sammendragpræferencer\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "for mange komprimeringspræferencer\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "ugyldigt punkt »%s« i præferencestreng\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte underskrift\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver egenunderskrift\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver underskrift for nøglebinding\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøglestørrelse afrundet op til %u bit\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5249,19 +5354,19 @@
 "ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
 "sammendragsstørrelse\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Underskriv"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certificer"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Godkend"
 
@@ -5275,110 +5380,110 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "UuKkGfAa"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mulige handligner for en %s-nøgle: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Aktuelt tilladte handlinger: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Skift evnen til at underskrive\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Skift evnen til at kryptere\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Skift evnen til at godkende\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Afsluttet\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA og RSA (standard)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (kun underskriv)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (kun krypter)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (kun krypter)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) DSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (kun krypter)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Eksisterende nøgle\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
@@ -5387,61 +5492,61 @@
 # key grip
 # chiefly  ( US ) See also grip the person in charge of moving and setting up camera
 # tracks and scenery in a film or television studio
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Indtst nøglegrebet: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøgle med dette nøglegreb\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "fejl ved læsning af kort: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serielnummer for kortet: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Tilgængelige nøgler:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "afrundet op til %u bit\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du for undernøglen? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5457,7 +5562,7 @@
 "      <n>m = nøgle udløber om n måneder\n"
 "      <n>y = nøgle udløber om n år\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5473,38 +5578,38 @@
 "      <n>m = underskriften udløber om n måneder\n"
 "      <n>y = underskriften udløber om n år\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Underskrift er gyldig for? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Underskriften udløber aldrig\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøglen udløber den %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Underskriften udløber den %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5512,11 +5617,11 @@
 "Dit system kan ikke vise datoer efter 2038.\n"
 "Det vil dog blive korrekt håndteret op til 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt? (j/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5530,7 +5635,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5546,50 +5651,50 @@
 "    »Heinrich Heine (digteren) <heinrichh@duesseldorf.de>«\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Fødselsnavn: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal være mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-post-adresse: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig e-post-adresse\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Du bruger tegnsættet »%s«.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5600,7 +5705,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
 
@@ -5615,35 +5720,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Ret venligst fejlen først\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5655,13 +5760,13 @@
 "under oprettelse af primtallet; dette giver det vilkårlig\n"
 "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøgleoprettelse mislykkedes: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5669,72 +5774,72 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "nøgle findes allerede\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Brug denne nøgle alligevel? (j/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "opretter ny nøgle\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "kan ikke oprette sikkerhedskopifil »%s«: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "skriver offentlig nøgle til »%s«\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5742,7 +5847,7 @@
 "Bemærk at denne nøgle ikke kan bruges til kryptering. Du kan bruge\n"
 "kommandoen »--edit-key« til at oprette en undernøgle til dette formål.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5750,7 +5855,7 @@
 "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5758,24 +5863,24 @@
 "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BEMÆRK: Oprettelse af undernøgler for v3-nøgler overholder ikke OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige dele for primær nøgle er ikke tilgængelige.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige dele for primær nøgle gemmes på kortet.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette? (j/N) "
 
@@ -5811,22 +5916,6 @@
 msgstr[0] "%d ugyldige underskrifter\n"
 msgstr[1] "%d ugyldige underskrifter\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d ugyldige underskrifter\n"
-msgstr[1] "%d ugyldige underskrifter\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
-msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5846,29 +5935,29 @@
 msgid "Keyring"
 msgstr "Nøglering"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Primær nøglefingeraftryk:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Undernøglefingeraftryk:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Primær nøglefingeraftryk:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "  Undernøglefingeraftryk:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "    Nøglefingeraftryk ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "   Serielnr. for kort ="
 
@@ -5901,7 +5990,7 @@
 msgstr[0] "1 ugyldig underskrift\n"
 msgstr[1] "1 ugyldig underskrift\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nøglering oprettet\n"
@@ -5952,7 +6041,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "»%s« er ikke et nøgle-id: udelader\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -5960,310 +6049,310 @@
 msgstr[0] "opdaterer %d nøgler fra %s\n"
 msgstr[1] "opdaterer %d nøgler fra %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: Kan ikke opdatere nøgle %s via %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nøgle blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "anmoder om nøgle %s fra %s server %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "anmoder om nøgle %s fra %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nøgleserverhandling!\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøgle %s til %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "anmoder om nøgle %s fra %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "underlig størrelse for en krypteret sessionsnøgle (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypteret sessionsnøgle\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøgle er %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "krypterede data for offentlig nøgle: god DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      »%s«\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypteret med %s nøgle, id %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: flere klartekster set\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypteret med %lu adgangsfraser\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypteret med 1 adgangsfrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antager %s krypterede data\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-chiffer utilgængelig, forsøger optimistisk at bruge %s i stedet for\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "afkryptering okay\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "BEMÆRK: afsender anmodte om »for-your-eyes-only«\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "oprindeligt filnavn=»%.*s«\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen underskrift fundet\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "UGYLDIG underskrift fra »%s«"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Udløbet underskrift fra »%s«"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra »%s«"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Underskrift lavet %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruger %s nøgle %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Underskrift lavet %s med %s nøgle-id %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Nøgle tilgængelig på: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Underskrift udløbet %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Underskrift udløber %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s underskrift, sammendragsalgoritme %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "tekstilstand"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "ukendt"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritme: %s"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke kontrollere underskrift: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en frakoblet underskrift\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6271,147 +6360,147 @@
 "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
 "kontrolleret.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) underskrift\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 #| msgid "fstat of `%s' failed in %s: %s\n"
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat for »%s« mislykkedes i %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislykkedes i %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruger eksperimentel offentlig nøglealgoritme %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "ADVARSEL: Elgamalnøgler for underskriv+krypter er forældede\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruger eksperimentel chifferalgoritme %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruger eksperimentel sammendragsalgoritme %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: sammendragsalgoritme %s er forældet\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s underskrift, sammendragsalgoritme %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s underskrift, sammendragsalgoritme %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s)\n"
 msgstr "læsefejl i »%s«: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "læsefejl i »%s«: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: forældet indstilling »%s«\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "brug venligst »%s%s« i stedet for\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: »%s« er en forældet kommando - brug den ikke\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Ukomprimeret"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "ukomprimeret|ingen"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "denne besked kan nok ikke bruges af %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "tvetydigt tilvalg »%s«\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, fuzzy, c-format
 #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6447,47 +6536,47 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "antager underskrevne data i »%s«\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan ikke håndtere offentlig nøglealgoritme %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "ADVARSEL: potentiel usikker symmetrisk krypteret sessionsnøgle\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritisk underskriftnotation: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke af typen %d har kritiske bitsæt\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Indtast adgangsfrase\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "afbrudt af bruger\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovednøgle-id %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
@@ -6495,37 +6584,37 @@
 "Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
 "objektet."
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6579,7 +6668,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette billede korrekt (j/N/a)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke vise billed-id!\n"
@@ -6901,12 +6990,12 @@
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Bemærk: nøgle %s har ingen %s-funktion\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Bemærk: nøgle %s har ingen præference for %s\n"
@@ -6961,28 +7050,28 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okay, vi er den anonyme modtager.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammel kodning for DEK'en er ikke understøttet\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "chifferalgoritme %d%s er ukendt eller deaktiveret\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "ADVARSEL: chifferalgoritme %s ikke fundet i modtagerpræferencer\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 #| msgid "NOTE: secret key %s expired at %s\n"
 msgid "Note: secret key %s expired at %s\n"
 msgstr "BEMÆRK: hemmelig nøgle %s udløb den %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7170,7 +7259,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ADVARSEL: konflikt for underskriftssammendrag i besked\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7249,31 +7338,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "BEMÆRK: underskriftnøgle %s er blevet tilbagekaldt\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "antager ugyldig underskrift fra nøgle %s på grund af en ukendt kritisk del\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "nøgle %s: ingen undernøgle til tilbagekaldsunderskrift for undernøgle\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nøgle %s: ingen undernøgle til bindingsunderskrift for undernøgle\n"
@@ -7301,12 +7390,12 @@
 "ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
 "Bruger uden udvidelse.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-underskrift fra: »%s«\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7314,12 +7403,12 @@
 "ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
 "modtagerpræferencer\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "underskriver:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s-kryptering vil blive brugt\n"
@@ -7345,7 +7434,7 @@
 msgstr ""
 "dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "stol på post %lu, type %d: skrivning mislykkedes: %s\n"
@@ -7393,12 +7482,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "læsefejl i »%s«: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronisering mislykkedes: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
@@ -7410,12 +7499,12 @@
 msgid "can't lock '%s'\n"
 msgstr "kan ikke låse »%s«\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: skrivning mislykkedes (n=%d): %s\n"
@@ -7430,105 +7519,105 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappe findes ikke!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan ikke tilgå »%s«: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: kunne ikke oprette versionspost: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ugyldig trustdb oprettet\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb oprettet\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "BEMÆRK: trustdb ikke skrivbar\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ugyldig trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: kunne ikke oprette hashtabel: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fejl ved opdatering af versionspost: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fejl ved læsning af versionspost: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fejl ved skrivning af versionspost: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek mislykkedes: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: læsning mislykkedes (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ikke en trustdb-fil\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ugyldig filversion %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fejl ved læsning af fri post: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fejl ved skrivning af mappepost: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: mislykkedes med at nulle en post: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: mislykkedes med at vedhæfte en post: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fejl: trustdb er ødelagt.\n"
@@ -7910,103 +7999,103 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "»%s« er ikke et gyldigt nøgle-id\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nøgle %s: accepteret som troværdig nøgle\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nøgle %s fremgår mere end en gang i trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nøgle %s: ingen offentlig nøgle for troværdig nøgle - udeladt\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nøgle %s markeret som ultimativ troværdig\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "troværdighedspost %lu, req-type %d: læsning mislykkedes: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "troværdighedspost %lu er ikke af den anmodne type %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Du kan forsøge at genskabe trustdb med kommandoerne:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Hvis det ikke virker, så se venligst manualen\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kan ikke bruge ukendt troværdighedsmodel (%d) - antager %s "
 "troværdighedsmodel\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "bruger %s troværdighedsmodel\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "intet behov for kontrol af trustdb\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "næste kontrol af trustdb sker den %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "intet behov for kontrol af trustdb med troværdighedsmodellen »%s«\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "udfør venligst en --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8014,7 +8103,7 @@
 msgstr[0] "     %lu-nøgler behandlet\n"
 msgstr[1] "     %lu-nøgler behandlet\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8022,17 +8111,17 @@
 msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
 msgstr[1] "%d nøgler behandlet (%d validiteter ryddet)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ingen ultimativ troværdige nøgler fundet\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8040,7 +8129,7 @@
 "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@ -8154,58 +8243,73 @@
 "Syntaks: kbxutil [tilvalg] [filer]\n"
 "Vis, eksporter, importer Keybox-data\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
+"underskrifter."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Indtast venligst PIn'en for standardnøglerne."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke størrelsen %d bit\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA offentlig eksponent mangler eller større end %d bit\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-tilbagekald returnerede fejl: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN'en er endnu ikke ændret\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Indtast venligst en ny PIN for standardnøglerne."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Indtast venligst PIn'en for standardnøglerne."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for standardnøglerne."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Indtast venligst PIN Unblocking Code (PUK) for standardnøglerne."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Indtast venligst en ny PIN for nøglen til at oprette kvalificerede "
 "underskrifter."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-"||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
-"underskrifter."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8213,7 +8317,7 @@
 "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for nøglen til at "
 "oprette kvalificerede underskrifter."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8221,48 +8325,48 @@
 "|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
 "kvalificerede underskrifter."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke gemme fingeraftrykket: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fejl ved indhentelse af CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar indeholder ikke RSA modulus'erne\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar indeholder ikke data for offentlig nøgle\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
@@ -8270,58 +8374,46 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruger standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "kunne ikke bruge standard-PIN som %s: %s - deaktiverer yderligere "
 "standardbrug\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificering af CHV%d mislykkedes: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent låst!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8332,24 +8424,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Indtast venligst administrator-PIN'en"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Indtast venligst nulstillingskoden for kortet"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@ -8357,88 +8449,88 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nulstillingskode"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny administrator-PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Indtast venligst PIN'en og ny PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "fejl ved læsning af programdata\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fejl ved læsning af fingeraftryk DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "nøgle findes allerede\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "eksisterende nøgle vil blive erstattet\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "opretter ny nøgle\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøgle\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oprettelsestidsstempel mangler\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s mangler eller har ikke størrelsen %d bit\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke gemme nøglen: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "ikke understøttet algoritme: %s"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vent venligst mens nøglen bliver oprettet ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "oprettelse af nøgle mislykkedes\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8446,27 +8538,27 @@
 msgstr[0] "nøgleoprettelse færdig (%d sekunder)\n"
 msgstr[1] "nøgleoprettelse færdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingeraftryk på kort matcher ikke den anmodte\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "underskrifter oprettet indtil videre: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8474,7 +8566,7 @@
 "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
 "kommando\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@ -8490,57 +8582,57 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Oprindelig ny PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "kør i flerservertilstand (forgrund)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|skriv en log til FIL"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|forbind til læser på port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAVN som ct-API-driver"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAVN som PC/SC-driver"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "brug ikke den interne CCID-driver"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|frakobl kortet efter N sekunder inaktivitet"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "brug ikke en læsers numeriske tastatur"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "nægt brugen af kommandoer for administratorkort"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8552,7 +8644,7 @@
 "Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
 "Smartcard-dæmon for GnuPG\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -8560,306 +8652,324 @@
 msgstr ""
 "brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "håndtering for fd %d startet\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "håndtering for fd %d termineret\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "anmodt om valideringsmodel af certifikat: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "kæde"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "skal"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritisk certifikatudvidelse %s er ikke understøttet"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "udstedercertifikat er ikke markeret som en CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markeret politik uden konfigurerede politikker"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 #| msgid "failed to open `%s': %s\n"
 msgid "failed to open '%s': %s\n"
 msgstr "kan ikke åbne »%s«: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 #| msgid "note: non-critical certificate policy not allowed"
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "bemærk: ikkekritisk certifikatpolitik er ikke tilladt"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certifikatpolitik er ikke tilladt"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "kunne ikke indhente fingeraftrykket\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår udsteder op på ekstern placering\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antallet af udstedere der matcher: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "can't access `%s': %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "kan ikke tilgå »%s«: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "status for certifikatet er ukendt"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "sikr dig at »dirmngr« er korrekt installeret\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrol af CRL'en mislykkedes: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med ugyldig validitet: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "rodcertifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "mellemliggende certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikat er udløbet"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "rodcertifikat er udløbet"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "mellemliggende certifikat er udløbet"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "krævede certifikatattributter mangler: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certifikat med ugyldig validitet"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "underskrift blev ikke oprettet under certifikatets livsforløb"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "mellemliggende certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (underskr. oprettet den "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certifkat oprettet den "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certifikat gyldigt fra "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (   udsteder gyldig fra "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeraftryk=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rodcertifikat er nu blevet markeret som troværdig\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv markering som troværdig er ikke aktiveret i gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv markering som troværdig deaktiveret for denne session\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "ADVARSEL: oprettelsestidspunkt for underskrift er ukendt - antager aktuelt "
 "tidspunkt"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rodcertifikat er ikke markeret som troværdig"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkæde er for lang\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikat har en UGYLDIG underskrift"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "fandt et andet mulig matchende CA-certifikat - prøver igen"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkæde er længere end tilladt af CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikat er gyldigt\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellemliggende certifikat er gyldigt\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rodcertifikat er gyldigt\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "skifter til kædemodel"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodel brugt: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "uden for kerne\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er MD2-algoritmen)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "ingen"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Fejl - ugyldig kodning]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Fejl - ikke nok kerne]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Fejl - intet navn]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Fejl - ugyldig DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8874,150 +8984,150 @@
 "S/N %s, id 0x%08lX,\n"
 "oprettet %s, udløber %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikat burde ikke være brugt for certificering\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikat burde ikke være brugt for kryptering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikat burde ikke være brugt for underskrift\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikat kan ikke bruges til kryptering\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikat kan ikke bruges til underskrivning\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "linje %d: ugyldig nøglelængde %u (gyldige er %d til %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "linje %d: intet emnenavn angivet\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name label `%.*s'\n"
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "linje %d: ugyldig etiket for emnenavn »%.*s«\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "linje %d: ugyldigt emnenavn »%s« på position %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "linje %d: ikke en gyldig e-post-adresse\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid serial number\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name label `%.*s'\n"
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "linje %d: ugyldig etiket for emnenavn »%.*s«\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "linje %d: ugyldigt emnenavn »%s« på position %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid date given\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 #| msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "linje %d: fejl ved indhentelse af nøgle med nøglegreb »%s«: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid authority-key-id\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid subject-key-id\n"
 msgstr "linje %d: ugyldigt emnenavn »%s« på position %d\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid extension syntax\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 #| msgid "line %d: error reading key `%s' from card: %s\n"
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "linje %d: fejl ved læsning af nøgle »%s« fra kort: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 #| msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "linje %d: fejl ved indhentelse af nøgle med nøglegreb »%s«: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "linje %d: nøgleoprettelse mislykkedes: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9159,7 +9269,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fejl ved låsning af nøgleboks: %s\n"
@@ -9186,125 +9296,125 @@
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige modtagere angivet\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "vis eksterne nøgler"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "vis certifikatkæde"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "importer certifikater"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "eksporter certifikater"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "registrer et smartkort"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "opstart gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "opret base-64-kodet resultat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "antag inddata er i PEM-format"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "antag inddata er i base-64-format"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "antag inddata er i binært format"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "konsulter aldrig en CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "kontroller validitet med OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikater der skal inkluderes"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|tag politikinformation fra FIL"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "kontroller ikke certifikatpolitikker"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende udstedercertifikater"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|skriv en servertilstandslog til FIL"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|skriv en revisionslog til FIL"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "kørselstilstand: spørg aldrig"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spørgsmål"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spørgsmål"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|tilføj nøglering til nøgleringslisten"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug chifferalgoritme NAVN"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9319,51 +9429,51 @@
 "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
 "standardhandling afhænger af inddata\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "BEMÆRK: kan ikke kryptere til »%s«: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "ukendt valideringsmodel »%s«\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: intet værtsnavn angivet\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: adgangskode angivet uden bruger\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: udelader denne linje\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "kunne ikke fortolke nøgleserver\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerer gængse certifikater »%s«\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 #| msgid "can't sign using `%s': %s\n"
 msgid "can't sign using '%s': %s\n"
 msgstr "kan ikke underskrive med »%s«: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@ -9383,7 +9493,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "grundlæggende certifikatkontroller mislykkedes - ikke importeret\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
@@ -9393,42 +9503,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "fejl under import af certifikat: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved læsning af inddata: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "kunne ikke indhente fingeraftrykket\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem under udkig efter eksisterende certifikat: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fejl under søgning efter skrivbar keyDB (nøgledatabase): %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem under gensøgning af certifikat: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fejl ved lagring af flag: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Fejl - "
 
@@ -9466,7 +9571,7 @@
 "\n"
 "%s%sEr du sikker på, at det er hvad du ønsker?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9502,22 +9607,23 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Underskrift lavet "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[dato ikke angivet]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " bruger certifikat-id 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "algoritme: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9525,17 +9631,17 @@
 "ugyldig underskrift: attribut for beskedsammendag matcher ikke den "
 "beregnede\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "God underskrift fra"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "     også kendt som"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dette er en kvalificeret underskrift\n"
@@ -9612,600 +9718,601 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "Inkluderede certifikater"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "    runtime cached certificates: %u\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 #| msgid "  (certificate created at "
 msgid "certificate already cached\n"
 msgstr "  (certifkat oprettet den "
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "certifikat er gyldigt\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error caching certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no issuer found in certificate\n"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "kan ikke oprette mappe »%s«: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating directory '%s': %s\n"
 msgstr "fejl ved oprettelse af nøgleboks »%s«: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 #| msgid "ignoring garbage line"
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorerer affaldslinje"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 #| msgid "error reading from %s: %s\n"
 msgid "error reading directory '%s': %s\n"
 msgstr "fejl ved læsning fra %s: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "removing cache file '%s'\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 #| msgid "failed to open `%s': %s\n"
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "kan ikke åbne »%s«: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "ny konfigurationsfil »%s« oprettet\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "ugyldig landekode i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "ugyldig landekode i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "ugyldigt nøgleflag i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "ugyldigt fingeraftryk i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "ugyldigt nøgleflag i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "ugyldigt nøgleflag i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "fejl ved læsning af »%s«: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "kan ikke tilgå »%s«: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "fejl i »%s«: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 #| msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "ugyldigt formateret fingeraftryk i »%s«, linje %d\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "opening cache file '%s'\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening cache file '%s': %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to create a new cache object: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Ingen hjælp tilgængelig for »%s«"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "Fejl ved læsning af sikkerhedskopinøgle fra »%s«: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting data from cache file: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "ugyldig hash-algoritme »%s«\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "iconv_open failed: %s\n"
 msgid "converting S-expression failed: %s\n"
 msgstr "iconv_open mislykkedes: %s:\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "ugyldig hash-algoritme »%s«\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 #| msgid "error getting serial number of card: %s\n"
 msgid "error getting update times of CRL: %s\n"
 msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "fejl ved skrivning til midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "opdatering af hemmelighed mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "fejl ved skrivning til midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 #| msgid "error reading input: %s\n"
 msgid "error reading CRL extensions: %s\n"
 msgstr "fejl ved læsning af inddata: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "creating cache file '%s'\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid notation data found\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "ADVARSEL: Ingen notationsdata fundet\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 #| msgid "error reading the card: %s\n"
 msgid "problem reading cache record: %s\n"
 msgstr "fejl ved læsning af kort: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 #| msgid "problem re-searching certificate: %s\n"
 msgid "problem reading cache key: %s\n"
 msgstr "problem under gensøgning af certifikat: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 #| msgid "error reading nonce on fd %d: %s\n"
 msgid "error reading cache entry from db: %s\n"
 msgstr "fejl ved læsning af nonce på fd %d: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10248,71 +10355,71 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "add a certificate to the cache"
 msgstr "  (certifkat oprettet den "
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 #| msgid "Included certificates"
 msgid "validate a certificate"
 msgstr "Inkluderede certifikater"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 #| msgid "Included certificates"
 msgid "lookup a certificate"
 msgstr "Inkluderede certifikater"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 #| msgid "Included certificates"
 msgid "lookup only locally stored certificates"
 msgstr "Inkluderede certifikater"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "load a CRL into the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 #| msgid "export certificates"
 msgid "expect certificates in PEM format"
 msgstr "eksporter certifikater"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10320,93 +10427,93 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error reading certificate from stdin: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 #| msgid "error reading from %s: %s\n"
 msgid "error reading certificate from '%s': %s\n"
 msgstr "fejl ved læsning fra %s: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "kan ikke forbinde til »%s«: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "opdatering mislykkedes: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 #| msgid "deleting certificate \"%s\" failed: %s\n"
 msgid "validation of certificate failed: %s\n"
 msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate is valid\n"
 msgstr "certifikat er gyldigt\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked\n"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 #| msgid "deleting certificate \"%s\" failed: %s\n"
 msgid "certificate check failed: %s\n"
 msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
 msgstr "ikke understøttet algoritme: %s"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10435,102 +10542,102 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|skriv servertilstandslogge til FIL"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 #| msgid "Quit without saving? (y/N) "
 msgid "run without asking a user"
 msgstr "Afslut uden at gemme? (j/N) "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "tillad PKA-opslag (DNS-forespørgsler)"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|brug nøgleserver på adressen"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10543,13 +10650,13 @@
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -10561,311 +10668,304 @@
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "valid debug levels are: %s\n"
 msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "brug: gpgsm [tilvalg] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 #| msgid "line too long - skipped\n"
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linje er for lang - udeladt\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "læsefejl i »%s«: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "ikke tvunget"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 #, fuzzy
 #| msgid "|N|connect to reader at port N"
 msgid "|N|connect to port N"
 msgstr "|N|forbind til læser på port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to stdout: %s\n"
 msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 #| msgid "certificate `%s' not found: %s\n"
 msgid "attribute '%s' not found\n"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "læser fra »%s«\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "      w/o bruger-id'er: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          pass '%s'\n"
 msgstr "       også kendt som »%s«"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          host '%s'\n"
 msgstr "      w/o bruger-id'er: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "      ikke importerede: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "            DN '%s'\n"
 msgstr "       også kendt som »%s«"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          attr '%s'\n"
 msgstr "       også kendt som »%s«"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 #| msgid "%s:%u: no hostname given\n"
 msgid "no host name in '%s'\n"
 msgstr "%s:%u: intet værtsnavn angivet\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: Using untrusted key!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not an LDAP URL\n"
 msgstr "»%s« er ikke en JPEG-fil\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "skriver til »%s«\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "fejl ved allokering af nok hukommelse: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
@@ -10921,7 +11021,7 @@
 msgid "malloc failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -11070,12 +11170,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "kan ikke tilgå »%s«: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -11150,7 +11244,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
@@ -11185,36 +11279,36 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 #| msgid "cannot allocate outfile string: %s\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "kan ikke allokere outfile-streng: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to allocate assuan context: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11260,63 +11354,63 @@
 msgid "certificate chain is good\n"
 msgstr "certifikat er gyldigt\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, fuzzy, c-format
 #| msgid "certificate should not have been used for signing\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikat burde ikke være brugt for underskrift\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "stille"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "vis data ud hex-kodet"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "afkod modtagne datalinjer"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "kør Assuanserveren angivet på kommandolinjen"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "brug ikke udvidet forbindelsestilstand"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|kør kommandoer fra FIL ved opstart"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "kør /subst ved opstart"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Brug: gpg-connect-agent [tilvalg] (-h for hjælp)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent [options]\n"
@@ -11328,44 +11422,44 @@
 "Syntaks: gpg-connect-agent [tilvalg]\n"
 "Forbind til en kørende agent og send kommandoer\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "tilvalg »%s« kræver et program og valgfrie parametre\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "tilvalg »%s« ignoreret på grund af »%s«\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linje er for lang - udeladt\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linje forkortet på grund af indlejret Nul-tegn\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "ukendt kommando »%s«\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl under afsendelse af standardtilvalg: %s\n"
@@ -11565,110 +11659,110 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Brug venligst kommandoen »toggle« først.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Ekstern verifikation af komponent %s mislykkedes"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Bemærk at gruppespecifikationer ignoreres\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s'\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "fejl i »%s«: %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "kontroller alle programmer"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|vis indstillinger"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|ændr indstillinger"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|kontroller indstillinger"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "anvend globale standardværdier"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|tag politikinformation fra FIL"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "hent konfigurationsmapperne for gpgconf"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "vis global konfigurationsfil"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "kontroller global konfigurationsfil"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "list all components"
 msgid "launch a given component"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 #, fuzzy
 #| msgid "list all components"
 msgid "kill a given component"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "aktiver ændringer ved kørselstid, hvis muligt"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgconf [options]\n"
@@ -11680,203 +11774,153 @@
 "Syntaks: gpgconf [tilvalg]\n"
 "Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Kræver en kompomentparameter"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Komponent blev ikke fundet"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Ingen parameter tilladt"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Brug: gpg-check-pattern [tilvalg] mønsterfil (-h for hjælp)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Kommandoer:\n"
-" "
-
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "afkrypteringstilstand"
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "krypteringstilstand"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "værktøjsklasse (confucius)"
+"Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
+"Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "filnavn for program"
+#, fuzzy
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "hemmelig nøglefil (krævet)"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Kommandoer:\n"
+#~ " "
+
+#~ msgid "decryption modus"
+#~ msgstr "afkrypteringstilstand"
+
+#~ msgid "encryption modus"
+#~ msgstr "krypteringstilstand"
+
+#~ msgid "tool class (confucius)"
+#~ msgstr "værktøjsklasse (confucius)"
+
+#~ msgid "program filename"
+#~ msgstr "filnavn for program"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "filnavn for inddata (standard stdin)"
+#~ msgid "secret key file (required)"
+#~ msgstr "hemmelig nøglefil (krævet)"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Brug: symcryptrun [tilvalg] (-h for hjælp)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "filnavn for inddata (standard stdin)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntaks: symcryptrun --class CLASS --program PROGRAM --keyfile NØGLEFIL "
-"[tilvalg ...] KOMMANDO [inddatafil]\n"
-"Kald et simpelt symmetrisk krypteringsværktøj\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Brug: symcryptrun [tilvalg] (-h for hjælp)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s på %s afbrudt med status %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntaks: symcryptrun --class CLASS --program PROGRAM --keyfile NØGLEFIL "
+#~ "[tilvalg ...] KOMMANDO [inddatafil]\n"
+#~ "Kald et simpelt symmetrisk krypteringsværktøj\n"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s på %s mislykkedes med status %i\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s på %s afbrudt med status %i\n"
 
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-#| msgid "can't create temporary directory `%s': %s\n"
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "kan ikke oprette midlertidig mappe »%s«: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s på %s mislykkedes med status %i\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "kunne ikke åbne %s for skrivning: %s\n"
+#, fuzzy
+#~| msgid "can't create temporary directory `%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kan ikke oprette midlertidig mappe »%s«: %s\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "fejl ved skrivning til »%s«: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "kunne ikke åbne %s for skrivning: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "fejl ved læsning fra %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "fejl ved lukning af %s: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "fejl ved læsning fra %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "tilvalget --program blev ikke leveret\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "fejl ved lukning af %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "kun --decrypt og --encrypt er understøttet\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "tilvalget --program blev ikke leveret\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "tilvalget --keyfile blev ikke leveret\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "kun --decrypt og --encrypt er understøttet\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "kan ikke allokere parametervektor\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "tilvalget --keyfile blev ikke leveret\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "kunne ikke oprette datakanal: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "kan ikke allokere parametervektor\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "kunne ikke oprette pty: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "kunne ikke oprette datakanal: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "kunne ikke forgrene: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "kunne ikke oprette pty: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv mislykkedes: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "kunne ikke forgrene: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select mislykkedes: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv mislykkedes: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "læsning mislykkedes: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select mislykkedes: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty-læsning mislykkedes: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "læsning mislykkedes: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid mislykkedes: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty-læsning mislykkedes: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "underproces afbrudt med status %i\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid mislykkedes: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "kan ikke allokere infile-streng: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "underproces afbrudt med status %i\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "kan ikke allokere outfile-streng: %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "kan ikke allokere infile-streng: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "enten %s eller %s skal være angivet\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "kan ikke allokere outfile-streng: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "ingen klasse angivet\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "enten %s eller %s skal være angivet\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klasse %s er ikke understøttet\n"
+#~ msgid "no class provided\n"
+#~ msgstr "ingen klasse angivet\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Brug: gpg-check-pattern [tilvalg] mønsterfil (-h for hjælp)\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klasse %s er ikke understøttet\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
-"Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " bruger certifikat-id 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11993,42 +12037,6 @@
 #~ msgstr "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
 
 #, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
-
-#, fuzzy
-#~| msgid "card does not support digest algorithm %s\n"
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "God underskrift fra"
-
-#, fuzzy
-#~| msgid "skipped \"%s\": %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "udelod »%s«: %s\n"
-
-#, fuzzy
-#~| msgid "User ID \"%s\": %d signature removed\n"
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
-#~ msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "God underskrift fra"
-#~ msgstr[1] "God underskrift fra"
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "ny konfigurationsfil »%s« oprettet\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/de.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/de.gmo sont différents
diff -Nru gnupg2-2.2.20/po/de.po gnupg2-2.2.27/po/de.po
--- gnupg2-2.2.20/po/de.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/de.po	2021-01-11 18:47:17.000000000 +0100
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: gnupg-2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2020-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-12-21 15:31+0100\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
@@ -19,7 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
@@ -30,47 +30,47 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "_Abbrechen"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "_Ja"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "_Nein"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "Im Passwordmanager _speichern"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 "Möchten Sie die eingegebene Passphrase wirklich auf dem Bildschirm sichtbar "
 "machen?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Die Passphrase sichtbar machen"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Passphrase unsichtbar machen"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -80,14 +80,14 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
 "Bitte fragen sie Ihren Systembeauftragten nach den\n"
 "Kriterien für die Messung der Qualität."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -95,7 +95,7 @@
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -103,17 +103,17 @@
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann."
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
 
@@ -121,36 +121,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Nochmal:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang!"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN!"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz!"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Falsche PIN!"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase!"
 
@@ -159,31 +163,31 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -247,7 +251,7 @@
 "Schlüssel%%0A   %s%%0A  %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
 "schützen."
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
@@ -383,17 +387,17 @@
 msgstr ""
 "WARNUNG:  Sie haben eine offensichtlich unsichere%0APassphrase eingegeben."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen."
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -401,134 +405,134 @@
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "Im \"Supervised\" Modus ausführen"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|Benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|Benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|Einige Kommandos über NAME annehmen"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "Benutze PINs im Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "Erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry nicht ersetzen"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "SSH Unterstützung einschalten"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "Verwende ALGO für SSH Fingerabdrücke"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "PuTTY Unterstützung einschalten"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -536,147 +540,135 @@
 "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "Optionendatei '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Zugriffsrechte für '%s' können nicht gesetzt werden: %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Aufruf: gpg-preset-passphrase [Optionen] KEYGRIP (-h für Hilfe)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -684,8 +676,8 @@
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Kennwortpuffer-Pflege\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -693,9 +685,9 @@
 "@Befehle:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -705,11 +697,11 @@
 "Optionen:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Aufruf: gpg-protect-tool [Optionen] (-h für Hilfe)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -717,16 +709,16 @@
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -734,7 +726,7 @@
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -742,18 +734,18 @@
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt, um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
@@ -763,35 +755,35 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Ungültiges Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger Wurzelzertifikate\n"
@@ -804,7 +796,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -814,11 +806,11 @@
 "\"%%0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja"
 "\"."
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Nein"
@@ -831,7 +823,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -843,22 +835,22 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Falsch"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie "
 "jetzt."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -867,15 +859,15 @@
 "Diese Passphrase wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
 "mehr geändert.  Bitte ändern Sie sie jetzt."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Die Passphrase ändern"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -884,11 +876,11 @@
 "Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A  %s%%0A  %%C%%0Awirklich "
 "entfernen?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Schlüssel löschen"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -897,12 +889,12 @@
 "Das Löschen dieses Schlüssels kann Ihren Zugriff auf entfernte Rechner\n"
 "behindern."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "Für DSA muß die Hashlänge ein Vielfaches von 8 Bit sein\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-Schlüssel verwendet ein unsicheres (%u-Bit) Hashverfahren\n"
@@ -913,7 +905,7 @@
 msgstr ""
 "Ein %zu-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
@@ -923,7 +915,7 @@
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "Public-Key-Verfahren %d (%s) wird nicht unterstützt\n"
@@ -952,7 +944,7 @@
 msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@ -998,27 +990,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "Beim Setzen der gpg-agent Optionen ist ein Problem aufgetreten\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Warte bis auf die Datei '%s' zugegriffen werden kann ...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
@@ -1079,7 +1071,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
@@ -1192,7 +1184,7 @@
 msgstr "Verfahren: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "Nicht unterstütztes Verfahren: %s"
@@ -1267,39 +1259,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Wurzelzertifikat vertrauenswürdig"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "Keine CRL für das Zertifikat gefunden"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP Prüfung der Zertifikate"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Mitgesendete Zertifikate"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Keine Einträge in der Audit-Datei"
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Unbekannte Operation"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent benutzbar"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr benutzbar"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Keine Hilfe für '%s' vorhanden."
@@ -1308,7 +1300,7 @@
 msgid "ignoring garbage line"
 msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[keine]"
 
@@ -1317,82 +1309,109 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "Argument nicht erwartet"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "Lesefehler"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "Schlüsselwort ist zu lang"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "Ungültiges Argument"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "Ungültiger Befehl"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "Ungültige Alias-Definition"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr "Zugriffsrechte nicht ausreichend"
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "Nicht genügend Speicher"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+msgid "invalid meta command"
+msgstr "Ungültige Meta-Anweisung"
+
+#: common/argparse.c:542 common/argparse.c:577
+msgid "unknown meta command"
+msgstr "Unbekannte Meta-Anweisung"
+
+#: common/argparse.c:544 common/argparse.c:579
+msgid "unexpected meta command"
+msgstr "Unerwartete Meta-Anweisung"
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "Ungültige Option"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "Fehlendes Argument für Option \"%.50s\"\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Ungültiges Argument für Option \"%.50s\"\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "Option \"%.50s\" erwartet kein Argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Ungültiger Befehl \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "Option \"%.50s\" ist mehrdeutig\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "Nicht genügend Speicher\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "Ungültige Option \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "Optionendatei '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+"Hinweis: Option \\\"--%s\\\" aufgrund der globalen Konfiguration ignoriert\n"
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1408,42 +1427,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "Die temporäre Datei `%s' kann nicht erstellt werden: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "eine übriggebliebene Sperrdatei wird entfernt (erzeugt von %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "warte auf die Freigabe der Sperre (gehalten von %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(Deadlock?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "Dateisperre %s konnte nicht eingerichtet werden: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
@@ -1627,13 +1645,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Hinweis: Der Befehl \"%s\" startet diese Server neu.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is nicht konform mit dem %s Modus\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "Der Dirmngr läuft nicht für diese Session\n"
@@ -1671,23 +1689,23 @@
 msgid "server uses an invalid certificate"
 msgstr "Der Server benutzt eine ungültiges Zertifikat"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, c-format
 msgid "Note: %s\n"
 msgstr "Hinweis: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@ -1697,137 +1715,137 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Der Rückstellcode ist nicht vorhanden\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr "Hr."
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr "Fr."
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Anrede (M=Hr., F=Fr. oder Leerzeichen): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1839,100 +1857,100 @@
 "         fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
 "         zu Rate.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Ändern des Schlüsselattributs für den: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "Die Karte wird nun rekonfiguriert, um einen Schlüssel von %u Bit zu "
 "erzeugen\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Die Karte wird nun rekonfiguriert für einen Schlüssel des Typs: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "Fehler beim Ändern der Attributs des Schlüssels %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Dieser Befehl wird von dieser Karte nicht unterstützt.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1943,167 +1961,167 @@
 "   PIN = '%s'     Admin-PIN = '%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Hinweis: Dieses Kommando zerstörrt alle auf der Karte gespeicherten "
 "Schlüssel!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Fortsetzen? (j/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Fehler beim Einstellen der KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr "Ändern der Anrede des Kartenbesitzers"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "die PIN mit dem Rückstellcode wieder freigeben"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "alle Schlüssel und Daten löschen"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "Einrichten der KDF zur Authentifizierung"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "Das Schlüsselattribut ändern"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2168,8 +2186,8 @@
 msgstr "Unterschlüssel"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
@@ -2197,39 +2215,52 @@
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
 "werden\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "benutze Cipher %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"Das Verschlüsselungsverfahren %s darf im %s Modus nicht verwendet werden.\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "Die Benutzung der Hashmethode %s ist im %s Modus nicht erlaubt.\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2237,20 +2268,13 @@
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
 "%s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"Das Verschlüsselungsverfahren %s darf im %s Modus nicht verwendet werden.\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist zur Verschlüsselung im %s Modus nicht geeignet.\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2259,41 +2283,41 @@
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
 "verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Die Benutzung der Option \"%s\" ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNUNG: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
@@ -2388,7 +2412,7 @@
 msgstr " - übersprungen"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -2423,266 +2447,270 @@
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "`%s' automatisch via %s geholt\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Kein Fingerabdruck vorhanden"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 "Prüfe auf eine aktuellere Kopie eines abgelaufenen Schlüssels über %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(Prüfe das Argument der Option '%s')\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr ""
 "WARNUNG: \"%s\" wird nicht als voreingestellter geheimer Schlüssel benutzt: "
 "%s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "\"%s\" wird als voreingestellter geheimer Signaturschlüssel benutzt\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Gültige Argumente für Option '%s':\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "Eine Signatur erzeugen"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "Eine Klartextsignatur erzeugen"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Signatur erzeugen"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "Schnell ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "Schnell eine neue User-ID anfügen"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "Schnell eine User-ID widerrufen"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "Schnell ein neues Ablaufdatum setzen"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "Schlüssel schnell signieren"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "Schlüssel schnell nur für diesen Rechner signieren"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+msgid "quickly revoke a key signature"
+msgstr "Schnell eine Schlüsselsignatur widerrufen"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "Signieren oder bearbeiten eines Schlüssels"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|Verschlüsseln für USER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "vor Überschreiben nachfragen"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2691,7 +2719,7 @@
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2711,11 +2739,11 @@
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2725,7 +2753,7 @@
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2733,75 +2761,75 @@
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Aufruf: %s [Optionen] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2809,20 +2837,20 @@
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2830,493 +2858,482 @@
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "Richtlinien-URL mit den Signaturen anlisten"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "Standard Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "Benutzer-Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Unbekannte TOFU Regel '%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Ungültiger Subjekt-Name '%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Ungültiges \"Herkunft\"-Argument '%s'\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Ungültige Filter-Option: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
 "anzeigen"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "Zeige widerrufene und verfallene User-IDs während der Signaturprüfung"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Haupt-User-ID während der Signaturprüfung"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "Werte das Vertrauen zu Signaturen durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "Die Benutzung der Hashmethode %s ist im %s Modus nicht erlaubt.\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "Im %s Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "Im %s Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "'%s\" sieht nicht nach einer gültigen Schlüssel-ID, einem Fingerabdruck oder "
 "einem \"Keygrip\" aus\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "WARNING:  Kein Kommando angegeben.  Versuche zu raten was gemeint ist ...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|Weise mit ALGO erstellte Signaturen zurück"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3514,7 +3531,7 @@
 "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
 "ändern\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
@@ -3524,7 +3541,7 @@
 msgid "key %s: %s\n"
 msgstr "Schlüssel %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "vom Import-Aufpasser zurückgewiesen"
 
@@ -3548,7 +3565,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
@@ -3563,7 +3580,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
@@ -3633,17 +3650,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
@@ -3656,238 +3673,305 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Um '%s' zu migrieren sollte für jede Smartcard \"%s\" aufgerufen werden.\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "Geheimer Schlüssel %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
 "übersprungen\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
 "angebracht werden\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
 "übersprungen\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
 "vorhanden\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "Fehler beim Allozieren von Speicher: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
+"nicht geprüft werden: %s\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
+"geprüft werden: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (neu geordnete Signaturen folgen)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "Schlüssel %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d doppelte Signatur entfernt\n"
+msgstr[1] "%d doppelte Signaturen entfernt\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
+msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d falsche Beglaubigung\n"
+msgstr[1] "%d falsche Beglaubigungen\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d Signatur neu eingeordnet\n"
+msgstr[1] "%d Signaturen neu eingeordnet\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
+"alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "Schlüsselbund `%s' erstellt\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
@@ -4133,8 +4217,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -4333,7 +4417,7 @@
 "Signaturen\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
@@ -4386,7 +4470,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
 
@@ -4465,7 +4549,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
@@ -4508,104 +4592,118 @@
 msgid "Nothing to sign.\n"
 msgstr "Nichts zu beglaubigen\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Nicht von Ihnen signiert.\n"
+
+#: g10/keyedit.c:2995
+#, c-format
+msgid "revoking the key signature failed: %s\n"
+msgstr "Fehler beim Widerruf der Schlüsselsignatur: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' ist kein gültiges Ablaufdatum\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" ist kein gültiger Fingerabdruck\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "Unterschlüssel \"%s\" nicht gefunden\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Der folgende Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "Nutzung: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4613,18 +4711,18 @@
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4633,17 +4731,17 @@
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
 "dazu führen, daß eine andere User-ID als primär angesehen wird.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Bitte erwägen Sie, dessen Verfallsdatum auch zu ändern.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4653,72 +4751,72 @@
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d Beglaubigung entfernt.\n"
 msgstr[1] "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
 msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4728,286 +4826,282 @@
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Möchten Sie wirklich die Verfallsdaten aller Unterschlüssel ändern? (j/N): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
 "Rücksignatur\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Nicht von Ihnen signiert.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "Versuch eine nicht-User-ID zu widerrufen: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Signatur datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "Ungültiges Argument für Option '%s'\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "Voreinstellung `%s' ist doppelt\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "zu viele Verschlüsselungeinstellungen\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5015,19 +5109,19 @@
 "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
 "Digestlänge nicht verwenden\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Signieren"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Zertif."
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Verschl."
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Authentisierung"
 
@@ -5041,161 +5135,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsVvAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Umschalten der Signaturnutzbarkeit\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Umschalten der Verschlüsselungsnutzbarkeit\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Umschalten der Authentisierungsnutzbarkeit\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA und RSA (voreingestellt)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA und Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (Nutzung selber einstellbar)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (Nutzung selber einstellbar)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "  (%d) ECC und ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (nur signieren)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (Nutzung selber einstellbar)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Vorhandener Schlüssel\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Vorhandener Schlüssel auf der Karte\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Geben Sie den \"Keygrip\" ein: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "Fehler beim Lesen von der Karte: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Karten-Seriennummer: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Vorhandene Schlüssel:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "gerundet auf %u Bit\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5211,7 +5305,7 @@
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5227,38 +5321,38 @@
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signatur verfällt am %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5266,11 +5360,11 @@
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5284,7 +5378,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5300,49 +5394,49 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Die Zeichen '%s' und '%s' dürfen in einem Namen nicht vorkommen\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5353,7 +5447,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5368,31 +5462,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfAa"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (A)bbrechen? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(A)bbrechen? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (E)-Mail oder (F)ertig/(A)bbrechen? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5403,13 +5497,13 @@
 "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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5420,64 +5514,64 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Fortsetzen? (J/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Trotzdem erzeugen? (j/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "wird trotzdem erzeugt\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Hinweis: \"%s %s\" ruft den erweiterten Dialog auf.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5486,7 +5580,7 @@
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5494,7 +5588,7 @@
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5502,22 +5596,22 @@
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Hinweis: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
@@ -5552,20 +5646,6 @@
 msgstr[0] "%d korrekte Signatur\n"
 msgstr[1] "%d korrekte Signaturen\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d falsche Beglaubigung\n"
-msgstr[1] "%d falsche Beglaubigungen\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
-msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5584,29 +5664,29 @@
 msgid "Keyring"
 msgstr "Schlüsselbund"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
@@ -5636,7 +5716,7 @@
 msgstr[0] " (%lu Beglaubigung)\n"
 msgstr[1] " (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
@@ -5688,142 +5768,142 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "%d Schlüssel wird per %s aktualisiert\n"
 msgstr[1] "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "fordere Schlüssel %s von %s-Server %s an\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "Kein Schlüsselserver bekannt\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "fordere Schlüssel von %s an\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame Länge für einen verschlüsselten Sitzungsschlüssel (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschlüsselter Sitzungsschlüssel\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5833,280 +5913,280 @@
 "vermutlich eine legitime Botschaft sein.  Die kann vermutet werden, da\n"
 "vor diesem Zeitpunkt ein Integritätsschutz nur selten verwendet wurde.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Mit der Option '%s' kann trotzdem entschlüsselt werden.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "Entschlüsselungs-Fehler erzwungen!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "Keine Signatur gefunden\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Signatur von \"%s\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Signatur von \"%s\""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Signatur von \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Signaturüberprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur vom %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               mittels %s-Schlüssel %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur vom %s mittels %s-Schlüssel ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               Aussteller \"%s\"\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Hinweis: Benutze '%s' um diese Information zu verwenden\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist zum Signieren im %s Modus nicht geeignet.\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Signatur verfällt am %s.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s Signatur, Hashmethode %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", Schlüsselverfahren "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "WARNUNG: Keine abgetrennte Signatur; die Datei '%s' wurde NICHT überprüft!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Signatur\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Signatur der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Signatur nach alter (PGP 2.x) Art\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat von `%s' schlug fehl in %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) schlug fehl in %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Public-Key-Verfahrens %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "WARNUNG: Die Verwendung von Elgamal sign+encrypt Schlüsseln ist nicht "
 "ratsam\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Hinweis: %s basierte Signaturen werden zurückgewiesen.\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr ""
 "Hinweis: Beglaubigungen von Dritten basierend auf dem %s Algorithmus werden "
 "zurückgewiesen.\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(gemeldeter Fehler: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(gemeldeter Fehler: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(weitere Infos: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: Die Option \"%s\" is veraltet - sie hat eine Wirkung nur in %s.\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6114,38 +6194,38 @@
 "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung nur\n"
 "in %s.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "Unbekannte Option '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge "
 "haben\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
@@ -6178,84 +6258,84 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Unbekannte Entscheidende Beglaubigungs-\"Notation\": "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
 "entsperren:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
 "importieren:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen OpenPGP Unterschlüssel zu "
 "exportieren:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
 "exportieren:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Möchten Sie den ausgewählten geheimen OpenPGP Unterschlüssel wirklich "
 "dauerhaft entfernen? (j/N) "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr ""
 "Möchten Sie den ausgewählten geheimen OpenPGP Schlüssel wirklich dauerhaft "
 "entfernen? (j/N) "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6313,7 +6393,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ist dieses Bild richtig? (j/N) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
@@ -6628,12 +6708,12 @@
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@ -6687,29 +6767,29 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "WARNUNG: Das Verschlüsselungsverfahren %s wurde nicht in den "
 "Empfängereinstellungen gefunden\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %s verfällt am %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Hinweis: Schlüssel wurde widerrufen"
@@ -6908,7 +6988,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr ""
@@ -6979,31 +7059,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "Falsche Schlüsselsignatur von Schlüssel %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "Falsche Datensignatur von Schlüssel %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Signatur von Schlüssel %s, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -7034,12 +7114,12 @@
 "WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
 "(zu groß). Verwende \"unerweiterte\".\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s Signatur von: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7047,12 +7127,12 @@
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signiere:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
@@ -7080,7 +7160,7 @@
 "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
 "NICHT sicher genug!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
@@ -7125,12 +7205,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "Lesefehler in `%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "Datei `%s' konnte nicht gesperrt werden\n"
@@ -7140,12 +7220,12 @@
 msgid "can't lock '%s'\n"
 msgstr "'%s' kann nicht gesperrt werden\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -7160,103 +7240,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "kann auf `%s' nicht zugreifen: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ungültige trust-db erzeugt\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Hinweis: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ungültige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n"
@@ -7658,103 +7738,103 @@
 msgstr ""
 "WARNUNG: Es wird an %s verschlüsselt, welcher nur widerrufene User-IDs hat.\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "Schlüssel %s tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "Schlüssel %s: kein öffentlicher Schlüssel für den vertrauenswürdigen "
 "Schlüssel - übersprungen\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Sie können versuchen die Vertrauensdatenbank durch folgende Befehle\n"
 "wiederherzustellen:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Falls dies nicht funktioniert, sehen Sie bitte im Handbuch nach\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
 "Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "verwende Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7762,24 +7842,24 @@
 msgstr[1] "%d Schlüssel bislang bearbeitet"
 
 # translated by wk
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d Validity Zähler gelöscht)\n"
 msgstr[1] " (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "öff. Schlüssel des ultimativ vertrauten Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7787,7 +7867,7 @@
 "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7899,60 +7979,75 @@
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlisten exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNummer: %s%%0ABesitzer: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Verbliebene Versuche: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Bitte geben Sie die PIN für den Schlüssel zur Erstellung qualifizierter "
+"Signaturen ein."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Die Nullpin wurde noch nicht geändert\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Bitte eine neue PIN für den Standard-Schlüssel eingeben."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Standard-"
 "Schlüssel ein."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Bitte geben Sie den PIN Entsperrcode (PUK) für den Standard-Schlüssel ein."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Bitte geben Sie eine neue PIN für den Schlüssel zur Erstellung "
 "qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-"||Bitte geben Sie die PIN für den Schlüssel zur Erstellung qualifizierter "
-"Signaturen ein."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7960,7 +8055,7 @@
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7968,47 +8063,47 @@
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "Der EC Schlüssel fehlt in der Antwort\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 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:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
@@ -8016,56 +8111,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNummer: %s%%0ABesitzer: %s%%0AAnzahl: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sNummer: %s%%0ABesitzer: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Verbliebene Versuche: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, 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:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Bitte entsperren Sie die Karte"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8075,24 +8158,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
@@ -8100,114 +8183,114 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Bitte die Admin-PIN sowie die neue Admin-PIN eingeben."
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Bitte die PIN sowie die neue PIN eingeben"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "der neue Schlüssel wird geschrieben\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "Nicht unterstützte Kurve\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Schlüsselerzeugung abgeschlossen (%d Sekunde)\n"
 msgstr[1] "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 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:4368
+#: scd/app-openpgp.c:4558
 #, 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:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8215,7 +8298,7 @@
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -8231,55 +8314,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Erstmalige neue PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|DATEI|Schreibe Logs auf DATEI"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|Schalte die Karte nach N Sekunden Inaktivität ab"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "Die Tastatur des Kartenlesers nicht benutzen"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "Variable Längeneingabe für die Kartenlesertastatur benutzen"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8287,320 +8370,337 @@
 "Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "Durch Zertifikat angefordertes Gültigkeitsmodell: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "Kette"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "Schale"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Hinweis: Die unkritische Zertifikatsrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "Die Zertifikatsrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "Kann den Fingerprint nicht ermitteln\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Der Herausgeber wird im Cache des Dirmngr gesucht\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Kann keinen KeyDB Handler bereitstellen\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "Der Status des Zertifikats ist nicht bekannt"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 "Bitte vergewissern Sie sich, daß der \"dirmngr\" richtig installiert ist\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Die CRL konnte nicht geprüft werden: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "Das Wurzelzertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "Das Zwischenzertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "Das Wurzelzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "Das Zwischenzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "Notwendige Zertifikatattribute fehlen: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "Zertifikat mit unzulässiger Gültigkeit"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "Die Signatur wurde nicht in der Gültigkeitszeit des Zertifikat erzeugt"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 "Das Zertifikat wurde nicht während der Gültigkeitszeit des Herausgebers "
 "erzeugt"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "Das Zwischenzertifikat wurde nicht während der Gültigkeitszeit des "
 "Herausgebers erzeugt"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (    Signatur erzeugt am "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (  Zertifikat erzeugt am "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (  Zertifikat gültig von "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  ( Herausgeber gültig von "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in gpg-agent ausgeschaltet\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in dieser Sitzung ausgeschaltet\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "WARNUNG: Der Erzeugungszeitpunkt der Signatur ist nicht bekannt - Nehme die "
 "aktuelle Zeit an"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "Das Zertifikat ist korrekt\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Das Zwischenzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "Das Wurzelzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "Umgeschaltet auf das Kettenmodell"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "Nicht genügend Speicher\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "keine"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Fehler - Ungültige Kodierung]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Fehler - Nicht genügend Speicher]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Fehler - Kein Name]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Fehler - Ungültiger DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8616,141 +8716,141 @@
 "gültig von %s bis %s\n"
 "zu entsperren.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
 "sollen\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "Zeile %d: Ungültiges Verfahren\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "Zeile %d: Ungültige Schlüssellänge %u (gültig Werte: %d bis %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "Zeile %d: Kein Subjekt-Name angegeben\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "Zeile %d: ungültiger Subjekt-Name-Label `%.*s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "Zeile %d: ungültige Betreffbezeichnung `%s' in Spalte %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Zeile %d: Keine gültige E-Mailadresse\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "Zeile %d: Ungültige Seriennummer\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "Zeile %d: ungültiger Issuer-Name-Label `%.*s'\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "Zeile %d: ungültiger Herausgeber `%s' in Spalte %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "Zeile %d: Ungültiges Datum\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr ""
 "Zeile %d: Fehler beim Holen des Signaturschlüssels per \"Keygrip\" `%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "Zeile %d: Ungültiges Hashverfahren\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "Zeile %d: Ungültige Authentisierungsschlüssel-ID\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "Zeile %d: ungültige \"Subject-Key-Id\"\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "Zeile %d: Ungültiger Syntax der Extension\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "Zeile %d: Fehler beim Lesen des Schlüssels `%s' von der Karte: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "Zeile %d: Fehler beim Holen des Schlüssels per \"Keygrip\" `%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Zeile %d: Schlüsselerzeugung schlug fehl: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8883,7 +8983,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "Zertifikat `%s' nicht gefunden: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Fehler beim Sperren der Keybox: %s\n"
@@ -8908,123 +9008,123 @@
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommando an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 Format erzeugen"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "Zertifikatsrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9033,47 +9133,47 @@
 "Syntax: @GPGSM@ [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: Kein Server-Name angegeben\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: Passwort ohne Benutzer\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: Zeile wird übersprungen\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -9093,7 +9193,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
@@ -9103,42 +9203,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "Kann den Fingerprint nicht ermitteln\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Fehler beim Speichern des Zertifikats: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Fehler - "
 
@@ -9176,7 +9271,7 @@
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9214,22 +9309,22 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Signatur erzeugt am "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[Datum nicht vorhanden]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " mittels Zertifikat ID 0x%08lX\n"
+msgid "algorithm:"
+msgstr "Verfahren:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9237,17 +9332,17 @@
 "Ungültige Signatur: Nachricht entspricht nicht dem Prüfwert in der "
 "Nachricht.\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Signatur.\n"
@@ -9321,286 +9416,285 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "Fehler beim Laden des Zertifikats `%s': %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "   dauerhaft geladene Zertifikate: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr " zwischengespeicherte Zertifikate: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "    vertrauenswürdige Zertifikate: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "Zertifikat wurde zwischengespeichert\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ungültiger SHA1 Fingerabdruck `%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "Fehler beim Holen des Zertifikats mittels Seriennummer: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "Fehler beim Holen des Zertifikats mittels Subject: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "Fehler beim Holen des \"authorityKeyIdentifier\": %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "Das Verzeichnis `%s' wird erzeugt\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "Fehler beim Erzeugen des Verzeichnis '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "Das DB-Verzeichnis `%s' wird ignoriert\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "Fehler beim Lesen des Verzeichnis `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "Die Zwischenspeicherdatei `%s' wird entfernt\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "Die Datei `%s' wird nicht gelöscht\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Fehler beim Schließen der Zwischenspeicherdatei: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr ""
 "Die Zwischenspeicherverzeichnisdatei `%s' konnte nicht geöffnet werden: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr ""
 "Fehler beim Erzeugen der neuen Zwischenspeicherverzeichnisdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr ""
 "Fehler beim Schreiben der neuen Zwischenspeicherverzeichnisdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr ""
 "Fehler beim Schließen der neuen Zwischenspeicherverzeichnisdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "Neue Zwischenspeicherverzeichnisdatei `%s' wurde erzeugt\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr ""
 "Fehler beim Wiederöffnen der Zwischenspeicherverzeichnisdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "Der erste Datensatz von `%s' enthält nicht die Version\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "Alte Version des Zwischenspeicherverzeichnisses - räume auf\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "Alte Version des Zwischenspeicherverzeichnisses - gebe auf\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "Weiteres Feld im CRL Datensatz von `%s', Zeile %u festgestellt\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "Ungültige Zeile in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Doppelter Eintrag in `%s', Zeile %u festgestellt\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "Nicht unterstützter Datensatztyp in `%s', Zeile %u übergangen\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "Ungültiger Issuer Hashwert in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "Kein Issuer DN in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "Ungültiger Zeitstempel in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "WARNUNG: Ungültiger Zwischenspeicherdatei Hashwert in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "Id der Zwischenspeicherverzeichnisdatei wurden Fehler erkannt\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 "Bitte ermitteln sie die Ursache und löschen sie die Datei dann manuell\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr ""
 "Die temporäre Zwischenspeicherverzeichnisdatei `%s' konnte nicht erzeugt "
 "werden: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "Fehler beim Schließen von `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "Fehler beim Umbenennen von `%s` nach `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "Hashwert von `%s' kann nicht gebildet werden: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "Fehler beim Vorbereiten des MD5 Hashkontext: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "Fehler beim Hashen von `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "Ungültig formatierte Prüfsumme für `%s'\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 "Zu viele geöffnete Zwischenspeicherdateien; weitere kann nicht geöffnet "
 "werden\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "Die Zwischenspeicherdatei `%s' wird geöffnet\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "Fehler beim Öffnen der Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 "Fehler beim Initialisieren der Zwischenspeicherdatei `%s' zum Lesen: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "unlock_db_file wird für eine geschlossene Datei aufgerufen\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "unlock_db_file wird für eine nicht gesperrte Datei aufgerufen\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "Ein neues Zwischenspeicherobjekt konnte nicht erzeugt werden: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "Es ist keine CRL für den Issuer mit der ID %s vorhanden\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "Die zwischengespeicherte CRL für den Issuer mit der ID %s ist zu alt; ein "
 "Update wird benötigt\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9609,203 +9703,205 @@
 "\"force-crl-refresh\" ist aktiviert und %d Minuten für den Issuer mit Id %s "
 "sind vorbei; Update wird benötigt\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "\"force-crl-refresh\" ist für den Issuer mit der Id %s aktiviert; Update "
 "wird benötigt\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 "Die vorhandene CRL für den Issuer mit der ID %s kann nicht benutzt werden\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "Die zwischengespeicherte CRL für den Issuer mit der ID %s wurde verändert; "
 "eine Update wird benötigt\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "WARNUNG: Ungültige Länge des Zwischenspeicherdateisatzes für S/N "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "Problem beim Lesen des Zwischenspeicherdatensatzes für S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s ist nicht gültig; Grund=%02X  Datum=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s ist gültig; sie ist nicht in der CRL enthalten\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "Fehler beim Holen der Daten aus der Zwischenspeicherdatei: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "Ungültige Hashmethode `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "gcry_md_open für Methode %d fehlgeschlagen: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "Ungültige S-Expression von Libksba erhalten\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "Ungültige Hashmethode `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open für Methode %d fehlgeschlagen: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "Die \"Update Times\" konnte nicht aus der CRL bestimmt werden: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "Die \"Update Times\" dieser CRL sind: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "\"nextUpdate\" fehlt; wir nehmen eine Gültigkeit von einem Tag an\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "Fehler beim Holen eines CRL Items: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "Fehler beim Einfügen eines Items in die temporäre Zwischenspeicherdatei: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "In der CRL wurde kein CRL Herausgeber gefunden: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "CRL Herausgeberzertifikat wird über \"authorityKeyIdentifier\" geholt\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "Signaturprüfung der CRL ist fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Fehler beim Püfen des CRL Herausgeberzertifikats: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "Die alte temporäre Zwischenspeicherdatei `%s' wurde entfernt\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "Problem beim Löschen der alten temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "Fehler beim Erzeugen der temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "Fehler beim Fertigstellen der temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "Fehler beim Schließen der temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "WARNUNG: Neue CRL ist immer noch zu alt; sie verfiel am %s - wird trotzdem "
 "geladen\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "Neue CRL ist immer noch zu alt; sie verviel am %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "Unbekannte kritische CRL Erweiterung %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Fehler beim Lesen einer CRL Erweiterung: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Zwischenspeicherdatei `%s' wird erzeugt\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "Problem beim Umbenennen von `%s' nach `%s': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9814,70 +9910,70 @@
 "Update der Zwischenspeicherverzeichnisdatei fehlgeschlagen - "
 "Zwischenspeichereintrag wird mit dem nächste Programmstart verloren gehen\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Anfang CRL Ausgabe (geholt via %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 " FEHLER: Die CRL wird nicht benutzt, da sie trotz eines Updates zu alt war!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " FEHLER: Die CRL wird nicht benutzt, da sie eine unbekannte kritische CRL "
 "Erweiterung trägt!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEHLER: Die CRL wird nicht benutzt\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " FEHLER: Diese zwischengespeicherte CRL ist möglicherweise abgeändert "
 "worden!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNUNG: Ungültige Länge eines Zwischenspeicherdatensatzes\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherdatensatzes: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherschlüssels: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "Fehler beim Lesen eine Zwischenspeichereintrags aus der DB: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Ende CRL Ausgabe\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n"
@@ -9915,56 +10011,56 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "Zertifikatsuche ist nicht möglich da %s abgeschaltet ist\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "OCSP anstatt CRL benutzen"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "Teste ob der dirmngr noch läuft"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "Ein Zertifikat dem Zwischenspeicher zufügen"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "Zertifikat prüfen"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "Zertifikat auffinden"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "Nur lokal gespeicherte Zertifikate auffinden"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "Eine URL wird für --lookup erwartet"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "CRL in den Dirmngr laden"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "Sondermodus für Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "Zertifikate werden im PEM Format erwartet"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "Die Nutzung des voreingestellten OCSP Responder erzwingen"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "Gebrauch: dirmngr-client [Optionen] [Zertdatei|Muster] (-h für Hilfe)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9977,82 +10073,82 @@
 "The Prozess gibt 0 zurück wenn das Zertifikat gültig ist, 1 wenn es nicht\n"
 "gültig ist und weitere Werte bei anderen Fehlern.\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "Fehler beim Lesen des Zertifikats von der Standardeingabe: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "Fehler beim Lesen des Zertifikats von `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "Zertifikat ist zu groß um Sinnvoll zu sein\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "Aufsuchen fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "Laden der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "Ein dirmngr ist vorhanden und aktiv\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "Prüfung des Zertifikats fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "Zertifikat ist gültig\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "Zertifikat wurde widerrufen\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "Zertifikatprüfung fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "Erhielt Status: `%s'\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "Nicht unterstützte INQUIRY `%s'\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "Absoluter Dateiname erwartet\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "Auffinden von `%s'\n"
@@ -10077,92 +10173,92 @@
 msgid "flush the cache"
 msgstr "Den Zwischenspeicher löschen"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "Ausführung ohne Benutzernachfrage"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "Laden von abgelaufenen CRLs erzwingen"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "OCSP Anfragen erlauben"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "Online Softwareversionstest erlauben"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "Sperre die Benutzung von HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "Sperre die Benutzung von LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "Übergehe HTTP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "Übergehe LDAP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|Leite alle HTTP Anfragen über URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|Benutze HOST für LDAP Anfragen"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|DATEI|Benutze die CA Zertifikate in DATEI für HKP über TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "Netzzugriff nur über Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10172,11 +10268,11 @@
 "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
 "und Optionen)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10184,134 +10280,134 @@
 "Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
 "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "Gültige Debugebenen sind: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "Aufruf: %s [Optionen] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: Lesefehler: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: Müll am Ende der Zeile wird ignoriert\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "SIGHUP empfangen - lese die Konfiguration erneut und lösche die "
 "Zwischenspeicher\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "Herunterfahren wurde erzwungen\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "Signal %d empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "Alle Werte in einem Record Format zurückgeben"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|Host Teil ignorieren und über NAME verbinden"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|Verbinde mit dem Host NAME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|Verbinde mit dem Port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|Benutze NAME zur Authentifizierung"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "Benutze Passwort PASS zur Authentifizierung"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "Nimm das Passwort von $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|Frage den DN STRING ab"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|Benutze STRING als Filterausdruck"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|Gib das Attribut STRING zurück"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10321,144 +10417,138 @@
 "Internes LDAP-Hilfsprogramm für Dirmngr.\n"
 "Interface und Optionen können sich mit jedem Release ändern.\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "Ungültige Portnummer %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "Absuchen des Ergebnisses nach Attribut `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "Fehler beim Schreiben auf Standardausgabe: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "        verfügbare Attribute `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "Attribut `%s' nicht gefunden\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "Attribut `%s' gefunden\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "Verarbeiten der URL `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "           Benutzer `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "           Passwort `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "               Host `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "               Port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "                 DN `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "             Filter `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "           Attribut `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "Kein Hostname in `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "Kein Attribut für Abfrage `%s' angegeben\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "WARNUNG: Es wird nur das erste Attribut benutzt\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "LDAP Initialisierung von `%s:%d' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "Anbindung an `%s:%d' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "Suche mit `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "`%s' ist kein LDAP URL\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "`%s' ist ein ungültiger LDAP URL\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "zu viele verschachtelte Umleitungen\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "\"Redirection\" geändert auf '%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "Fehler beim Allozieren von Speicher: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10509,7 +10599,7 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
@@ -10640,11 +10730,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "Fehler beim Bereitstellen eines OCSP Kontext: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10713,7 +10798,7 @@
 msgstr "Seriennummer fehlt in der Cert-ID"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire fehlgeschlagen: %s\n"
@@ -10743,32 +10828,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d überschritten\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "Fehler beim Initialisieren des Servers: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Fehler beim Registrieren der Kommandos gegen Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept Problem: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@ -10808,57 +10893,57 @@
 msgid "certificate chain is good\n"
 msgstr "Der Zertifikatkette ist gültig\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "Reduzierte Informationen"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "Druckdaten hexkodiert ausgeben"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "Dekodiere empfangene Datenzeilen"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "Mit dem Dirmngr verbinden"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|Verbinde mit dem Assuan-Server an Adresse ADDR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "Starten des auf der Kommandozeile angegebenen Assuan-Server"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "Den \"extended connect\"-Modus nicht nutzen"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DATEI|Beim Starten Kommandos aus DATEI lesen"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "Nach dem Starten \"/subst\" ausführen"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Aufruf: @GPG@-connect-agent [Optionen] (-h für Hilfe)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10866,43 +10951,43 @@
 "Syntax: @GPG@-connect-agent [Optionen]\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Option \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "Empfangen der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
@@ -11090,94 +11175,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Hinweis: Für Details bitte das Kommando \"%s%s\" verwenden.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "Fehler beim Schließen von '%s'\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "Fehler beim Hashen von '%s'\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "Liste aller Komponenten"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "Prüfe alle Programme"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTE|Zeige die Optionen an"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTE|Ändere die Optionen"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENTE|Prüfe die Optionen"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|DATEI|Konfigurationsdateien mittels DATEI ändern"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "Zeige die globale Konfigurationsdatei an"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "Prüfe die globale Konfigurationsdatei"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "Abfrage der Datenbank mit Softwareversionen"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "\"reload\" an alle oder eine Komponente senden"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "Die angegebene Komponente starten"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "\"kill\" an eine Komponente senden"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11185,202 +11270,149 @@
 "Syntax: @GPGCONF@ {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Aufruf: gpg-check-pattern [Optionen] Musterdatei  (-h für Hilfe)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"@KBefehle:\n"
-" "
+"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
+"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "Entschlüsselungsmodus"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "Verschlüsselungsmodus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "@KBefehle:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "Toolklasse (Konfuzius)"
+#~ msgid "decryption modus"
+#~ msgstr "Entschlüsselungsmodus"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "Programmdateiname"
+#~ msgid "encryption modus"
+#~ msgstr "Verschlüsselungsmodus"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "Dateiname des geheimen Schlüssels (erforderlich)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "Toolklasse (Konfuzius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "Eingabedateiname (Standardeingabe ist voreingestellt)"
+#~ msgid "program filename"
+#~ msgstr "Programmdateiname"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Aufruf: symcryptrun [Optionen] (-h für Hilfe)"
+#~ msgid "secret key file (required)"
+#~ msgstr "Dateiname des geheimen Schlüssels (erforderlich)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax: symcryptrun --class KLASSE --program PROGRAMM --keyfile "
-"SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
-"Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "Eingabedateiname (Standardeingabe ist voreingestellt)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s auf %s brach mit Status %i ab\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Aufruf: symcryptrun [Optionen] (-h für Hilfe)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s auf %s schlug mit Status %i fehl\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntax: symcryptrun --class KLASSE --program PROGRAMM --keyfile "
+#~ "SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
+#~ "Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s auf %s brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s auf %s schlug mit Status %i fehl\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "Fehler beim Schreiben von %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "Fehler beim Lesen von %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "Fehler beim Schließen von %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "Option --program nicht angegeben\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "Fehler beim Lesen von %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "nur --decrypt und --encrypt sind vorhanden\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "Fehler beim Schließen von %s: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "keine --keyfile -Option angegeben\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "Option --program nicht angegeben\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "Kann \"args-vector\" nicht zuteilen\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "nur --decrypt und --encrypt sind vorhanden\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "Pipe kann nicht erzeugt werden: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "keine --keyfile -Option angegeben\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "Pty kann nicht erzeugt werden: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "Kann \"args-vector\" nicht zuteilen\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "Kann nicht fork()en: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "Pipe kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "Pty kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "Kann nicht fork()en: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "Lesen schlug fehl: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "Lesen schlug fehl: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "Kind brach mit Status %i ab\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "Kind brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "entweder %s oder %s muß angegeben sein\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "keine Klasse angegeben\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "Klasse %s wird nicht unterstützt\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "entweder %s oder %s muß angegeben sein\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Aufruf: gpg-check-pattern [Optionen] Musterdatei  (-h für Hilfe)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "keine Klasse angegeben\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
-"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "Klasse %s wird nicht unterstützt\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " mittels Zertifikat ID 0x%08lX\n"
 
 #, fuzzy
 #~ msgid ""
@@ -11523,41 +11555,6 @@
 #~ msgstr ""
 #~ "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr ""
-#~ "Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
-#~ "nicht geprüft werden: %s\n"
-
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr ""
-#~ "Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
-#~ "geprüft werden: %s.\n"
-
-#~ msgid " (reordered signatures follow)"
-#~ msgstr " (neu geordnete Signaturen folgen)"
-
-#~ msgid "key %s:\n"
-#~ msgstr "Schlüssel %s:\n"
-
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "%d doppelte Signatur entfernt\n"
-#~ msgstr[1] "%d doppelte Signaturen entfernt\n"
-
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "%d Signatur neu eingeordnet\n"
-#~ msgstr[1] "%d Signaturen neu eingeordnet\n"
-
-#~ msgid ""
-#~ "Warning: errors found and only checked self-signatures, run '%s' to check "
-#~ "all signatures.\n"
-#~ msgstr ""
-#~ "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; "
-#~ "um alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
-
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/el.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/el.gmo sont différents
diff -Nru gnupg2-2.2.20/po/el.po gnupg2-2.2.27/po/el.po
--- gnupg2-2.2.20/po/el.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/el.po	2021-01-11 18:47:17.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2017-09-14 21:14+0300\n"
 "Last-Translator: Dimitris Maroulidis <dmaroulidis@dimitrismaroulidis.com>\n"
 "Language-Team: team@gnome.gr\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
@@ -29,40 +29,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -70,7 +70,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -80,35 +80,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "κακή φράση κλειδί"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -116,40 +116,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "η φράση κλειδί είναι πολύ μεγάλη\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "κακό MPI"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "κακή φράση κλειδί"
@@ -159,33 +163,33 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -243,7 +247,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
@@ -375,20 +379,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Χρειάζεστε μια Φράση κλειδί για να προστατεύσετε το μυστικό κλειδί.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -398,124 +402,124 @@
 "Επιλογές:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Το κλειδί έχει παρακαμθεί"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "αναλυτικά"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "ήσυχη έξοδος"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "δεν υποστηρίζεται"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -524,180 +528,166 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Αναφέρετε τα προβλήματα στο <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "ΣΗΜΕΙΩΣΗ: μη προκαθορισμένο αρχείο επιλογών `%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "αρχείο επιλογών `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: κατάλογος δημιουργήθηκε\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: παραλείφθηκε: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -705,9 +695,9 @@
 "@Εντολές:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -717,52 +707,52 @@
 "Επιλογές:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Ακύρωση"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -772,32 +762,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -810,19 +800,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ναι|ναί"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -835,7 +825,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -845,59 +835,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "ενεργοποιεί ένα κλειδί"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -907,7 +897,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
@@ -917,7 +907,7 @@
 msgid "secret key parts are not available\n"
 msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -949,7 +939,7 @@
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -996,27 +986,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "αδυναμία απενεργοποίησης των core dump: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
@@ -1077,7 +1067,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
@@ -1200,7 +1190,7 @@
 msgstr "θωράκιση: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1284,44 +1274,44 @@
 msgid "Root certificate trustworthy"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "άγνωστη έκδοση"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
@@ -1331,7 +1321,7 @@
 msgid "ignoring garbage line"
 msgstr "σφάλμα στη γραμμή trailer\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "άγνωστο"
@@ -1341,92 +1331,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "σφάλμα ανάγνωσης αρχείου"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "μη έγκυρο όρισμα"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "μη έγκυρη θωράκιση"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "μη επεξεργασμένο"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "συγκρουόμενες εντολές\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "μη αναμενόμενα δεδομένα"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Μη έγκυρη εντολή  (δοκιμάστε \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "μη επεξεργασμένο"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "ΣΗΜΕΙΩΣΗ: μη προκαθορισμένο αρχείο επιλογών `%s'\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "αρχείο επιλογών `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1442,42 +1464,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1667,14 +1688,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Παρακαλώ χρησιμοποιείστε την εντολή \"toggle\" πρώτα.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
@@ -1717,24 +1738,24 @@
 msgid "server uses an invalid certificate"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "θωράκιση: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "το μυστικό κλειδί δεν είναι διαθέσιμο"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
@@ -1744,246 +1765,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Η επιλογή σας; "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "μη επεξεργασμένο"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "αναωεωμένες επιλογές"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Μη έγκυρη επιλογή.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1991,184 +2012,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Σίγουρα να υπογραφεί; "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "τερματισμός αυτού του μενού"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "απεικόνιση αυτής της βοήθειας"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "αλλαγή της ημερομηνίας λήξης"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Μη έγκυρη εντολή  (δοκιμάστε \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output δεν λειτουργεί για αυτή την εντολή\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "αδυναμία πρόσβασης του `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2231,8 +2252,8 @@
 msgstr "ΔημοσΚλειδί:"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
@@ -2258,40 +2279,53 @@
 msgstr ""
 "χρησιμοποιείστε πρώτα την επιλογή \"--delete-secret-key\" για διαγραφή του.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "αδυναμία χρήσης ενός συμμετρικού πακέτου ESK λόγω της κατάστασης S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "χρήση του κρυπταλγόριθμου: %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: `%s' είναι ένα άδειο αρχείο\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "ανάγνωση από `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2299,18 +2333,12 @@
 "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
 "επιλογές του παραλήπτη\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2319,35 +2347,35 @@
 "ο εξαναγκασμός χρήσης του αλγορίθμου συμπίεσης %s (%d) παραβιάζει τις\n"
 "επιλογές του παραλήπτη\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
 "επιλογές του παραλήπτη\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s κρυπτογραφήθηκε για: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s κρυπτογραφημένα δεδομένα\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2355,7 +2383,7 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το μήνυμα κρυπτογραφήθηκε με αδύναμο κλειδί στο\n"
 "συμμετρικό κρυπταλγόριθμο.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "πρόβλημα στο χειρισμό κρυπτογραφημένου πακέτου\n"
@@ -2458,7 +2486,7 @@
 msgstr "%s: παραλείφθηκε: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2497,287 +2525,293 @@
 msgid "[User ID not found]"
 msgstr "[User id δεν βρέθηκε]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Μη έγκυρο κλειδί %08lX έγινε έγκυρο από το --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[αρχείο]|δημιουργία μιας μη κρυπτογραφημένης υπογραφής"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "κρυπτογράφηση δεδομένων"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "κρυπτογράφηση με χρήση μόνο συμμετρικών αλγορίθμων"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "αποκρυπτογράφηση δεδομένων (προκαθορισμένο)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "επαλήθευση μιας υπογραφής"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "απεικόνιση της λίστας κλειδιών"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "απεικόνιση της λίστας κλειδιών και υπογραφών"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "έλεγχος υπογραφής κλειδιού"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "αφαίρεση των κλειδιών από τη μυστική κλειδοθήκη"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "υπογραφή ενός κλειδιού"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "υπογραφή ενός κλειδιού τοπικά"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "υπογραφή ενός κλειδιού"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "υπογραφή ενός κλειδιού τοπικά"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "υπογραφή ή επεξεργασία ενός κλειδιού"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "εξαγωγή κλειδιών"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "εισαγωγή/συγχώνευση κλειδιών"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "δημιουργία ascii θωρακισμένης εξόδου"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "χρήση αυτής της ταυτότητας (user id) για υπογραφή ή αποκρυπτογράφηση"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|καθορισμός επιπέδου συμπίεσης N (0 απενεργοποιεί)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "χρήση κανονικής κατάστασης κειμένου"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "να μη γίνει καμμία αλλαγή"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "ερώτηση πριν την επικάλυψη"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2785,7 +2819,7 @@
 "@\n"
 "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2815,13 +2849,13 @@
 " --list-keys [ονόματα]        απεικόνιση κλειδιών\n"
 " --fingerprint [ονόματα]      απεικόνιση αποτυπωμάτων (fingerprints)\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2836,7 +2870,7 @@
 "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
 "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2844,592 +2878,579 @@
 "\n"
 "Υποστηριζόμενοι αλγόριθμοι:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Κρυπταλγόριθμος: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Συμπίεση: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "χρήση: gpg [επιλογές] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "δεν βρέθηκε το σύμβολο = στον ορισμό της ομάδας \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "ΣΗΜΕΙΩΣΗ: αγνοήθηκε το παλιό αρχείο προκαθορισμένων επιλογών `%s'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το %s δεν είναι για κανονική χρήση!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Μη έγκυρη διεύθυνση Email\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "αδυναμία ορισμού του exec-path σε %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "το %s δεν επιτρέπεται με το %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
 "δεν είναι έγκυρος\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth πρέπει να είναι μεταξύ 1 και 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "μη έγκυρο default-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "μη έγκυρο min-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ΣΗΜΕΙΩΣΗ: η απλή S2K κατάσταση (0) πρέπει να αποφεύγεται\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "μη έγκυρες προεπιλογές\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
 "δημοσίου κλειδιού\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver λήψη απέτυχε: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver αναζήτηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver ανανέωση απέτυχε: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "αποθωράκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδοθήκη"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Χρήση: gpgv [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3629,7 +3650,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
@@ -3639,7 +3660,7 @@
 msgid "key %s: %s\n"
 msgstr "παραλείφθηκε `%s': %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3663,7 +3684,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "αυτό μπορεί να συνέβει από μια απούσα ιδιοϋπογραφή\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί που δε βρέθηκε: %s\n"
@@ -3678,7 +3699,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "δεν βρεθηκε εγγράψιμη κλειδοθήκη: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3749,18 +3770,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "κλειδί %08lX: \"%s\" αμετάβλητο\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@ -3773,239 +3794,303 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί με άκυρο κρυπταλγ. %d - παραλείφθηκε\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Δεν έχει οριστεί αιτία"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Το κλειδί έχει παρακαμθεί"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Το κλειδί έχει εκτεθεί"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Το κλειδί δε χρησιμοποιείται πλέον"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Το User ID δεν είναι πλέον έγκυρο"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "αιτία για ανάκληση:"
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "σχόλιο ανάκλησης:"
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "κλειδί %08lX: όχι δημόσιο κλειδί - αδυναμία εφαρμογής πιστοποιητικού "
 "ανάκλησης\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - απόρριψη\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "κλειδί %08lX: δεν υπάρχει user ID για την υπογραφή\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού στο user id "
 "\"%s\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "κλειδί %08lX: μη έγκυρη ιδιο-υπογραφή στο user id \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση κλειδιού\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "κλειδί %08lX: αφαιρέθηκε η δέσμευση πολλαπλού υποκλειδιού\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για την ανάκληση κλειδιού\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "κλειδί %08lX: μη έγκυρη ανάκληση υποκλειδιού\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "κλειδί %08lX: αφαιρέθηκε η ανάκληση πολλαπλού υποκλειδιού\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "κλειδί %08lX: παραλείφθηκε user ID '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "κλειδί %08lX: παραλείφθηκε υποκλειδί\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "κλειδί %08lX: μη εξαγόμενη υπογραφή (κλάση %02x) - παραλείφθηκε\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - παραλείφθηκε\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - παραλείφθηκε\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "κλειδί %08lX: μη αναμενώμενη κλάση υπογραφής (0x%02x) - παραλείφθηκε\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: λήψη κλειδιού ανάκλησης "
 "%08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: το κλειδί ανάκλησης %08lX\n"
 "δεν είναι παρών.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης προστέθηκε\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Καλή υπογραφή από \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "παραλείφθηκε `%s': %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Το user ID \"%s\" ανακαλείτε."
+msgstr[1] "Το user ID \"%s\" ανακαλείτε."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
+msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d κακές υπογραφές\n"
+msgstr[1] "%d κακές υπογραφές\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Καλή υπογραφή από \""
+msgstr[1] "Καλή υπογραφή από \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "κλειδοθήκη `%s' δημιουργήθηκε\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "κλειδοθήκη `%s' δημιουργήθηκε\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
@@ -4271,8 +4356,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Σίγουρα να υπογραφεί; "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
@@ -4485,7 +4570,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Το κλειδί ανακλήθηκε."
 
@@ -4543,7 +4628,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
@@ -4631,7 +4716,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Τερματισμός χωρίς αποθήκευση; "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Το κλειδί δεν άλλαξε οπότε δεν χρειάζεται ενημέρωση.\n"
@@ -4679,106 +4764,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Τίποτα για να υπογραφεί με το κλειδί  %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   υπογράφθηκε από %08lX στις %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Περίληψη: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Δυνατότητε: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Σημείωση: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Δεν υπάρχουν προεπιλογές σε ένα user ID τύπου PGP 2.x.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (ευαίσθητο)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " εμπιστοσύνη: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " εμπιστοσύνη: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Αυτό το κλειδί έχει απενεργοποιηθεί"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4786,19 +4886,19 @@
 "Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
 "εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4807,18 +4907,18 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χρήστη σαν πρωτεύων.  Αυτή η εντολή\n"
 "              μπορεί να κάνει ένα άλλο ID χρήστη να γίνει το πρωτεύων.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4827,35 +4927,35 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τύπου PGP2. Η προσθήκη ενός photo ID\n"
 "               μπορεί να κάνει μερικές εκδόσεις PGP να το απορρίψουν.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Σίγουρα ακόμα θέλετε να το προσθέσετε; (y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Διαγραφή αυτής της καλής υπογραφής; (y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Διαγραφή αυτής της μη έγκυρης υπογραφής; (y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Διαγραφή αυτής της άγνωστης υπογραφής; (y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Σίγουρα να διαγραφεί αυτή η ιδιο-υπογραφή; (y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4863,38 +4963,38 @@
 msgstr[0] "Διαγράφτηκε %d υπογραφή.\n"
 msgstr[1] "Διαγράφτηκε %d υπογραφή.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Τίποτα δεν διαγράφτηκε.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "μη έγκυρη θωράκιση"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Το user ID \"%s\" ανακαλείτε."
 msgstr[1] "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4904,40 +5004,40 @@
 "               καθορισμένου ανακλητή μπορεί να κάνει μερικές εκδόσεις PGP\n"
 "               να το απορρίψουν.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Δεν μπορείτε να προσθέσετε ένα καθορισμένο ανακλητή σε κλειδί τύπου PGP2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "αδυναμία ορισμού ενός κλειδιού τύπου PGP 2.x, σαν διορισμένου ανακλητή\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "δε μπορείτε να ορίσετε ένα κλειδί σαν το διορισμένο ανακλητή του εαυτού του\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ορίσετε ένα κλειδί σαν διορισμένο ανακλητή δεν μπορεί να "
 "επανέλθει!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4945,7 +5045,7 @@
 "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -4954,270 +5054,265 @@
 "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
 "πιστοποιηθεί\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Πρέπει να επιλέξετε ακριβώς ένα user ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "παραλείφθηκε η v3 ιδιο-υπογραφή στο user id \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Σημείωση υπογραφής: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Επικάλυψη (y/N); "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   υπογράφθηκε από %08lX στις %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Αυτή η υπογραφή έληξε στις %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτή την υπογραφή; (y/N)"
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   υπογράφθηκε από %08lX στις %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Έχετε υπογράψει αυτά τα user ID:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ανακλήθηκε από %08lX στις %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Σκοπεύετε να ανακαλέσετε αυτές τις υπογραφές:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Σίγουρα να δημιουργηθούν τα πιστοποιητικά ανάκλησης; (y/N)"
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "κανένα μυστικό κλειδί\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογραφή user ID έχει ημερομηνία %d δεύτερα στο μέλλον\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Απεικόνιση %s photo ID μεγέθους %ld για το κλειδί 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "εγγραφή άμεσης υπογραφής\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "εγγραφή ιδιο-υπογραφής\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "εγγραφή υπογραφής \"δέσιμου\" κλειδιού\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "στρογγυλοποίηση του μέγεθος κλειδιού έως %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "κρυπτογράφηση δεδομένων"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5231,169 +5326,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Σημείωση υπογραφής: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "απενεργοποιεί ένα κλειδί"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Το μέγεθος κλειδιού που ζητήθηκε είναι %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5409,7 +5504,7 @@
 "      <n>m = το κλειδί λήγει σε n μήνες\n"
 "      <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5425,40 +5520,40 @@
 "      <n>m = το κλειδί λήγει σε n μήνες\n"
 "      <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Το κλειδί είναι έγκυρο για; (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Η υπογραφή έιναι έγκυρη για; (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "μη έγκυρη τιμή\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "το %s λήγει στις %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Υπογραφή λήγει στις %s.\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5466,12 +5561,12 @@
 "Το σύστημα σας δεν μπορεί να απεικονίσει ημερομηνίες πέρα του 2038.\n"
 "Όμως, θα χειρίζονται σωστά έως το 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Είναι αυτό σωστό (y/n); "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5482,7 +5577,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5499,50 +5594,50 @@
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Αληθινό Όνομα: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Το όνομα δεν επιτρέπεται να ξεκινά με αριθμητικό ψηφίο\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Διεύθυνση Email: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Μη έγκυρη διεύθυνση Email\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Σχόλιο: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Μη έγκυρος χαρακτήρας στο σχόλιο\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Χρησιμοποιείτε το `%s' σετ χαρακτήρων.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5553,7 +5648,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
 
@@ -5568,35 +5663,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Παρακαλώ, διορθώστε πρώτα το σφάλμα\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5608,13 +5703,13 @@
 "τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
 "στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5622,67 +5717,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Η δημιουργία κλειδιού αναβλήθηκε.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "εγγραφή του δημοσίου κλειδιού στο `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "δε βρέθηκε εγγράψιμη δημόσια κλειδοθήκη: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "αδυναμία εγγραφής δημόσιας κλειδοθήκης `%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5693,7 +5788,7 @@
 "Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
 "ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5701,7 +5796,7 @@
 "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
 "απλώς πρόβλημα στο ρολόι)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5709,7 +5804,7 @@
 "το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
 "απλώς πρόβλημα στο ρολόι)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
@@ -5717,17 +5812,17 @@
 "ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
 "με το OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Σίγουρα να δημιουργηθεί; "
@@ -5764,22 +5859,6 @@
 msgstr[0] "%d κακές υπογραφές\n"
 msgstr[1] "%d κακές υπογραφές\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d κακές υπογραφές\n"
-msgstr[1] "%d κακές υπογραφές\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
-msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5799,30 +5878,30 @@
 msgid "Keyring"
 msgstr "Κλειδοθήκη"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Αποτύπωμα πρωτεύοντος κλειδιού:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Αποτύπωμα υποκλειδιού:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Αποτύπωμα πρωτ. κλειδιού:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Αποτύπωμα υποκλειδιού:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Αποτύπωμα κλειδιού ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5853,7 +5932,7 @@
 msgstr[0] "1 κακή υπογραφή\n"
 msgstr[1] "1 κακή υπογραφή\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: κλειδοθήκη δημιουργήθηκε\n"
@@ -5906,261 +5985,261 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "αίτηση κλειδιού %08lX από το %s\n"
 msgstr[1] "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "παραλείφθηκε `%s': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "υπογράφθηκε με το κλειδί σας %08lX στις %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "παράξενο μέγεθος για ένα κλειδί κρυπτογραφημένης συνεδρίας (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s κλειδί κρυπτογραφημένης συνεδρία\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "δημόσιο κλειδί είναι %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "κρυπτογραφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "κρυπτογραφημένο με %u-bit %s κλειδί, ID %08lX, δημιουργήθηκε %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "κρυπτογραφημένο με %s key, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "κρυπτογράφηση με δημόσιο κλειδί απέτυχε: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "κρυπτογραφημένο με 1 φράση κλειδί\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "υπόθεση %s κρυπτογραφημένων δεδομένων\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "Κρυπταλγόριθμος IDEA μη διαθέσιμος, αισιόδοξη προσπάθεια χρήσης του\n"
 "%s αντίθετα\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν προστατεύτηκε η ακεραιότητα του μηύματος\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "αποκρυπτογράφηση OK\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κρυπτογραφημένο μήνυμα έχει πειραχθεί!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "ΣΗΜΕΙΩΣΗ: ο αποστολέας ζήτησε \"για-τα-μάτια-σας-μόνο\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "αρχικό όνομα αρχείου='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ανεξάρτητη ανάκληση - χρησιμοποιείστε \"gpg --import\" για εφαρμογή\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Καλή υπογραφή από \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ΚΑΚΗ υπογραφή από \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Ληγμένη υπογραφή από \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Καλή υπογραφή από \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "καταστολή ανάκλησης υπογραφής\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "αδυναμία χειρισμού αυτών των πολλαπλών υπογραφών\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Υπογραφή έγινε στο %.*s με χρήση του κλειδιού%s ID %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[αβέβαιο]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
@@ -6168,200 +6247,200 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστεύσιμη "
 "υπογραφή!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Υπογραφή λήγει στις %s.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "δυαδικό"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "κατάσταση-κειμένου"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "άγνωστος αλγόριθμος δημοσίου κλειδιού"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Αδυναμία ελέγχου της υπογραφής: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "δεν είναι αποκομμένη υπογραφή\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογραφών. Μόνο η πρώτη θα ελεγχθεί.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "υπογραφή παλιού στυλ (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "αδυναμία χειρισμού του αλγόριθμου δημοσίου κλειδιού %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
 "προεπιλογές του παραλήπτη\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "μη υλοποιημένος αλγόριθμος κρυπτογράφησης"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
 "προεπιλογές του παραλήπτη\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "παρακαλώ χρησιμοποιήστε το \"%s%s\" καλύτερα\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Ασυμπίεστο"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Ασυμπίεστο"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "αυτό το μήνυμα ίσως δεν μπορεί να χρησιμοποιηθεί από %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "άγνωστη κλάση υπογραφής"
@@ -6397,77 +6476,77 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "υπόθεση υπογεγραμμένων δεδομένων στο `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "αδυναμία χειρισμού του αλγόριθμου δημοσίου κλειδιού %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: πιθανόν μη ασφαλές κρυπτογραφημένο συμμετρικά κλειδί\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Σημείωση κρίσιμης υπογραφής: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "υποπακέτο τύπου %d έχει ορισμένο το κριτικό bit\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Πληκτρολογήστε τη φράση κλειδί\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "ακυρώθηκε από το χρήστη\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (κύριο κλειδί, ID %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6519,7 +6598,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Είναι αυτή η φωτογραφία σωστή (y/N/q); "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "αδυναμία απεικόνισης του photo ID!\n"
@@ -6838,12 +6917,12 @@
 msgid "no valid addressees\n"
 msgstr "καμμία έγκυρη διεύθυνση\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
@@ -6897,27 +6976,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "εντάξει, είμαστε ο ανώνυμος παραλήπτης.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "παλαιά κωδικοποίηση του DEK δεν υποστηρίζεται\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "ο αλγόριθμος κρυπτογράφησης %d%s είναι άγνωστος ή απενεργοποιημένος\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "ΣΗΜΕΙΩΣΗ: ο αλγόριθμος κρυπτογράφησης %d δεν είναι στις επιλογές\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7106,7 +7185,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σύγκρουση υπογραφής περίληψης στο μήνυμα\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7184,29 +7263,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "υπόθεση κακής υπογραφής από κλειδί %08lX λόγω άγνωστου κρίσιμου bit\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "κλειδί %08lX: κανένα υποκλειδί για το πακέτο ανάκλησης υποκλειδιού\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση υποκλειδιού\n"
@@ -7235,12 +7314,12 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
 "               Χρήση μη ανεπτυγμένου.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s υπογραφή από: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7248,12 +7327,12 @@
 "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
 "προεπιλογές του παραλήπτη\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "υπογραφή:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s κρυπτογράφηση θα χρησιμοποιηθεί\n"
@@ -7282,7 +7361,7 @@
 "παραλείφθηκε `%s': αυτό είναι δημιουργημένο από PGP κλειδί ElGamal και δεν "
 "είναι ασφαλές για υπογραφές!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@ -7330,12 +7409,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync απέτυχε: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
@@ -7345,12 +7424,12 @@
 msgid "can't lock '%s'\n"
 msgstr "αδυναμία πρόσβασης του `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: αποτυχία lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: αποτυχία write (n=%d): %s\n"
@@ -7365,104 +7444,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ο φάκελος δεν υπάρχει!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: αποτυχία δημιουργίας μιας εγγραφής έκδοσης: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: δημιουργήθηκε μη έγκυρη trustdb\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: δημιουργήθηκε η trustdb\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "ΣΗΜΕΙΩΣΗ: η trustdb δεν είναι εγγράψιμη\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: μη έγκυρη trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: σφάλμα στην ενημέρωση της εγγραφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: σφάλμα στην εγγραφή της εγγραφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: απέτυχε lseek: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: δεν είναι trustdb αρχείο\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: εγγραφή έκδοσης με recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: μη έγκυρη έκδοση αρχείου %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: αποτυχία στον μηδενισμό μιας εγγραφής: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: αποτυχία στην προσθήκη μιας εγγραφής: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: δημιουργήθηκε η trustdb\n"
@@ -7833,107 +7912,107 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' δεν είναι έγκυρο μακρύ keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "κλειδί %08lX: αποδοχή σαν κλειδί με εμπιστοσύνη\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "το κλειδί %08lX υπάρχει πάνω από μια φορά στην trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "κλειδί %08lX: κανένα δημόσιο κλειδί για το κλειδί με εμπιστοσύνη - "
 "παράλειψη\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "σημείωση κλειδιού σαν απόλυτης εμπιστοσύνης.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "εγγραφή trust %lu, req τύπος %d: read απέτυχε: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "η εγγραφή trust %lu δεν είναι του ζητούμενου τύπου %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "παρακαλώ κάντε ένα --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "έλεγχος της trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
 msgstr[1] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7941,24 +8020,24 @@
 msgstr[0] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
 msgstr[1] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "δε βρέθηκαν απόλυτα εμπιστεύσιμα κλειδιά\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "δε βρέθηκε το δημόσιο κλειδί του απόλυτα εμπιστεύσιμου κλειδιού %08lX\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@ -8073,110 +8152,125 @@
 "List, export, import Keybox data\n"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "αλλαγή της φράσης κλειδί"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "αλλαγή της φράσης κλειδί"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@ -8184,55 +8278,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8242,27 +8324,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8270,123 +8352,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "μη υποστηριζόμενο URI"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Η δημιουργία κλειδιού απέτυχε: %s\n"
 msgstr[1] "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
@@ -8403,376 +8485,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "μη χρήση τερματικού"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "δεν υποστηρίζεται η έκδοση πρωτοκόλλου %d του gpg-agent\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: αδυναμία πρόσβασης: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        νέες υπογραφές: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "απεικόνιση του fingerprint"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "επαλήθευση μιας υπογραφής"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "μη επεξεργασμένο"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "όχι|οχι"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8786,137 +8886,137 @@
 "\"%.*s\"\n"
 "%u-bit %s κλειδί, ID %08lX, δημιουργία %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Μη έγκυρη διεύθυνση Email\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9057,7 +9157,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@ -9082,134 +9182,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Δεν δώθηκε περιγραφή)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "δημιουργία ascii θωρακισμένης εξόδου"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "μη χρήση τερματικού"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "κατάσταση batch: να μη γίνονται ερωτήσεις"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "απάντηση ναι στις περισσότερες ερωτήσεις"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "απάντηση όχι στις περισσότερες ερωτήσεις"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "προσθήκη αυτού του κλειδιού στη λίστα των κλειδοθηκών"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου περίληψης μηνύματος ΟΝΟΜΑ "
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9220,47 +9320,47 @@
 "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
 "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Δεν δώθηκε περιγραφή)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = παράλειψη αυτού του κλειδιού\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "εγγραφή στο  `%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9280,7 +9380,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@ -9290,42 +9390,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9355,7 +9450,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9385,38 +9480,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+msgid "algorithm:"
+msgstr "θωράκιση: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Καλή υπογραφή από \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                γνωστό σαν \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9487,182 +9582,181 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "σφάλμα στη γραμμή trailer\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
@@ -9670,327 +9764,329 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
 "χρησιμοποιείτε\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "μη έγκυρη απάντηση από τον agent\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "εγγραφή στο  `%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "καταστολή ανάκλησης υπογραφής\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "εγγραφή στο  `%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -9998,36 +10094,36 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
 "χρησιμοποιείτε\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@ -10066,64 +10162,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10131,88 +10227,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "αδυναμία λήψης πληροφοριών για το `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Υποστηριζόμενοι αλγόριθμοι:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10238,95 +10334,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Τερματισμός χωρίς αποθήκευση; "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10339,301 +10435,295 @@
 "@\n"
 "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "χρήση: gpg [επιλογές] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "το %s δεν επιτρέπεται με το %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "μη επεξεργασμένο"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "ανάγνωση από `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "          χωρίς user ID: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "                γνωστό σαν \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "                γνωστό σαν \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "          μη  εισαχθέντα: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "                γνωστό σαν \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "                γνωστό σαν \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Δεν δώθηκε περιγραφή)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: χρήση μη ασφαλούς μνήμης!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "αποθωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" δεν είναι JPEG αρχείο\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "εγγραφή στο  `%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10684,7 +10774,7 @@
 msgid "malloc failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10816,12 +10906,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: αδυναμία πρόσβασης: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10892,7 +10976,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
@@ -10922,33 +11006,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10989,101 +11073,101 @@
 msgid "certificate chain is good\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "τερματισμός"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@ -11282,302 +11366,234 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Παρακαλώ χρησιμοποιείστε την εντολή \"toggle\" πρώτα.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "χρήση ως αρχείου εξόδου"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "δεν βρέθηκε το δημόσιο κλειδί"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Εντολές:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "αποκρυπτογράφηση OK\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "ΣΗΜΕΙΩΣΗ: αγνοήθηκε το παλιό αρχείο προκαθορισμένων επιλογών `%s'\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "αποκρυπτογράφηση OK\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Εντολές:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [όνομα αρχείου]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "αποκρυπτογράφηση OK\n"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
-
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "το %s δεν επιτρέπεται με το %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "αδυναμία πρόσβασης του %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
+#~ msgid "encryption modus"
+#~ msgstr "αποκρυπτογράφηση OK\n"
 
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [όνομα αρχείου]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "το %s δεν επιτρέπεται με το %s!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "αδυναμία δημιουργίας του %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "αδυναμία πρόσβασης του %s: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "αδυναμία δημιουργίας του %s: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "αδυναμία δημιουργίας του `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "αδυναμία δημιουργίας του `%s': %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11668,36 +11684,6 @@
 #~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Καλή υπογραφή από \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "παραλείφθηκε `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Το user ID \"%s\" ανακαλείτε."
-#~ msgstr[1] "Το user ID \"%s\" ανακαλείτε."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Καλή υπογραφή από \""
-#~ msgstr[1] "Καλή υπογραφή από \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
@@ -12822,9 +12808,6 @@
 #~ msgid "file delete error"
 #~ msgstr "σφάλμα διαγραφής αρχείου"
 
-#~ msgid "unexpected data"
-#~ msgstr "μη αναμενόμενα δεδομένα"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "σύγκρουση ώρας (timestamp)"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/en@boldquot.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/en@boldquot.gmo sont différents
diff -Nru gnupg2-2.2.20/po/en@boldquot.po gnupg2-2.2.27/po/en@boldquot.po
--- gnupg2-2.2.20/po/en@boldquot.po	2020-03-20 15:40:32.000000000 +0100
+++ gnupg2-2.2.27/po/en@boldquot.po	2021-01-11 18:47:21.000000000 +0100
@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2020.
+# Automatically generated, 2021.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.20\n"
+"Project-Id-Version: GNU gnupg 2.2.27\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2021-01-11 18:47+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -42,7 +42,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -53,45 +53,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Do you really want to make your passphrase visible on the screen?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -101,11 +101,11 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -113,7 +113,7 @@
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -121,17 +121,17 @@
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -139,36 +139,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
@@ -177,31 +181,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -262,7 +266,7 @@
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
@@ -390,17 +394,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Please enter the passphrase to%0Aprotect your new key"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -408,132 +412,132 @@
 "@Options:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "use a log file for the server"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted”"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "enable putty support"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -541,147 +545,135 @@
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Note: no default option file ‘%s’\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "option file '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "a gpg-agent is already running - not starting a new one\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -689,8 +681,8 @@
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -698,9 +690,9 @@
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -710,11 +702,11 @@
 "Options:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -722,15 +714,15 @@
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -738,7 +730,7 @@
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -746,18 +738,18 @@
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
@@ -767,32 +759,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s” ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -805,7 +797,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -814,11 +806,11 @@
 "Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user "
 "certificates?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -831,7 +823,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -843,20 +835,20 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -865,15 +857,15 @@
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -882,11 +874,11 @@
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -894,12 +886,12 @@
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s key uses an unsafe (%u bit) hash\n"
@@ -909,7 +901,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
@@ -919,7 +911,7 @@
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -948,7 +940,7 @@
 msgstr "error creating a stream for a pipe: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -994,27 +986,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem setting the gpg-agent options\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Warning: unsafe ownership on %s “%s”\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s”\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1074,7 +1066,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
@@ -1187,7 +1179,7 @@
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1262,39 +1254,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP check of certificates"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Included certificates"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "No audit log entries."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Unknown operation"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent usable"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr usable"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "No help available for '%s'."
@@ -1303,7 +1295,7 @@
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[none]"
 
@@ -1312,82 +1304,108 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "argument not expected"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "read error"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "keyword too long"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "missing argument"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "invalid argument"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "invalid command"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "invalid alias definition"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr "permission error"
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "out of core"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+msgid "invalid meta command"
+msgstr "invalid meta command"
+
+#: common/argparse.c:542 common/argparse.c:577
+msgid "unknown meta command"
+msgstr "unknown meta command"
+
+#: common/argparse.c:544 common/argparse.c:579
+msgid "unexpected meta command"
+msgstr "unexpected meta command"
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "invalid option"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "missing argument for option “%.50s”\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s”\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "option “%.50s” does not expect an argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "invalid command “%.50s”\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "option “%.50s” is ambiguous\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "command “%.50s” is ambiguous\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "out of core\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "invalid option “%.50s”\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr "Note: ignoring option “--%s” due to global config\n"
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1403,42 +1421,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "failed to create temporary file '%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "waiting for lock (held by %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘%s’ not made: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1618,13 +1635,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Note: Use the command “%s” to restart them.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
@@ -1662,23 +1679,23 @@
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP card not available: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP card no. %s detected\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
@@ -1688,136 +1705,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code not or not anymore available\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[not set]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<” character may not be used.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: Combined name too long (limit is %d characters).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1827,97 +1844,97 @@
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "The card will now be re-configured to generate a key of %u bits\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "The card will now be re-configured to generate a key of type: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error changing key attribute for key %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "This command is not supported by this card\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Note: keys are already stored on the card!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1928,165 +1945,165 @@
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Note: This command destroys all keys stored on the card!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes”) "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s” not found: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2145,8 +2162,8 @@
 msgstr "subkey"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2171,55 +2188,61 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use option “--delete-secret-keys” to delete it first.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "using cipher %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2228,39 +2251,39 @@
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s”\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
@@ -2352,7 +2375,7 @@
 msgstr " - skipped"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "writing to ‘%s’\n"
@@ -2387,262 +2410,266 @@
 msgid "[User ID not found]"
 msgstr "[User ID not found]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘%s’ via %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘%s’ via %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "checking for a fresh copy of an expired key via %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s” not found: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Warning: not using ‘%s’ as default key: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "using “%s” as default secret key for signing\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘%s’ ignored\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+msgid "quickly revoke a key signature"
+msgstr "quickly revoke a key signature"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2650,7 +2677,7 @@
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2670,11 +2697,11 @@
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2684,7 +2711,7 @@
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2692,73 +2719,73 @@
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2766,19 +2793,19 @@
 "WARNING: unsafe enclosing directory ownership on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2786,482 +2813,471 @@
 "WARNING: unsafe enclosing directory permissions on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help” to list choices)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Note: old default options file ‘%s’ ignored\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” is not a proper mail address\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt in %s mode\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|take the keys from the keyring FILE"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|reject signatures made with ALGO"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Usage: gpgv [options] [files] (-h for help)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3456,7 +3472,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
@@ -3466,7 +3482,7 @@
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
@@ -3490,7 +3506,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
@@ -3505,7 +3521,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
@@ -3575,17 +3591,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “%s” not changed\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
@@ -3598,227 +3614,292 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "To migrate '%s', with each smartcard, run: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "key %s: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "key %s: can't locate original keyblock: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "key %s: can't read original keyblock: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “%s” revocation certificate imported\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "key %s: invalid self-signature on user ID “%s”\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “%s”\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "key %s: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "key %s: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “%s” revocation certificate added\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error allocating memory: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplicate signature removed\n"
+msgstr[1] "%d duplicate signatures removed\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d bad signature\n"
+msgstr[1] "%d bad signatures\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signature reordered\n"
+msgstr[1] "%d signatures reordered\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Warning: errors found and only checked self-signatures, run ‘%s’ to "
+"check all signatures.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error creating keybox '%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "error creating keyring '%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ‘%s’ created\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "keyring ‘%s’ created\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock resource '%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error opening key DB: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
@@ -4058,8 +4139,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4250,7 +4331,7 @@
 "signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
@@ -4303,7 +4384,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
@@ -4378,7 +4459,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
@@ -4421,104 +4502,118 @@
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:2995
+#, c-format
+msgid "revoking the key signature failed: %s\n"
+msgstr "revoking the key signature failed: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s” is not a proper fingerprint\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s” not found\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4526,17 +4621,17 @@
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4545,17 +4640,17 @@
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4565,72 +4660,72 @@
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s” compacted: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s”: %d signature removed\n"
 msgstr[1] "User ID “%s”: %d signatures removed\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s”: already minimized\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s”: already clean\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4640,40 +4735,40 @@
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4681,255 +4776,251 @@
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s”\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Are you sure you want to replace it? (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Are you sure you want to delete it? (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s”\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signed by your key %s on %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Not signed by you.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "You have signed these user IDs on key %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tried to revoke a non-user ID: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘%s’\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘%s’ duplicated\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -4943,161 +5034,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Possible actions for a %s key: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA and RSA (default)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA and Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (set your own capabilities)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (set your own capabilities)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC and ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (set your own capabilities)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (encrypt only)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Existing key\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "  (%d) Existing key from card\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s keys may be between %u and %u bits long.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "What keysize do you want for the subkey? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5113,7 +5204,7 @@
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5129,38 +5220,38 @@
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5168,11 +5259,11 @@
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5186,7 +5277,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5202,49 +5293,49 @@
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5255,7 +5346,7 @@
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
@@ -5270,31 +5361,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5306,13 +5397,13 @@
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5323,64 +5414,64 @@
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s” already exists\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Note: backup of card key saved to ‘%s’\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5388,36 +5479,36 @@
 "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"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Secret parts of primary key are stored on-card.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5452,20 +5543,6 @@
 msgstr[0] "%d good signature\n"
 msgstr[1] "%d good signatures\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d bad signature\n"
-msgstr[1] "%d bad signatures\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d signature not checked due to a missing key\n"
-msgstr[1] "%d signatures not checked due to missing keys\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5484,29 +5561,29 @@
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
@@ -5536,7 +5613,7 @@
 msgstr[0] " (%lu signature)\n"
 msgstr[1] " (%lu signatures)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring created\n"
@@ -5587,139 +5664,139 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” not a key ID: skipping\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "refreshing %d key from %s\n"
 msgstr[1] "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s” not found on keyserver\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requesting key %s from %s server %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s”: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "weird size for an encrypted session key (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s encrypted session key\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5729,307 +5806,307 @@
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s”"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s”"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s”"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s”\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Note: Use ‘%s’ to make use of this info\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s”"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "WARNING: This key is not suitable for signing in %s mode\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat of ‘%s’ failed in %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) failed in %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "WARNING: using experimental public key algorithm %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "WARNING: using experimental cipher algorithm %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNING: using experimental digest algorithm %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNING: digest algorithm %s is deprecated\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Note: signatures using the %s algorithm are rejected\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Note: third-party key signatures using the %s algorithm are rejected\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(reported error: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(reported error: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(further info: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s”\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s” is a deprecated option\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "please use “%s%s” instead\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6062,71 +6139,71 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "assuming signed data in ‘%s’\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "can't handle public key algorithm %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Unknown critical signature notation: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Enter passphrase\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelled by user\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (main key ID %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Do you really want to permanently delete the OpenPGP secret subkey key:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6182,7 +6259,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6481,12 +6558,12 @@
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -6539,27 +6616,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okay, we are the anonymous recipient.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "old encoding of the DEK is not supported\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "cipher algorithm %d%s is unknown or disabled\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Note: secret key %s expired at %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Note: key has been revoked"
@@ -6747,7 +6824,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "key %s may not be used for signing in %s mode\n"
@@ -6812,27 +6889,27 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Note: signature key %s has been revoked\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "key %s: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
@@ -6859,24 +6936,24 @@
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s encryption will be used\n"
@@ -6901,7 +6978,7 @@
 msgstr ""
 "this is a PGP generated Elgamal key which is not secure for signatures!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
@@ -6946,12 +7023,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "read error in '%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "can't create lock for ‘%s’\n"
@@ -6961,12 +7038,12 @@
 msgid "can't lock '%s'\n"
 msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -6981,103 +7058,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Note: trustdb not writable\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: The trustdb is corrupted.\n"
@@ -7451,128 +7528,128 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "You may try to re-create the trustdb using the commands:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "If that does not work, please consult the manual\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -7682,54 +7759,69 @@
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNumber: %s%%0AHolder: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Please enter the PIN for the key to create qualified signatures."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus missing or not of size %d bits\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Please enter a new PIN for the standard keys."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Please enter the PIN for the standard keys."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||Please enter the PIN for the key to create qualified signatures."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7737,7 +7829,7 @@
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7745,47 +7837,47 @@
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -7793,54 +7885,42 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sNumber: %s%%0AHolder: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Remaining attempts: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7850,24 +7930,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -7875,121 +7955,121 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA prime %s missing or not of size %d bits\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "key generation completed (%d second)\n"
 msgstr[1] "key generation completed (%d seconds)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingerprint on card does not match requested one\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verification of Admin PIN is currently prohibited through this command\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8005,55 +8085,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial New PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|write a log to FILE"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|connect to reader at port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|use NAME as ct-API driver"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|use NAME as PC/SC driver"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "do not use the internal CCID driver"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|disconnect the card after N seconds of inactivity"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "do not use a reader's pinpad"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "deny the use of admin card commands"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "use variable length input for pinpad"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8061,307 +8141,324 @@
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "critical certificate extension %s is not supported"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "issuer certificate is not marked as a CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "critical marked policy without configured policies"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "failed to open '%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Note: non-critical certificate policy not allowed"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "please make sure that the “dirmngr” is properly installed\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "root certificate has now been marked as trusted\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interactive marking as trusted disabled for this session\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "WARNING: creation time of signature not known - assuming current time"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "none"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Error - invalid encoding]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Error - out of core]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Error - No name]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Error - invalid DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8376,137 +8473,137 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error getting key usage information: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "line %d: invalid algorithm\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "line %d: no subject name given\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "line %d: invalid subject name label ‘%.*s’\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "line %d: not a valid email address\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "line %d: invalid serial number\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "line %d: invalid date given\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "line %d: invalid hash algorithm given\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "line %d: invalid authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "line %d: invalid subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "line %d: invalid extension syntax\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "line %d: error getting key by keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "line %d: key generation failed: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8639,7 +8736,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘%s’ not found: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -8664,123 +8761,123 @@
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|write a server mode log to FILE"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8790,47 +8887,47 @@
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Note: won't be able to encrypt to '%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: no hostname given\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: password given without user\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: skipping this line\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "could not parse keyserver\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -8850,7 +8947,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
@@ -8860,42 +8957,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "failed to get the fingerprint\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Error - "
 
@@ -8931,7 +9023,7 @@
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8966,39 +9058,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Signature made "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[date not given]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " using certificate ID 0x%08lX\n"
+msgid "algorithm:"
+msgstr "algorithm:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "invalid signature: message digest attribute does not match computed one\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9066,273 +9158,272 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "error loading certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanently loaded certificates: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    runtime cached certificates: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           trusted certificates: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificate already cached\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificate cached\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error caching certificate: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error fetching certificate by S/N: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error getting authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creating directory ‘%s’\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error creating directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignoring database dir ‘%s’\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error reading directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "removing cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘%s’\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "failed to open cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "error creating new cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "error writing new cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "error closing new cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "new cache dir file ‘%s’ created\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "failed to re-open cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "first record of ‘%s’ is not the version\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "old version of cache directory - cleaning up\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "old version of cache directory - giving up\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "extra field detected in crl record of ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "invalid line detected in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "duplicate entry detected in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "unsupported record type in ‘%s’ line %u skipped\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "invalid issuer hash in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "no issuer DN in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "invalid timestamp in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "detected errors in cache dir file\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "please check the reason and manually delete that file\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "failed to create temporary cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "error closing '%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "can't hash '%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error setting up MD5 hash context: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error hashing '%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "invalid formatted checksum for ‘%s’\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "too many open cache files; can't open anymore\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "opening cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error opening cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "error initializing cache file ‘%s’ for reading: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "calling unlock_db_file on a closed file\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "calling unlock_db_file on an unlocked file\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "failed to create a new cache object: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "no CRL available for issuer id %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "cached CRL for issuer id %s too old; update required\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9341,192 +9432,194 @@
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refresh active for issuer id %s; update required\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "available CRL for issuer ID %s can't be used\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr "cached CRL for issuer id %s tampered; we need to update\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "WARNING: invalid cache record length for S/N "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "problem reading cache record for S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s is not valid; reason=%02X  date=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s is valid, it is not listed in the CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "unknown hash algorithm ‘%s’\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "gcry_md_open for algorithm %d failed: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘%s’\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open for algorithm %d failed: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "update times of this CRL: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate not given; assuming a validity period of one day\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error inserting item into temporary cache file: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error checking validity of CRL issuer certificate: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problem removing stale temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "new CRL still too old; it expired on %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9535,12 +9628,12 @@
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9548,55 +9641,55 @@
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ERROR: This cached CRL may have been tampered with!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -9634,55 +9727,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "certificate search not possible due to disabled %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "use OCSP instead of CRLs"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "check whether a dirmngr is running"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "add a certificate to the cache"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "validate a certificate"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "lookup a certificate"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "lookup only locally stored certificates"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "expect an URL for --lookup"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "load a CRL into the dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "special mode for use by Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "expect certificates in PEM format"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "force the use of the default OCSP responder"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9694,82 +9787,82 @@
 "The process returns 0 if the certificate is valid, 1 if it is\n"
 "not valid and other error codes for general failures\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "error reading certificate from stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "error reading certificate from '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "certificate too large to make any sense\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "can't connect to the dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "lookup failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "loading CRL ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "a dirmngr daemon is up and running\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "validation of certificate failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "certificate is valid\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "certificate has been revoked\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "certificate check failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "got status: ‘%s’\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "error writing base64 encoding: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "unsupported inquiry ‘%s’\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "absolute file name expected\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
@@ -9794,92 +9887,92 @@
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "run without asking a user"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "add new servers discovered in CRL distribution points to serverlist"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|do not return more than N items in one query"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9889,11 +9982,11 @@
 "(See the “info” manual for a complete listing of all commands and "
 "options)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9901,132 +9994,132 @@
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: garbage at end of line ignored\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "return all values in a record oriented format"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|ignore host part and connect through NAME"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|connect to host NAME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|connect to port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|use user NAME for authentication"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|use password PASS for authentication"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "take password from $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|query DN STRING"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|use STRING as filter expression"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|return the attribute STRING"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10036,144 +10129,138 @@
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "invalid port number %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "scanning result for attribute ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "error writing to stdout: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          available attribute ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "attribute ‘%s’ not found\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "found attribute ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "processing url ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          user ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          pass ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          host ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        filter ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          attr ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "no host name in ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "no attribute given for query ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "WARNING: using first attribute only\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "binding to ‘%s:%d’ failed: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "searching ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "‘%s’ is not an LDAP URL\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘%s’ is an invalid LDAP URL\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "error allocating memory: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10224,7 +10311,7 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc failed: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
@@ -10354,11 +10441,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "can't get authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10427,7 +10509,7 @@
 msgstr "serialno missing in cert ID"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
@@ -10457,32 +10539,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "failed to the register commands with Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10520,56 +10602,56 @@
 msgid "certificate chain is good\n"
 msgstr "certificate chain is good\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "quiet"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "print data out hex encoded"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "decode received data lines"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "connect to the dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connect to Assuan socket NAME"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connect to Assuan server at ADDR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "run the Assuan server given on the command line"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "do not use extended connect mode"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|run commands from FILE on startup"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "run /subst on startup"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Usage: @GPG@-connect-agent [options] (-h for help)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10577,43 +10659,43 @@
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "option “%s” requires a program and optional arguments\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option “%s” ignored due to “%s”\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "receiving line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "line too long - skipped\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "line shortened due to embedded Nul character\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unknown command ‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
@@ -10799,94 +10881,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Note: Use the command “%s%s” to get details.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "External verification of component %s failed"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "list all components"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "check all programs"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|list options"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|change options"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|check options"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "apply global default values"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|update configuration files using FILE"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "get the configuration directories for @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "list global configuration file"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "check global configuration file"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "query the software version database"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "reload all or a given component"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "launch a given component"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "kill a given component"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "use as output file"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "activate changes at runtime, if possible"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10894,196 +10976,23 @@
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "No argument allowed"
 
-#: tools/symcryptrun.c:166
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-"@\n"
-"Commands:\n"
-" "
-
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "decryption modus"
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "encryption modus"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "tool class (confucius)"
-
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "program filename"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "secret key file (required)"
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "input file name (default stdin)"
-
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Usage: symcryptrun [options] (-h for help)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s on %s aborted with status %i\n"
-
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s on %s failed with status %i\n"
-
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "can't create temporary directory '%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "could not open %s for writing: %s\n"
-
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "error writing to %s: %s\n"
-
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "error reading from %s: %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "error closing %s: %s\n"
-
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "no --program option provided\n"
-
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "only --decrypt and --encrypt are supported\n"
-
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "no --keyfile option provided\n"
-
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "cannot allocate args vector\n"
-
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "could not create pipe: %s\n"
-
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "could not create pty: %s\n"
-
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "could not fork: %s\n"
-
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv failed: %s\n"
-
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select failed: %s\n"
-
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read failed: %s\n"
-
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty read failed: %s\n"
-
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid failed: %s\n"
-
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "child aborted with status %i\n"
-
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "cannot allocate infile string: %s\n"
-
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "cannot allocate outfile string: %s\n"
-
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "either %s or %s must be given\n"
-
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "no class provided\n"
-
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "class %s is not supported\n"
-
-#: tools/gpg-check-pattern.c:144
+#: tools/gpg-check-pattern.c:147
 msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 
-#: tools/gpg-check-pattern.c:147
+#: tools/gpg-check-pattern.c:150
 msgid ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/en@quot.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/en@quot.gmo sont différents
diff -Nru gnupg2-2.2.20/po/en@quot.po gnupg2-2.2.27/po/en@quot.po
--- gnupg2-2.2.20/po/en@quot.po	2020-03-20 15:40:30.000000000 +0100
+++ gnupg2-2.2.27/po/en@quot.po	2021-01-11 18:47:21.000000000 +0100
@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2020.
+# Automatically generated, 2021.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.20\n"
+"Project-Id-Version: GNU gnupg 2.2.27\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2021-01-11 18:47+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -39,7 +39,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -50,45 +50,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Do you really want to make your passphrase visible on the screen?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -98,11 +98,11 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -110,7 +110,7 @@
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -118,17 +118,17 @@
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -136,36 +136,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
@@ -174,31 +178,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -259,7 +263,7 @@
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
@@ -387,17 +391,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Please enter the passphrase to%0Aprotect your new key"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -405,132 +409,132 @@
 "@Options:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "use a log file for the server"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted”"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "enable putty support"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -538,147 +542,135 @@
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Note: no default option file ‘%s’\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "option file '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "a gpg-agent is already running - not starting a new one\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -686,8 +678,8 @@
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -695,9 +687,9 @@
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -707,11 +699,11 @@
 "Options:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -719,15 +711,15 @@
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -735,7 +727,7 @@
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -743,18 +735,18 @@
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
@@ -764,32 +756,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s” ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -802,7 +794,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -810,11 +802,11 @@
 msgstr ""
 "Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user certificates?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -827,7 +819,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -839,20 +831,20 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -861,15 +853,15 @@
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -878,11 +870,11 @@
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -890,12 +882,12 @@
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s key uses an unsafe (%u bit) hash\n"
@@ -905,7 +897,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
@@ -915,7 +907,7 @@
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -944,7 +936,7 @@
 msgstr "error creating a stream for a pipe: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -990,27 +982,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem setting the gpg-agent options\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Warning: unsafe ownership on %s “%s”\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s”\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1070,7 +1062,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
@@ -1183,7 +1175,7 @@
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1258,39 +1250,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP check of certificates"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Included certificates"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "No audit log entries."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Unknown operation"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent usable"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr usable"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "No help available for '%s'."
@@ -1299,7 +1291,7 @@
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[none]"
 
@@ -1308,82 +1300,108 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "argument not expected"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "read error"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "keyword too long"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "missing argument"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "invalid argument"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "invalid command"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "invalid alias definition"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr "permission error"
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "out of core"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+msgid "invalid meta command"
+msgstr "invalid meta command"
+
+#: common/argparse.c:542 common/argparse.c:577
+msgid "unknown meta command"
+msgstr "unknown meta command"
+
+#: common/argparse.c:544 common/argparse.c:579
+msgid "unexpected meta command"
+msgstr "unexpected meta command"
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "invalid option"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "missing argument for option “%.50s”\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s”\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "option “%.50s” does not expect an argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "invalid command “%.50s”\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "option “%.50s” is ambiguous\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "command “%.50s” is ambiguous\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "out of core\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "invalid option “%.50s”\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr "Note: ignoring option “--%s” due to global config\n"
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1399,42 +1417,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "failed to create temporary file '%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "waiting for lock (held by %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘%s’ not made: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1614,13 +1631,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Note: Use the command “%s” to restart them.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
@@ -1658,23 +1675,23 @@
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP card not available: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP card no. %s detected\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
@@ -1684,136 +1701,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code not or not anymore available\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[not set]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<” character may not be used.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: Combined name too long (limit is %d characters).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1823,97 +1840,97 @@
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "The card will now be re-configured to generate a key of %u bits\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "The card will now be re-configured to generate a key of type: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error changing key attribute for key %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "This command is not supported by this card\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Note: keys are already stored on the card!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1924,165 +1941,165 @@
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Note: This command destroys all keys stored on the card!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes”) "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s” not found: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2141,8 +2158,8 @@
 msgstr "subkey"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2167,55 +2184,61 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use option “--delete-secret-keys” to delete it first.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "using cipher %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2224,39 +2247,39 @@
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s”\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
@@ -2348,7 +2371,7 @@
 msgstr " - skipped"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "writing to ‘%s’\n"
@@ -2383,262 +2406,266 @@
 msgid "[User ID not found]"
 msgstr "[User ID not found]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘%s’ via %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘%s’ via %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "checking for a fresh copy of an expired key via %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s” not found: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Warning: not using ‘%s’ as default key: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "using “%s” as default secret key for signing\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘%s’ ignored\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+msgid "quickly revoke a key signature"
+msgstr "quickly revoke a key signature"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2646,7 +2673,7 @@
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2666,11 +2693,11 @@
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2680,7 +2707,7 @@
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2688,570 +2715,559 @@
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help” to list choices)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Note: old default options file ‘%s’ ignored\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” is not a proper mail address\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt in %s mode\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|take the keys from the keyring FILE"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|reject signatures made with ALGO"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Usage: gpgv [options] [files] (-h for help)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3446,7 +3462,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
@@ -3456,7 +3472,7 @@
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
@@ -3480,7 +3496,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
@@ -3495,7 +3511,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
@@ -3565,17 +3581,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “%s” not changed\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
@@ -3588,227 +3604,292 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "To migrate '%s', with each smartcard, run: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "key %s: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "key %s: can't locate original keyblock: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "key %s: can't read original keyblock: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “%s” revocation certificate imported\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "key %s: invalid self-signature on user ID “%s”\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “%s”\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "key %s: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "key %s: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “%s” revocation certificate added\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error allocating memory: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplicate signature removed\n"
+msgstr[1] "%d duplicate signatures removed\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d bad signature\n"
+msgstr[1] "%d bad signatures\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signature reordered\n"
+msgstr[1] "%d signatures reordered\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Warning: errors found and only checked self-signatures, run ‘%s’ to check "
+"all signatures.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error creating keybox '%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "error creating keyring '%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ‘%s’ created\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "keyring ‘%s’ created\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock resource '%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error opening key DB: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
@@ -4047,8 +4128,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4238,7 +4319,7 @@
 "  a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
@@ -4291,7 +4372,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
@@ -4366,7 +4447,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
@@ -4409,104 +4490,118 @@
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:2995
+#, c-format
+msgid "revoking the key signature failed: %s\n"
+msgstr "revoking the key signature failed: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s” is not a proper fingerprint\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s” not found\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4514,17 +4609,17 @@
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4533,17 +4628,17 @@
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4553,72 +4648,72 @@
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s” compacted: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s”: %d signature removed\n"
 msgstr[1] "User ID “%s”: %d signatures removed\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s”: already minimized\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s”: already clean\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4628,40 +4723,40 @@
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4669,255 +4764,251 @@
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s”\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Are you sure you want to replace it? (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Are you sure you want to delete it? (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s”\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signed by your key %s on %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Not signed by you.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "You have signed these user IDs on key %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tried to revoke a non-user ID: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘%s’\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘%s’ duplicated\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -4931,161 +5022,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Possible actions for a %s key: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA and RSA (default)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA and Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (set your own capabilities)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (set your own capabilities)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC and ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (set your own capabilities)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (encrypt only)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Existing key\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "  (%d) Existing key from card\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s keys may be between %u and %u bits long.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "What keysize do you want for the subkey? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5101,7 +5192,7 @@
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5117,38 +5208,38 @@
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5156,11 +5247,11 @@
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5174,7 +5265,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5190,49 +5281,49 @@
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5243,7 +5334,7 @@
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
@@ -5258,31 +5349,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5294,13 +5385,13 @@
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5311,64 +5402,64 @@
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s” already exists\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Note: backup of card key saved to ‘%s’\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5376,36 +5467,36 @@
 "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"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Secret parts of primary key are stored on-card.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5440,20 +5531,6 @@
 msgstr[0] "%d good signature\n"
 msgstr[1] "%d good signatures\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d bad signature\n"
-msgstr[1] "%d bad signatures\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d signature not checked due to a missing key\n"
-msgstr[1] "%d signatures not checked due to missing keys\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5472,29 +5549,29 @@
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
@@ -5524,7 +5601,7 @@
 msgstr[0] " (%lu signature)\n"
 msgstr[1] " (%lu signatures)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring created\n"
@@ -5575,139 +5652,139 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” not a key ID: skipping\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "refreshing %d key from %s\n"
 msgstr[1] "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s” not found on keyserver\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requesting key %s from %s server %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s”: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "weird size for an encrypted session key (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s encrypted session key\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5717,306 +5794,306 @@
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s”"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s”"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s”"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s”\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Note: Use ‘%s’ to make use of this info\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s”"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "WARNING: This key is not suitable for signing in %s mode\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat of ‘%s’ failed in %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) failed in %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "WARNING: using experimental public key algorithm %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "WARNING: using experimental cipher algorithm %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNING: using experimental digest algorithm %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNING: digest algorithm %s is deprecated\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Note: signatures using the %s algorithm are rejected\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Note: third-party key signatures using the %s algorithm are rejected\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(reported error: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(reported error: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(further info: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s”\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s” is a deprecated option\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "please use “%s%s” instead\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6049,71 +6126,71 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "assuming signed data in ‘%s’\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "can't handle public key algorithm %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Unknown critical signature notation: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Enter passphrase\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelled by user\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (main key ID %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Do you really want to permanently delete the OpenPGP secret subkey key:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6169,7 +6246,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6468,12 +6545,12 @@
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -6526,27 +6603,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okay, we are the anonymous recipient.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "old encoding of the DEK is not supported\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "cipher algorithm %d%s is unknown or disabled\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Note: secret key %s expired at %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Note: key has been revoked"
@@ -6734,7 +6811,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "key %s may not be used for signing in %s mode\n"
@@ -6799,27 +6876,27 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Note: signature key %s has been revoked\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "key %s: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
@@ -6846,24 +6923,24 @@
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s encryption will be used\n"
@@ -6888,7 +6965,7 @@
 msgstr ""
 "this is a PGP generated Elgamal key which is not secure for signatures!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
@@ -6933,12 +7010,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "read error in '%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "can't create lock for ‘%s’\n"
@@ -6948,12 +7025,12 @@
 msgid "can't lock '%s'\n"
 msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -6968,103 +7045,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Note: trustdb not writable\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: The trustdb is corrupted.\n"
@@ -7437,128 +7514,128 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "You may try to re-create the trustdb using the commands:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "If that does not work, please consult the manual\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -7668,54 +7745,69 @@
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNumber: %s%%0AHolder: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Please enter the PIN for the key to create qualified signatures."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus missing or not of size %d bits\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Please enter a new PIN for the standard keys."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Please enter the PIN for the standard keys."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||Please enter the PIN for the key to create qualified signatures."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7723,7 +7815,7 @@
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7731,47 +7823,47 @@
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -7779,54 +7871,42 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sNumber: %s%%0AHolder: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Remaining attempts: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7836,24 +7916,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -7861,121 +7941,121 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA prime %s missing or not of size %d bits\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "key generation completed (%d second)\n"
 msgstr[1] "key generation completed (%d seconds)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingerprint on card does not match requested one\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verification of Admin PIN is currently prohibited through this command\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -7991,55 +8071,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial New PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|write a log to FILE"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|connect to reader at port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|use NAME as ct-API driver"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|use NAME as PC/SC driver"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "do not use the internal CCID driver"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|disconnect the card after N seconds of inactivity"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "do not use a reader's pinpad"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "deny the use of admin card commands"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "use variable length input for pinpad"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8047,307 +8127,324 @@
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "critical certificate extension %s is not supported"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "issuer certificate is not marked as a CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "critical marked policy without configured policies"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "failed to open '%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Note: non-critical certificate policy not allowed"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "please make sure that the “dirmngr” is properly installed\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "root certificate has now been marked as trusted\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interactive marking as trusted disabled for this session\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "WARNING: creation time of signature not known - assuming current time"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "none"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Error - invalid encoding]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Error - out of core]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Error - No name]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Error - invalid DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8362,137 +8459,137 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error getting key usage information: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "line %d: invalid algorithm\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "line %d: no subject name given\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "line %d: invalid subject name label ‘%.*s’\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "line %d: not a valid email address\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "line %d: invalid serial number\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "line %d: invalid date given\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "line %d: invalid hash algorithm given\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "line %d: invalid authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "line %d: invalid subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "line %d: invalid extension syntax\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "line %d: error getting key by keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "line %d: key generation failed: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8625,7 +8722,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘%s’ not found: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -8650,123 +8747,123 @@
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|write a server mode log to FILE"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8776,47 +8873,47 @@
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Note: won't be able to encrypt to '%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: no hostname given\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: password given without user\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: skipping this line\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "could not parse keyserver\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -8836,7 +8933,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
@@ -8846,42 +8943,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "failed to get the fingerprint\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Error - "
 
@@ -8917,7 +9009,7 @@
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8952,39 +9044,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Signature made "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[date not given]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " using certificate ID 0x%08lX\n"
+msgid "algorithm:"
+msgstr "algorithm:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "invalid signature: message digest attribute does not match computed one\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9052,273 +9144,272 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "error loading certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanently loaded certificates: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    runtime cached certificates: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           trusted certificates: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificate already cached\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificate cached\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error caching certificate: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error fetching certificate by S/N: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error getting authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creating directory ‘%s’\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error creating directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignoring database dir ‘%s’\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error reading directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "removing cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘%s’\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "failed to open cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "error creating new cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "error writing new cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "error closing new cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "new cache dir file ‘%s’ created\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "failed to re-open cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "first record of ‘%s’ is not the version\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "old version of cache directory - cleaning up\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "old version of cache directory - giving up\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "extra field detected in crl record of ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "invalid line detected in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "duplicate entry detected in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "unsupported record type in ‘%s’ line %u skipped\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "invalid issuer hash in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "no issuer DN in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "invalid timestamp in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "detected errors in cache dir file\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "please check the reason and manually delete that file\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "failed to create temporary cache dir file '%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "error closing '%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "can't hash '%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error setting up MD5 hash context: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error hashing '%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "invalid formatted checksum for ‘%s’\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "too many open cache files; can't open anymore\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "opening cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error opening cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "error initializing cache file ‘%s’ for reading: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "calling unlock_db_file on a closed file\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "calling unlock_db_file on an unlocked file\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "failed to create a new cache object: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "no CRL available for issuer id %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "cached CRL for issuer id %s too old; update required\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9327,192 +9418,194 @@
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refresh active for issuer id %s; update required\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "available CRL for issuer ID %s can't be used\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr "cached CRL for issuer id %s tampered; we need to update\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "WARNING: invalid cache record length for S/N "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "problem reading cache record for S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s is not valid; reason=%02X  date=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s is valid, it is not listed in the CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "unknown hash algorithm ‘%s’\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "gcry_md_open for algorithm %d failed: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘%s’\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open for algorithm %d failed: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "update times of this CRL: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate not given; assuming a validity period of one day\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error inserting item into temporary cache file: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error checking validity of CRL issuer certificate: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problem removing stale temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "new CRL still too old; it expired on %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9521,12 +9614,12 @@
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9534,55 +9627,55 @@
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ERROR: This cached CRL may have been tampered with!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -9620,55 +9713,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "certificate search not possible due to disabled %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "use OCSP instead of CRLs"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "check whether a dirmngr is running"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "add a certificate to the cache"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "validate a certificate"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "lookup a certificate"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "lookup only locally stored certificates"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "expect an URL for --lookup"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "load a CRL into the dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "special mode for use by Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "expect certificates in PEM format"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "force the use of the default OCSP responder"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9680,82 +9773,82 @@
 "The process returns 0 if the certificate is valid, 1 if it is\n"
 "not valid and other error codes for general failures\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "error reading certificate from stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "error reading certificate from '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "certificate too large to make any sense\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "can't connect to the dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "lookup failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "loading CRL ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "a dirmngr daemon is up and running\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "validation of certificate failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "certificate is valid\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "certificate has been revoked\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "certificate check failed: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "got status: ‘%s’\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "error writing base64 encoding: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "unsupported inquiry ‘%s’\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "absolute file name expected\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
@@ -9780,92 +9873,92 @@
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "run without asking a user"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "add new servers discovered in CRL distribution points to serverlist"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|do not return more than N items in one query"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9874,11 +9967,11 @@
 "@\n"
 "(See the “info” manual for a complete listing of all commands and options)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9886,132 +9979,132 @@
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: garbage at end of line ignored\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "return all values in a record oriented format"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|ignore host part and connect through NAME"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|connect to host NAME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|connect to port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|use user NAME for authentication"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|use password PASS for authentication"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "take password from $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|query DN STRING"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|use STRING as filter expression"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|return the attribute STRING"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10021,144 +10114,138 @@
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "invalid port number %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "scanning result for attribute ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "error writing to stdout: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          available attribute ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "attribute ‘%s’ not found\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "found attribute ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "processing url ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          user ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          pass ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          host ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        filter ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          attr ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "no host name in ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "no attribute given for query ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "WARNING: using first attribute only\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "binding to ‘%s:%d’ failed: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "searching ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "‘%s’ is not an LDAP URL\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘%s’ is an invalid LDAP URL\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "error allocating memory: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10209,7 +10296,7 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc failed: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
@@ -10339,11 +10426,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "can't get authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10412,7 +10494,7 @@
 msgstr "serialno missing in cert ID"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
@@ -10442,32 +10524,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "failed to the register commands with Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10505,56 +10587,56 @@
 msgid "certificate chain is good\n"
 msgstr "certificate chain is good\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "quiet"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "print data out hex encoded"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "decode received data lines"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "connect to the dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connect to Assuan socket NAME"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connect to Assuan server at ADDR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "run the Assuan server given on the command line"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "do not use extended connect mode"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|run commands from FILE on startup"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "run /subst on startup"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Usage: @GPG@-connect-agent [options] (-h for help)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10562,43 +10644,43 @@
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "option “%s” requires a program and optional arguments\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option “%s” ignored due to “%s”\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "receiving line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "line too long - skipped\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "line shortened due to embedded Nul character\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unknown command ‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
@@ -10784,94 +10866,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Note: Use the command “%s%s” to get details.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "External verification of component %s failed"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "list all components"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "check all programs"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|list options"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|change options"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|check options"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "apply global default values"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|update configuration files using FILE"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "get the configuration directories for @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "list global configuration file"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "check global configuration file"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "query the software version database"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "reload all or a given component"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "launch a given component"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "kill a given component"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "use as output file"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "activate changes at runtime, if possible"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10879,196 +10961,23 @@
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "No argument allowed"
 
-#: tools/symcryptrun.c:166
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-"@\n"
-"Commands:\n"
-" "
-
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "decryption modus"
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "encryption modus"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "tool class (confucius)"
-
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "program filename"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "secret key file (required)"
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "input file name (default stdin)"
-
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Usage: symcryptrun [options] (-h for help)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s on %s aborted with status %i\n"
-
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s on %s failed with status %i\n"
-
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "can't create temporary directory '%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "could not open %s for writing: %s\n"
-
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "error writing to %s: %s\n"
-
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "error reading from %s: %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "error closing %s: %s\n"
-
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "no --program option provided\n"
-
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "only --decrypt and --encrypt are supported\n"
-
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "no --keyfile option provided\n"
-
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "cannot allocate args vector\n"
-
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "could not create pipe: %s\n"
-
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "could not create pty: %s\n"
-
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "could not fork: %s\n"
-
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv failed: %s\n"
-
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select failed: %s\n"
-
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read failed: %s\n"
-
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty read failed: %s\n"
-
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid failed: %s\n"
-
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "child aborted with status %i\n"
-
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "cannot allocate infile string: %s\n"
-
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "cannot allocate outfile string: %s\n"
-
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "either %s or %s must be given\n"
-
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "no class provided\n"
-
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "class %s is not supported\n"
-
-#: tools/gpg-check-pattern.c:144
+#: tools/gpg-check-pattern.c:147
 msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 
-#: tools/gpg-check-pattern.c:147
+#: tools/gpg-check-pattern.c:150
 msgid ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/eo.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/eo.gmo sont différents
diff -Nru gnupg2-2.2.20/po/eo.po gnupg2-2.2.27/po/eo.po
--- gnupg2-2.2.20/po/eo.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/eo.po	2021-01-11 18:47:17.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -28,41 +28,41 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to create a sign and encrypt key? "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Ĉu vi vere volas krei subskriban kaj ĉifran ŝlosilon? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -70,7 +70,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -80,35 +80,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -116,40 +116,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
@@ -159,33 +163,33 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -243,7 +247,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
@@ -376,20 +380,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan ŝlosilon.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -399,124 +403,124 @@
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Ŝlosilo estas anstataŭigita."
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -525,178 +529,164 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "opcio-dosiero '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu ŝlosiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -704,9 +694,9 @@
 "@Komandoj:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -716,52 +706,52 @@
 "Opcioj:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -771,32 +761,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -809,19 +799,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -834,7 +824,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -844,59 +834,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "ŝalti ŝlosilon"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -906,7 +896,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@ -916,7 +906,7 @@
 msgid "secret key parts are not available\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -948,7 +938,7 @@
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -995,27 +985,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas malŝalti kreadon de core-dosieroj: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -1077,7 +1067,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
@@ -1202,7 +1192,7 @@
 msgstr "kiraso: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1288,44 +1278,44 @@
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Bona atestilo"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "Nevalida atestilo"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "nekonata versio"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nenia helpo disponata por '%s'"
@@ -1335,7 +1325,7 @@
 msgid "ignoring garbage line"
 msgstr "eraro en vostolinio\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "nekonata versio"
@@ -1345,92 +1335,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "legeraro ĉe dosiero"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "nevalida argumento"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "nevalida kiraso"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "malkongruaj komandoj\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "nevalida kiraso"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "ne traktita"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "malkongruaj komandoj\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "nekonata implicita ricevonto '%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "neatendita dateno"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "nevalida kiraso"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "ne traktita"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "opcio-dosiero '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1446,42 +1468,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1668,13 +1689,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@ -1716,24 +1737,24 @@
 msgid "server uses an invalid certificate"
 msgstr "krei revokatestilon"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta ŝlosilo ne havebla"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga reĝimo\n"
@@ -1743,246 +1764,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan ŝlosilon al '%s'\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita ĝis %u bitoj\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1990,184 +2011,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "forlasi ĉi tiun menuon"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "montri ĉi tiun helpon"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "ŝanĝi la daton de eksvalidiĝo"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ŝanĝi la posedantofidon"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ŝanĝi la posedantofidon"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por ĉi tiu komando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2229,8 +2250,8 @@
 msgstr "al"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -2255,96 +2276,102 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forviŝi ĝin unue.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-ĉifrita por: %s\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-ĉifritaj datenoj\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesaĝo estis ĉifrita per malforta ŝlosilo en la simetria ĉifro.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problemo ĉe traktado de ĉifrita paketo\n"
@@ -2440,7 +2467,7 @@
 msgstr "%s: ignorita: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2478,286 +2505,292 @@
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Fingrospuro:"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "nevalida kiraso"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida ŝlosilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan ŝlosilon %08lX anstataŭ la ĉefa ŝlosilo %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "ĉifri datenojn"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "ĉifri nur kun simetria ĉifro"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "listigi ŝlosilojn"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "listigi ŝlosilojn kaj subskribojn"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli ŝlosilsubskribojn"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "listigi sekretajn ŝlosilojn"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "forigi ŝlosilojn de la sekreta ŝlosilaro"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "subskribi ŝlosilon"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "subskribi ŝlosilon loke"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "krei novan ŝlosilparon"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "subskribi ŝlosilon"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "subskribi ŝlosilon loke"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "subskribi aŭ redakti ŝlosilon"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "eksporti ŝlosilojn"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "eksporti ŝlosilojn al ŝlosilservilo"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importi ŝlosilojn de ŝlosilservilo"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "aktualigi ĉiujn ŝlosilojn de ŝlosilservilo"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importi/kunfandi ŝlosilojn"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "uzi tekstan reĝimon"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "fari neniajn ŝanĝojn"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2765,7 +2798,7 @@
 "@\n"
 "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2795,13 +2828,13 @@
 " --list-keys [nomoj]        montri ŝlosilojn\n"
 " --fingerprint [nomoj]      montri fingroŝpurojn\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2816,7 +2849,7 @@
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2824,584 +2857,573 @@
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, fuzzy, c-format
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, fuzzy, c-format
 msgid "invalid export options\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, fuzzy, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 aŭ 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 aŭ 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-reĝimo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-reĝimo; devas esti 0, 1 aŭ 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, fuzzy, c-format
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, fuzzy, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, fuzzy, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesaĝon ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "Ĉu forviŝi ĉi tiun ŝlosilon de la ŝlosilaro? "
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3598,7 +3620,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
@@ -3608,7 +3630,7 @@
 msgid "key %s: %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3632,7 +3654,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ŝlosilo %08lX: publika ŝlosilo ne trovita: %s\n"
@@ -3647,7 +3669,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla ŝlosilaro trovita: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3718,18 +3740,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ŝlosilo %08lX: ne ŝanĝita\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ŝlosilo %08lX: sekreta ŝlosilo importita\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -3742,230 +3764,294 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ŝlosilo %08lX: sekreta ŝlosilo sen publika ŝlosilo - ignorita\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Ŝlosilo estas anstataŭigita."
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Ŝlosilo estas kompromitita"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Ŝlosilo estas ne plu uzata"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, fuzzy, c-format
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, fuzzy, c-format
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ŝlosilo %08lX: publika ŝlosilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ŝlosilo %08lX: ne povas trovi originalan ŝlosilblokon: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ŝlosilo %08lX: ne povas legi originalan ŝlosilblokon: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ŝlosilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ŝlosilo %08lX.%lu: Valida subŝlosilrevoko\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ŝlosilo %08lX: ignoris subŝlosilon\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ŝlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s-subskribo de: %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Bona subskribo de \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "ignoris '%s': %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
+msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
+msgstr[1] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d malbonaj subskriboj\n"
+msgstr[1] "%d malbonaj subskriboj\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Bona subskribo de \""
+msgstr[1] "Bona subskribo de \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "ŝlosilaro '%s' kreita\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "ŝlosilaro '%s' kreita\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
@@ -4245,8 +4331,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -4457,7 +4543,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Ŝlosilo estas revokita.\n"
@@ -4516,7 +4602,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
@@ -4603,7 +4689,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Ĉu fini sen skribi ŝanĝojn? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ŝlosilo ne ŝanĝita, do aktualigo ne necesas.\n"
@@ -4651,142 +4737,157 @@
 msgid "Nothing to sign.\n"
 msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   subskribita per %08lX je %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ĉi tiu ŝlosilo estas revokebla per %s ŝlosilo %s%s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ĉi tiu ŝlosilo estas revokebla per %s ŝlosilo %s%s\n"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidiĝos: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidiĝos: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Ĉi tiu ŝlosilo estas malŝaltita"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 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"
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4795,36 +4896,36 @@
 "AVERTO: Ĉi tiu estas PGP2-stila ŝlosilo. Aldono de foto-identigilo eble\n"
 "        kaŭzos, ke iuj versioj de PGP malakceptos la ŝlosilon.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ĉu forviŝi ĉi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ĉu forviŝi ĉi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ĉu forviŝi ĉi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ĉu vere forviŝi ĉi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4832,37 +4933,37 @@
 msgstr[0] "Forviŝis %d subskribon.\n"
 msgstr[1] "Forviŝis %d subskribon.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviŝita.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
 msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -4872,312 +4973,307 @@
 "AVERTO: Ĉi tiu estas PGP2-stila ŝlosilo. Aldono de foto-identigilo eble\n"
 "        kaŭzos, ke iuj versioj de PGP malakceptos la ŝlosilon.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la ŝlosilgrandon"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ŝanĝas la daton de eksvalidiĝo de la ĉefa ŝlosilo.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ŝanĝas la daton de eksvalidiĝo de la ĉefa ŝlosilo.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ĉu surskribi (j/N)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   subskribita per %08lX je %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi ŝlosilon nerevokeble"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "mankas sekreta ŝlosilo\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skribas ŝlosilbindan subskribon\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ŝlosilgrando rondigita ĝis %u bitoj\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "ĉifri datenojn"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5191,169 +5287,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "malŝalti ŝlosilon"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "rondigita ĝis %u bitoj\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita ŝlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5369,7 +5465,7 @@
 "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
 "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5385,40 +5481,40 @@
 "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
 "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Ŝlosilo validu ...? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Ŝlosilo validu por ...? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidiĝos\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidiĝos\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidiĝos je %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5426,12 +5522,12 @@
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, ĝi estos ĝuste traktata ĝis 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ĉu tio estas ĝusta (j/n)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5442,7 +5538,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5458,50 +5554,50 @@
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciĝi per cifero\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaŭ 5 signojn\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5512,7 +5608,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5527,35 +5623,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5567,13 +5663,13 @@
 "kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
 "akiri sufiĉe da entropio.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5581,67 +5677,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kreado de ŝlosiloj nuligita.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "skribas publikan ŝlosilon al '%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika ŝlosilaro trovita: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "eraro dum skribado de publika ŝlosilaro '%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5650,7 +5746,7 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5658,7 +5754,7 @@
 "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horloĝeraro)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5666,23 +5762,23 @@
 "ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
 "horloĝeraro)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ĉu vere krei? "
@@ -5721,22 +5817,6 @@
 msgstr[0] "%d malbonaj subskriboj\n"
 msgstr[1] "%d malbonaj subskriboj\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d malbonaj subskriboj\n"
-msgstr[1] "%d malbonaj subskriboj\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
-msgstr[1] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5756,34 +5836,34 @@
 msgid "Keyring"
 msgstr "Ŝlosilaro"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     Ŝlosilo-fingrospuro ="
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     Ŝlosilo-fingrospuro ="
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     Ŝlosilo-fingrospuro ="
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Ŝlosilo-fingrospuro ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5815,7 +5895,7 @@
 msgstr[0] "1 malbona subskribo\n"
 msgstr[1] "1 malbona subskribo\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ŝlosilaro kreita\n"
@@ -5868,453 +5948,453 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida ŝlosilidentigilo\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 msgstr[1] "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via ŝlosilo %08lX je %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-ĉifritaj datenoj\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika ŝlosilo estas %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikŝlosile ĉifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "ĉifrita per %u-bita %s-ŝlosilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "ĉifrita per %s-ŝlosilo, %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikŝlosila malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s ĉifritajn datenojn\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Ĉifro IDEA ne disponata, optimisme provas uzi %s anstataŭe\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, fuzzy, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "malĉifrado sukcesis\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: ĉifrita mesaĝo estis manipulita!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki ĝin\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidiĝinta subskribo de \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malŝaltita\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, ŝlosilo %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 #, fuzzy
 msgid "binary"
 msgstr "ĉefa"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "nekonata publikŝlosila metodo"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publikŝlosilan metodon %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita ĉifrad-metodo"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "kiraso: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "kiraso: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ĉi tiu mesaĝo povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nekonata klaso de subskribo"
@@ -6350,76 +6430,76 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publikŝlosilan metodon %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas ŝaltitan \"critical bit\"\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ĉefŝlosilo %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6467,7 +6547,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ĉu tio estas ĝusta (j/n)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
@@ -6781,12 +6861,12 @@
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
@@ -6840,27 +6920,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "ĉifrad-metodo %d%s estas nekonata aŭ malŝaltita\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 msgid "Note: key has been revoked"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
@@ -7043,7 +7123,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
@@ -7112,29 +7192,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
@@ -7163,23 +7243,23 @@
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ĉifrado estos aplikata\n"
@@ -7208,7 +7288,7 @@
 "ignoris '%s': ĉi tio estas PGP-kreita ElGamal-ŝlosilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -7254,12 +7334,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -7269,12 +7349,12 @@
 msgid "can't lock '%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
@@ -7289,103 +7369,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: fido-datenaro kreita\n"
@@ -7754,128 +7834,128 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa ŝlosilidentigilo\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ŝlosilo %08lX: akceptita kiel fidata ŝlosilo\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ŝlosilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ŝlosilo %08lX: mankas publika ŝlosilo por fidata ŝlosilo - ignorita\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ŝlosilo markita kiel absolute fidata.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu ŝlosiloj jam traktitaj\n"
 msgstr[1] "%lu ŝlosiloj jam traktitaj\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, fuzzy, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -7988,110 +8068,125 @@
 "List, export, import Keybox data\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "ŝanĝi la pasfrazon"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "ŝanĝi la pasfrazon"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, 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:840
+#: scd/app-openpgp.c:873
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
@@ -8099,55 +8194,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8157,27 +8240,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8185,123 +8268,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "eraro dum legado de ŝlosilbloko: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "krei novan ŝlosilparon"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "krei novan ŝlosilparon"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, 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:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nerealigita URI"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Kreado de ŝlosiloj malsukcesis: %s\n"
 msgstr[1] "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -8319,383 +8402,401 @@
 msgid "|N|Initial New PIN"
 msgstr "Donu la uzantidentigilon: "
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "helpo"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: ne povas aliri: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "            novaj subskriboj: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, fuzzy, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ne traktita"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "ne"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8708,137 +8809,137 @@
 "\"%.*s\"\n"
 "%u-bita %s ŝlosilo, ID %08lX, kreita je %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8980,7 +9081,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eraro dum legado de ŝlosilbloko: %s\n"
@@ -9005,134 +9106,134 @@
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn ŝlosilojn"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "neinteraga reĝimo: neniam demandi"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "aldoni ĉi tiun ŝlosilaron al la listo de ŝlosilaroj"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9143,47 +9244,47 @@
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ne povas konektiĝi al '%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = supersalti ĉi tiun ŝlosilon\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9203,7 +9304,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -9213,42 +9314,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9278,7 +9374,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9308,38 +9404,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
+msgid "algorithm:"
+msgstr "kiraso: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "            alinome \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
@@ -9408,541 +9504,542 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Nevalida atestilo"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 msgid "creating directory '%s'\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "eraro en vostolinio\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "error reading dir record for LID %lu: %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "eraro dum legado de dosieruja registro por LID %lu: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "nevalida kompendi-metodo '%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "converting S-expression failed: %s\n"
 msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "nevalida kompendi-metodo '%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "kontrolo de subskribo estas malŝaltita\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "lid ?: enŝovo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "lid ?: enŝovo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
@@ -9981,65 +10078,65 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 #| msgid "bad certificate"
 msgid "validate a certificate"
 msgstr "malbona atestilo"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 #| msgid "bad certificate"
 msgid "lookup a certificate"
 msgstr "malbona atestilo"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "Nevalida atestilo"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "Bona atestilo"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 msgid "force the use of the default OCSP responder"
 msgstr "Donu la ŝlosilgrandon"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10047,88 +10144,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "ne povas konektiĝi al '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10154,95 +10251,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Ĉu fini sen skribi ŝanĝojn? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10255,299 +10352,293 @@
 "@\n"
 "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ne traktita"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 msgid "invalid port number %d\n"
 msgstr "nevalida kiraso"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 #| msgid "user '%s' not found: %s\n"
 msgid "attribute '%s' not found\n"
 msgstr "uzanto '%s' ne trovita: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "legas el '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "            alinome \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "            alinome \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 msgid "          port %d\n"
 msgstr "                  importitaj: %lu"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "            alinome \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "            alinome \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10598,7 +10689,7 @@
 msgid "malloc failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10731,12 +10822,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: ne povas aliri: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10806,7 +10891,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -10836,33 +10921,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10903,101 +10988,101 @@
 msgid "certificate chain is good\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -11196,302 +11281,233 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "aktualigi la fido-datenaron"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "publika ŝlosilo ne trovita"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Komandoj:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "malĉifrado sukcesis\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "malĉifrado sukcesis\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Komandoj:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [dosiero]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "malĉifrado sukcesis\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ne eblas kun %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "%s: ne povas krei dosierujon: %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "ne povas malfermi %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
+#~ msgid "encryption modus"
+#~ msgstr "malĉifrado sukcesis\n"
 
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [dosiero]"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ne eblas kun %s!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "ne povas krei %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "ne povas malfermi %s: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "ne povas krei %s: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: tools/symcryptrun.c:566
-#, fuzzy, c-format
-msgid "could not fork: %s\n"
-msgstr "%s: uzanto ne trovita: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "could not fork: %s\n"
+#~ msgstr "%s: uzanto ne trovita: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "ne povas krei '%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "ne povas krei '%s': %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "protekto-metodo %d%s ne estas realigita\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "ne povas krei '%s': %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "eraro dum kreado de pasfrazo: %s\n"
 
 #, fuzzy
 #~ msgid ""
@@ -11584,36 +11600,6 @@
 #~ msgstr "aktualigo malsukcesis: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%s-subskribo de: %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Bona subskribo de \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "ignoris '%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
-#~ msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Bona subskribo de \""
-#~ msgstr[1] "Bona subskribo de \""
-
-#, fuzzy
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "%s: nova opcio-dosiero kreita\n"
 
@@ -12625,9 +12611,6 @@
 #~ msgid "file delete error"
 #~ msgstr "eraro ĉe forviŝo de dosiero"
 
-#~ msgid "unexpected data"
-#~ msgstr "neatendita dateno"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "malkongruo de tempostampoj"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/es.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/es.gmo sont différents
diff -Nru gnupg2-2.2.20/po/es.po gnupg2-2.2.27/po/es.po
--- gnupg2-2.2.20/po/es.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/es.po	2021-01-11 18:47:17.000000000 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2018-05-25 15:44+0000\n"
 "Last-Translator: emma peel <emma.peel@riseup.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -21,7 +21,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@ -32,45 +32,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancelar"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Sí"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Guardar en gestor de contraseñas"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "¿De verdad quiere hacer que su frase contraseña se vea en la pantalla?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Mostrar frase contraseña"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Esconder frase contraseña"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -80,18 +80,18 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Por favor introduzca su PIN para desbloquear la clave secreta de esta sesión"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -99,7 +99,7 @@
 "Por favor introduzca la frase contraseña para desbloquear la clave secreta "
 "de esta sesión"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
@@ -112,13 +112,13 @@
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Frase contraseña:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "no coincide - reinténtelo"
 
@@ -126,32 +126,36 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Repetir:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Frase contraseña demasiado larga"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inválidos en el PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "PIN incorrecto"
 
@@ -164,7 +168,7 @@
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Frase contraseña errónea"
 
@@ -173,31 +177,31 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "no se puede crear '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "no se puede abrir '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -259,7 +263,7 @@
 "Por favor introduzca una frase contraseña para proteger la clave secreta "
 "recibida %%0A  %s%%0A  %s%%0A  en el almacén de claves del agente gpg"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
@@ -394,17 +398,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Aviso: ha introducido una frase contraseña insegura."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Por favor introduzca frase contraseña para%0Aproteger su nueva clave"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contraseña"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -412,132 +416,132 @@
 "@Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "ejecutar en modo supervisado"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "usar un fichero log para el servidor"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|aceptar algunos comandos via NAME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la caché expiran en N segundos"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el caché de PINs al firmar"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "no permitir el uso de un cache externo de contraseñas"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "no permitir que los clientes marquen claves como \"confiables\""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contraseña"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "no permitir que el caller cambie la entrada de pin"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "permitir que Emacs pida la clave"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "permitir soporte de ssh-agent"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "habilitar soporte de putty"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: @GPG_AGENT@ [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -545,148 +549,136 @@
 "Sintaxis: @GPG_AGENT@ [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "el nivel de depuración '%s' no es válido\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: no existe el fichero de opciones predeterminado '%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "fichero de opciones '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Atención: \"%s\" no se considera una opción\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "el nombre de socket '%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ya hay un agente gpg ejecutándose - no se inicia otro\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor único para el socket\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con '%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "no puedo cambiar los permisos de '%s': %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "escuchando en el socket '%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "no se puede crear el directorio '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "creado el directorio '%s'\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() falló para '%s': %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "no puede usar '%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error al leer valor único en el descriptor %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect falló: %s - espero 1s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg-preset-passphrase [opciones] KEYGRIP (-h para ayuda)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -698,8 +690,8 @@
 # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -707,9 +699,9 @@
 "@Órdenes:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -719,11 +711,11 @@
 "Opciones:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg-protect-tool [opciones] (-h para ayuda)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -731,22 +723,22 @@
 "Sintaxis: gpg-protect-tool [opciones] [args]\n"
 "Herramienta para el mantenimiento de claves secretas\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduzca frase contraseña para desproteger el objeto PKCS#12."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Introduzca la frase contraseña para proteger el objeto importado en GnuPG."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -754,18 +746,18 @@
 "Por favor introduzca la frase contraseña o PIN\n"
 "necesarios para completar esta operación."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelado\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error pidiendo la frase contraseña: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error abriendo '%s': %s\n"
@@ -775,32 +767,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fichero '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "declaración \"%s\" ignorada en '%s', línea %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "la lista de confianza '%s' del sistema no está disponible\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "huella digital incorrecta en '%s', línea %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "opción de clave inválida en '%s', línea %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error al leer '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error al leer la lista de certificados raíz fiables\n"
@@ -813,7 +805,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -822,11 +814,11 @@
 "¿Confía absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Sí"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -839,7 +831,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -851,21 +843,21 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Correcto"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Incorrecto"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: Esta frase contraseña nunca ha sido cambiada.%0APor favor hágalo ahora."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -874,15 +866,15 @@
 "Esta frase contraseña no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
 "cámbiela ahora."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Cambia la frase contraseña"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "La cambiaré más tarde"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -891,11 +883,11 @@
 "¿De verdad quiere borrar la clave identificada con el keygrip%%0A  %s%%0A  "
 "%%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Borrar clave"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -903,12 +895,12 @@
 "Cuidado: ¡Esta clave también está listada para usarse con SSH!\n"
 "Borrarla puede remover tu capacidad de acceder a máquinas remotas."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA necesita un resumen cuya longitud sea múltiplo de 8 bits\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
@@ -918,7 +910,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %zu bits no vale para %u bits de la clave %s\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
@@ -928,7 +920,7 @@
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no están disponibles\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "el algoritmo de llave pública %d (%s) no se puede usar\n"
@@ -957,7 +949,7 @@
 msgstr "error al crear stream para una tubería: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
@@ -1003,27 +995,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema estableciendo opciones de gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "esperando que el archivo '%s' esté disponible ...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renombrar '%s' a '%s' falló: %s\n"
@@ -1083,7 +1075,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria al reservar %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error reservando memoria: %s\n"
@@ -1198,7 +1190,7 @@
 msgstr "algoritmo: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo no disponible: %s"
@@ -1273,39 +1265,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certificado raíz fiable"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "no se encuentra CRL para el certificado"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "el CRL disponible es demasiado antiguo"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "Comprobación CRL/OCSP de certificados"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Certificados incluidos"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "No auditar entradas de los logs."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Operación desconocida"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent utilizable"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr utilizable"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "No hay ayuda disponible para '%s'."
@@ -1314,7 +1306,7 @@
 msgid "ignoring garbage line"
 msgstr "ignorando línea con basura"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[ninguno]"
 
@@ -1323,82 +1315,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inválido radix64 %02x omitido\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "parámetro inesperado"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "error de lectura"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "palabra clave demasiado larga"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "falta el parámetro"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "parámetro incorrecto"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "orden inválida"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "definición de alias inválida"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "memoria desbordada"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "orden inválida"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "orden desconocida '%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "datos inesperados"
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "opción inválida"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "falta parámetro para la opción \"%.50s\"\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "parámetro incorrecto para la opción \"%.50s\"\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "la opción \"%.50s\" no necesita parámetros\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "orden inválida \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "la opción \"%.50s\" es ambigua\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la orden \"%.50s\" es ambigua\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "memoria desbordada\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opción inválida \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: no existe el fichero de opciones predeterminado '%s'\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "fichero de opciones '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1414,42 +1438,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "la conversión de '%s' a '%s' falló: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "no se pudo crear el fichero temporal '%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error escribiendo a '%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "borrando fichero de bloqueo residual (creado por %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "esperando al bloqueo (que mantiene %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(¿bloqueo mutuo?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "bloqueo '%s' no hecho: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "esperando al bloqueo %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@ -1633,13 +1656,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Atención: Usa el comando \"%s\" para reiniciarlos.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s no funciona con el modo %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
@@ -1684,24 +1707,24 @@
 msgid "server uses an invalid certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@ -1711,136 +1734,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "No hay Código de Reinicio o ya no está disponible\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: sólo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (máximo %d caracteres).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave pública: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error al leer '%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error al escribir '%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inválida.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no válida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "Huella digital CA: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inválido de huella digital.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operación con la clave no es posible: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la información actual de la clave: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "¿Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1850,98 +1873,98 @@
 "      requerido. Si la generación de clave fracasa, por favor compruebe\n"
 "      la documentación de su tarjeta para ver los tamaños posibles.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿De qué tamaño quiere la clave? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Cambiando el atributo de la clave de tarjeta por: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Clave de firmado\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Clave de cifrado\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Clave de autentificación\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Ahora la tarjeta se reconfigurará para generar una clave de %u bits\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Ahora la tarjeta se reconfigurará para generar una clave de tipo: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error cambiando el atributo de clave de la clave %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error al obtener información de la clave: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Esta orden no se puede usar con esta tarjeta\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "¿Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "NOTA: ¡ya hay claves almacenadas en la tarjeta!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "¿Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1952,168 +1975,168 @@
 "   PIN = '%s'     PIN Administrador = '%s'\n"
 "Debería cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Clave de firmado\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificación\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD fallido: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "NOTA: ¡Esta orden destruye todas las claves almacenadas en la tarjeta!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "¿Realmente quiere volver a los valores de fábrica? (escriba \"sí\") "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error de la configuración KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "salir de este menú"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "ver órdenes de administrador"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "cambiar huella digital de una CA"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opción forzar firma del PIN"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "menú para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando Código de Reinicio"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "destruir todas las claves y datos"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "cambia valores de la clave"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/tarjeta> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Órdenes sólo de administrador\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "no se puede abrir '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2172,8 +2195,8 @@
 msgstr "subclave"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
@@ -2198,37 +2221,49 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opción \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error al crear frase contraseña: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete simétrico ESK debido al modo S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' ya está comprimido\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ATENCIÓN '%s' es un fichero vacío\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "no se puede usar el cifrado '%s' en modo %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "no puede usar el resumen '%s' en modo %s\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "leyendo desde '%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2236,20 +2271,14 @@
 "AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "no se puede usar el cifrado '%s' en modo %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 "ATENCIÓN: la clave %s no es adecuada para la encriptación en modo %s\n"
 "\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2258,41 +2287,41 @@
 "AVISO: forzar el algoritmo de compresión %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado simétrico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "no se puede usar la opción '%s' en modo %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
@@ -2386,7 +2415,7 @@
 msgstr " - omitido"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "escribiendo en '%s'\n"
@@ -2421,258 +2450,264 @@
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "'%s' recuperado automáticamente vía %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error recuperando '%s' vía %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "No hay huella digital"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(revisar el parámetro de la opción '%s')\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Advertencia: no estamos usando '%s' como clave predeterminada: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "usando \"%s\" como clave secreta predeterminada para firmar\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "todos los valores pasados a '%s' ignorados\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "parámetros válidos para la opción '%s':\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "genera un nuevo par de claves en modo rápido"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "añade una nueva id de usuario en modo rápido"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "revoca una id de usuario en modo rápido"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "cambia la fecha de caducidad de modo rápido"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "generación de claves con todas las funcionalidades"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo público"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "firma una clave en modo rápido"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "firma una clave localmente en modo rápido"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "revoca una id de usuario en modo rápido"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "cambia una frase contraseña"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "imprime resúmenes de mensaje"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|decide la política TOFU de una clave"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|cifra para ID-USUARIO"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|usa este identificador para firmar o descifrar"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresión N (0 desactiva)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|volcar salida en FICHERO"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
@@ -2680,7 +2715,7 @@
 # página man -> página de manual
 # Vale. ¿del manual mejor?
 # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2688,7 +2723,7 @@
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2708,11 +2743,11 @@
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: @GPG@ [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2722,7 +2757,7 @@
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2730,73 +2765,73 @@
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Clave pública: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: %s [opciones] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no se encontró el signo = en la definición de grupo '%s'\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal '%s'\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuración '%s'\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedad insegura de la extensión '%s'\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal '%s'\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuración '%s'\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros de la extensión '%s'\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de '%s'\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2804,18 +2839,18 @@
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensión '%s'\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de '%s'\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2823,436 +2858,425 @@
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensión '%s'\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "artículo de configuración desconocido '%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "mostrar información de uso de las claves al listarlas"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de política al listar firmas"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones estándar IETF al listar firmas"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "política TOFU desconocida '%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(usa \"ayuda\" para listar las opciones)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas '%s'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' no es una fecha de caducidad de firma válida\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" no es una dirección de email válida\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modo de entrada de pin inválido '%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origen incorrecto de la consulta '%s'\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' no es un juego de caracteres válido\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opción de filtro inválida: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inválida\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "lista de opciones inválida\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de política al verificar firmas"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones estándar IETF al verificar firmas"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos válidos PKA"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutará en memoria insegura por %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresión seleccionado es inválido\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "no puede usar el resumen '%s' en modo %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "no puede usar la compresión '%s' en modo %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicialización de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "el cifrado simétrico de '%s' falló: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "no puede usar --symmetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "envío al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "exportación como clave ssh fallida: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido '%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error al leer la especificación de clave '%s': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' no parece ser una ID de clave, huella digital o keygrip válido\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
@@ -3263,47 +3287,47 @@
 # En español no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario déjalo siempre.
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|tomar las claves del anillo FILE"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean sólo un aviso"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escribe información de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|rechaza firmas hechas con ALGO"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3500,7 +3524,7 @@
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
@@ -3510,7 +3534,7 @@
 msgid "key %s: %s\n"
 msgstr "clave %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "rechazado por el filtro de importación"
 
@@ -3534,7 +3558,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave pública no encontrada: %s\n"
@@ -3549,7 +3573,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error escribiendo anillo '%s': %s\n"
@@ -3619,17 +3643,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "clave %s: clave secreta ya existe\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clave %s: error enviando al agente: %s\n"
@@ -3642,231 +3666,299 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Para migrar '%s', para cada smartcard ejecuta: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "clave secreta %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado incorrecto %d - omitida\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "No se dio ninguna razón"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "La clave ya no está en uso"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es válido"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "razón para la revocación: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario a la revocación: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave pública - imposible emplear el\n"
 "certificado de revocación\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocación inválido: %s - rechazado\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocación importado\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave pública no disponible para ID \"%s\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inválida para el id \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave pública no disponible\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clave %s: firma directa de clave inválida\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: unión de subclave inválida\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves múltiples\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocación de clave\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocación de subclave inválida\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocación de subclave múltiple\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02X) - omitida\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocación en lugar equivocado - omitido\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocación no valido: %s - omitido\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02X) inesperada - omitida\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocación %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocación %s.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocación añadido\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave añadida\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error al reservar memoria: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "clave %s: algoritmo de clave pública no disponible\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "revoke signatures"
+msgid " (reordered signatures follow)"
+msgstr "revoca firmas"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "omitido \"%s\": %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
+msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 firma no comprobada por falta de una clave\n"
+msgstr[1] "%d firmas no comprobadas por falta de claves\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d firma incorrecta\n"
+msgstr[1] "%d firmas incorrectas\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Firma correcta de"
+msgstr[1] "Firma correcta de"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error al crear caja de claves '%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "error al crear anillo '%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "caja de claves '%s' creada\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "anillo '%s' creado\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "recurso de bloque de claves '%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error al abrir base de datos de claves: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
@@ -4104,8 +4196,8 @@
 msgid "Really sign? (y/N) "
 msgstr "¿Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -4296,7 +4388,7 @@
 "locales (lsign), una 't' para firmas fiables (tsign), 'nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinación de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "La clave está revocada."
 
@@ -4351,7 +4443,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
@@ -4428,7 +4520,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "¿Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
@@ -4473,104 +4565,119 @@
 msgid "Nothing to sign.\n"
 msgstr "Nada que firmar.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "No está firmado por usted.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "la comprobación de la firma creada falló: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' no es una fecha de caducidad válida\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subclave \"%s\" no encontrada\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La siguiente clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "caducó: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4578,17 +4685,17 @@
 "Ten en cuenta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicies el programa.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4597,17 +4704,17 @@
 "AVISO: ningún ID de usuario está marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Puede que también quieras cambiar su fecha de caducidad.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4616,72 +4723,72 @@
 "AVISO: esta es una clave de tipo PGP2. Añadir un ID fotográfico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d firma borrada.\n"
 msgstr[1] "%d firmas borradas.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "inválida"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
 msgstr[1] "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4690,41 +4797,41 @@
 "AVISO: esta es una clave tipo PGP2. Añadir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4732,236 +4839,232 @@
 "¿Está seguro de querer cambiar la fecha de caducidad para multiples "
 "subclaves? (s/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando el uso de una subclave.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando uso de clave primaria.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la subclave de firmado %s ya está certificada en cruz\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la subclave %s no firma y así no necesita ser certificada en cruz\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Introduzca la notación: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ningún identificador de usuario con el índice %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No existe una subclave con ID de usuario '%s'.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "No está firmado por usted.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ha intentado revocar una ID no de usuario: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "No se puede revocar el último identificador de usuario válido\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotográfico %s de tamaño %ld para la clave %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "parámetro incorrecto para la opción '%s'\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferencia '%s' duplicada\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresión\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "item incorrecto '%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -4969,19 +5072,19 @@
 "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
 "tamaño\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certificar"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Autentificación"
 
@@ -4995,162 +5098,162 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autenticación\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA y RSA (por defecto)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA y ElGamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sólo firmar)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sólo cifrar)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC y ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sólo firmar)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) ECC (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) ECC (sólo cifrar)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Clave existente\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Clave existente de la tarjeta\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Introduzca keygrip: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "No es un keygrip válido (se esperaban 40 dígitos hex)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "No hay claves con ese keygrip\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error al leer la tarjeta: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Número de serie de la tarjeta: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Claves disponibles:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿De qué tamaño quiere la subclave? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Seleccione el tipo de curva elíptica deseado:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5166,7 +5269,7 @@
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5182,38 +5285,38 @@
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave válida ¿durante? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5221,11 +5324,11 @@
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "¿Es correcto? (s/n) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5239,7 +5342,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5255,49 +5358,49 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Los caracteres '%s' y '%s' no pueden aparecer en el nombre\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Está usando el juego de caracteres '%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5308,7 +5411,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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 "
@@ -5325,31 +5428,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "¿Cambia (N)ombre, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5362,13 +5465,13 @@
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5379,64 +5482,64 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "¿Continuar? (S/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ya existe una clave para \"%s\"\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de todas formas?(s/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "creando de todas formas\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Nota: Usa \"%s %s\" para el diálogo completo de generación de clave.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, 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:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en '%s'\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "escribiendo clave pública en '%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo público de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error al escribir en el anillo público '%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5444,7 +5547,7 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5452,7 +5555,7 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5460,23 +5563,23 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Atención: crear subclaves para claves V3 no sigue el estándar OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no están disponibles.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "¿Crear de verdad? (s/N) "
 
@@ -5511,20 +5614,6 @@
 msgstr[0] "%d firma correcta\n"
 msgstr[1] "%d firmas correctas\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d firma incorrecta\n"
-msgstr[1] "%d firmas incorrectas\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 firma no comprobada por falta de una clave\n"
-msgstr[1] "%d firmas no comprobadas por falta de claves\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5543,29 +5632,29 @@
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Huella clave primaria:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Número de serie de la tarjeta ="
 
@@ -5595,7 +5684,7 @@
 msgstr[0] " (%lu firma)\n"
 msgstr[1] " (%lu firmas)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
@@ -5646,451 +5735,451 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "renovando %d clave desde %s\n"
 msgstr[1] "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ningún servidor de claves conocido\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando clave de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamaño anormal para una clave de sesión cifrada (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesión cifrada\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contraseña generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave pública es %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave de %u bits %s, ID %s, creada el %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVISO: se observan varios textos en claro\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contraseña\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contraseña\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Atención: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "no se encontró firma\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no puedo manejar estos datos ambiguos en la firma\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               emisor \"%s\"\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "ATENCIÓN: ¡Esta clave no se puede usar para firmar en modo %s!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 "firma %s, algoritmo de resumen %s%s%s\n"
 "\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", algoritmo de clave pública "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "ADVERTENCIA: firma no separada; ¡el archivo %s NO ha sido verificado!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas múltiples firmas. Sólo la primera se comprueba.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat de '%s' falló en %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) falló en %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVISO: usando un algoritmo de clave pública experimental %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "AVISO: las firmas Elgamal para firmar y cifrar están obsoletas\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s está obsoleto\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Atención: las firmas que usan el algoritmo %s son rechazadas\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "Note: signatures using the %s algorithm are rejected\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Atención: las firmas que usan el algoritmo %s son rechazadas\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(error reportado: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(error reportado: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(más información: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción obsoleta \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCIÓN: \"%s\" es una orden obsoleta - no la use\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: opción obsoleta \"%s\"en este archivo - sólo tiene efecto en %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto excepto en %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podría no ser utilizable por %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opción ambigua '%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opción desconocida '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Una clave pública ECDSA debe estar en un encoding SEC múltiplo de 8 bits\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "algoritmo débil de resumen desconocido '%s'\n"
@@ -6123,73 +6212,73 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "asumiendo que los datos firmados están en '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave pública %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesión cifrada simétricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notación de firmas críticas: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contraseña\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de clave primaria %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Introduzca frase contraseña para desbloquear la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Introduzca frase contraseña para importar la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Introduzca frase contraseña para exportar la subclave secreta OpenPGP:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Introduzca frase contraseña para exportar la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "De verdad quiere borrar para siempre la subclave secreta de la clave OpenPGP:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "De verdad quiere borrar para siempre la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6245,7 +6334,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "¿Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "¡no puedo mostrar ID fotográfico!\n"
@@ -6558,12 +6647,12 @@
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la clave %s no usa %s\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@ -6616,27 +6705,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificación de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "NOTA: clave secreta %s caducó el %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
@@ -6833,7 +6922,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "no puede usar la clave %s para firmar en modo %s\n"
@@ -6903,29 +6992,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "firma incorrecta de la clave %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "firma incorrecta de la clave %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit crítico desconocido\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocación de subclave\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
@@ -6954,12 +7043,12 @@
 "AVISO: no puedo expandir el %%- de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6967,12 +7056,12 @@
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usará un cifrado %s\n"
@@ -6997,7 +7086,7 @@
 msgstr ""
 "¡esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@ -7042,12 +7131,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "error de lectura '%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "no se puede crear el bloqueo para '%s'\n"
@@ -7057,12 +7146,12 @@
 msgid "can't lock '%s'\n"
 msgstr "no se puede bloquear '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -7078,103 +7167,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no se puede acceder a '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creación del registro de versión: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inválida\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inválida\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, 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:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versión: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error al leer registro de versión: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versión: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, 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:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versión del fichero %d inválida\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error al leer registro libre: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al añadir un registro: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: base de datos de confianza corrupta.\n"
@@ -7562,126 +7651,126 @@
 "ADVERTENCIA: Cifrando para %s, que no tiene ningún identificador de usuario "
 "no revocado\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave válido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clave %s: aceptada como clave fiable\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clave %s aparece más de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clave %s: clave fiable sin clave pública - omitida\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clave %s marcada como de confianza absoluta\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petición tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Puede intentar recrear la base de datos de confianza usando las órdenes:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Si eso no funciona, por favor consulte el manual\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "no es necesaria una comprobación de la base de datos de confianza\n"
 "con el modelo de confianza '%s'\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo '%s'\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave pública %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d clave procesada"
 msgstr[1] "%d claves procesadas"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validación de cuenta borrada)\n"
 msgstr[1] " (%d validaciones de cuenta borradas)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave pública de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7689,7 +7778,7 @@
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7801,54 +7890,69 @@
 "Sintaxis: kbxutil [opciones] [ficheros]\n"
 "Listar, exportar, importar datos Keybox\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNúmero: %s%%0ATitular: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Intentos disponibles: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Introduzca un PIN para la clave que crea firmas cualificadas."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Por favor, introduzca PIN para claves estándar."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la función de manejo del PIN devolvió un error: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "el PIN-Nulo no ha sido cambiado\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Por favor introduzca un nuevo PIN para las claves estándar."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Por favor, introduzca PIN para claves estándar."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Introduzca nuevo PIN Unblocking Code (PUK) para claves estándar."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Por favor introduzca PIN Unblocking Code (PUK) para claves estándar."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Entre un nuevo PIN para la clave que crea firmas cualificadas."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||Introduzca un PIN para la clave que crea firmas cualificadas."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7856,7 +7960,7 @@
 "|NP|Por favor introduzca un nuevo PIN Unblocking Code (PUK) para la clave "
 "que crea firmas cualificadas."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7864,47 +7968,47 @@
 "|P|Introduzca el PIN Unblocking Code (PUK) para que la clave pueda crear "
 "firmas cualificadas."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el módulo RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 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:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "la respuesta no incluye la clave pública EC\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave pública\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo al leer clave pública: %s\n"
@@ -7912,54 +8016,42 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sNúmero: %s%%0ATitular: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Intentos disponibles: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "usando PIN por defecto %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Por favor desbloquee la tarjeta"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificación CHV%d falló: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "¡la tarjeta está bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7973,24 +8065,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a órdenes de administrador no está configurado\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
@@ -7998,121 +8090,121 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuevo Código de Reinicio"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Introduzca el PIN de Administrador y el Nuevo PIN de Administrador"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Por favor introduzca el PIN y el Nuevo PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "error al leer datos de la aplicación\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error al leer huella digital DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "la clave existente será reemplazada\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "escribiendo clave nueva\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creación\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva no soportada\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "la generación de la clave falló\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "generación de clave completada (%d segundo)\n"
 msgstr[1] "generación de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 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:4368
+#: scd/app-openpgp.c:4558
 #, 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:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 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:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@ -8128,55 +8220,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Nuevo PIN Inicial"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|poner el nivel de depurado a NIVEL"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|escribir log en FICHERO"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|conectar el lector al puerto N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|usa NOMBRE como driver ct-API"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|usa NOMBRE como driver PC/SC"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "no usa el driverd del CCID interno"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "no usar el teclado del lector"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "denegar órdenes de administración de la tarjeta"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "usar input the largo variable para el pinpad"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: @SCDAEMON@ [opciones] (-h para ayuda)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8184,307 +8276,324 @@
 "Sintaxis: scdaemon [opciones] [orden [args]]\n"
 "Demonio de la tarjeta inteligente para @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "use la opción '--daemon' para ejecutar el programa en segundo plano\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "el certificado: %s requiere un modelo de validación"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "cadena"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la extensión crítica de certificado %s no puede usarse"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "el certificado del emisor no está marcado como CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "política marcada como crítica sin políticas configuradas"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "fallo al abrir '%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Nota: no se permiten políticas no críticas de certificados"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "no se permite política de certificado"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "fallo obteniendo huella digital\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "buscando al emisor en una localización externa\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero de emisores coincidentes: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "no se ha podido obtener authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "buscando emisor en el caché de Dirmngr\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "número de certificados coincidentes: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "fallo buscando la clave sólo caché de dirmngr: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "fallo al reservar handle de keyDB\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "el certificado ha sido revocado"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "el estado del certificado es desconocido"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "por favor asegúrese de que \"dirmngr\" está bien instalado\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobación de CRL falló: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "validez del certificado incorrecta: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "el certificado aún no es válido"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "el certificado raíz no es válido aún"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "el certificado intermedio aún no es válido"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificado caducado"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "el certificado raíz ha caducado"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "el certificado intermedio ha caducado"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "faltan los atributos requeridos del certificado: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "el certificado tiene una validez incorrecta"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "la firma no se creo durante el tiempo de validez del certificado"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "el certificado no se creo durante el tiempo de validez el emisor"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificado intermedio no creado durante el tiempo de validez del emisor"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  ( firmas creadas en "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificado creado en "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificado válido desde "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     emisor válido desde "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "huella digital=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "certificado raíz marcado ahora como fiable\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "marcar interactivamente como fiable no está activado en gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "marcar interactivamente como fíable desactivado en esta sesión\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "AVISO: fecha de creación de firma desconocida - asumo momento actual"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "no se encuentra el emisor de este certificado"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificado auto firmado con firma INCORRECTA"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "el certificado raíz no está marcado como fiable"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobación de la lista de confianza falló: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "cadena de certificados demasiado larga\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "no se encuentra emisor del certificado"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "el certificado tiene una firma INCORRECTA"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "encontrado otro posible certificado de CA coincidente - reintentando"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "cadena de certificados más larga de lo que permite la CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificado correcto\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado intermedio correcto\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificado raíz correcto\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "cambiando al modelo en cadena"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "modelo de validación usado: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "memoria desbordada\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(es el algoritmo MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "ninguno"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Error - codificación inválida]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Error - core]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Error - Sin nombre]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Error - DN inválido]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8499,139 +8608,139 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error obteniendo información sobre uso de la clave: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "el certificado no debería haberse usado para certificar\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "el certificado no debería haberse usado para cifrar\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "el certificado no debería haberse usado para firmar\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "el certificado no es utilizable para cifrar\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "el certificado no es utilizable para firmar\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "línea %d: algoritmo inválido\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "línea %d: longitud de clave inválida %u (válidas de %d a %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "línea %d: falta nombre de entidad\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "línea %d: etiqueta con nombre de entidad inválida '%.*s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "línea %d: nombre de entidad inválida '%s' en posición %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "línea %d: no es una dirección de email válida\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "línea %d: número de serie inválido\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "línea %d: etiqueta con nombre de emisor no válido '%.*s'\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "línea %d: nombre de emisor no válido '%s' posición %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "línea %d: fecha no válida\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "línea %d: error al obtener clave de firmado con keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "línea %d: algoritmo de hash no válido\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "línea %d: id de autoridad de clave no válido\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr ""
 "línea %d: subject-key-id no válido\n"
 "\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "línea %d: sintaxis de estensión no válida\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "línea %d: error al leer clave '%s' de la tarjeta: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "línea %d: error obteniendo clave con keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "línea %d: generación de clave fallida: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8764,7 +8873,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificado '%s' no encontrado: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error bloqueando keybox: %s\n"
@@ -8789,87 +8898,87 @@
 msgid "no valid recipients given\n"
 msgstr "no se dieron receptores válidos\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "lista claves externas"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "lista de cadenas de certificados"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "importa certificado"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "exporta certificado"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "registrar tarjeta inteligente"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "pasar una orden a dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "invocar gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "crea una salida en base-64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "asumir entrada en formato PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "asumir entrada en formato base-64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "asumir entrada en formato binario"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "nunca consultar una CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "comprabar validez usando OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|número de certificados que incluir"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|tomar política de información de FICHERO"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "no comprobar políticas de certificados"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "recuperar certificados de emisor perdidos"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|escribir un log en modo servidor en FICHERO"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|escribir inform de auditoría a FICHERO"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -8879,39 +8988,39 @@
 # Además una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "sí" en casi todas las
 # preguntas no me acaba de gustar.
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|añade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|usa ID-USUARIO como clave secreta por defecto"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|usa este servidor para buscar claves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: @GPGSM@ [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8921,47 +9030,47 @@
 "firma, comprueba, cifra o descifra usando el protocolo S/MIME\n"
 "La operación predeterminada depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Nota: no se podrá cifrar a '%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modelo de validación desconocido '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: falta el nombre del host\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: se dio contraseña sin usuario\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: omitir esta línea\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "no se puede interpretar el servidor de claves\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importando certificados comunes '%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no puedo firmar usando '%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inválida (no hay orden implícita)\n"
@@ -8981,7 +9090,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "fallaron comprobaciones básicas sobre el certificado - no importado\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error obteniendo parámetros almacenados: %s\n"
@@ -8991,42 +9100,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "error importando el certificado: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error al leer la entrada: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "fallo obteniendo huella digital\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problema buscando el certificado existente: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error obteniendo keyDB para escribir: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error almacenando certificado: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problema re-buscando el certificado: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error almacenando parámetros: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Error - "
 
@@ -9061,7 +9165,7 @@
 "\n"
 "%s%sEstá realmente seguro de querer hacer esto?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9096,38 +9200,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobación de la firma cualificada falló: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Firmado el "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[no hay fecha]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " usando el certificado ID 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "algoritmo: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "firma inválida: el resumen del mensaje no coincide con el calculado\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Firma correcta de"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Es una firma cualificada\n"
@@ -9196,275 +9301,274 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "error al cargar certificado '%s': %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "    certificados cargados permanentemente: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "certificados almacenados para esta sesión: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "                   certificados confiados: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificado ya almacenado\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificado almacenado\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error al almacenar certificado: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "huella digital SHA1 no válida '%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error al descargar certificado con S/N: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error al descargar certificado por asunto: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no se encuentra el emisor de este certificado\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error al obtener authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creando directorio '%s'\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error al crear directorio '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorando directorio de base de datos '%s'\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error al leer directorio '%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "removiendo archivo de cache '%s'\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "no se remueve el archivo '%s'\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error cerrando archivo de cache: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "fallo al abrir archivo de directorio de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "error al crear nuevo archivo de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "error al escribir nuevo archivo de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "error al cerrar nuevo archivo de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "creado nuevo archivo de cache '%s'\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "no se puede reabrir el archivo de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "la primera entrada de '%s' no es la versión\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "versión antigua del directorio de cache - limpiando\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "versión antigua del directorio de cache - me rindo\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "detectado un campo extra en la entrada crl de '%s' línea %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "línea no válida detectada en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "entrada duplicada detectada en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "tipo de entrada no soportada en '%s', salteada la línea %u\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "hash de emisor no válido en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "no hay DN de emisor en '%s' línea %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "fecha no válida en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "ADVERTENCIA: hash de archivo de cache no válido en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "errores detectados en el archivo de cache\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "chequea el problema y borra este archivo manualmente\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "no se puede crear el fichero de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "error al cerrar '%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error al renombrar '%s' a '%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "no se puede hacer el hash de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error al establecer el contexto de hash MD5: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error al hacer el hash de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "formato inválido de huella digital para '%s'\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "demasiados archivos de cache abiertos; ya no puedo abrir más\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "abriendo archivo de cache '%s'\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error al abrir archivo de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "error al inicializar el archivo de cache '%s' para lectura: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "llamando unlock_db_file para un archivo cerrado\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "llamando unlock_db_file para un archivo ya desbloqueado\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "fallo al crear un nuevo objecto de cache: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "No hay CRL disponible para el identificador de emisor %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "el CRL almacenado para el identificador de emisor %s es demasiado antiguo; "
 "se requiere una actualización\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9473,7 +9577,7 @@
 "force-crl-refresh activado y han pasado %d minutos para el identificador de "
 "emisor %s; se requiere una actualización\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
@@ -9481,192 +9585,194 @@
 "una actualización\n"
 "\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 "no se puede usar el CRL disponible para el identificador de emisor %s\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "el CRL almacenado en local para el identificador de emisor %s ha sido "
 "toqueteado; necesitamos actualizar\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "ATENCIÓN: largo de entrada de cache no válido para S/N "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "problemas al leer la entrada de cache para S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s no es válido; razón=%02X  fecha=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s es válido, no está listado en el CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error al obtener datos del archivo de cache: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "algoritmo hash inválido '%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "gcry_md_open para algoritmo %d ha fallado: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "respuesta S-expression de libksba no válida\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "he fallado al convertir la expresión S-expression: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "algoritmo hash inválido '%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open para algoritmo %d ha fallado: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "fallo al crear S-expression: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ha fallado ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error obteniendo el número de serie de la tarjeta: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "fechas de actualización de este CRL: esta=%s próxima=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "no se ha dado nextUpdate, asumiento un período de validez de un día\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error al obtener un objeto CRL: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error al insertar objeto en el alacenamiento temporal: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no se encuentra el emisor en el CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "buscando el certificado de emisor CRL por authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "ha fallado la verificación CRL de la firma: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error al verificar la validez del emisor del certificado CRL: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ha fallado ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ha fallado ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "se ha removido el fichero temporal de cache en desuso '%s'\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problema al remover el fichero temporal de cache en desuso '%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error al crear fichero temporal de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "ha fallado crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error al finalizar fichero temporal de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error al cerrar fichero temporal de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "ADVERTENCIA: el nuevo CRL es también anticuado; caducó el %s - cargándolo de "
 "todos modos\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "el nuevo CRL está anticuado; caducó el %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "extensión crítica CRL desconocida %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error al leer las extensiones CRL: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creando fichero de cache '%s'\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problema al renombrar '%s' a '%s': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9675,12 +9781,12 @@
 "ha fallado la actualización del archivo DIR - la entrada de cache se perderá "
 "al reiniciar el programa\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Comienzo del dump CRL (obtenido mediante %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9689,57 +9795,57 @@
 "luego de una actualización!\n"
 
 # qué es una 'extensión crítica desconocida'? dice que falta?
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: El CRL no se usará a causa de una extensión crítica desconocida!\n"
 "\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: No se usará el CRL\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " ERROR: ¡Puede que alguien haya manipulado este CRL almacenado en local!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " ATENCIÓN: el tamaño de la entrada de cache no es correcto\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "error al leer entrada de cache: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problema al leer clave de cache: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error al leer entrada de cache de la base de datos: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Terminar el dump de CRL\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallado crl_fetch via DP: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "ha fallado crl_cache_insert via DP: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "ha fallado crl_cache_insert via emisor: %s\n"
@@ -9779,55 +9885,55 @@
 "búsqueda de certificado imposible a causa de que %s está deshabilitado\n"
 "\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "usar OCSP en lugar de CRLs"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "verifica si hay un dirmngr corriendo"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "añadir un certificado a la cache"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "valida el certificado"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "busca un certificado"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "busca sólo en los certificados almacenados localmente"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "espera recibir una URL con --lookup"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "cargar un CRL en el dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "modo especial para usar con Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "esperar recibir certificados en formato PEM"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "forzar el uso del contestador OCSP predeterminado"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Uso: dirmngr-client  [opciones] [fichero|patrón] (-h para ayuda)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9839,82 +9945,82 @@
 "El proceso devuelve 0 si el certificado es válido, 1 si no lo es\n"
 "y otros códigos de error para fallos generales\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "error al leer certificado de stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "error al leer certificado de '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "certificado demasiado grande para ser correcto\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "no se puede conectar con el dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "ha fallado la búsqueda: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "ha fallado la carga del CRL '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "hay un demonio dirmngr en ejecución\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "ha fallado la validación del certificado: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "certificado correcto\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "el certificado ha sido revocado\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "ha fallado el chequeo del certificado: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "obtenido el estado '%s'\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "error al escribir con encoding base64: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "pregunta no soportada '%s'\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "espero la ruta absoluta del archivo\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "buscando '%s'\n"
@@ -9939,90 +10045,90 @@
 msgid "flush the cache"
 msgstr "descargar la memoria cache"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|escribir logs en modo servidor en FICHERO"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "arrancar sin preguntar a un usuario"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "forzar la carga de CRLs caducados"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "permitir el envío de búsquedas OSCP"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "permitir el chequeo online de versiones de software"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "inhibir el uso de HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "inhibir el uso de LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL HTTP"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL LDAP"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorar URLs de servicio contenidas en los certificados OSCP"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirigir todos los pedidos HTTP a URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|usar HOST para las consultas LDAP"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "no usar hosts de reserva con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lee lista de servidores LDAP de FILE"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "añadir nuevos servidores descubiertos en los puntos de distribución CRL a la "
 "lista de servidores"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|establecer vida máxima de LDAP en N segundos"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|usar contestador OSCP en la URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|respuesta OCSP firmada por FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|no devolver más de N items en una consulta"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|usar los certificados CA en FILE para HKP a través de TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "enrutar todo el tráfico a través de Tor"
 
@@ -10030,7 +10136,7 @@
 # página man -> página de manual
 # Vale. ¿del manual mejor?
 # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10039,11 +10145,11 @@
 "@\n"
 "(Véase en la página del manual la lista completa de órdenes y opciones)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: @DIRMNGR@ [opciones] (-h para ayuda)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10051,132 +10157,132 @@
 "Sintaxis: @DIRMNGR@ [opciones] [orden [argumentos]]\n"
 "Acceso al servidor de claves, CRL y OCSP para @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "los niveles de debug válidos son: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "uso: %s [opciones] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "los dos puntos(:) no están permitidos en el nombre del socket\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fallo al intentar descargar CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "falló el procesamiento CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: línea demasiado larga - omitida\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: se detectó huella digital no válida\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorada la basura al final de la línea\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP recibido - releyendo y haciendo correr las caches\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 recibido - ninguna acción definida\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM recibido - apagando ...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM recibido - todavía %d conexiones activas\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "apagado forzado\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT recibido - apagado inmediato\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "señal %d recibida - ninguna acción definida\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "devuelve todos los valores en un formato orientado a record"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|ignorar la parte del host y conectar con el NAME"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|conectar al host NAME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|conectar al puerto N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|usa NOMBRE como destinatario por defecto"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|usar la contraseña PASS para autentificación"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "tomar el password de $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|preguntar DN STRING"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|usar FRASE como expresión de filtro"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|devuelve el atributo STRING"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Uso: dirmngr_ldap [opciones] [URL] (-h para ayuda)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10186,145 +10292,139 @@
 "Ayudante interno de LDAP para Dirmngr\n"
 "La interfaz y las opciones pueden cambiar sin previo aviso\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "número de puerto inválido %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "resultado del scanning para el atributo '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "error al escribir a stdout: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          atributo disponible '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "atributo \"%s\" no encontrado\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "atributo \"%s\" encontrado\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "procesando url '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "       usuario '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "         pasar '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          host '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "        puerto %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        filtro '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "           atr '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "no hay hostname en '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "no se ha dado ningún atributo para la consulta '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "ATENCIÓN: ¡se está usando sólo el primer atributo!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "ha fallado el binding con '%s:%d': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "ha fallado la búsqueda '%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' no es una URL LDAP\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' no es una URL LDAP válida\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error mientras se accedía '%s': http status %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' redirigida a '%s' (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas redirecciones\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "escribiendo en '%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "error al reservar memoria: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10375,7 +10475,7 @@
 msgid "malloc failed: %s\n"
 msgstr "ha fallado malloc: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: patrón '%s' incorrecto\n"
@@ -10508,11 +10608,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "fallo al asignar el contexto OCSP: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "no se ha podido obtener authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10581,7 +10676,7 @@
 msgstr "falta el número de serie en el ID del certificado"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "ha fallado assuan_inquire: %s\n"
@@ -10611,32 +10706,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "se ha excedido el número de respuestas(max_replies) %d\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no puedo colocar la estructura de control: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "fallo al reservar el contexto assuan: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "ha fallado la inicialización del servidor: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "fallo en las órdenes de registro con Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problema de aceptación Assuan: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "ha fallado el procesado Assuan: %s\n"
@@ -10674,56 +10769,56 @@
 msgid "certificate chain is good\n"
 msgstr "cadena de certificados es buena\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "el certificado no debería haberse usado para firmas CRL\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "silencioso"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "escribir datos de salida en hexadecimal"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "decodificar líneas de datos recibidos"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "conecta al dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|conectar al socket Assuan NOMBRE"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|conectar al servidor Assuan en ADDR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "ejecutar el servidor Assuan indicando en línea de órdenes"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "no usar el modo de conexión extendido"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|ejecuta órdenes de FICHERO al empezar"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "ejecutar /subst al empezar"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uso: @GPG@-connect-agent [opciones] (-h para ayuda)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10731,43 +10826,43 @@
 "Sintaxis:  @GPG@-connect-agent [opciones]\n"
 "Conectar a un agente que se está ejecutando y mandar órdenes\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "la opción \"%s\" necesita un programa y parámetros opcionales\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "la opción \"%s\" se ignora por \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo recibiendo la línea: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "línea demasiado larga -omitida\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "línea acortada por culpa del caracter Nul incluído\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "orden desconocida '%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallo mandando la línea: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando opciones estándar: %s\n"
@@ -10968,94 +11063,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Atención: Usa el comando \"%s\" para reiniciarlos.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Verificación externa del componente %s fallida"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificación de grupo se ignoran\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error al cerrar '%s'\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error al leer '%s'\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "listar todos los componentes"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "comprobar todos los programas"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|lista de opciones"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|cambiar opciones"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|comprobar opciones"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "aplicar valores globales por defecto"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|actualizar los archivos de configuración usando ARCHIVO"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "obtener directorios de configuración para @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "listar fichero de configuración global"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "comprobar fichero global de configuración"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "consulta la base de datos de versiones de software"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "listar todos los componentes, o uno en particular"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "iniciar un componente en particular"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "matar un componente particular"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "activar cambios en tiempo de ejecución, si es posible"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uso: @GPGCONF@ [opciones] (-h para ayuda)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11063,208 +11158,155 @@
 "Sintaxis: @GPGCONF@ [opciones]\n"
 "Administra opciones de configuración de las herramientas GnuPG\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Necesita un argumento de un componente"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Componente no encontrado"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "No se permiten parámetros"
 
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr ""
+"Uso: gpg-check-pattern [opciones] [fichero_de_patrones] (-h para ayuda)\n"
+
+#: tools/gpg-check-pattern.c:150
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Sintaxis: gpg-check-pattern [opciones] fichero_de_patrones\n"
+"Compara frase contraseña dada en entrada estándar con un fichero de "
+"patrones\n"
+
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas '%s'\n"
+
 # Órdenes, please...
 # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
-#: tools/symcryptrun.c:166
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-"@\n"
-"Órdenes:\n"
-" "
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Órdenes:\n"
+#~ " "
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "modo de descifrado"
+#~ msgid "decryption modus"
+#~ msgstr "modo de descifrado"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "modo de cifrado"
+#~ msgid "encryption modus"
+#~ msgstr "modo de cifrado"
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "clase de herramienta (confucius)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "clase de herramienta (confucius)"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "nombre del programa"
+#~ msgid "program filename"
+#~ msgstr "nombre del programa"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "fichero de clave secreta (requerido)"
+#~ msgid "secret key file (required)"
+#~ msgstr "fichero de clave secreta (requerido)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "nombre del fichero de entrada (por defecto stdin)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nombre del fichero de entrada (por defecto stdin)"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: symcryptrun [opciones] (-h para ayuda)"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uso: symcryptrun [opciones] (-h para ayuda)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Sintaxis: symcryptrun --class CLASE --program PROGRAMA --keyfile FICHERO "
-"[opciones...] ORDEN [fichero entrada]\n"
-"Invocar una herramienta simple de cifrado simétrico\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Sintaxis: symcryptrun --class CLASE --program PROGRAMA --keyfile FICHERO "
+#~ "[opciones...] ORDEN [fichero entrada]\n"
+#~ "Invocar una herramienta simple de cifrado simétrico\n"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s en %s abortó con estado %i\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s en %s abortó con estado %i\n"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s en %s falló con estado %i\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s en %s falló con estado %i\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "no se puede crear el directorio temporal '%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "no se puede crear el directorio temporal '%s': %s\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "no se puede abrir %s para escribir: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "no se puede abrir %s para escribir: %s\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "error escribiendo en %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "error escribiendo en %s: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "error al leer de %s: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "error al leer de %s: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "error cerrando %s: %s\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "error cerrando %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "falta la opción --program\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "falta la opción --program\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "sólo pueden usarse --decrypt y --encrypt\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "sólo pueden usarse --decrypt y --encrypt\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "falta la opción --keyfile\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "falta la opción --keyfile\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "no puedo reservar espacio para el vector de parámetros\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "no puedo reservar espacio para el vector de parámetros\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "no se pudo crear la tubería: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "no se pudo crear la tubería: %s\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "no se pudo crear pty: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "no se pudo crear pty: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "no se puede bifurcar: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "no se puede bifurcar: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv fallido: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv fallido: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select fallido: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select fallido: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "lectura fallida: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "lectura fallida: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "lectura de pty fallida: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "lectura de pty fallida: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid fallido: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid fallido: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "proceso hijo abortado con estado %i\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "proceso hijo abortado con estado %i\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "no puedo reservar espacio para la cadena de entrada: %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "no puedo reservar espacio para la cadena de entrada: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "debe darse %s o bien %s\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "debe darse %s o bien %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "se necesita una clase\n"
+#~ msgid "no class provided\n"
+#~ msgstr "se necesita una clase\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "la clase %s no puede usarse\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "la clase %s no puede usarse\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Uso: gpg-check-pattern [opciones] [fichero_de_patrones] (-h para ayuda)\n"
-
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Sintaxis: gpg-check-pattern [opciones] fichero_de_patrones\n"
-"Compara frase contraseña dada en entrada estándar con un fichero de "
-"patrones\n"
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " usando el certificado ID 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "option '%s' may not be used in %s mode\n"
@@ -11381,42 +11423,6 @@
 #~ "caracteres).\n"
 
 #, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "clave %s: algoritmo de clave pública no disponible\n"
-
-#, fuzzy
-#~| msgid "card does not support digest algorithm %s\n"
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
-
-#, fuzzy
-#~| msgid "revoke signatures"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "revoca firmas"
-
-#, fuzzy
-#~| msgid "skipped \"%s\": %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "omitido \"%s\": %s\n"
-
-#, fuzzy
-#~| msgid "User ID \"%s\": %d signature removed\n"
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
-#~ msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Firma correcta de"
-#~ msgstr[1] "Firma correcta de"
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "creado un nuevo fichero de configuración '%s'\n"
@@ -12658,9 +12664,6 @@
 #~ msgid "file delete error"
 #~ msgstr "error al borrar fichero"
 
-#~ msgid "unexpected data"
-#~ msgstr "datos inesperados"
-
 # o tal vez "en el sello..."
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relación con el mensaje.
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/et.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/et.gmo sont différents
diff -Nru gnupg2-2.2.20/po/et.po gnupg2-2.2.27/po/et.po
--- gnupg2-2.2.20/po/et.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/et.po	2021-01-11 18:47:17.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@ -26,40 +26,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -67,7 +67,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -77,35 +77,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -113,40 +113,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
@@ -156,33 +160,33 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -240,7 +244,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
@@ -372,20 +376,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -395,124 +399,124 @@
 "Võtmed:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Võti on asendatud"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -521,180 +525,166 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "võtmete fail `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -702,9 +692,9 @@
 "@Käsud:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -714,52 +704,52 @@
 "Võtmed:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -769,32 +759,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -807,19 +797,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -832,7 +822,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -842,59 +832,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuda parooli"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "luba võti"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -904,7 +894,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
@@ -914,7 +904,7 @@
 msgid "secret key parts are not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -946,7 +936,7 @@
 msgstr "viga parooli loomisel: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -993,27 +983,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
@@ -1074,7 +1064,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@ -1197,7 +1187,7 @@
 msgstr "pakend: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1281,44 +1271,44 @@
 msgid "Root certificate trustworthy"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Võtme leiate: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tundmatu versioon"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "`%s' kohta abiinfo puudub"
@@ -1328,7 +1318,7 @@
 msgid "ignoring garbage line"
 msgstr "viga lõpetaval real\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "tundmatu"
@@ -1338,92 +1328,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "viga faili lugemisel"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "rida on liiga pikk\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "vigane argument"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "vigane pakend"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "vastuolulised käsud\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "vigased impordi võtmed\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "ei töödeldud"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "vastuolulised käsud\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "ootamatud andmed"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "vigased impordi võtmed\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "ei töödeldud"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "võtmete fail `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1439,42 +1461,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1663,14 +1684,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@ -1713,24 +1734,24 @@
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane võti ei ole kättesaadav"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
@@ -1740,246 +1761,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "ei töödeldud"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku võtit pole: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1987,184 +2008,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Võtme leiate: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2227,8 +2248,8 @@
 msgstr "Avalik võti: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
@@ -2253,58 +2274,64 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "kasutan šiffrit %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on tühi fail\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2312,40 +2339,40 @@
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krüpteeritud andmed\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on krüptitud sümmeetrilise šifri nõrga võtmega.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "probleem krüptitud paketi käsitlemisel\n"
@@ -2450,7 +2477,7 @@
 msgstr "%s: jätsin vahele: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2488,288 +2515,294 @@
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "krüpteeri andmed"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "dekrüpteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "näita võtmeid"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "näita võtmeid ja allkirju"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "näita võtmeid ja sõrmejälgi"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [failid]|trüki teatelühendid"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "ära tee mingeid muutusi"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "küsi enne ülekirjutamist"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2777,7 +2810,7 @@
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2807,13 +2840,13 @@
 " --list-keys [nimed]        näita võtmeid\n"
 " --fingerprint [nimed]      näita sõrmejälgi\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2828,7 +2861,7 @@
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2836,584 +2869,572 @@
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Avalik võti: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Šiffer: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Räsi: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku šifri eelistused\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "võta võtmed sellest võtmehoidlast"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [võtmed] [failid] (-h näitab abiinfot)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3613,7 +3634,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -3623,7 +3644,7 @@
 msgid "key %s: %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3648,7 +3669,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
@@ -3663,7 +3684,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3734,18 +3755,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "võti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "võti %08lX: salajane võti on imporditud\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -3758,232 +3779,296 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "võti %08lX: salajane võti vigase šifriga %d - jätsin vahele\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Põhjus puudub"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Võti on asendatud"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Võti on kompromiteeritud"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Võti ei ole enam kasutusel"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "tühistamise põhjus: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "tühistamise kommentaar: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "võti %08lX: vigane alamvõtme seos\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "võti %08lX: jätsin vahele kasutaja ID '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "võti %08lX: jätsin alamvõtme vahele\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Korrektne allkiri kasutajalt \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "`%s' jätsin vahele: %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
+msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
+msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d halba allkirja\n"
+msgstr[1] "%d halba allkirja\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Korrektne allkiri kasutajalt \""
+msgstr[1] "Korrektne allkiri kasutajalt \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "võtmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "võtmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
@@ -4247,8 +4332,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
@@ -4458,7 +4543,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
@@ -4516,7 +4601,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
@@ -4603,7 +4688,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
@@ -4651,106 +4736,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   allkirjastanud %08lX %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Teatelühend: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Selle võtme võib olla tühistanud %s võti "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle võtme võib olla tühistanud %s võti "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4758,19 +4858,19 @@
 "Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n"
 "näidatud võtme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4779,18 +4879,18 @@
 "HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks.  See käsklus võib\n"
 "              põhjustada muu kasutaja ID primaarseks määramist.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4799,35 +4899,35 @@
 "HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n"
 "         PGP versioone seda võtit tagasi lükkama.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4835,38 +4935,38 @@
 msgstr[0] "Kustutatud %d allkiri.\n"
 msgstr[1] "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
 msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4875,41 +4975,41 @@
 "HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n"
 "         põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -4917,267 +5017,262 @@
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan üle (j/E)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   allkirjastanud %08lX %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "krüpteeri andmed"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5191,169 +5286,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "blokeeri võti"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud võtmepikkus on %u bitti\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5369,7 +5464,7 @@
 "      <n>m = võti aegub n kuuga\n"
 "      <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5385,40 +5480,40 @@
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5426,12 +5521,12 @@
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5442,7 +5537,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5458,50 +5553,50 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei või alata numbriga\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5512,7 +5607,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5527,35 +5622,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5567,13 +5662,13 @@
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5581,67 +5676,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Kasutan seda võtit ikka? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "kirjutan avaliku võtme faili `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5651,35 +5746,35 @@
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, 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:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, 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:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon tõesti? "
@@ -5716,22 +5811,6 @@
 msgstr[0] "%d halba allkirja\n"
 msgstr[1] "%d halba allkirja\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d halba allkirja\n"
-msgstr[1] "%d halba allkirja\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
-msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5751,30 +5830,30 @@
 msgid "Keyring"
 msgstr "Võtmehoidla"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Primaarse võtme sõrmejälg:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "    Alamvõtme sõrmejälg:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Primaarse võtme sõrmejälg:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "     Alamvõtme sõrmejälg:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Võtme sõrmejälg ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5805,7 +5884,7 @@
 msgstr[0] "1 halb allkiri\n"
 msgstr[1] "1 halb allkiri\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: võtmehoidla on loodud\n"
@@ -5858,455 +5937,455 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "küsin võtit %08lX võtmeserverist %s\n"
 msgstr[1] "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus krüptitud sessiooni võtme jaoks (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krüpteeritud sessiooni võti\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krüpteeritud ühe parooliga\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s krüpteeritud andmeid\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA šiffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Võtme leiate: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tundmatu avaliku võtme algoritm"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata šifri algoritm"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tundmatu allkirja klass"
@@ -6342,79 +6421,79 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni "
 "võti\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise võtme ID %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6466,7 +6545,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto õige (j/E/v)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa näidata!\n"
@@ -6776,12 +6855,12 @@
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -6835,27 +6914,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anonüümne teate saaja.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "šifri algoritm %d%s on tundmatu või blokeeritud\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "MÄRKUS: šifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7048,7 +7127,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7110,29 +7189,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "võti %08lX: alamvõtme allkirjaga sidumiseks puudub alamvõti\n"
@@ -7161,24 +7240,24 @@
 "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s krüpteerimist\n"
@@ -7206,7 +7285,7 @@
 "jätsin `%s' vahele: see on PGP genereeritud ElGamal võti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
@@ -7254,12 +7333,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
@@ -7269,12 +7348,12 @@
 msgid "can't lock '%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -7289,104 +7368,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei õnnestu: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "MÄRKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb on loodud\n"
@@ -7757,105 +7836,105 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk võtmeID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "võti %08lX: aktsepteerin usaldusväärse võtmena\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "võti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "võti %08lX: usaldataval võtmel pole avalikku võtit - jätsin vahele\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "võti on märgitud abslouutselt usaldatuks.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, päringu tüüp %d: lugemine ebaõnnestus: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud tüüpi %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb järgmine kontroll %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu võtit on seni töödeldud\n"
 msgstr[1] "%lu võtit on seni töödeldud\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7863,23 +7942,23 @@
 msgstr[0] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 msgstr[1] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid võtmeid pole\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
@@ -7994,110 +8073,125 @@
 "List, export, import Keybox data\n"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muuda parooli"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "muuda parooli"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -8105,55 +8199,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8163,27 +8245,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8191,123 +8273,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "mittetoetatud URI"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Võtme genereerimine ebaõnnestus: %s\n"
 msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, 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:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -8324,376 +8406,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ära kasuta terminali"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "vastuolulised käsud\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: ei õnnestu kasutada: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "         uusi allkirju: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näita sõrmejälge"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ei töödeldud"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "ei"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8706,137 +8806,137 @@
 "\"%.*s\"\n"
 "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "võti %08lX: vigane alamvõtme seos\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8977,7 +9077,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
@@ -9002,134 +9102,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "näita salajasi võtmeid"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis väljund"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "ära kasuta terminali"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda võtmeserverit"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta šifri algoritmi NIMI"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9140,47 +9240,47 @@
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " j = jäta see võti vahele\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9200,7 +9300,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -9210,42 +9310,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9275,7 +9370,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9305,38 +9400,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Allkiri aegus %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "viga parooli loomisel: %s\n"
+msgid "algorithm:"
+msgstr "pakend: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                 ka \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9407,543 +9502,544 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "halb sertifikaat"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "viga lõpetaval real\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "vigane räsialgoritm `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "vigane vastus agendilt\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -9982,64 +10078,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "halb sertifikaat"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "halb sertifikaat"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "halb sertifikaat"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "halb sertifikaat"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10047,88 +10143,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "ei õnnestu lugeda `%s' atribuute: %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10154,95 +10250,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Väljun salvestamata? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10255,301 +10351,295 @@
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei töödeldud"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "vigased impordi võtmed\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "                 ka \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "                 ka \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "                 ka \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "                 ka \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "HOIATUS: kasutan ebaturvalist mälu!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10600,7 +10690,7 @@
 msgid "malloc failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10732,12 +10822,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: ei õnnestu kasutada: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10808,7 +10892,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
@@ -10838,33 +10922,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10905,101 +10989,101 @@
 msgid "certificate chain is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "välju"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -11198,302 +11282,234 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "kasuta väljundfailina"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku võtit"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Käsud:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "lahtikrüpteerimine õnnestus\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "lahtikrüpteerimine õnnestus\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Käsud:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [failinimi]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "encryption modus"
+#~ msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ja %s ei ole koos lubatud!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "faili ei õnnestu avada: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s ei õnnestu avada: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [failinimi]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "mittelokaalse programmi käivitamist ei toetata\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "faili ei õnnestu avada: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s ei õnnestu avada: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "mittelokaalse programmi käivitamist ei toetata\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s ei õnnestu luua: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s ei õnnestu luua: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "viga parooli loomisel: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11584,36 +11600,6 @@
 #~ msgstr "uuendamine ebaõnnestus: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Korrektne allkiri kasutajalt \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "`%s' jätsin vahele: %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
-#~ msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Korrektne allkiri kasutajalt \""
-#~ msgstr[1] "Korrektne allkiri kasutajalt \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "uus omaduste fail `%s' on loodud\n"
@@ -12699,9 +12685,6 @@
 #~ msgid "file delete error"
 #~ msgstr "viga faili kustutamisel"
 
-#~ msgid "unexpected data"
-#~ msgstr "ootamatud andmed"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "ajatemplite konflikt"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/fi.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/fi.gmo sont différents
diff -Nru gnupg2-2.2.20/po/fi.po gnupg2-2.2.27/po/fi.po
--- gnupg2-2.2.20/po/fi.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/fi.po	2021-01-11 18:47:17.000000000 +0100
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -42,40 +42,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -83,7 +83,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -93,35 +93,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -129,40 +129,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
@@ -172,33 +176,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -256,7 +260,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
@@ -388,20 +392,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -411,124 +415,124 @@
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Avain on uusittu"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -537,181 +541,167 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "asetustiedosto \"%s\": %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -719,9 +709,9 @@
 "@Komennot:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -731,52 +721,52 @@
 "Valitsimet:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -786,32 +776,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -824,19 +814,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -849,7 +839,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -859,59 +849,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "ota avain käyttöön"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -921,7 +911,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@ -931,7 +921,7 @@
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -963,7 +953,7 @@
 msgstr "virhe luotaessa salasanaa: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1010,27 +1000,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -1091,7 +1081,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@ -1214,7 +1204,7 @@
 msgstr "ascii-koodaus: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1298,44 +1288,44 @@
 msgid "Root certificate trustworthy"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tuntematon versio"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Ei ohjetta aiheesta \"%s\""
@@ -1345,7 +1335,7 @@
 msgid "ignoring garbage line"
 msgstr "virhe trailer-rivissä\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "tuntematon "
@@ -1355,92 +1345,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "virhe tiedostoa luettaessa"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "rivi on liian pitkä\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "virheellinen argumentti"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "virheellinen ascii-koodaus"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "ristiriitainen komento\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "ei käsitelty"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "ristiriitainen komento\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "odottamatonta dataa"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "ei käsitelty"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "asetustiedosto \"%s\": %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1456,42 +1478,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1682,14 +1703,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@ -1732,24 +1753,24 @@
 msgid "server uses an invalid certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
@@ -1759,246 +1780,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2006,184 +2027,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2246,8 +2267,8 @@
 msgstr "JulkAvain: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
@@ -2272,90 +2293,96 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2363,7 +2390,7 @@
 "VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
 "esiintyvällä heikolla avaimella.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
@@ -2465,7 +2492,7 @@
 msgstr "%s: ohitettu: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2503,288 +2530,294 @@
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "luo uusi avainpari"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2793,7 +2826,7 @@
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2822,13 +2855,13 @@
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2843,7 +2876,7 @@
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2851,585 +2884,573 @@
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3630,7 +3651,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -3640,7 +3661,7 @@
 msgid "key %s: %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3665,7 +3686,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
@@ -3680,7 +3701,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3751,18 +3772,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -3775,234 +3796,299 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
+
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Allekirjoitus täsmää lähettäjään \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "ohitetaan \"%s\": %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
+msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
+msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d väärää allekirjoitusta\n"
+msgstr[1] "%d väärää allekirjoitusta\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Allekirjoitus täsmää lähettäjään \""
+msgstr[1] "Allekirjoitus täsmää lähettäjään \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@ -4267,8 +4353,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -4478,7 +4564,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
@@ -4536,7 +4622,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
@@ -4623,7 +4709,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
@@ -4671,106 +4757,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   %08lX allekirjoitti tämän %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4778,19 +4879,19 @@
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4799,18 +4900,18 @@
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4819,35 +4920,35 @@
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4855,38 +4956,38 @@
 msgstr[0] "%d allekirjoitus poistettu.\n"
 msgstr[1] "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
 msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4896,41 +4997,41 @@
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -4938,271 +5039,266 @@
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   %08lX allekirjoitti tämän %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
 "(käyttäjätunnus %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5216,169 +5312,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "poista avain käytöstä"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5394,7 +5490,7 @@
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5410,40 +5506,40 @@
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5451,12 +5547,12 @@
 "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:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5467,7 +5563,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5485,50 +5581,50 @@
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 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:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5539,7 +5635,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5554,35 +5650,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5594,13 +5690,13 @@
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5608,67 +5704,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "luo uusi avainpari"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5677,7 +5773,7 @@
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5685,7 +5781,7 @@
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5693,23 +5789,23 @@
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
@@ -5746,22 +5842,6 @@
 msgstr[0] "%d väärää allekirjoitusta\n"
 msgstr[1] "%d väärää allekirjoitusta\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d väärää allekirjoitusta\n"
-msgstr[1] "%d väärää allekirjoitusta\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
-msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5781,30 +5861,30 @@
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5835,7 +5915,7 @@
 msgstr[0] "1 väärä allekirjoitus\n"
 msgstr[1] "1 väärä allekirjoitus\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
@@ -5888,319 +5968,319 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "pyydetään avainta %08lX kohteesta %s\n"
 msgstr[1] "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6208,145 +6288,145 @@
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
@@ -6382,77 +6462,77 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6505,7 +6585,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
@@ -6824,12 +6904,12 @@
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -6884,27 +6964,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, nimetön vastaanottaja olet sinä.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vanhaa DEK-koodaus ei tueta\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7094,7 +7174,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7165,31 +7245,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "HUOM: avain on mitätöity!"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
 "\"critical bit\":istä\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
@@ -7218,24 +7298,24 @@
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -7264,7 +7344,7 @@
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -7312,12 +7392,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -7327,12 +7407,12 @@
 msgid "can't lock '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
@@ -7347,104 +7427,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb luotu\n"
@@ -7815,106 +7895,106 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "tähän mennessä käsitelty %lu avainta\n"
 msgstr[1] "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7922,23 +8002,23 @@
 msgstr[0] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 msgstr[1] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -8053,110 +8133,125 @@
 "List, export, import Keybox data\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muuta salasanaa"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "muuta salasanaa"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -8164,55 +8259,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8222,27 +8305,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8250,124 +8333,124 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI-muotoa ei tueta"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Avaimen luonti epäonnistui: %s\n"
 msgstr[1] "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 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:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -8384,376 +8467,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "apua"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: kohteeseen ei päästä: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ei käsitelty"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "ei"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8766,137 +8867,137 @@
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9037,7 +9138,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -9062,134 +9163,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9200,47 +9301,47 @@
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = ohita tämä avain\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9260,7 +9361,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -9270,42 +9371,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9335,7 +9431,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9365,38 +9461,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
+msgid "algorithm:"
+msgstr "ascii-koodaus: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                aka \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9467,545 +9563,546 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "uusi asetustiedosto \"%s\" luotu\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -10044,64 +10141,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10109,88 +10206,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "HUOM: avain on mitätöity!"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10216,95 +10313,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10318,301 +10415,295 @@
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei käsitelty"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "                aka \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "                aka \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "                aka \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "                aka \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10663,7 +10754,7 @@
 msgid "malloc failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10795,12 +10886,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: kohteeseen ei päästä: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10871,7 +10956,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -10901,33 +10986,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10968,101 +11053,101 @@
 msgid "certificate chain is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -11261,302 +11346,234 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "päivitä luottamustietokanta"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Komennot:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "avaus onnistui\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "avaus onnistui\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Komennot:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [tiedostonimi]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "avaus onnistui\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+#~ msgid "encryption modus"
+#~ msgstr "avaus onnistui\n"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "ei voi avata tiedostoa: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "tiedostoa %s ei voi avata: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [tiedostonimi]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "etäohjelman suorittamista ei tueta\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "ei voi avata tiedostoa: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "ei voida luoda kohdetta %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "tiedostoa %s ei voi avata: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "ei voida luoda kohdetta %s: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "virhe luotaessa salasanaa: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11647,37 +11664,6 @@
 #~ msgstr "päivitys epäonnistui: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
-
-# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Allekirjoitus täsmää lähettäjään \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "ohitetaan \"%s\": %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
-#~ msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Allekirjoitus täsmää lähettäjään \""
-#~ msgstr[1] "Allekirjoitus täsmää lähettäjään \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "uusi asetustiedosto \"%s\" luotu\n"
@@ -12799,9 +12785,6 @@
 #~ msgid "file delete error"
 #~ msgstr "virhe tiedostoa poistettaessa"
 
-#~ msgid "unexpected data"
-#~ msgstr "odottamatonta dataa"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "aikaleima ei täsmää"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/fr.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/fr.gmo sont différents
diff -Nru gnupg2-2.2.20/po/fr.po gnupg2-2.2.27/po/fr.po
--- gnupg2-2.2.20/po/fr.po	2020-03-20 15:40:33.000000000 +0100
+++ gnupg2-2.2.27/po/fr.po	2021-01-11 18:47:18.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@ -29,48 +29,48 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|Code personnel :"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -78,7 +78,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -88,13 +88,13 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "La qualité du texte entré ci-dessus.\n"
 "Veuillez demander à votre administrateur des précisions sur les critères."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -102,7 +102,7 @@
 "Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -110,17 +110,17 @@
 "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "ne correspond pas — veuillez réessayer"
 
@@ -128,36 +128,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (essai %d sur %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Répéter :"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "Code personnel trop long"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Phrase secrète trop longue"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Caractères incorrects dans le code personnel"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "Code personnel trop court"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Mauvais code personnel"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Mauvaise phrase secrète"
 
@@ -166,31 +170,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "impossible de créer « %s » : %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossible d'ouvrir « %s » : %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -252,7 +256,7 @@
 "Veuillez entrer une phrase secrète pour protéger la clef secrète%%0A   %s"
 "%%0A   %s%%0Areçue dans l'espace de stockage de clefs de gpg-agent"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "échec de création du flux à partir de cette socket : %s\n"
@@ -390,17 +394,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Avertissement : une phrase secrète non sécurisée a été entrée."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Veuillez entrer la phrase secrète%0Apour protéger la nouvelle clef"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Veuillez entrer la nouvelle phrase secrète"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -408,119 +412,119 @@
 "@Options :\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "exécuter en mode démon (arrière-plan)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "exécuter en mode serveur"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sortie de commandes à la sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "sortie de commandes à la csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FICHIER|lire les options depuis le FICHIER"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "ne pas détacher de la console"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "utiliser un fichier journal pour le serveur"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROG|utiliser PROG pour entrer le code personnel"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "ne pas utiliser le SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NOM|se connecter à l'hôte NOM"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorer les demandes de modification du TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorer les demandes de modification d'aff. X"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|oublier les codes personnels après N secondes"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "ne pas utiliser le cache de code pour signer"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ne pas marquer les clefs comme de confiance"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "activer la prise en charge de SSH"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "activer la prise en charge de putty"
 
@@ -528,21 +532,21 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -550,152 +554,140 @@
 "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
 "Gestionnaire de clefs secrètes pour @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "fichier d'options « %s » : %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "le nom de la socket « %s » est trop long\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 "une instance de gpg-agent fonctionne déjà —\n"
 "pas de démarrage d'une nouvelle instance\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erreur de lecture du « nonce » de la socket\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "écoute sur la socket « %s »\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "impossible de créer le répertoire « %s » : %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "impossible d'utiliser « %s » comme répertoire personnel\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "gestionnaire 0x%lx pour le descripteur %d démarré\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "gestionnaire 0x%lx pour le descripteur %d terminé\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "gestionnaire SSH 0x%lx pour le descripteur %d démarré\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "gestionnaire SSH 0x%lx pour le descripteur %d terminé\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "échec de npth_pselect : %s — attente 1 s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrêté\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Utilisation : gpg-preset-passphrase [options] KEYGRIP (-h pour l'aide)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -703,8 +695,8 @@
 "Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
 "Maintenance du cache des mots de passe\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -712,9 +704,9 @@
 "@Commandes :\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -724,11 +716,11 @@
 "Options :\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Utilisation : gpg-protect-tool [options] (-h pour l'aide)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -736,16 +728,16 @@
 "Syntaxe : gpg-protect-tool [options] [arguments]\n"
 "Outils de maintenance des clefs secrètes\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Veuillez entrer la phrase secrète pour déprotéger l'objet PKCS#12."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Veuillez entrer la phrase secrète pour protéger le nouvel objet PKCS#12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -753,7 +745,7 @@
 "Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
 "système GnuPG."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -761,18 +753,18 @@
 "Veuillez entrer la phrase secrète ou le code personnel\n"
 "nécessaires pour terminer cette opération."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "annulé\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur de demande de la phrase secrète : %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
@@ -782,32 +774,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fichier « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "déclaration « %s » ignorée dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "le système de liste de confiance « %s » n'est pas disponible\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "mauvaise empreinte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "option de clef incorrecte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erreur de lecture de « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "erreur de lecture de la liste de certificats racine de confiance\n"
@@ -820,7 +812,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -829,11 +821,11 @@
 "Attribuez-vous une confiance ultime%%0A  « %s »%%0Apour certifier "
 "correctement les certificats de l'utilisateur ?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Oui"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Non"
@@ -846,7 +838,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -858,22 +850,22 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Exact"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Faux"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Remarque : cette phrase secrète n'a jamais été modifiée.%0AVeuillez la "
 "modifier maintenant."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -882,15 +874,15 @@
 "Cette phrase secrète n'a pas été modifiée%%0Adepuis le %.4s-%.2s-%.2s. "
 "Veuillez la modifier maintenant."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Modifier la phrase secrète"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Je la modifierai plus tard"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -898,11 +890,11 @@
 "%%0A?"
 msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Supprimer la clef"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -912,12 +904,12 @@
 "Supprimer cette clef pourrait vous empêcher d’accéder à des machines "
 "distantes."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA nécessite que la taille du hachage soit un multiple de 8 bits\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "la clef %s utilise un hachage non sûr (%u bits)\n"
@@ -928,7 +920,7 @@
 msgstr ""
 "un hachage de %1$zu bits n'est pas valable pour une clef %3$s de %2$u bits\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "échec de vérification de la signature créée : %s\n"
@@ -938,7 +930,7 @@
 msgid "secret key parts are not available\n"
 msgstr "des parties de la clef secrète ne sont pas disponibles\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "l'algorithme de clef publique %d (%s) n'est pas pris en charge\n"
@@ -968,7 +960,7 @@
 msgstr "erreur de création d'un flux pour un tube : %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur de création de processus fils : %s\n"
@@ -1015,28 +1007,28 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problème de configuration des options de gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'empêcher la génération de fichiers « core » : %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Avertissement : le propriétaire de %s n'est pas sûr « %s »\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "impossible de renommer « %s » en « %s » : %s\n"
@@ -1096,7 +1088,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "hors limite lors de l'allocation de %lu octets"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
@@ -1213,7 +1205,7 @@
 msgstr "algorithme : %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algorithme non pris en charge : %s"
@@ -1288,39 +1280,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certificat racine digne de confiance"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "aucune liste de révocations trouvée pour le certificat"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "la liste de révocations de certificat est trop vieille"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "vérification de liste de révocations par OCSP pour le certificat"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Certificats inclus"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Aucune entrée de journal d'audit."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Opération inconnue"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "gpg-agent utilisable"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr utilisable"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Pas d'aide disponible pour « %s »."
@@ -1329,7 +1321,7 @@
 msgid "ignoring garbage line"
 msgstr "ligne inutile ignorée"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[aucun]"
 
@@ -1338,82 +1330,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractère %02x incorrect en radix64, ignoré\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "argument inattendu"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "erreur de lecture"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "mot-clef trop long"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "argument incorrect"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "commande incorrecte"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "définition d'alias incorrecte"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "hors limite"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "commande incorrecte"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "commande « %s » inconnue\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "données inattendues"
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "option incorrecte"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument manquant pour l'option « %.50s »\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "l'option « %.50s » n'attend pas d'argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "commande « %.50s » incorrecte\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "l'option « %.50s » est ambiguë\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la commande « %.50s » est ambiguë\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "hors limite\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "option « %.50s » incorrecte\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "fichier d'options « %s » : %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1429,42 +1453,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "impossible de convertir « %s » en « %s » : %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "impossible de créer le fichier temporaire « %s » : %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erreur d'écriture sur « %s » : %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "suppression du vieux fichier verrou (créé par %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "attente du verrou (appartenant à %d%s) %s…\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(peut-être un verrou mort) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "verrou « %s » non effectif : %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "attente du verrou %s…\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@ -1655,14 +1678,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Veuillez d'abord utiliser la commande « toggle ».\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1709,24 +1732,24 @@
 msgid "server uses an invalid certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible : %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP nº %s détectée\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
@@ -1736,138 +1759,138 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "le code de réinitialisation n'est plus disponible\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Quel est votre choix ? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[non positionné]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "non forcé"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "forcé"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur : seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur : le caractère « < » ne peut pas être utilisé.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur : les espaces doubles ne sont pas permises.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Nom du détenteur de la carte : "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Prénom du détenteur de la carte : "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur : nom combiné trop long (limité à %d caractères).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL pour récupérer la clef publique : "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "erreur de lecture de « %s » : %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erreur d'écriture de « %s » : %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Données d'identification (nom du compte) : "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Données DO privées : "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Préférences de langue : "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Erreur : réponse incorrecte.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorité de certification : "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur : formatage incorrect de l'empreinte.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opération sur la clef impossible : %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur de lecture des renseignements actuellement contenus\n"
 "dans la clef : %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Faut-il remplacer la clef existante ? (o/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1877,84 +1900,84 @@
 "           En cas d'échec de génération de la clef, veuillez vérifier les\n"
 "           tailles permises dans la documentation de la carte.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de clef désirez-vous ? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Clef de signature\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clef désiré :\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Choix incorrect.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 "La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "erreur de modification de taille de clef %d en %u bits : %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
@@ -1962,27 +1985,27 @@
 "erreur de lecture des renseignements actuellement contenus\n"
 "dans la clef : %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Cette commande n'est pas permise en mode %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1993,177 +2016,177 @@
 "   code personnel = « %s »     code personnel d'admin. = « %s ».\n"
 "Vous devriez les modifier avec la commande --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Veuillez sélectionner le type de clef à générer :\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Clef de signature\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "échec de KEYTOCARD : %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "erreur de fermeture de %s : %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "afficher les commandes d'administration"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "afficher toutes les données disponibles"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "modifier le nom du détenteur de la carte"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "modifier l'URL pour récupérer la clef"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "récupérer la clef indiquée dans l'URL de la carte"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "modifier l'identifiant de connexion"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "modifier les préférences de langue"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "modifier le sexe du détenteur de la carte"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "modifier une empreinte d'autorité de certification"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le paramètre obligeant à entrer le code personnel pour les\n"
 "signatures"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "générer de nouvelles clefs"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour modifier ou déverrouiller le code personnel"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "vérifier le code personnel et afficher toutes les données"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "débloquer le code personnel en utilisant un code de réinitialisation"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/carte> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande incorrecte (essayez « help »)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "impossible d'ouvrir « %s »\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clef « %s » introuvable : %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2223,8 +2246,8 @@
 msgstr "sous-clef"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "échec de la mise à jour : %s\n"
@@ -2250,37 +2273,51 @@
 msgstr ""
 "utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur de création de la phrase secrète : %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "impossible d'utiliser un paquet ESK symétrique en mode S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "« %s » est déjà compressé\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Attention : « %s » est un fichier vide\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+#| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "lecture de « %s »\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2288,20 +2325,13 @@
 "Attention : forcer le chiffrement symétrique %s (%d) est en\n"
 "            désaccord avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2310,35 +2340,35 @@
 "Attention : forcer l'algorithme de compression %s (%d) est en\n"
 "            désaccord avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement symétrique %s (%d) est en désaccord\n"
 "avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffré pour : « %s »\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser %s en mode %s.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2346,7 +2376,7 @@
 "Attention : le message a été chiffré avec une clef faible pendant le\n"
 "            chiffrement symétrique.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problème de gestion des paquets chiffrés\n"
@@ -2444,7 +2474,7 @@
 msgstr " — ignoré"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "écriture de « %s »\n"
@@ -2479,277 +2509,283 @@
 msgid "[User ID not found]"
 msgstr "[identité introuvable]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "« %s » automatiquement récupéré par %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erreur de récupération de « %s » avec %s : %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Aucune empreinte"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clef secrète « %s » introuvable : %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "argument manquant pour l'option « %.50s »\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clef incorrecte %s a été rendue valable par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-clef %s à la place de la clef\n"
 "principale %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "faire une signature"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "faire une signature en texte clair"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "afficher les clefs"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "afficher les clefs et les signatures"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "afficher les clefs et les empreintes"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "afficher les clefs secrètes"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clefs"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "générer une paire de clefs complètes"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "supprimer les clefs du porte-clefs public"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "supprimer les clefs du porte-clefs secret"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "signer rapidement une clef"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "signer rapidement une clef localement"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "générer rapidement une nouvelle paire de clefs"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "signer une clef"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "signer une clef localement"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clef"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "modifier une phrase secrète"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exporter les clefs"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exporter les clefs vers un serveur de clefs"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "chercher les clefs avec un serveur de clefs"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clefs depuis un serveur"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importer ou fusionner les clefs"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "afficher l'état de la carte"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "modifier les données d'une carte"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "modifier le code personnel d'une carte"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "indiquer les fonctions de hachage"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
 # NOTE: Extra initial space to realign the output (maybe wchar issue)
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FICHIER|écrire la sortie dans le FICHIER"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "ne rien modifier"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "demander avant d'écraser un fichier"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser le comportement strict d'OpenPGP"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2758,7 +2794,7 @@
 "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2788,11 +2824,11 @@
 " --list-keys [noms]         montrer les clefs\n"
 " --fingerprint [noms]       montrer les empreintes\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2802,7 +2838,7 @@
 "Signer, vérifier, chiffrer ou déchiffrer\n"
 "L'opération par défaut dépend des données entrées\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2810,87 +2846,87 @@
 "\n"
 "Algorithmes pris en charge :\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Clef publique : "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Chiffrement : "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hachage : "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilisation : %s [options] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire personnel « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "Attention : le propriétaire du fichier de configuration « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 "Attention : le propriétaire de l'extension « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "Attention : les droits du répertoire personnel « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "Attention : les droits du fichier de configuration « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 "Attention : les droits de l'extension « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire contenant le répertoire personnel\n"
 "            « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2898,21 +2934,21 @@
 "Attention : le propriétaire du répertoire contenant le fichier de\n"
 "            configuration « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire contenant l'extension\n"
 "            « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Attention : les droits du répertoire contenant le répertoire personnel\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2920,499 +2956,487 @@
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Attention : les droits du répertoire contenant l'extension\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "montrer les identités révoquées et expirées en affichant les clefs"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "indiquer les sous-clefs révoquées et expirées en affichant les clefs"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "ligne %d : ce n'est pas une adresse électronique valable\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "mode pinentry « %s » incorrect\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "« %s » n'est pas un jeu de caractères valable\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en vérifiant les signatures"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "montrer les identités révoquées et expirées en vérifiant les signatures"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "ne montrer que l'identité principale en vérifiant les signatures"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "valider les signatures avec les données PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "augmenter la confiance des signatures avec des données PKA valables"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de configurer le chemin d'exécution à %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s : %d : liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Attention : exécution avec un système de temps contrefait : "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "ne sera pas exécuté avec une mémoire non sécurisée à cause de %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "« max-cert-depth » doit être compris entre 1 et 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Attention : les destinataires (-r) indiqués n'utilisent pas\n"
 "            de clef publique pour le chiffrement\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "impossible d'utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "impossible d'utiliser --symmetric --sign --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "échec d'envoi vers le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erreur de chargement du certificat « %s » : %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donnée est incorrecte\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donnée est incorrecte\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de clefs favori qui a été donnée est incorrecte\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FICHIER|prendre les clefs dans le porte-clefs FICHIER"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "convertir les conflits de date en avertissements"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation : gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3617,7 +3641,7 @@
 "vous pouvez mettre à jour vos préférences avec :\n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clef %s : pas d'identité\n"
@@ -3627,7 +3651,7 @@
 msgid "key %s: %s\n"
 msgstr "clef %s : %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "rejetée par le filtre d’importation"
 
@@ -3651,7 +3675,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela pourrait provenir d'une autosignature manquante\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clef %s : clef publique introuvable : %s\n"
@@ -3666,7 +3690,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
@@ -3736,17 +3760,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clef %s : « %s » n'est pas modifiée\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clef %s : clef secrète importée\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "clef %s : la clef secrète clef existe déjà\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
@@ -3759,234 +3783,304 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "clef secrète %s : %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "impossible d'importer des clefs secrètes\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Aucune cause indiquée"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "La clef a été remplacée"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "La clef a été compromise"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "La clef n'est plus utilisée"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "L'identité n'est plus valable"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "cause de révocation : "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "commentaire de révocation : "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clef %s : pas de clef publique — impossible d'appliquer le certificat\n"
 "          de révocation\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clef %s : « %s » certificat de révocation importé\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clef %s : pas d'identité pour la signature\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clef %s : algorithme à clef publique non géré avec l'identité « %s »\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clef %s : autosignature de l'identité « %s » incorrecte\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clef %s : algorithme à clef publique non pris en charge\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clef %s : signature directe de clef incorrecte\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clef %s : pas de sous-clef pour relier la clef\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clef %s : lien à la sous-clef incorrect\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clef %s : pas de sous-clef pour révoquer la clef\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clef %s : révocation de sous-clef incorrecte\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clef %s : suppression de la révocation de sous-clefs multiples\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clef %s : identité « %s » ignorée\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clef %s : sous-clef ignorée\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clef %s : signature non exportable (classe 0x%02X) — ignorée\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clef %s : certificat de révocation au mauvais endroit — ignoré\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clef %s : certificat de révocation incorrect : %s — ignoré\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clef %s : signature de sous-clef au mauvais endroit — ignorée\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clef %s : classe de signature inattendue (0x%02X) — ignorée\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clef %s : identités en double détectées — fusionnées\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Attention : la clef %s est peut-être révoquée :\n"
 "            récupération de la clef de révocation %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Attention : la clef %s est peut-être révoquée :\n"
 "            la clef de révocation %s est absente.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clef %s : ajout du certificat de révocation « %s »\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clef %s : ajout de la signature directe de clef\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "erreur d'allocation de mémoire : %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "clef %s : algorithme à clef publique non pris en charge\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Bonne signature de"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "clef %s : %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Identité « %s » : %d signature supprimée\n"
+msgstr[1] "Identité « %s » : %d signature supprimée\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
+msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d mauvaises signatures\n"
+msgstr[1] "%d mauvaises signatures\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Bonne signature de"
+msgstr[1] "Bonne signature de"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erreur de création du trousseau local « %s » : %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "erreur de création du porte-clefs « %s » : %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "le trousseau local « %s » a été créé\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "le porte-clefs « %s » a été créé\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "ressource de bloc de clef « %s » : %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 #| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
@@ -4226,8 +4320,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Voulez-vous vraiment signer ? (o/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "échec de la signature : %s\n"
@@ -4430,7 +4524,7 @@
 "  confiance (tsign), « nr » pour les signatures non révocables\n"
 "  (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "La clef est révoquée."
 
@@ -4485,7 +4579,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez sélectionner exactement une clef.\n"
 
@@ -4564,7 +4658,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Faut-il quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
@@ -4611,107 +4705,122 @@
 msgid "Nothing to sign.\n"
 msgstr "Rien à signer.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Non signée par vous.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "échec de vérification de la signature créée : %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 #| msgid "'%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "clef « %s » introuvable : %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Hachage : "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Fonctionnalités : "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Serveur de clefs sans modification"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Serveur de clefs favori : "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notations : "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Il n'y a pas de préférences dans une identité de type PGP 2.x.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La clef suivante a été révoquée le %s par la clef %s %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette clef peut être révoquée par la clef %s %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "créé : %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "révoquée : %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "expirée : %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "expire : %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation : %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "nº de carte : "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "confiance : %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "validité : %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Cette clef a été désactivée"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4719,17 +4828,17 @@
 "Veuillez remarquer que la validité affichée pour la clef n'est pas\n"
 "forcément correcte avant d'avoir relancé le programme.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "révoquée"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "expirée"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4739,17 +4848,17 @@
 "commande\n"
 "            risque de rendre une autre identité principale par défaut.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4758,36 +4867,36 @@
 "Attention : c'est une clef de type PGP 2. Ajouter une photo d'identité\n"
 "            peut forcer certaines versions de PGP à rejeter cette clef.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4795,20 +4904,20 @@
 msgstr[0] "%d signature supprimée.\n"
 msgstr[1] "%d signature supprimée.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "incorrecte"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identité « %s » compactée : %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -4816,17 +4925,17 @@
 msgstr[0] "Identité « %s » : %d signature supprimée\n"
 msgstr[1] "Identité « %s » : %d signature supprimée\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identité « %s » : déjà minimisée\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identité « %s » : déjà nettoyée\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4835,46 +4944,46 @@
 "Attention : c'est une clef de type PGP 2.x. Ajouter un révocateur désigné\n"
 "            peut forcer certaines versions de PGP à rejeter cette clef.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de révocateur désigné à une clef de type PGP 2."
 "x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez l'identité du révocateur désigné : "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une clef de type PGP 2.x comme révocateur désigné.\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une clef comme son propre révocateur désigné\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette clef à déjà été désignée comme un révocateur\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "Attention : l'établissement d'une clef comme révocateur désigné\n"
 "            est irréversible.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4884,252 +4993,248 @@
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sous-clef de signature %s a déjà une certification croisée\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "la sous-clef %s ne signe pas et n'a donc pas besoin de certification "
 "croisée\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Veuillez sélectionner exactement une identité.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clefs favori : "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Entrez la notation : "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Faut-il continuer ? (o/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'identité d'indice %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signée par votre clef %s le %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voulez-vous vraiment toujours la révoquer ? (o/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Faut-il créer un certificat de révocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Non signée par vous.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez signé ces identités sur la clef %s :\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (non révocable)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "révoquée par votre clef %s le %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "pas de clef secrète\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'identité « %s »\" est déjà révoquée.\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Attention : une signature d'identité date de %d secondes dans le futur\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clef %s est déjà révoqué.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-clef %s est déjà révoquée.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage de la photo d'identité %s de taille %ld pour la clef\n"
 "%s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid value for option '%s'\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "préférence « %s » en double\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "trop de préférences de chiffrement\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "trop de préférences de hachage\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "trop de préférences de compression\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "élément « %s » incorrect dans la chaîne de préférences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "écriture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "écriture de l'autosignature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de lien à la clef\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "taille incorrecte ; utilisation de %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5137,19 +5242,19 @@
 "Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
 "            de clef DSA avec cette taille de hachage\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certifier"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Authentifier"
 
@@ -5163,162 +5268,162 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une clef %s : "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises : "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacité de signature\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacité de chiffrement\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacité d'authentification\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminé\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA et RSA (par défaut)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA et Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC et ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (signature seule)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (chiffrement seul)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Clef existante\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Clef existante sur la carte\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Entrez le keygrip : "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ce n'est pas un keygrip valable (40 chiffres hexadécimaux attendus)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Pas de clef avec ce keygrip\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "erreur de lecture de la carte : %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numéro de série de la carte : %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Clefs disponibles :\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quelle taille de clef désirez-vous pour la sous-clef ? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5334,7 +5439,7 @@
 "      <n>m = la clef expire dans n mois\n"
 "      <n>y = la clef expire dans n ans\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5351,38 +5456,38 @@
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ans\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "La clef n'expire pas du tout\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clef expire le %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5390,11 +5495,11 @@
 "Le système ne peut pas afficher les dates au-delà de 2038.\n"
 "Cependant, la gestion des dates sera correcte jusqu'en 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5408,7 +5513,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5424,49 +5529,49 @@
 "   « Heinrich Heine (le poète) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nom réel : "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Caractère incorrect dans le nom\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit contenir au moins cinq caractères\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Adresse électronique : "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse électronique valable\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Caractère incorrect dans le commentaire\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères « %s ».\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5477,7 +5582,7 @@
 "    « %s »\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
@@ -5494,34 +5599,34 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcAaOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique ou (Q)uitter ? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique\n"
 "ou (O)ui/(Q)uitter ? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, l'(A)dresse électronique ou (O)ui/(Q)uitter ? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Veuillez d'abord corriger l'erreur\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5533,13 +5638,13 @@
 "pendant la génération de nombres premiers ; cela donne au générateur de\n"
 "nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Échec de génération de la clef : %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5550,66 +5655,66 @@
 "   « %s »\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Une clef pour « %s » existe déjà\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Faut-il quand même créer ? (o/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "création quand même\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Remarque : Utilisez « %s %s » pour une fenêtre de dialogue de génération de "
 "clef complète.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La génération de clef a été annulée.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, 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:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "écriture de la clef publique dans « %s »\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "les clefs publique et secrète ont été créées et signées.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5618,7 +5723,7 @@
 "pouvez\n"
 "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5626,7 +5731,7 @@
 "la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5634,25 +5739,25 @@
 "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Remarque : la création de sous-clefs pour des clefs v3 n'est pas compatible\n"
 "           avec OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secrètes de la clef principale ne sont pas disponibles.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secrètes de la clef principale sont stockées sur la carte.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Faut-il vraiment la créer ? (o/N) "
 
@@ -5688,22 +5793,6 @@
 msgstr[0] "%d mauvaises signatures\n"
 msgstr[1] "%d mauvaises signatures\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d mauvaises signatures\n"
-msgstr[1] "%d mauvaises signatures\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
-msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5724,29 +5813,29 @@
 msgid "Keyring"
 msgstr "Porte-clefs"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de clef principale :"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-clef :"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Empreinte clef princip. :"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr " Empreinte de sous-clef :"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr " Empreinte de la clef ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr " Nº de série de carte ="
 
@@ -5779,7 +5868,7 @@
 msgstr[0] "1 mauvaise signature\n"
 msgstr[1] "1 mauvaise signature\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-clefs créé\n"
@@ -5832,7 +5921,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -5840,310 +5929,310 @@
 msgstr[0] "rafraîchissement de %d clefs à partir de %s\n"
 msgstr[1] "rafraîchissement de %d clefs à partir de %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "Attention : impossible de rafraîchir la clef %s\n"
 "            avec %s : %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clef « %s » introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clef introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "demande de la clef %s sur le serveur %s %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requête de la clef %s sur %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "pas d'action pour le serveur de clefs.\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "« %s » a été ignorée : %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la clef %s à %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requête de la clef sur « %s »\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille étonnante pour une clef de session chiffrée (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clef de session chiffrée %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase secrète générée avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clef publique est %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 "données chiffrées par clef publique : bonne clef de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "chiffré avec une clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      « %s »\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffré avec une clef %s, identifiant %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "échec du déchiffrement par clef publique : %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Attention : plusieurs textes en clair ont été vus\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffré avec %lu phrases secrètes\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffré avec 1 phrase secrète\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "les données sont supposées chiffrées avec %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, essai avec %s\n"
 "qui fonctionnera peut-être avec un peu de chance\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Attention : l'intégrité du message n'était pas protégée\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Attention : le message chiffré a été manipulé.\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : « %.*s »\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "aucune signature trouvée\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de « %s »"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de « %s »"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossible de traiter ces données ambiguës de signature\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               avec la clef %s %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Clef disponible sur : "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[doute]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expiré le %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signature %s, algorithme de hachage %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "mode texte"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", algorithme de clef "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature : %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6151,111 +6240,111 @@
 "Attention : plusieurs signatures ont été détectées.\n"
 "            Seule la première sera vérifiée.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien type (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "échec du fstat de « %s » dans %s : %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "échec de fstat(%d) dans %s : %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "Attention : utilisation de l'algorithme expérimental à clef publique %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "Attention : Les clefs de signature et chiffrement Elgamal sont "
 "déconseillées\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "Attention : utilisation de l'algorithme expérimental de chiffrement %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Attention : utilisation de l'algorithme expérimental de hachage %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "Attention : l'algorithme de hachage %s est déconseillé\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Remarque : les signatures utilisant l’algorithme %s sont rejetées\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "Note: signatures using the %s algorithm are rejected\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Remarque : les signatures utilisant l’algorithme %s sont rejetées\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 #| msgid "%s:%u: read error: %s\n"
 msgid "(reported error: %s)\n"
 msgstr "%s : %u : erreur de lecture : %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 #| msgid "read error in '%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "erreur de lecture dans « %s » : %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s : %d : option « %s » déconseillée\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Attention : « %s » est une option déconseillée\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "veuillez plutôt utiliser « %s%s »\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "Attention : « %s » est une commande déconseillée — ne l'utilisez pas\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s : %u : « %s » est obsolète dans ce fichier — n’est prise en compte que "
 "dans %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6263,38 +6352,38 @@
 "Attention : « %s%s » est une option obsolète — non prise en compte à part "
 "dans %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Non compressé"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "non compressé|non|sans"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "option « %s » ambiguë\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "une clef publique ECDSA est censée être dans un encodage SEC multiple de "
 "8 bits\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6328,83 +6417,83 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "les données signées sont supposées être dans « %s »\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme à clef publique %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "Attention : la clef de session chiffrée de manière symétrique risque\n"
 "            de ne pas être sécurisée\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notation de signature critique : "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d possède un bit critique\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problème avec l'agent : %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase secrète\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "annulé par l'utilisateur\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (identifiant de clef principale %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour déverrouiller la clef secrète "
 "OpenPGP :"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour importer la clef secrète OpenPGP :"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour exporter la sous-clef secrète "
 "OpenPGP :"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour exporter la clef secrète OpenPGP :"
 
 # NOTE:  s/subkey key/subkey/
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Voulez-vous vraiment supprimer de façon permanente la sous-clef secrète "
 "OpenPGP :"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr ""
 "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6460,7 +6549,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identité.\n"
@@ -6783,12 +6872,12 @@
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valable\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Remarque : la clef %s n'a pas de fonctionnalité %s\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Remarque : la clef %s n'a pas de préférence pour %s\n"
@@ -6844,30 +6933,30 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 "l'ancien encodage de la clef de chiffrement (DEK) n'est pas pris en charge\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou désactivé\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "Attention : l'algorithme de chiffrement %s est introuvable\n"
 "            dans les préférences du destinataire\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Remarque : la clef secrète %s a expiré le %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Remarque : la clef a été révoquée"
@@ -7076,7 +7165,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Attention : conflit de hachage de signature dans le message\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7158,32 +7247,32 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Remarque : la clef de signature %s a été révoquée\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "la signature de la clef %s est supposée être fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clef %s : pas de sous-clef pour la signature de révocation de sous-clef\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clef %s : pas de sous-clef pour la signature de lien à la sous-clef\n"
@@ -7215,12 +7304,12 @@
 "            l'URL du serveur de clef favori (chaîne trop grande).\n"
 "            Utilisation de la version non expansée.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de : « %s »\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7228,12 +7317,12 @@
 "Attention : forcer l'algorithme de hachage %s (%d) est en\n"
 "            désaccord avec les préférences du destinataire\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signature :"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilisé\n"
@@ -7261,7 +7350,7 @@
 "c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
 "signatures."
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d : échec d'écriture : %s\n"
@@ -7306,12 +7395,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "erreur de lecture dans « %s » : %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance : échec de synchronisation : %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossible de créer un verrou pour « %s »\n"
@@ -7321,12 +7410,12 @@
 msgid "can't lock '%s'\n"
 msgstr "impossible de verrouiller « %s »\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu : échec de lseek : %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -7342,103 +7431,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le répertoire n'existe pas.\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossible d'accéder à « %s » : %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : impossible de créer un enregistrement de version : %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s : base de confiance incorrecte créée\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance créée\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s : base de confiance incorrecte\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s : échec de création de la table de hachage : %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s : erreur de mise à jour de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s : erreur de lecture d'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s : erreur d'écriture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance : échec de lseek : %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance : échec de lecture (n=%d) : %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, 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:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s : enregistrement de version avec le numéro %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s : version %d du fichier incorrecte\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s : erreur de lecture d'enregistrement libre : %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s : erreur d'écriture de l'enregistrement de répertoire: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s : échec de mise à zéro d'un enregistrement : %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Erreur : la base de confiance est corrompue\n"
@@ -7820,105 +7909,105 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "« %s » n'est pas un identifiant valable de clef longue\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clef %s : acceptée comme clef de confiance\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clef %s apparaît plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clef %s : pas de clef publique pour la clef de confiance — ignorée\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clef %s marquée de confiance ultime.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requête %d : échec de lecture : %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu n'est pas du type %d demandé\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Vous pourriez essayer de recréer la base de confiance avec les commandes :\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Si cela ne fonctionne pas, veuillez consulter le mode d'emploi\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce modèle de confiance inconnu (%d) —\n"
 "     utilisation du modèle de confiance %s à la place\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du modèle de confiance %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "inutile de vérifier la base de confiance\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "inutile de vérifier la base de confiance avec le modèle de\n"
 "     confiance « %s »\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "inutile de mettre à jour la base de confiance avec le modèle de\n"
 "     confiance « %s »\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clef publique %s introuvable : %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "veuillez faire un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "vérification de la base de confiance\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -7926,7 +8015,7 @@
 msgstr[0] "%lu clefs traitées jusqu'à présent\n"
 msgstr[1] "%lu clefs traitées jusqu'à présent\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7934,17 +8023,17 @@
 msgstr[0] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 msgstr[1] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune clef de confiance ultime n'a été trouvée\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7952,7 +8041,7 @@
 "profondeur : %d  valables : %3d  signées : %3d\n"
 "     confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8068,61 +8157,76 @@
 "Syntaxe : kbxutil [options] [fichiers]\n"
 "Afficher, exporter, importer les données de trousseau local\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Veuillez entrer le code personnel pour permettre à la clef de créer des "
+"signatures qualifiées."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Veuillez entrer le code personnel pour les clefs standards."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou sa taille n'est pas de %d bits\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou plus grand que %d bits\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "le rappel du code personnel a renvoyé une erreur : %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "le code personnel nul n'a pas encore été modifié\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Veuillez entrer un nouveau code personnel pour les clefs standards."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Veuillez entrer le code personnel pour les clefs standards."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Veuillez entrer un nouveau code de déblocage personnel (CDP) pour les "
 "clefs standards."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Veuillez entrer le code de déblocage personnel (CDP) pour les clefs "
 "standards."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Veuillez entrer un nouveau code personnel pour permettre à la clef de "
 "créer des signatures qualifiées."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-"||Veuillez entrer le code personnel pour permettre à la clef de créer des "
-"signatures qualifiées."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8130,7 +8234,7 @@
 "|NP|Veuillez entrer un nouveau code de déblocage personnel (CDP) pour "
 "permettre à la clef de créer des signatures qualifiées."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8138,48 +8242,48 @@
 "|P|Veuillez entrer le code de déblocage personnel (CDP) pour permettre à la "
 "clef de créer des signatures qualifiées."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur de lecture du nouveau code personnel : %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte : %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur de récupération de l'état CHV de la carte\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "la réponse ne contient pas le module RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 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:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "response does not contain the EC public point\n"
 msgid "response does not contain the EC public key\n"
 msgstr "la réponse ne contient pas le point public EC\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "la réponse ne contient pas les données de clef publique\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "échec de lecture de clef publique : %s\n"
@@ -8187,60 +8291,48 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "utilisation du code personnel par défaut en tant que %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "impossible d'utiliser le code personnel par défaut en tant que %s :\n"
 "%s — désactivation de la prochaine utilisation par défaut\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "le code personnel pour CHV%d est trop court ; la taille minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "échec de vérification CHV%d : %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "la carte est irrémédiablement bloquée.\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8255,24 +8347,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Veuillez entrer le code personnel d'administration"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 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:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8282,92 +8374,92 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nouveau code de réinitialisation"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code personnel d'administration"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code personnel"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr ""
 "||Veuillez entrer le code personnel d'administration et le nouveau code "
 "personnel d'administration"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "erreur de lecture des données d'application\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "erreur de lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "la clef existe déjà\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "la clef existante sera remplacée\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "génération d'une nouvelle clef\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "écriture d'une nouvelle clef\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "la date de création est manquant\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou sa taille n'est pas de\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "impossible de stocker la clef : %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non pris en charge"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "veuillez patienter pendant la génération de la clef…\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "échec de génération de la clef\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8375,27 +8467,27 @@
 msgstr[0] "la génération de clef est terminé (%d secondes)\n"
 msgstr[1] "la génération de clef est terminé (%d secondes)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "l'empreinte de la carte ne correspond pas à celle demandée\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures créées jusqu'à présent : %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8403,7 +8495,7 @@
 "la vérification du code personnel d'administration est actuellement\n"
 "interdite avec cette commande\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8421,55 +8513,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Nouveau code personnel initial"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "exécuter en mode multiserveur (premier plan)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHIER|écrire un journal dans le FICHIER"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|se connecter au lecteur par le port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|utiliser NOM comme pilote ct-API"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|utiliser NOM comme pilote PC/SC"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "ne pas utiliser le pilote CCID interne"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|déconnecter la carte après N secondes d'inactivité "
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "ne pas utiliser de pavé numérique du lecteur"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "refus d'utiliser les commandes d'administration de la carte"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "utiliser une entrée de taille variable pour le pavé numérique"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8477,317 +8569,334 @@
 "Syntaxe : scdaemon [options] [commande [arguments]]\n"
 "Démon de carte à puce pour @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
 "en arrière-plan\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestionnaire pour le descripteur %d démarré\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestionnaire pour le descripteur %d terminé\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "modèle de validation demandé par le certificat : %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "chaîne"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "invite"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "l'extension de certificat critique %s n'est pas prise en charge"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 "le certificat d'émetteur n'est pas marqué comme une autorité de certification"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "politique de signature marquée critique sans politiques configurées"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "échec d'ouverture de « %s » : %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Remarque : politique de certificat non critique non autorisée"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "politique de certificat non autorisée"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "impossible d'obtenir l'empreinte\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "recherche d'émetteur à l'extérieur\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "nombre d'émetteurs correspondants : %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "recherche d'émetteur dans le cache du Dirmngr\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "nombre de certificats correspondants : %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "échec de recherche de clef seulement dans le cache du dirmngr : %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "impossible d'allouer la gestion de base de clefs\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "le certificat a été révoquée"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "l'état du certificat est inconnu"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "veuillez vous assurer que le « dirmngr » est correctement installé\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "échec de vérification de la liste de révocations de certificat : %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificat avec validité incorrecte : %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificat pas encore valable"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "certificat racine pas encore valable"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "certificat intermédiaire pas encore valable"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "le certificat a expiré"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "le certificat racine a expiré"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "le certificat intermédiaire a expiré"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "des attributs nécessaires du certificat sont manquants : %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certificat avec validité incorrecte"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "signature non créée pendant la durée de vie du certificat"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificat non créé pendant la durée de vie de l'émetteur"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificat intermédiaire non créé pendant la durée de vie de l'émetteur"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       signature créée le "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (       certificat créé le "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificat valable depuis "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (  émetteur valable depuis "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "le certificat racine a maintenant été marqué de confiance\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "marquage de confiance interactif non activé dans gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "marquage de confiance interactif désactivé pour cette session\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "Attention : date de création de la signature inconnue — date supposée "
 "actuelle"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "aucun émetteur trouvé dans le certificat"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificat autosigné avec une mauvaise signature"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "le certificat racine n'est pas marqué de confiance"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "chaîne de certificats trop longue\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certificat d'émetteur introuvable"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificat avec une mauvaise signature"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "un autre certificat d'autorité de certification pouvant correspondre a été "
 "trouvé — nouvel essai"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 "chaîne de certificats plus longue que celle autorisée par l'autorité de "
 "certification (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "le certificat est correct\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "le certificat intermédiaire est correct\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "le certificat racine est correct\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "basculement en modèle chaîne"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "modèle de validation utilisé : %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "un hachage de %1$u bits n'est pas valable pour une clef %3$s de %2$u bits\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "hors limite\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(c'est l'algorithme MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "aucun"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Erreur — encodage incorrect]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Erreur — hors limite]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Erreur — pas de nom]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Erreur — DN incorrect]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8803,142 +8912,142 @@
 "numéro de série %s, identifiant 0x%08lX,\n"
 "créé le %s, expire le %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "aucune utilisation de clef indiquée — toutes les utilisations sont "
 "supposées\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour la certification\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "le certificat n'aurait pas dû être utilisé pour la signature de réponse "
 "OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour le chiffrement\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour la signature\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "le certificat n'est pas utilisable pour la signature\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "ligne %d : algorithme incorrect\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "ligne %d : taille %u de clef incorrecte (%d à %d possible)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "ligne %d : aucun nom de sujet donné\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "ligne %d : étiquette de nom de sujet « %.*s » incorrecte\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "ligne %d : nom de sujet « %s » incorrect à la position %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "ligne %d : ce n'est pas une adresse électronique valable\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "ligne %d : numéro de série incorrect\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "ligne %d : étiquette de nom d'émetteur « %.*s » incorrecte\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "ligne %d : nom d'émetteur « %s » incorrect à la position %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "ligne %d : date donnée incorrect\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr ""
 "ligne %d : erreur de lecture de clef de signature par keygrip « %s » : %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "ligne %d : algorithme de hachage donné incorrect\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "ligne %d : authority-key-id incorrect\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "ligne %d : subject-key-id incorrect\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "ligne %d : syntaxe d'extension incorrecte\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "ligne %d : erreur de lecture de la clef « %s » sur la carte : %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "ligne %d : erreur de lecture de clef par keygrip « %s » : %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "ligne %d : échec de génération de la clef : %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9073,7 +9182,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificat « %s » introuvable : %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erreur de verrouillage du trousseau local : %s\n"
@@ -9098,123 +9207,123 @@
 msgid "no valid recipients given\n"
 msgstr "aucune destinataire valable donnée\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "afficher les clefs externes"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "afficher la chaîne de certificats"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "importer les certificats"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "exporter les certificats"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "enregistrer une carte à puce"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "passer une commande au dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "appeler gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "créer une sortie encodée en base-64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "entrée supposée au format PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "entrée supposée au format base-64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "entrée supposée au format binaire"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "ne pas consulter liste de révocations de cert."
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "vérifier la validité avec OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|nombre de certificats à inclure"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "ne pas vérifier les politiques de certificat"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "récupérer certificats d'émetteur manquants"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "mode automatique : aucune question"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "oui comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "non comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de hachage NOM"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9224,47 +9333,47 @@
 "Signer, vérifier, chiffrer ou déchiffrer en utilisant le protocole S/MIME\n"
 "L'opération par défaut dépend des données entrées\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modèle de validation « %s » inconnu\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s : %u : aucun nom d'hôte donné\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s : %u : mot de passe donné sans utilisateur\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s : %u : ignorer cette ligne\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "impossible d'analyser le serveur de clefs\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importation des certificats commun « %s »\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossible de signer en utilisant « %s » : %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@ -9284,7 +9393,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "échec des vérifications de base du certificat — non importé\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
@@ -9294,42 +9403,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "erreur d'importation du certificat : %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur de lecture de l'entrée : %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "impossible d'obtenir l'empreinte\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problème de recherche de certificat existant : %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "impossible de trouver une base de clefs inscriptible : %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erreur de stockage du certificat : %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problème de nouvelle recherche de certificat : %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "erreur de stockage des options : %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Erreur — "
 
@@ -9368,7 +9472,7 @@
 "\n"
 "%s%sVoulez-vous vraiment faire cela ?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9406,22 +9510,23 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "échec de vérification de certificat qualifié : %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Signature faite le "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[date non donnée]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " en utilisant le certificat d'identifiant 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "algorithme : %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9429,17 +9534,17 @@
 "signature incorrecte : l'attribut de hachage du message ne correspond pas à "
 "celui calculé\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Bonne signature de"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "C'est une signature qualifiée\n"
@@ -9509,281 +9614,280 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "erreur de chargement du certificat « %s » : %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificats chargés de façon permanente : %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "      certificats actuellement en cache : %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 #| msgid "    runtime cached certificates: %u\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "      certificats actuellement en cache : %u\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificat déjà en cache\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificat en cache\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erreur de mise en cache du certificat : %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "chaîne « %s » d'empreinte SHA1 incorrecte\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erreur de récupération du certificat par numéro de série : %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erreur de récupération du certificat par sujet : %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "aucun émetteur trouvé dans le certificat\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erreur de lecture d'authorityKeyIdentifier : %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "création du répertoire « %s »\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "erreur de création du répertoire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "répertoire de base de données « %s » ignoré\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "erreur de lecture du répertoire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "suppression du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "pas de suppression du fichier « %s »\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erreur de fermeture du fichier de cache : %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "échec d'ouverture du répertoire de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "erreur de création du nouveau répertoire de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "erreur d'écriture du nouveau répertoire de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "erreur de fermeture du nouveau répertoire de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "nouveau répertoire de cache « %s » créé\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "échec de réouverture du répertoire de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "le premier enregistrement de « %s » n'est pas la version\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "ancienne version du répertoire de cache — nettoyage\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "ancienne version du répertoire de cache — abandon\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 "champ supplémentaire détecté dans l'enregistrement de liste de révocations "
 "de certificat de « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "ligne incorrecte détectée dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "entrée en double détectée dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "type d'enregistrement non pris en charge dans « %s » ligne %u ignoré\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "hachage d'émetteur incorrect dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "aucun DN d'émetteur dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "date incorrecte dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 "Attention : hachage de fichier de cache incorrect dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "erreurs détectées dans le répertoire de cache\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "veuillez vérifier la raison et effacer vous-même ce fichier\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "impossible de créer le répertoire de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "erreur de fermeture de « %s » : %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "erreur en renommant « %s » en « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossible de hacher « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "erreur de configuration du contexte de hachage MD5 : %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "erreur du hachage de « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "formatage incorrect de la somme de contrôle pour « %s »\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "trop de fichiers de cache ouverts ; impossible d'en ouvrir plus\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "ouverture du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "erreur d'ouverture du fichier de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "erreur d'initialisation du fichier de cache « %s » en lecture : %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "appel d'unlock_db_file sur un fichier fermé\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "appel d'unlock_db_file sur un fichier déverrouillé\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "échec de création d'un nouvel objet de cache : %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr ""
 "pas de liste de révocations de certificat disponible pour l'identifiant "
 "d'émetteur %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "la liste de révocations de certificat en cache pour l'identifiant d'émetteur "
 "%s est trop ancienne ; mise à jour nécessaire\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9792,223 +9896,225 @@
 "force-crl-refresh activé et %d minutes se sont écoulées pour l'identifiant "
 "d'émetteur %s ; mise à jour nécessaire\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "force-crl-refresh activé pour l'identifiant d'émetteur %s ; mise à jour "
 "nécessaire\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 "la liste de révocations de certificat pour l'identifiant d'émetteur %s ne "
 "peut pas être utilisée\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "la liste de révocations de certificat en cache pour l'identifiant d'émetteur "
 "%s a été modifiée ; mise à jour nécessaire\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 "Attention : taille d'enregistrement de cache incorrecte pour le numéro de "
 "série "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr ""
 "problème de lecture d'enregistrement de cache pour le numéro de série %s : "
 "%s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "le numéro de série %s est incorrect ; raison=%02X  date=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 "le numéro de série %s est valable, il ne fait pas partie de la liste de "
 "révocation de certificats\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "erreur de lecture des données du fichier de cache : %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "algorithme de hachage « %s » inconnu\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "échec de gcry_md_open pour l'algorithme %d : %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "expression symbolique incorrecte obtenue de libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "échec de conversion d'expression symbolique : %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "algorithme de hachage « %s » inconnu\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "échec de gcry_md_open pour l'algorithme %d : %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "échec de création d'expression symbolique : %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "échec de ksba_crl_parse : %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 "erreur de lecture des dates de mises à jour de la liste de révocations de "
 "certificat : %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 "dates de mises à jour de la liste de révocations de certificat : celle-ci=%s "
 "prochaine=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate non donné ; période de validité supposée d'un jour\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr ""
 "erreur de lecture de l'élément de liste de révocations de certificat : %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "erreur d'insertion d'élément dans le fichier cache temporaire : %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr ""
 "aucun émetteur de liste de révocations de certificat trouvé dans la liste : "
 "%s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "localisation du certificat d'émetteur de liste de révocations par "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr ""
 "échec de vérification de signature de liste de révocations de certificat : "
 "%s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "erreur de vérification de la validité du certificat d'émetteur de liste de "
 "révocations : %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "échec de ksba_crl_new : %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "échec de ksba_crl_set_reader : %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "vieux fichier de cache temporaire « %s » supprimé\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "problème de suppression du vieux fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erreur de création du fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "échec de crl_parse_insert : %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "erreur de finalisation du fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erreur de fermeture du fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "Attention : la nouvelle liste de révocations de certificat est trop "
 "ancienne ; elle a expiré le %s — chargement quand même\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 "la nouvelle liste de révocations de certificat est trop ancienne ; elle a "
 "expiré le %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "extension %s de liste de révocations de certificat critique inconnue\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr ""
 "erreur de lecture des extensions de liste de révocations de certificat : %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "création du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problème en renommant « %s » en « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10017,14 +10123,14 @@
 "échec de mise à jour du fichier DIR — l'entrée de cache sera perdue avec le "
 "prochain démarrage du programme\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 "Démarrage du vidage de liste de révocations de certificat (récupérée par "
 "%s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10032,59 +10138,59 @@
 " Erreur : la liste de révocations de certificat ne sera pas utilisée car "
 "elle était encore trop ancienne après une mise à jour.\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " Erreur : la liste de révocations de certificat ne sera pas utilisée à cause "
 "d'une extension critique inconnue.\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 " Erreur : la liste de révocations de certificat ne sera pas utilisée.\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " Erreur : cette liste de révocations de certificat en cache a pu être "
 "modifiée.\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " Attention : taille d'enregistrement de cache incorrecte\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problème de lecture d'enregistrement de cache : %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problème de lecture d'enregistrement de clef : %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erreur de lecture de l'entrée de cache dans la base de données : %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Fin du vidage de liste de révocations de certificat\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "échec de crl_fetch par points de distribution : %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "échec de crl_cache_insert par points de distribution : %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "échec de crl_cache_insert par émetteur : %s\n"
@@ -10127,56 +10233,56 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "recherche de certificats impossible car %s est désactivé\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "utiliser OCSP au lieu des listes de révocations de certificat"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "vérifier si une instance de dirmngr fonctionne"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "ajouter un certificat au cache"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "valider un certificat"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "rechercher un certificat"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "rechercher seulement les certificats localement"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "exiger une URL pour --lookup"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "charger une liste de rév. de cert. dans dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "mode spécial pour être utilisé par Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "attendre les certificats au format PEM"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "forcer utilisation du répondeur OCSP par défaut"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "Utilisation : dirmngr-client [options] [fic_cert|motif] (-h pour l'aide)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10189,83 +10295,83 @@
 "Le processus renvoie 0 si le certificat est valable, 1 s'il est\n"
 "incorrect et d'autres codes d'erreurs pour les problèmes globaux\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "erreur de lecture du certificat sur l'entrée standard : %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "erreur de lecture du certificat sur « %s » : %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "certificat trop grand pour être possible\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "impossible de se connecter au dirmngr : %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "échec de la recherche : %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr ""
 "échec de chargement de la liste de révocations de certificat « %s » : %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "un démon dirmngr fonctionne et est disponible\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "échec de validation du certificat : %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "le certificat est valable\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "le certificat a été révoquée\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "échec de vérification du certificat : %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "état obtenu : « %s »\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "erreur d'écriture en encodage base64 : %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "demande « %s » non prise en charge\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "nom de fichier absolu attendu\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "recherche de « %s »\n"
@@ -10292,98 +10398,98 @@
 msgid "flush the cache"
 msgstr "vider le cache"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "exécuter sans demander à l'utilisateur"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "permettre l'envoi de requêtes OCSP"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "interdire l'utilisation d'HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "interdire l'utilisation de LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "HTTP"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "LDAP"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorer les URL de service OCSP contenues dans le certificat"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "ajouter les nouveaux serveurs découverts dans les points de distribution de "
 "liste de révocations de certificat à la liste de serveurs"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utiliser le répondeur OCSP à l'URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|EMPR|réponse OCSP signée par EMPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FICHIER|utiliser les certificats de CA dans FICHIER pour HKP par TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10393,11 +10499,11 @@
 "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10406,134 +10512,134 @@
 "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
 "@GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "les niveaux de débogage possibles sont : %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "utilisation : %s [options] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "les deux-points ne sont pas permis dans le nom de socket\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 "échec de récupération de liste de révocations de certificat sur « %s » : %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 "échec du traitement de liste de révocations de certificat sur « %s » : %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s : %u : ligne trop longue — ignorée\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s : %u : empreinte incorrecte détectée\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s : %u : erreur de lecture : %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s : %u : fin de ligne inutile ignorée\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP reçu — relecture de la configuration et vidage des caches\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM reçu — arrêt…\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM reçu — encore %d connexions actives\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arrêt forcé\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT reçu — arrêt immédiat\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "renvoyer toutes les valeurs au format enreg."
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NOM|ignorer l'hôte et se connecter par NOM"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NOM|se connecter à l'hôte NOM"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|se connecter au port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|MDP|utiliser le mot de passe MDP pour authentif."
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "prendre le mot de passe de $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|CHAÎNE|demander la CHAÎNE DN"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|CHAÎNE|utiliser la CHAÎNE comme expression de filtre"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|CHAÎNE|renvoyer l'attribut CHAÎNE"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Utilisation : dirmngr_ldap [options] [URL] (-h pour l'aide)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10543,145 +10649,139 @@
 "Assistant LDAP interne pour Dirmngr\n"
 "L'interface et les options pourraient changer sans prévenir\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "numéro de port %d incorrect\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "examen de résultat pour l'attribut « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "erreur d'écriture sur la sortie standard : %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          attribut « %s » disponible\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "attribut « %s » introuvable\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "attribut « %s » trouvé\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "traitement de l'URL « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "  utilisateur « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr " mot de passe « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "         hôte « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "         port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "           DN « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "       filtre « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "     attribut « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "aucun nom d'hôte donné dans « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "pas d'attribut donné pour la requête « %s »\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "Attention : utilisation du premier attribut seulement\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "échec du lien de « %s : %d » : %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "échec de recherche de « %s » : %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "« %s » n'est pas une URL LDAP\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "« %s » est une URL LDAP incorrecte\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erreur d'accès à « %s » : état HTTP %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL « %s » redirigée vers « %s » (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "trop de redirections\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "écriture de « %s »\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "erreur d'allocation de mémoire : %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10732,7 +10832,7 @@
 msgid "malloc failed: %s\n"
 msgstr "échec de malloc : %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch : motif « %s » incorrect\n"
@@ -10864,11 +10964,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "échec d'allocation du contexte OCSP : %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10937,7 +11032,7 @@
 msgstr "serialno manquant dans l'identifiant de certificat"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "échec d'assuan_inquire : %s\n"
@@ -10967,32 +11062,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d dépassé\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossible d'allouer une structure de contrôle : %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "échec d'allocation du contexte Assuan : %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossible d'initialiser le serveur : %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "impossible d'enregistrer les commandes avec Assuan : %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problème d'accept_assuan : %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "problème de traitement Assuan : %s\n"
@@ -11035,58 +11130,58 @@
 msgid "certificate chain is good\n"
 msgstr "la chaîne de certificats est correcte\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 "le certificat n'aurait pas dû être utilisé pour signer une liste de "
 "révocations de certificat\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "silencieux"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "afficher les données encodées au format hexadécimal"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "décoder les lignes de données reçues"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "se connecter au dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NOM|se connecter à la socket Assuan NOM"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADR|se connecter au serveur Assuan à ADR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "exécuter le serveur Assuan donné en ligne de commande"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "ne pas utiliser le mode de connexion étendu"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHIER|exécuter les commandes du FICHIER au démarrage"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "exécuter /subst au démarrage"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Utilisation : @GPG@-connect-agent [options] (-h pour l'aide)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11094,43 +11189,43 @@
 "Syntaxe : @GPG@-connect-agent [options]\n"
 "Se connecter à un agent en fonctionnement et envoyer des commandes\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "l'option « %s » nécessite un programme et des arguments facultatifs\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option « %s » ignorée à cause de « %s »\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "échec de réception de ligne : %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue — ignorée\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "ligne raccourcie à cause de caractère NULL inclus\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "commande « %s » inconnue\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "échec d'envoi de ligne : %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erreur d'envoi d'options standards : %s\n"
@@ -11340,100 +11435,100 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Veuillez d'abord utiliser la commande « toggle ».\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Échec de vérification externe du composant %s"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "erreur de fermeture de « %s » : %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "erreur du hachage de « %s » : %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "afficher tous les composants"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "vérifier tous les programmes"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPOSANT|afficher les options"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPOSANT|modifier les options"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPOSANT|vérifier les options"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "appliquer les valeurs par défaut globales"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "aff. répertoires de configuration pour @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "afficher le fichier de configuration globale"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "vérifier le fichier de configuration globale"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "mettre la base de confiance à jour"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "recharger tous les composants ou celui donné"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "lancer un composant donné"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "tuer un composant donné"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "activer modif. pendant l'exécution si possible"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11441,203 +11536,151 @@
 "Syntaxe : @GPGCONF@ [options]\n"
 "Gérer les options de configuration pour les outils du système @GNUPG@\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Un argument de composant nécessaire"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Composant introuvable"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Aucun argument permis"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Utilisation : gpg-check-pattern [options] ficmotif (-h pour l'aide)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Commandes :\n"
-" "
+"Syntaxe : gpg-check-pattern [options] ficmotif\n"
+"Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
+"ficmotif\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "mode déchiffrement"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr ""
+#~ "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "mode chiffrement"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Commandes :\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "classe d'outils (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "mode déchiffrement"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "nom de fichier du programme"
+#~ msgid "encryption modus"
+#~ msgstr "mode chiffrement"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "fichier de clef secrète (nécessaire)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "classe d'outils (confucius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "nom de fichier d'entrée (entrée standard par défaut)"
+#~ msgid "program filename"
+#~ msgstr "nom de fichier du programme"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Utilisation : symcryptrun [options] (-h pour l'aide)"
+#~ msgid "secret key file (required)"
+#~ msgstr "fichier de clef secrète (nécessaire)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax : symcryptrun --class CLASSE --program PROGRAMME --keyfile CLEF "
-"[options...] COMMANDE [entrée]\n"
-"Appeler un simple outil de chiffrement symétrique\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nom de fichier d'entrée (entrée standard par défaut)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "interruption de %s sur %s avec l'état %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Utilisation : symcryptrun [options] (-h pour l'aide)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "échec de %s sur %s avec l'état %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntax : symcryptrun --class CLASSE --program PROGRAMME --keyfile CLEF "
+#~ "[options...] COMMANDE [entrée]\n"
+#~ "Appeler un simple outil de chiffrement symétrique\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "impossible de créer le répertoire temporaire « %s » : %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "interruption de %s sur %s avec l'état %i\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "impossible d'ouvrir %s en écriture : %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "échec de %s sur %s avec l'état %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "erreur d'écriture sur %s : %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "impossible de créer le répertoire temporaire « %s » : %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "erreur de lecture de %s : %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "impossible d'ouvrir %s en écriture : %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "erreur de fermeture de %s : %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "erreur d'écriture sur %s : %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "aucune option --program fournie\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "erreur de lecture de %s : %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "seuls --decrypt et --encrypt sont pris en charge\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "erreur de fermeture de %s : %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "aucune option --keyfile fournie\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "aucune option --program fournie\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "impossible d'allouer le vecteur d'arguments\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "seuls --decrypt et --encrypt sont pris en charge\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "impossible de créer un tube : %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "aucune option --keyfile fournie\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "impossible de créer le pty : %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "impossible d'allouer le vecteur d'arguments\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "impossible de créer un processus fils : %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "impossible de créer un tube : %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "échec d'execv : %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "impossible de créer le pty : %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "échec de select : %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "impossible de créer un processus fils : %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "échec de lecture : %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "échec d'execv : %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "échec de lecture du pty : %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "échec de select : %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "échec de waitpid : %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "échec de lecture : %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "interruption du fils avec l'état %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "échec de lecture du pty : %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "impossible d'allouer la chaîne infile : %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "échec de waitpid : %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "impossible d'allouer la chaîne outfile : %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "interruption du fils avec l'état %i\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "soit %s, soit %s doit être donné\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "impossible d'allouer la chaîne infile : %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "aucune classe fournie\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "impossible d'allouer la chaîne outfile : %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "la classe %s n'est pas prise en charge\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "soit %s, soit %s doit être donné\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Utilisation : gpg-check-pattern [options] ficmotif (-h pour l'aide)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "aucune classe fournie\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaxe : gpg-check-pattern [options] ficmotif\n"
-"Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
-"ficmotif\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "la classe %s n'est pas prise en charge\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " en utilisant le certificat d'identifiant 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11763,42 +11806,6 @@
 #~ msgid "Error: Private DO too long (limit is %d characters).\n"
 #~ msgstr "Erreur : DO privé trop long (limité à %d caractères).\n"
 
-#, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "clef %s : algorithme à clef publique non pris en charge\n"
-
-#, fuzzy
-#~| msgid "card does not support digest algorithm %s\n"
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Bonne signature de"
-
-#, fuzzy
-#~| msgid "key %s: %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "clef %s : %s\n"
-
-#, fuzzy
-#~| msgid "User ID \"%s\": %d signature removed\n"
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Identité « %s » : %d signature supprimée\n"
-#~ msgstr[1] "Identité « %s » : %d signature supprimée\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Bonne signature de"
-#~ msgstr[1] "Bonne signature de"
-
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "nouveau fichier de configuration « %s » créé\n"
 
@@ -12986,9 +12993,6 @@
 #~ msgid "file delete error"
 #~ msgstr "erreur de suppression du fichier"
 
-#~ msgid "unexpected data"
-#~ msgstr "données inattendues"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflit de date"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/gl.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/gl.gmo sont différents
diff -Nru gnupg2-2.2.20/po/gl.po gnupg2-2.2.27/po/gl.po
--- gnupg2-2.2.20/po/gl.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/gl.po	2021-01-11 18:47:18.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@ -26,41 +26,41 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to create a sign and encrypt key? "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "¿Seguro que quere crear unha chave para asinar e cifrar? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -68,7 +68,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -78,35 +78,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal erróneo"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -114,40 +114,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "liña longa de máis\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non válido no nome\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI erróneo"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal erróneo"
@@ -157,33 +161,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -241,7 +245,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
@@ -374,20 +378,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Necesita un contrasinal para protexe-la súa chave secreta.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -397,124 +401,124 @@
 "Opcións:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A chave é obsoleta"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -523,182 +527,168 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducción a <proxecto@trasno.net>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "ficheiro de opcións `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Revocación de certificado válida"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -706,9 +696,9 @@
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -718,52 +708,52 @@
 "Opcións:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -773,32 +763,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -811,19 +801,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -836,7 +826,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -846,59 +836,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "habilitar unha chave"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -908,7 +898,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
@@ -918,7 +908,7 @@
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -950,7 +940,7 @@
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -997,27 +987,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non é posible deshabilita-los volcados de 'core': %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
@@ -1078,7 +1068,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@ -1203,7 +1193,7 @@
 msgstr "armadura: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1289,44 +1279,44 @@
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispoñible en: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificado correcto"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificado non válido"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versión descoñecida"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Non hai axuda dispoñible para `%s'"
@@ -1336,7 +1326,7 @@
 msgid "ignoring garbage line"
 msgstr "error nunha liña adicional\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "descoñecido"
@@ -1346,92 +1336,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "carácter radix64 non válido %02x omitido\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "erro de lectura de ficheiro"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "liña longa de máis\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "argumento non válido"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "armadura non válida"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos conflictivos\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opcións de importación non válidas\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "non procesado"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "comandos conflictivos\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "destinatario por defecto `%s' descoñecido\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "datos inesperados"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "opcións de importación non válidas\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "non procesado"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "ficheiro de opcións `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1447,42 +1469,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "non se atopou a chave pública %08lX: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1672,14 +1693,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@ -1722,24 +1743,24 @@
 msgid "server uses an invalid certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non está dispoñible"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
@@ -1749,246 +1770,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "¿A súa selección? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave pública correspondente: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (só asinar)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1996,184 +2017,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispoñible en: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2237,8 +2258,8 @@
 msgstr "Pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
@@ -2263,58 +2284,64 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opción \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete simétrico ESK debido ao modo S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVISO: `%s' é un ficheiro baleiro\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2323,40 +2350,40 @@
 "forza-lo algoritmo de compresión %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado simétrico.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
@@ -2459,7 +2486,7 @@
 msgstr "%s: omitido: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2497,287 +2524,293 @@
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Pegada dactilar:"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro público"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "xerar un novo par de chaves"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2785,7 +2818,7 @@
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2815,13 +2848,13 @@
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2836,7 +2869,7 @@
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2844,584 +2877,572 @@
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opcións] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "non se atopou un signo = na definición do grupo \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s non é para uso normal!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificación dado non é válido\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3621,7 +3642,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -3631,7 +3652,7 @@
 msgid "key %s: %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3655,7 +3676,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave pública non atopada: %s\n"
@@ -3670,7 +3691,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3741,18 +3762,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -3765,244 +3786,308 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "A chave é obsoleta"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non é válido"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo para a revocación: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario de revocación: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave pública - non se pode aplica-lo\n"
 "certificado de revocación\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocación incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocación importado\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocación de sub-chave non válida\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación "
 "%08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
 "ausente.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Sinatura correcta de \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "omítese `%s': %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "O ID de usuario \"%s\" está revocado."
+msgstr[1] "O ID de usuario \"%s\" está revocado."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
+msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d sinaturas erróneas\n"
+msgstr[1] "%d sinaturas erróneas\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Sinatura correcta de \""
+msgstr[1] "Sinatura correcta de \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
@@ -4263,8 +4348,8 @@
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -4480,7 +4565,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "A chave está revocada."
 
@@ -4538,7 +4623,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
@@ -4627,7 +4712,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
@@ -4675,106 +4760,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   asinada por %08lX no %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "fallou a comprobación da sinatura creada: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notación: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4782,19 +4882,19 @@
 "Teña en conta que a validez da chave amosada non é necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4803,18 +4903,18 @@
 "AVISO: non se marcou ningún ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4823,37 +4923,37 @@
 "AVISO: Esta é unha chave de estilo PGP2. Se engade unha identificación\n"
 "       fotográfica algunhas versións de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificación fotográfica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4861,38 +4961,38 @@
 msgstr[0] "Borrada %d sinatura.\n"
 msgstr[1] "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non válida"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "O ID de usuario \"%s\" está revocado."
 msgstr[1] "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4902,45 +5002,45 @@
 "designado\n"
 "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -4948,271 +5048,266 @@
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "¿Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   asinada por %08lX no %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5226,169 +5321,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (só asinar)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deshabilitar unha chave"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamaño de chave requerido son %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5404,7 +5499,7 @@
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5420,40 +5515,40 @@
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "¿Por canto tempo é válida a sinatura? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "valor non válido\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5461,12 +5556,12 @@
 "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:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "¿Isto é correcto? (s/n) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5477,7 +5572,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5494,50 +5589,50 @@
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun díxito\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Carácter non válido no comentario\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5548,7 +5643,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
@@ -5564,35 +5659,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5604,13 +5699,13 @@
 "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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5618,69 +5713,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeración de chaves.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "gravando a chave pública en `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, 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:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erro escribindo no chaveiro público `%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 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:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5690,7 +5785,7 @@
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5698,7 +5793,7 @@
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5706,23 +5801,23 @@
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "¿Crear realmente? "
@@ -5759,22 +5854,6 @@
 msgstr[0] "%d sinaturas erróneas\n"
 msgstr[1] "%d sinaturas erróneas\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d sinaturas erróneas\n"
-msgstr[1] "%d sinaturas erróneas\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
-msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5794,30 +5873,30 @@
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5849,7 +5928,7 @@
 msgstr[0] "1 sinatura errónea\n"
 msgstr[1] "1 sinatura errónea\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
@@ -5902,458 +5981,458 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non é un ID de chave válido\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "solicitando a chave %08lX de %s\n"
 msgstr[1] "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamaño moi estraño para unha chave de sesión cifrada (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesión cifrada con %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supoñendo datos cifrados con %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non está dispoñible, téntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non tiña protección de integridade\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas múltiples\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Chave dispoñible en: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "descoñecido"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública descoñecido"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detectáronse sinaturas múltiples. Só se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr ""
 "a actualización da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción a extinguir \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "clase de sinatura descoñecida"
@@ -6389,78 +6468,78 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesión cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notación de sinaturas críticas: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6512,7 +6591,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "¿É esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "¡non se pode amosa-la identificación fotográfica!\n"
@@ -6830,12 +6909,12 @@
 msgid "no valid addressees\n"
 msgstr "non hai enderezos válidos\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -6889,27 +6968,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, nós somo-lo destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificación vella do DEK non está soportada\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s é descoñecido ou está desactivado\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7097,7 +7176,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7169,33 +7248,33 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: a chave está revocada"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta da chave %08lX debido a un bit crítico "
 "descoñecido\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocación de "
 "subchave\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligazón da chave\n"
@@ -7220,24 +7299,24 @@
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -7266,7 +7345,7 @@
 "omítese `%s': ¡esta é unha chave ElGamal xerada por PGP que non é segura "
 "para sinaturas!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -7314,12 +7393,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronización: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -7329,12 +7408,12 @@
 msgid "can't lock '%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -7350,104 +7429,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡o directorio non existe!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versión: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non válida\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, 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:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, 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:983
+#: g10/tdbio.c:985
 #, 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:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non é un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, 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:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versión do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: creouse a base de datos de confianza\n"
@@ -7818,106 +7897,106 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' non é un ID longo de chave válido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece máis dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave pública para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petición %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non é do tipo %d solicitado\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave pública %08lX: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu chaves procesadas hasta polo momento\n"
 msgstr[1] "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7925,23 +8004,23 @@
 msgstr[0] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 msgstr[1] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -8057,110 +8136,125 @@
 "List, export, import Keybox data\n"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "cambia-lo contrasinal"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "cambia-lo contrasinal"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, 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:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "borrar chaves do chaveiro público"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -8168,55 +8262,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, 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:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8226,27 +8308,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8254,123 +8336,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, 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:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non soportado"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "A xeración da chave fallou: %s\n"
 msgstr[1] "A xeración da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
@@ -8388,383 +8470,401 @@
 msgid "|N|Initial New PIN"
 msgstr "Introduza o ID de usuario: "
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "axuda"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: non é posible acceder: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave está revocada"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "         novas sinaturas: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Creouse o certificado de revocación.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, fuzzy, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "non procesado"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "non|nom"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8777,137 +8877,137 @@
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9049,7 +9149,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -9074,134 +9174,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocación de certificado válida"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear saída con armadura en ascii"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9212,47 +9312,47 @@
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omitir esta chave\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9272,7 +9372,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -9282,42 +9382,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9347,7 +9442,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9377,38 +9472,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "A sinatura caducou o %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
+msgid "algorithm:"
+msgstr "armadura: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "               alias \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9479,547 +9574,548 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Certificado non válido"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "error nunha liña adicional\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "certificado duplicado - borrado"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Non hai axuda dispoñible para `%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "error reading dir record for LID %lu: %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "erro ao le-lo rexistro de directorio para o LID %lu: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "algoritmo de hash non válido `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "resposta do axente non válida\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "converting S-expression failed: %s\n"
 msgstr "o cambio de permisos de `%s' fallou: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "algoritmo de hash non válido `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "o cambio de permisos de `%s' fallou: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "lid ?: a inserción fallou: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "lid ?: a inserción fallou: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -10058,66 +10154,66 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 #| msgid "bad certificate"
 msgid "validate a certificate"
 msgstr "certificado erróneo"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 #| msgid "bad certificate"
 msgid "lookup a certificate"
 msgstr "certificado erróneo"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "Certificado non válido"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "Certificado correcto"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10125,88 +10221,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "NOTA: a chave está revocada"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10232,95 +10328,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "¿Saír sin gardar? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10333,301 +10429,295 @@
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opcións] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "non procesado"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "opcións de importación non válidas\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "               alias \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "               alias \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "       non importadas: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "               alias \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "               alias \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "AVISO: ¡úsase memoria insegura!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" non é un ficheiro JPEG\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "erro ao crea-lo chaveiro `%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10678,7 +10768,7 @@
 msgid "malloc failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10811,12 +10901,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: non é posible acceder: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10886,7 +10970,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -10916,33 +11000,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10983,101 +11067,101 @@
 msgid "certificate chain is good\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -11277,304 +11361,240 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "usar coma ficheiro de saída"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave pública"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Comandos:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "descifrado correcto\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "descifrado correcto\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comandos:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [ficheiro]"
+#~ msgid "decryption modus"
+#~ msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
-
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "¡%s non se admite con %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr ""
-"a actualización da base de datos de confianza fallou:\n"
-"%s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "non se pode crea-lo directorio `%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "non se puido abrir %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
+#~ msgid "encryption modus"
+#~ msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "erro lendo `%s': %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [ficheiro]"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "erro lendo `%s': %s\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "non se soporta a execución remota de programas\n"
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "¡%s non se admite con %s!\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr ""
+#~ "a actualización da base de datos de confianza fallou:\n"
+#~ "%s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "non se puido abrir %s: %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "non foi posible crear %s: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "non foi posible crear %s: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:566
-#, fuzzy, c-format
-msgid "could not fork: %s\n"
-msgstr "%s: non se atopou o usuario: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "non se soporta a execución remota de programas\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "could not fork: %s\n"
+#~ msgstr "%s: non se atopou o usuario: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "non se pode crear `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "non se pode crear `%s': %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "o algoritmo de protección %d%s non está soportado\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "non se pode crear `%s': %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "erro ao crea-lo contrasinal: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11669,36 +11689,6 @@
 #~ msgstr "a actualización fallou: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "Sinatura %s, algoritmo de resumo %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Sinatura correcta de \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "omítese `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "O ID de usuario \"%s\" está revocado."
-#~ msgstr[1] "O ID de usuario \"%s\" está revocado."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Sinatura correcta de \""
-#~ msgstr[1] "Sinatura correcta de \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr " creouse un novo ficheiro de configuración `%s'\n"
@@ -12818,9 +12808,6 @@
 #~ msgid "file delete error"
 #~ msgstr "erro de borrado de ficheiro"
 
-#~ msgid "unexpected data"
-#~ msgstr "datos inesperados"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflicto de selo de data"
 
diff -Nru gnupg2-2.2.20/po/gnupg2.pot gnupg2-2.2.27/po/gnupg2.pot
--- gnupg2-2.2.20/po/gnupg2.pot	2020-03-20 15:40:27.000000000 +0100
+++ gnupg2-2.2.27/po/gnupg2.pot	2021-01-11 18:47:17.000000000 +0100
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the GNU gnupg package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.20\n"
+"Project-Id-Version: GNU gnupg 2.2.27\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
@@ -29,45 +29,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -77,33 +77,33 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr ""
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -111,36 +111,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr ""
 
@@ -149,31 +153,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr ""
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -230,7 +234,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr ""
@@ -353,357 +357,345 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
 msgstr ""
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr ""
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr ""
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr ""
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr ""
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr ""
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr ""
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr ""
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr ""
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr ""
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr ""
@@ -713,32 +705,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -751,18 +743,18 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr ""
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -775,7 +767,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -785,57 +777,57 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr ""
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr ""
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr ""
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -845,7 +837,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
@@ -855,7 +847,7 @@
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -884,7 +876,7 @@
 msgstr ""
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
@@ -930,27 +922,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr ""
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr ""
@@ -1010,7 +1002,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr ""
@@ -1123,7 +1115,7 @@
 msgstr ""
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1198,39 +1190,39 @@
 msgid "Root certificate trustworthy"
 msgstr ""
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr ""
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr ""
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr ""
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr ""
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr ""
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr ""
@@ -1239,7 +1231,7 @@
 msgid "ignoring garbage line"
 msgstr ""
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr ""
 
@@ -1248,80 +1240,106 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr ""
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr ""
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr ""
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr ""
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr ""
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr ""
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr ""
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr ""
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+msgid "invalid meta command"
+msgstr ""
+
+#: common/argparse.c:542 common/argparse.c:577
+msgid "unknown meta command"
+msgstr ""
+
+#: common/argparse.c:544 common/argparse.c:579
+msgid "unexpected meta command"
+msgstr ""
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr ""
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
+#: common/argparse.c:581
 #, c-format
-msgid "out of core\n"
+msgid "invalid option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:403
+#: common/argparse.c:1745 common/argparse.c:1840
 #, c-format
-msgid "invalid option \"%.50s\"\n"
+msgid "Note: no default option file '%s'\n"
+msgstr ""
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr ""
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
 
 #: common/utf8conv.c:123
@@ -1339,42 +1357,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr ""
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr ""
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr ""
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr ""
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr ""
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr ""
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1551,13 +1568,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr ""
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
@@ -1595,23 +1612,23 @@
 msgid "server uses an invalid certificate"
 msgstr ""
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, c-format
 msgid "Note: %s\n"
 msgstr ""
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr ""
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr ""
@@ -1621,233 +1638,233 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr ""
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr ""
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr ""
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr ""
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr ""
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr ""
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr ""
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1855,165 +1872,165 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr ""
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr ""
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr ""
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr ""
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr ""
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr ""
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr ""
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr ""
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr ""
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr ""
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2072,8 +2089,8 @@
 msgstr ""
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
@@ -2098,92 +2115,98 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr ""
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ""
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr ""
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
 #, c-format
-msgid "reading from '%s'\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
 #, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
+#: g10/encrypt.c:549
 #, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "reading from '%s'\n"
+msgstr ""
+
+#: g10/encrypt.c:597
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr ""
@@ -2273,7 +2296,7 @@
 msgstr ""
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr ""
@@ -2308,268 +2331,272 @@
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr ""
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr ""
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr ""
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr ""
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr ""
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr ""
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr ""
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr ""
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr ""
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr ""
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr ""
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr ""
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr ""
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr ""
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr ""
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr ""
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr ""
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr ""
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr ""
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr ""
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr ""
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr ""
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr ""
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr ""
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+msgid "quickly revoke a key signature"
+msgstr ""
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr ""
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr ""
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr ""
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr ""
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr ""
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr ""
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2581,585 +2608,574 @@
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr ""
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr ""
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr ""
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ""
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ""
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr ""
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3349,7 +3365,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr ""
@@ -3359,7 +3375,7 @@
 msgid "key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3383,7 +3399,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr ""
@@ -3398,7 +3414,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr ""
@@ -3468,17 +3484,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr ""
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr ""
@@ -3491,227 +3507,288 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr ""
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr ""
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr ""
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr ""
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr ""
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr ""
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr ""
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr ""
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
@@ -3931,8 +4008,8 @@
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
@@ -4118,7 +4195,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr ""
 
@@ -4171,7 +4248,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr ""
 
@@ -4245,7 +4322,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr ""
@@ -4288,501 +4365,511 @@
 msgid "Nothing to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr ""
+
+#: g10/keyedit.c:2995
+#, c-format
+msgid "revoking the key signature failed: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ""
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr ""
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr ""
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr ""
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr ""
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr ""
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 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"
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr ""
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr ""
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr ""
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "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 ""
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr ""
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr ""
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr ""
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr ""
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr ""
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr ""
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -4796,161 +4883,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr ""
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr ""
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr ""
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr ""
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr ""
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr ""
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr ""
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr ""
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr ""
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4960,7 +5047,7 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4970,48 +5057,48 @@
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr ""
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5022,7 +5109,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5032,49 +5119,49 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5082,7 +5169,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -5097,31 +5184,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5129,13 +5216,13 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5143,97 +5230,97 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr ""
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr ""
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr ""
 
@@ -5268,20 +5355,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5300,29 +5373,29 @@
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr ""
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr ""
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5352,7 +5425,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
@@ -5403,442 +5476,442 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr ""
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr ""
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr ""
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr ""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr ""
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr ""
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ""
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr ""
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr ""
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr ""
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr ""
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr ""
@@ -5871,70 +5944,70 @@
 msgid "assuming signed data in '%s'\n"
 msgstr ""
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr ""
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr ""
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -5980,7 +6053,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr ""
@@ -6266,12 +6339,12 @@
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr ""
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr ""
@@ -6324,27 +6397,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr ""
@@ -6514,7 +6587,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr ""
@@ -6575,27 +6648,27 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr ""
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr ""
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr ""
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6618,23 +6691,23 @@
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr ""
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6658,7 +6731,7 @@
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
@@ -6701,12 +6774,12 @@
 msgid "read error in '%s': %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr ""
@@ -6716,12 +6789,12 @@
 msgid "can't lock '%s'\n"
 msgstr ""
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6736,103 +6809,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr ""
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr ""
@@ -7189,127 +7262,127 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr ""
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr ""
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7414,105 +7487,120 @@
 "List, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr ""
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr ""
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr ""
@@ -7520,54 +7608,42 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr ""
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7577,24 +7653,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr ""
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -7602,120 +7678,120 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7731,360 +7807,377 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr ""
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr ""
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr ""
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr ""
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr ""
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr ""
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr ""
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr ""
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr ""
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr ""
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr ""
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr ""
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr ""
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr ""
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr ""
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr ""
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr ""
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8094,137 +8187,137 @@
 "created %s, expires %s.\n"
 msgstr ""
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr ""
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr ""
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr ""
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr ""
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr ""
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr ""
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr ""
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr ""
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr ""
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr ""
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr ""
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr ""
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr ""
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8355,7 +8448,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr ""
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr ""
@@ -8380,170 +8473,170 @@
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr ""
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr ""
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr ""
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr ""
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr ""
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr ""
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -8563,7 +8656,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr ""
@@ -8573,42 +8666,37 @@
 msgid "error importing certificate: %s\n"
 msgstr ""
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr ""
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr ""
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -8638,7 +8726,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8668,38 +8756,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr ""
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
+msgid "algorithm:"
 msgstr ""
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr ""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr ""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8767,530 +8855,531 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr ""
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr ""
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr ""
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
-msgid "unknown hash algorithm '%s'\n"
+msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1554
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgid "converting S-expression failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
 #, c-format
-msgid "got an invalid S-expression from libksba\n"
+msgid "unknown hash algorithm '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1637
 #, c-format
-msgid "converting S-expression failed: %s\n"
+msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr ""
@@ -9328,55 +9417,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9384,82 +9473,82 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -9484,378 +9573,372 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr ""
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
 "options)\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr ""
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr ""
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr ""
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr ""
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr ""
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr ""
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -9906,7 +9989,7 @@
 msgid "malloc failed: %s\n"
 msgstr ""
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10036,11 +10119,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr ""
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10109,7 +10187,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr ""
@@ -10139,32 +10217,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr ""
@@ -10202,98 +10280,98 @@
 msgid "certificate chain is good\n"
 msgstr ""
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
@@ -10479,283 +10557,116 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr ""
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr ""
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr ""
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr ""
 
-#: tools/symcryptrun.c:166
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr ""
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr ""
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
-
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr ""
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
-
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr ""
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr ""
-
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr ""
-
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr ""
-
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
-
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
-
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
-
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
-
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
-
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
-
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr ""
-
-#: tools/gpg-check-pattern.c:144
+#: tools/gpg-check-pattern.c:147
 msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
 
-#: tools/gpg-check-pattern.c:147
+#: tools/gpg-check-pattern.c:150
 msgid ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/hu.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/hu.gmo sont différents
diff -Nru gnupg2-2.2.20/po/hu.po gnupg2-2.2.27/po/hu.po
--- gnupg2-2.2.20/po/hu.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/hu.po	2021-01-11 18:47:18.000000000 +0100
@@ -1,13 +1,13 @@
 # GnuPG Hungarian translation.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Nagy Ferenc László <nfl@nfllab.com>, 2003, 2004.
+# Copyright (C) 2003, 2004, 2020 Free Software Foundation, Inc.
+# Nagy Ferenc László <nfl@nfllab.com>, 2003, 2004, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.5\n"
+"Project-Id-Version: gnupg 2.2.20\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2004-06-19 21:53+0200\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-06-09 23:10+0200\n"
 "Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@ -26,40 +26,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -67,7 +67,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -77,35 +77,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelszó"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -113,40 +113,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor túl hosszú!\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelszó túl hosszú!\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hibás MPI"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelszó"
@@ -156,33 +160,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -240,7 +244,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
@@ -372,20 +376,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -395,124 +399,124 @@
 "Opciók:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A kulcsot lecserélték."
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "bőbeszédű mód"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "még szűkszavúbb mód"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keresése kulcsszerveren"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatbázis frissítése"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NÉV|terminál karakterkódolásának megadása"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -521,180 +525,166 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "A hibákat (angolul) a <gnupg-bugs@gnu.org> címre írja meg!\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "\"%s\" opciós fájl: %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: Könyvtárat létrehoztam.\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: Nem tudom a könyvtárat létrehozni: %s.\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -702,9 +692,9 @@
 "@Parancsok:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -714,52 +704,52 @@
 "Opciók:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Mégsem"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -769,32 +759,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -807,19 +797,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -832,7 +822,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -842,59 +832,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "kulcs engedélyezése"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -904,7 +894,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
@@ -914,7 +904,7 @@
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -946,7 +936,7 @@
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -993,27 +983,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core fájlokat: %s.\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
@@ -1074,7 +1064,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@ -1197,7 +1187,7 @@
 msgstr "Páncél: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1281,44 +1271,44 @@
 msgid "Root certificate trustworthy"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs található: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "ismeretlen verzió"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
@@ -1328,7 +1318,7 @@
 msgid "ignoring garbage line"
 msgstr "Hiba a záró sorban!\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "Ismeretlen módú"
@@ -1338,92 +1328,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "állományolvasási hiba"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "A sor túl hosszú!\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "érvénytelen argumentum"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "érvénytelen páncél"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "Érvénytelen import opciók!\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "nem feldolgozott"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "Egymásnak ellentmondó parancsok!\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "nem várt adat"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "Érvénytelen import opciók!\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "nem feldolgozott"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "\"%s\" opciós fájl: %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1439,42 +1461,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1663,14 +1684,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Kérem, használja előbb a \"toggle\" parancsot!\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s és %s egyelőre nem használható együtt!\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@ -1713,24 +1734,24 @@
 msgid "server uses an invalid certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "Páncél: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem áll rendelkezésre"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
@@ -1740,246 +1761,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Mit választ? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenciák frissítése"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (csak aláírás)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Érvénytelen választás.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1987,184 +2008,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "kilépés ebből a menüből"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "megmutatja ezt a súgót"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs található: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "lejárat megváltoztatása"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "új kulcspár létrehozása"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opció nem működik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2227,8 +2248,8 @@
 msgstr "Nyilvános kulcsú (pubkey): "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
@@ -2253,98 +2274,105 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "Először azt törölje a \"--delete-secret-keys\" opcióval!\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot használni a S2K mód miatt!\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s rejtjelezést használok.\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" állomány üres.\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "Olvasok a \"%s\" állományból.\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) tömörítés használata sérti a címzett preferenciáit!\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkosítva \"%s\" számára\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkosított adat.\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "FIGYELEM: Az üzenet szimmetrikus titkosítását gyenge kulccsal végezték.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "Probléma a titkosított csomag kezelésekor!\n"
@@ -2447,7 +2475,7 @@
 msgstr "%s: kihagyva: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2485,288 +2513,294 @@
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX érvénytelen kulcsot érvényesítettük az\n"
 "--allow-non-selfsigned-uid opcióval.\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsődleges helyett.\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fájl]|olvasható szöveg aláírása"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "adat titkosítása"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "titkosítás csak szimmetrikus rejtjelezővel"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "adat visszafejtése (alapértelmezés)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "aláírás ellenőrzése"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "kulcsok listázása"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "kulcsok és aláírások listázása"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "kulcsok és ujjlenyomatok listázása"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "új kulcspár létrehozása"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "kulcs aláírása vagy szerkesztése"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "kulcsok exportálása"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "kulcsok exportálása kulcsszerverre"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "kulcsok keresése kulcsszerveren"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs frissítése kulcsszerverről"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "kulcsok importálása/összefűzése"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "kanonikus szöveges mód használata"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "ne csináljon semmi változtatást"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "felülírás előtt rákérdezés"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2774,7 +2808,7 @@
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2804,13 +2838,13 @@
 " --list-keys [nevek]        kulcsok kiíratása\n"
 " --fingerprint [nevek]      ujjlenyomatok kiíratása\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2825,7 +2859,7 @@
 "Aláírás, ellenőrzés, titkosítás vagy visszafejtés.\n"
 "Az alapértelmezett művelet a bemeneti adattól függ.\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2833,585 +2867,572 @@
 "\n"
 "Támogatott algoritmusok:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Rejtjelező (cipher): "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Kivonatoló (hash): "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Tömörítő (compression): "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Használat: gpg [opciók] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 és 255 közé kell essen!\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "Érvénytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZÉS: Egyszerű S2K mód (0) erősen ellenjavallt!\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s és %s egyelőre nem használható együtt!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "Lehet, hogy nem használhatja \"%s\" tömörítő algoritmust %s módban!\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "a megadott kulcskarikáról vegye a kulcsokat"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Használat: gpgv [opciók] [fájlok] (-h a súgóhoz)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3611,7 +3632,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -3621,7 +3642,7 @@
 msgid "key %s: %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3645,7 +3666,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hiányzó önaláírás.\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n"
@@ -3660,7 +3681,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "Nem írható kulcskarikát találtam: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3731,18 +3752,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem változott.\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs importálva.\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -3755,236 +3776,300 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs érvénytelen (%d) rejtjelezővel - kihagytam.\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "A kulcsot lecserélték."
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "A kulcs kompromittálódott."
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "A kulcs már nem használatos."
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "A felhasználói azonosító már nem érvényes."
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "Visszavonás oka: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "Megjegyzés a visszavonáshoz: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító ehhez az aláíráshoz!\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. "
 "azonosítón!\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
 "lehívom a %08lX visszavonó kulcsot.\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
 "visszavonó kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Jó aláírás a következőtől: \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "Kihagytam \"%s\"-t: %s.\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
+msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
+msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d rossz aláírás.\n"
+msgstr[1] "%d rossz aláírás.\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Jó aláírás a következőtől: \""
+msgstr[1] "Jó aláírás a következőtől: \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "\"%s\" kulcskarikát létrehoztam.\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "\"%s\" kulcskarikát létrehoztam.\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
@@ -4246,8 +4331,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
@@ -4457,7 +4542,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "A kulcsot visszavonták."
 
@@ -4515,7 +4600,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
@@ -4602,7 +4687,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Kilépjek mentés nélkül? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem változott, nincs szükség frissítésre.\n"
@@ -4650,106 +4735,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   aláírva %08lX által %s%s időpontban.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Jellemzők: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Jelölés: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozható létre: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4757,19 +4857,19 @@
 "Kérem, vegye figyelembe, hogy az itt látható kulcs érvényessége nem\n"
 "feltétlenül helyes, amíg újra nem indítja a programot!\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4778,18 +4878,18 @@
 "FIGYELEM: Nincs kijelölt elsődleges felhasználóazonosító. Ez a parancs\n"
 " azt okozhatja, hogy egy másik azonosító lesz elsődlegesként használva.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4799,35 +4899,35 @@
 "okozhatja,\n"
 "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Továbbra is hozzá akarja adni? (i/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Törli ezt a jó aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Valóban törli ezt az önaláírást? (i/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4835,38 +4935,38 @@
 msgstr[0] "Töröltem %d aláírást.\n"
 msgstr[1] "Töröltem %d aláírást.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nem töröltem semmit.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "érvénytelen páncél"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
 msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4876,310 +4976,305 @@
 "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Felülírjam (i/N)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   aláírva %08lX által %s%s%s időpontban.\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s időpontban.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) "
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   aláírva %08lX által %s%s időpontban.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ön aláírta a következő felhasználóazonosítókat:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX által %s időpontban.\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következő aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhasználóazonosítót %d másodperccel a jövőben írták alá.\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Sima aláírást írok.\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "Önaláírást írok.\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Összefűző aláírást írok.\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkosítása"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5193,169 +5288,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak aláírás)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak aláírás)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (csak aláírás)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "kulcs tiltása"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A kívánt kulcsméret %u bit.\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5371,7 +5466,7 @@
 "      <n>m = a kulcs n hónapig érvényes\n"
 "      <n>y = a kulcs n évig érvényes\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5387,40 +5482,40 @@
 "      <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:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Meddig érvényes a kulcs? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig érvényes az aláírás? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lejár: %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5428,12 +5523,12 @@
 "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:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez így helyes (i/n)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5444,7 +5539,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5461,50 +5556,50 @@
 "    \"Heinrich Heine (a költő) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Teljes név: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "A név legalább 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-mail cím: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Megjegyzés: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Érvénytelen karakter a megjegyzésben!\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Ön a(z) %s karakterkódolást használja.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5515,7 +5610,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5530,37 +5625,32 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
-msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
+msgstr "(N)év, (E)-mail megváltoztatása vagy (K)ilépés? "
 
-#: g10/keygen.c:2930
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (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? "
+msgstr "(N)év, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Kérem, előbb javítsa ki a hibát!\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5572,13 +5662,13 @@
 "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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5586,69 +5676,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kulcs létrehozása megszakítva.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, 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:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "Írom a kulcsot a %s állományba.\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 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:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5658,38 +5748,38 @@
 "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, 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:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, 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:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Valóban létrehozzam? "
@@ -5726,22 +5816,6 @@
 msgstr[0] "%d rossz aláírás.\n"
 msgstr[1] "%d rossz aláírás.\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d rossz aláírás.\n"
-msgstr[1] "%d rossz aláírás.\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
-msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5761,30 +5835,30 @@
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Elsődlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Elsődlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5815,7 +5889,7 @@
 msgstr[0] "1 rossz aláírás.\n"
 msgstr[1] "1 rossz aláírás.\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarikát létrehoztam.\n"
@@ -5868,462 +5942,462 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 msgstr[1] "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Aláírva az Ön %08lX kulcsával %s időpontban.\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa méretű (%d) titkosított munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkosított munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilvános kulcs: %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkosítva %u bites %s kulccsal, azonosító: %08lX, létrehozva: %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkosított adatot feltételezek.\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelező nem áll rendelkezésre, optimista módon megpróbálok\n"
 "%s-t használni helyette.\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az üzenetet nem látták el integritásvédelemmel.\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "Visszafejtés rendben.\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZÉS: A feladó kérése: \"csak az Ön szemeinek\".\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti fájlnév: '%.*s'.\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Különálló visszavonás. Használja a \"gpg --import\"-ot az alkalmazásához!\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ aláírás a következőtől: \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lejárt aláírás a következőtől: \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a többszörös aláírásokat!\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Kulcs található: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "Bináris"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "ismeretlen nyilvános kulcsú algoritmus"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "Nem különálló aláírás.\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: Többszörös aláírást érzékeltem. Csak az elsőt ellenőrzöm.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x osztályú különálló aláírás.\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
 "a címzett preferenciáival.\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megvalósított rejtjelező algoritmus"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
 "a címzett preferenciáival.\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opció: \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Kérem, ezt használja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "tömörítetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "tömörítetlen"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az üzenet használhatatlan a %s számára!\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "ismeretlen aláírásosztály"
@@ -6359,80 +6433,80 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "Azt feltételezem, hogy az aláírt adat a %s állományban van.\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztonságos!\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritikus aláírás-jelölés: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Írja be a jelszót!\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "A felhasználó megszakította a műveletet.\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (fő kulcsazonosító: %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6484,7 +6558,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fotó megfelelő (i/N/k)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n"
@@ -6798,12 +6872,12 @@
 msgid "no valid addressees\n"
 msgstr "Nincsenek érvényes címzettek!\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -6858,27 +6932,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Rendben, mi vagyunk az anonim címzett.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "A DEK régi kódolása nem támogatott.\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "A %d%s rejtjelező algoritmus ismeretlen vagy tiltott.\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "MEGJEGYZÉS: %d rejtjelező algoritmus nincs a preferenciák között.\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7066,7 +7140,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "FIGYELEM: Aláíráskivonat-konfliktus az üzenetben.\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7132,31 +7206,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "0x%02x osztályú különálló aláírás.\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "0x%02x osztályú különálló aláírás.\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Rossz aláírást feltételezek a %08lX kulcstól egy ismeretlen\n"
 "kritikus bit miatt.\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavonó csomaghoz.\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcskötő aláíráshoz!\n"
@@ -7187,12 +7261,12 @@
 "hosszú).\n"
 "Kifejtés nélkül használom.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s aláírás a következőtől: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7200,12 +7274,12 @@
 "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
 "a címzett preferenciáival.\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "Aláírom:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkosítást fogok használni.\n"
@@ -7234,7 +7308,7 @@
 "Kihagytam \"%s\"-t: ez egy PGP által létrehozott ElGamal kulcs, amely nem\n"
 "biztonságos aláírásokhoz!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
@@ -7282,12 +7356,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
@@ -7297,12 +7371,12 @@
 msgid "can't lock '%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, 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"
@@ -7317,104 +7391,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Könyvtár nem létezik!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: Érvénytelen bizalmi adatbázis jött létre.\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatbázis létrejött.\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "MEGJEGYZÉS: Bizalmi adatbázis nem írható.\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: Érvénytelen bizalmi adatbázis.\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verziórekord frissítésekor: %s.\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verziórekord olvasásakor: %s.\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verziórekord írásakor: %s.\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatbázis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatbázis.\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verziórekord, rekordszám: %lu.\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: Érvénytelen állományverzió (%d).\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, 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:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: Bizalmi adatbázis létrejött.\n"
@@ -7785,106 +7859,106 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "\"%s\" nem egy érvényes hosszú kulcsazonosító.\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "%08lX kulcs: Elfogadva megbízható kulcsként.\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "A(z) %08lX kulcs egynél többször szerepel a bizalmi adatbázisban.\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "%08lX kulcs: Nincs nyilvános kulcs a megbízható kulcshoz - kihagytam.\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "A kulcsot alapvetően megbízhatónak jelöltem.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "%lu bizalmi rekord, %d kéréstípus: olvasás sikertelen: %s.\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a kért típusú (%d).\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatbázis következő ellenőrzése: %s.\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "Eddig %lu kulcsot dolgoztam fel.\n"
 msgstr[1] "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7892,23 +7966,23 @@
 msgstr[0] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 msgstr[1] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem találom az alapvetően megbízható %08lX kulcs nyilvános kulcsát!\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
@@ -8023,110 +8097,125 @@
 "List, export, import Keybox data\n"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "jelszóváltoztatás"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "jelszóváltoztatás"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, 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:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -8134,55 +8223,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8192,27 +8269,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8220,123 +8297,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, 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:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nem támogatott URI"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Kulcsgenerálás sikertelen: %s\n"
 msgstr[1] "Kulcsgenerálás sikertelen: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, 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:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@ -8353,376 +8430,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne használja a terminált egyáltalán"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: Nem tudom elérni: %s.\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "              új aláírások: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "aláírás ellenőrzése"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "nem feldolgozott"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "nem"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8736,137 +8831,137 @@
 "\"%.*s\"\n"
 "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9007,7 +9102,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@ -9032,134 +9127,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Nincs leírás.)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok listázása"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "ne használja a terminált egyáltalán"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "kötegelt mód: soha nem kérdez"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "igen válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "nem válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "kulcskarika hozzáadása a kulcskarikalistához"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9170,47 +9265,47 @@
 "Aláírás, ellenőrzés, titkosítás vagy visszafejtés.\n"
 "Az alapértelmezett művelet a bemeneti adattól függ.\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nincs leírás.)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " h = kulcs kihagyása\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9230,7 +9325,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@ -9240,42 +9335,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9305,7 +9395,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9335,38 +9425,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+msgid "algorithm:"
+msgstr "Páncél: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Jó aláírás a következőtől: \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "               azaz \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9437,543 +9527,544 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "rossz igazolás"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "Hiba a záró sorban!\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "FIGYELEM: Érvénytelen méretű random_seed állomány. Nem használom.\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "Érvénytelen válasz az ügynöktől!\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "FIGYELEM: Érvénytelen méretű random_seed állomány. Nem használom.\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -10012,64 +10103,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "rossz igazolás"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "rossz igazolás"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "rossz igazolás"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "rossz igazolás"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10077,88 +10168,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "Nem tudom a stat műveletet elvégezni a(z) \"%s\" állományon: %s.\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Támogatott algoritmusok:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10184,95 +10275,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Kilépjek mentés nélkül? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10285,301 +10376,295 @@
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "Használat: gpg [opciók] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nem feldolgozott"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NÉV|terminál karakterkódolásának megadása"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "Olvasok a \"%s\" állományból.\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "    felh. azonosító nélkül: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "               azaz \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "               azaz \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "             nem importált: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "               azaz \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "               azaz \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Nincs leírás.)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "FIGYELEM: Nem biztonságos memóriát használunk!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" nem JPEG állomány.\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10630,7 +10715,7 @@
 msgid "malloc failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10762,12 +10847,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: Nem tudom elérni: %s.\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10838,7 +10917,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
@@ -10868,33 +10947,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10935,101 +11014,101 @@
 msgid "certificate chain is good\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "kilépés|kilepes"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -11228,302 +11307,234 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Kérem, használja előbb a \"toggle\" parancsot!\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "kimeneti állomány megadása"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilvános kulcs nem található"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Parancsok:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "Visszafejtés rendben.\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "Visszafejtés rendben.\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Parancsok:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [fájlnév]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "Visszafejtés rendben.\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s és %s nem használható együtt!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "Nem tudom megnyitni az állományt: %s.\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "Nem tudom megnyitni %s-t: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
+#~ msgid "encryption modus"
+#~ msgstr "Visszafejtés rendben.\n"
 
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [fájlnév]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "Külső program meghívása nem támogatott.\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s és %s nem használható együtt!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s nem hozható létre: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "Nem tudom megnyitni %s-t: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s nem hozható létre: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "A kulcsblokk törlése sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "Külső program meghívása nem támogatott.\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s nem hozható létre: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s nem hozható létre: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "%d%s védő algoritmus nem támogatott.\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "%d%s védő algoritmus nem támogatott.\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11614,36 +11625,6 @@
 #~ msgstr "Frissítés sikertelen: %s.\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Jó aláírás a következőtől: \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "Kihagytam \"%s\"-t: %s.\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
-#~ msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Jó aláírás a következőtől: \""
-#~ msgstr[1] "Jó aláírás a következőtől: \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
@@ -12757,9 +12738,6 @@
 #~ msgid "file delete error"
 #~ msgstr "állománytörlési hiba"
 
-#~ msgid "unexpected data"
-#~ msgstr "nem várt adat"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "időbélyeg-konfliktus"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/id.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/id.gmo sont différents
diff -Nru gnupg2-2.2.20/po/id.po gnupg2-2.2.27/po/id.po
--- gnupg2-2.2.20/po/id.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/id.po	2021-01-11 18:47:18.000000000 +0100
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -31,40 +31,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -72,7 +72,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -82,35 +82,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -118,40 +118,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
@@ -161,33 +165,33 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -245,7 +249,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
@@ -377,20 +381,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -400,124 +404,124 @@
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Kunci dilampaui"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di keyserver"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -526,180 +530,166 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "file pilihan `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -707,9 +697,9 @@
 "@Perintah:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -719,52 +709,52 @@
 "Pilihan:\n"
 "  "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -774,32 +764,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -812,19 +802,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -837,7 +827,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -847,59 +837,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "ubah passphrase"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "aktifkan kunci"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -909,7 +899,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@ -919,7 +909,7 @@
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -951,7 +941,7 @@
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -998,27 +988,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
@@ -1079,7 +1069,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -1202,7 +1192,7 @@
 msgstr "armor: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1286,44 +1276,44 @@
 msgid "Root certificate trustworthy"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versi tidak dikenal"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -1333,7 +1323,7 @@
 msgid "ignoring garbage line"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "tidak dikenal"
@@ -1343,92 +1333,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "kesalahan baca file"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "baris terlalu panjang\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "argumen tidak valid"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "armor tidak valid"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "perintah saling konflik\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opsi impor tidak valid\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "tidak diproses"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "perintah saling konflik\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "penerima baku tidak dikenal `%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "data tidak terduga"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "opsi impor tidak valid\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "tidak diproses"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "file pilihan `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1444,42 +1466,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1669,14 +1690,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@ -1719,24 +1740,24 @@
 msgid "server uses an invalid certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@ -1746,246 +1767,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1993,184 +2014,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2233,8 +2254,8 @@
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
@@ -2259,98 +2280,105 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
@@ -2452,7 +2480,7 @@
 msgstr "%s: dilewati: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2490,286 +2518,292 @@
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "buat sepasang kunci baru"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "ekspor kunci ke keyserver"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "cari kunci di keyserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2777,7 +2811,7 @@
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2807,13 +2841,13 @@
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2828,7 +2862,7 @@
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2836,587 +2870,574 @@
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3616,7 +3637,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -3626,7 +3647,7 @@
 msgid "key %s: %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3650,7 +3671,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
@@ -3665,7 +3686,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3736,18 +3757,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -3760,233 +3781,297 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Signature baik dari \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "melewati `%s': %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "User ID \"%s\" dibatalkan."
+msgstr[1] "User ID \"%s\" dibatalkan."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
+msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d signature yang buruk\n"
+msgstr[1] "%d signature yang buruk\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Signature baik dari \""
+msgstr[1] "Signature baik dari \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
@@ -4251,8 +4336,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -4462,7 +4547,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
@@ -4520,7 +4605,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
@@ -4607,7 +4692,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
@@ -4655,106 +4740,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   ditandai oleh %08lX pada %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "Gagal memeriksa signature yang dibuat: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4762,19 +4862,19 @@
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4783,18 +4883,18 @@
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4804,35 +4904,35 @@
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4840,38 +4940,38 @@
 msgstr[0] "Menghapus %d signature.\n"
 msgstr[1] "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID \"%s\" dibatalkan."
 msgstr[1] "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4881,46 +4981,46 @@
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -4928,267 +5028,262 @@
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   ditandai oleh %08lX pada %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5202,169 +5297,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notasi signature: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "tiadakan kunci"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5380,7 +5475,7 @@
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5396,40 +5491,40 @@
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5437,12 +5532,12 @@
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5453,7 +5548,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5469,50 +5564,50 @@
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5522,7 +5617,7 @@
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5537,35 +5632,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5577,13 +5672,13 @@
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5591,69 +5686,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5663,37 +5758,37 @@
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, 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:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, 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:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
@@ -5730,22 +5825,6 @@
 msgstr[0] "%d signature yang buruk\n"
 msgstr[1] "%d signature yang buruk\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d signature yang buruk\n"
-msgstr[1] "%d signature yang buruk\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
-msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5765,30 +5844,30 @@
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5819,7 +5898,7 @@
 msgstr[0] "1 signature yang buruk\n"
 msgstr[1] "1 signature yang buruk\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
@@ -5872,455 +5951,455 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "meminta kunci %08lX dari %s\n"
 msgstr[1] "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritma pubkey tidak dikenal"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "kelas signature tidak dikenal"
@@ -6356,77 +6435,77 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6480,7 +6559,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
@@ -6793,12 +6872,12 @@
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -6852,27 +6931,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7062,7 +7141,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7130,31 +7209,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
 "dikenal\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
@@ -7183,23 +7262,23 @@
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -7228,7 +7307,7 @@
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -7276,12 +7355,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -7291,12 +7370,12 @@
 msgid "can't lock '%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -7311,104 +7390,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: tercipta trustdb\n"
@@ -7779,105 +7858,105 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu kunci telah diproses\n"
 msgstr[1] "%lu kunci telah diproses\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7885,23 +7964,23 @@
 msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
 msgstr[1] "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -8016,110 +8095,125 @@
 "List, export, import Keybox data\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "ubah passphrase"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "ubah passphrase"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "hapus kunci dari keyring publik"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -8127,55 +8221,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8185,27 +8267,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8213,123 +8295,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI tidak didukung"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Pembuatan kunci gagal: %s\n"
 msgstr[1] "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -8346,376 +8428,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "bantuan"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: tidak dapat mengakses: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "       signature baru: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "tidak diproses"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "n|t|tidak"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8728,137 +8828,137 @@
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9000,7 +9100,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -9025,134 +9125,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9163,47 +9263,47 @@
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = lewati kunci ini\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9223,7 +9323,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -9233,42 +9333,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "gagal inisialisasi TrustDB: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9298,7 +9393,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9328,38 +9423,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Signature kadaluwarsa %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
+msgid "algorithm:"
+msgstr "armor: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9430,543 +9525,544 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "algoritma hash tidak valid `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "algoritma hash tidak valid `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet gagal: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -10005,64 +10101,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10070,88 +10166,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10177,95 +10273,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Berhenti tanpa menyimpan? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10278,301 +10374,295 @@
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "tidak diproses"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "opsi impor tidak valid\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "              alias \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10623,7 +10713,7 @@
 msgid "malloc failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10755,12 +10845,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: tidak dapat mengakses: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10831,7 +10915,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -10861,33 +10945,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10928,101 +11012,101 @@
 msgid "certificate chain is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -11221,302 +11305,234 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "perbarui database trust"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Perintah:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "dekripsi lancar\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "dekripsi lancar\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Perintah:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [namafile]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "dekripsi lancar\n"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
-
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s tidak dibolehkan dengan %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "tidak dapat membuka file: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "tidak dapat membuat direktori `%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "tidak dapat membuka %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
+#~ msgid "encryption modus"
+#~ msgstr "dekripsi lancar\n"
 
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [namafile]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "tidak ada eksekusi program remote yang didukung\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "tidak dapat membuka file: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "tidak dapat membuka %s: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "algoritma proteksi %d%s tidak didukung\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "kesalahan penciptaan passphrase: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11607,36 +11623,6 @@
 #~ msgstr "gagal memperbarui: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%s signature, algoritma digest %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Signature baik dari \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "melewati `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "User ID \"%s\" dibatalkan."
-#~ msgstr[1] "User ID \"%s\" dibatalkan."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Signature baik dari \""
-#~ msgstr[1] "Signature baik dari \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "file konfigurasi baru `%s' tercipta\n"
@@ -12755,9 +12741,6 @@
 #~ msgid "file delete error"
 #~ msgstr "kesalahan hapus file"
 
-#~ msgid "unexpected data"
-#~ msgstr "data tidak terduga"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "konflik timestamp"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/it.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/it.gmo sont différents
diff -Nru gnupg2-2.2.20/po/it.po gnupg2-2.2.27/po/it.po
--- gnupg2-2.2.20/po/it.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/it.po	2021-01-11 18:47:18.000000000 +0100
@@ -1,24 +1,25 @@
 # GnuPG italian translation
 # Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
 # Marco d'Itri <md@linux.it>, 1998, 1999, 2001, 2002.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.1.92\n"
+"Project-Id-Version: GNU gnupg 2.2.23\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2008-05-26 12:02+0200\n"
-"Last-Translator: Marco d'Itri <md@linux.it>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-10-10 19:54+0200\n"
+"Last-Translator: Denis <student@alice.it>\n"
+"Language-Team: \n"
+"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.4.1\n"
 
-#: agent/call-pinentry.c:322
-#, fuzzy, c-format
+#: agent/call-pinentry.c:323
+#, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "impossibile acquisire il blocco pinentry: %s\n"
 
 #. TRANSLATORS: These are labels for buttons etc used in
 #. Pinentries.  An underscore indicates that the next letter
@@ -26,50 +27,47 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
-msgstr ""
+msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
-msgstr ""
+msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
-msgstr ""
+msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
-msgstr ""
+msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
-msgstr ""
+msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
-msgstr ""
+msgstr "|pinentry-label|_Save in gestione password"
 
-#: agent/call-pinentry.c:534
-#, fuzzy
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr "Vuoi davvero rendere la tua passphrase visibile sullo schermo?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
-msgstr ""
+msgstr "|pinentry-tt|Rendere visibile la passphrase"
 
-#: agent/call-pinentry.c:537
-#, fuzzy
-#| msgid "invalid passphrase"
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
-msgstr "passphrase non valida"
+msgstr "|pinentry-tt|Nascondi passphrase"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
-msgstr ""
+msgstr "Qualità:"
 
 #. TRANSLATORS: This string is a tooltip, shown by pinentry when
 #. hovering over the quality bar.  Please use an appropriate
@@ -77,136 +75,135 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
-msgstr ""
+msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
+"Inserisci il tuo PIN, in modo che la chiave segreta possa essere sbloccata "
+"per questa sessione"
 
-#: agent/call-pinentry.c:1013
-#, fuzzy
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr ""
+"Inserisci la tua passphrase, in modo che la chiave segreta possa essere "
+"sbloccata per questa sessione"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
-msgstr ""
+msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
-#, fuzzy
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
-msgstr "passphrase errata"
+msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
-msgstr ""
+msgstr "non corrisponde - riprova"
 
 #. TRANSLATORS: 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.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
-msgstr ""
+msgstr "SETERROR %s (provare %d di %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
-msgstr ""
+msgstr "Ripeti :"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
-#, fuzzy
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
-msgstr "riga troppo lunga\n"
+msgstr "PIN troppo lungo"
 
-#: agent/call-pinentry.c:1139
-#, fuzzy
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
-msgstr "passphrase troppo lunga\n"
+msgstr "Passphrase troppo lunga"
 
-#: agent/call-pinentry.c:1147
-#, fuzzy
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
-msgstr "Carattere non valido nel nome\n"
+msgstr "Caratteri non validi nel PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
-msgstr ""
+msgstr "PIN troppo corto"
 
-#: agent/call-pinentry.c:1171
-#, fuzzy
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
-msgstr "MPI danneggiato"
+msgstr "PIN non valido"
 
-#: agent/call-pinentry.c:1171
-#, fuzzy
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
-msgstr "passphrase errata"
+msgstr "Passphrase non valido"
 
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
-#, fuzzy, c-format
+#, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+msgstr "le chiavi ssh maggiori di %d bit non sono supportate\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
-#, fuzzy, c-format
-#| msgid "can't create `%s': %s\n"
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
+#, c-format
 msgid "can't create '%s': %s\n"
-msgstr "impossibile creare `%s': %s\n"
+msgstr "impossibile creare '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
-#, fuzzy, c-format
-#| msgid "can't open `%s': %s\n"
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
+#, c-format
 msgid "can't open '%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile aprire '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "error getting serial number of card: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero del numero di serie della scheda: %s\n"
 
 #: agent/command-ssh.c:2435
 #, c-format
 msgid "detected card with S/N: %s\n"
-msgstr ""
+msgstr "scheda rilevata con S/N: %s\n"
 
 #: agent/command-ssh.c:2440
-#, fuzzy, c-format
+#, c-format
 msgid "no authentication key for ssh on card: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr "nessuna chiave di autenticazione per ssh sulla scheda: %s\n"
 
 #: agent/command-ssh.c:2460
-#, fuzzy, c-format
+#, c-format
 msgid "no suitable card key found: %s\n"
-msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
+msgstr "nessuna chiave della scheda adatta trovata: %s\n"
 
 #: agent/command-ssh.c:2587
-#, fuzzy, c-format
+#, c-format
 msgid "error getting list of cards: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero dell'elenco delle schede: %s\n"
 
 #: agent/command-ssh.c:2765
 #, c-format
@@ -214,127 +211,123 @@
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
+"Un processo ssh ha richiesto l'utilizzo della chiave%%0A  %s%%0A  (%s)%%0ASi "
+"desidera consentire questa operazione?"
 
 #: agent/command-ssh.c:2772
 msgid "Allow"
-msgstr ""
+msgstr "Permettere"
 
 #: agent/command-ssh.c:2772
 msgid "Deny"
-msgstr ""
+msgstr "Rifiutare"
 
 #: agent/command-ssh.c:2781
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr "Immettere la passphrase per la chiave ssh%%0A %F%%0A (%c)"
 
 #: agent/command-ssh.c:3058 agent/genkey.c:351
-#, fuzzy
 msgid "Please re-enter this passphrase"
-msgstr "cambia la passphrase"
+msgstr "Inserisci di nuovo questa passphrase"
 
 #: agent/command-ssh.c:3085
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr ""
+"Immettere una passphrase per proteggere la chiave segreta ricevuta%%0A %s"
+"%%0A %s%%0A all'interno dell'archivio chiavi dell'agente gpg"
 
-#: agent/command-ssh.c:3666
-#, fuzzy, c-format
+#: agent/command-ssh.c:3667
+#, c-format
 msgid "failed to create stream from socket: %s\n"
-msgstr "%s: creazione della tabella hash fallita: %s\n"
+msgstr "impossibile creare il flusso dal socket: %s\n"
 
 #: agent/divert-scd.c:117
 msgid "Please insert the card with serial number"
-msgstr ""
+msgstr "Inserire la scheda con il numero di serie"
 
 #: agent/divert-scd.c:118
 msgid "Please remove the current card and insert the one with serial number"
-msgstr ""
+msgstr "Rimuovere la carta corrente e inserire quella con il numero di serie"
 
 #: agent/divert-scd.c:246
 msgid "Admin PIN"
-msgstr ""
+msgstr "PIN amministratore"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
 #: agent/divert-scd.c:251
 msgid "PUK"
-msgstr ""
+msgstr "PUK"
 
 #: agent/divert-scd.c:258
 msgid "Reset Code"
-msgstr ""
+msgstr "Resetta codice"
 
 #: agent/divert-scd.c:286
 msgid "Push ACK button on card/token."
-msgstr ""
+msgstr "Premere il pulsante ACK sulla scheda/token."
 
 #: agent/divert-scd.c:308 agent/divert-scd.c:312
 msgid "Use the reader's pinpad for input."
-msgstr ""
+msgstr "Utilizzare il pinpad del lettore per l'input."
 
 #: agent/divert-scd.c:378
-#, fuzzy
 msgid "Repeat this Reset Code"
-msgstr "Ripeti la passphrase: "
+msgstr "Ripeti questo codice di reimpostazione"
 
 #: agent/divert-scd.c:380
-#, fuzzy
 msgid "Repeat this PUK"
-msgstr "Ripeti la passphrase: "
+msgstr "Ripeti questo PUK"
 
 #: agent/divert-scd.c:381
-#, fuzzy
 msgid "Repeat this PIN"
-msgstr "Ripeti la passphrase: "
+msgstr "Ripeti questo PIN"
 
 #: agent/divert-scd.c:386
-#, fuzzy
 msgid "Reset Code not correctly repeated; try again"
-msgstr "passphrase non ripetuta correttamente; prova ancora"
+msgstr "Reimpostare il codice non ripetuto correttamente; Riprova"
 
 #: agent/divert-scd.c:388
-#, fuzzy
 msgid "PUK not correctly repeated; try again"
-msgstr "passphrase non ripetuta correttamente; prova ancora"
+msgstr "PUK non ripetuto correttamente; Riprova"
 
 #: agent/divert-scd.c:389
-#, fuzzy
 msgid "PIN not correctly repeated; try again"
-msgstr "passphrase non ripetuta correttamente; prova ancora"
+msgstr "PIN non ripetuto correttamente; Riprova"
 
 #: agent/divert-scd.c:402
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
-msgstr ""
+msgstr "Immettere il PIN%s%s%s per sbloccare la scheda"
 
 #: agent/genkey.c:110 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "error creating temporary file: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la creazione del file temporaneo: %s\n"
 
 #: agent/genkey.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "error writing to temporary file: %s\n"
-msgstr "scrittura in `%s'\n"
+msgstr "errore durante la scrittura nel file temporaneo: %s\n"
 
 #: agent/genkey.c:158 agent/genkey.c:164
-#, fuzzy
 msgid "Enter new passphrase"
-msgstr "Inserisci la passphrase\n"
+msgstr "Inserisci la nuova passphrase"
 
 #: agent/genkey.c:172
-#, fuzzy
 msgid "Take this one anyway"
-msgstr "Uso lo stesso questa chiave? "
+msgstr "Prendi questo comunque"
 
 #: agent/genkey.c:202
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
+"Non è stata immessa una passphrase!%0AUna passphrase vuota non è consentita."
 
 #: agent/genkey.c:204
 #, c-format
@@ -342,18 +335,20 @@
 "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 ""
+"Non è stata inserita una passphrase- in generale è una cattiva idea!%0ASi "
+"prega di confermare che non si desidera disporre di alcuna protezione sulla "
+"chiave."
 
 #: agent/genkey.c:216
 msgid "Yes, protection is not needed"
-msgstr ""
+msgstr "Sì, la protezione non è necessaria"
 
 #: agent/genkey.c:233
-#, fuzzy, c-format
-#| msgid "Name must be at least 5 characters long\n"
+#, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
-msgstr[0] "Il nome deve essere lungo almeno 5 caratteri\n"
-msgstr[1] "Il nome deve essere lungo almeno 5 caratteri\n"
+msgstr[0] "Una passphrase deve avere almeno lunga %u carattere."
+msgstr[1] "Una passphrase deve avere almeno lunga %u caratteri."
 
 #: agent/genkey.c:252
 #, c-format
@@ -361,340 +356,311 @@
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
+"Una passphrase deve contenere almeno %u cifra o%%0Acarattere speciale."
 msgstr[1] ""
+"Una passphrase deve contenere almeno %u cifre o%%0Acaratteri speciali."
 
 #: agent/genkey.c:278
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
+"Una passphrase non può essere un termine noto o corrispondere%%0Acertain "
+"modello."
 
 #: agent/genkey.c:293
 msgid "Warning: You have entered an insecure passphrase."
-msgstr ""
+msgstr "Avviso: è stata immessa una passphrase non sicura."
 
-#: agent/genkey.c:480
-#, fuzzy, c-format
+#: agent/genkey.c:482
+#, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr ""
-"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
-"\n"
+msgstr "Immettere la passphrase a%0Aproteggere la nuova chiave"
 
-#: agent/genkey.c:606
-#, fuzzy
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
-msgstr "cambia la passphrase"
+msgstr "Inserisci la nuova passphrase"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
-#, fuzzy
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
 msgstr ""
-"@\n"
-"Opzioni:\n"
+"@Optioni:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
-msgstr ""
+msgstr "eseguire in modalità daemon (sfondo)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
-msgstr ""
+msgstr "eseguire in modalità server (in primo piano)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
-#, fuzzy
-#| msgid "Key is superseded"
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
-msgstr "Questa chiave è stata sostituita"
+msgstr "eseguire in modalità supervisionata"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
-msgstr ""
+msgstr "uscita del comando sh-stile"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
-msgstr ""
+msgstr "uscita del comando in csh-stile"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
-#, fuzzy
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|opzioni di lettura da FILE"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
-msgstr ""
+msgstr "non scollegarsi dalla console"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
-#, fuzzy
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
-msgstr "cerca delle chiavi su un keyserver"
+msgstr "utilizzare un file di registro per il server"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr ""
+msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
-msgstr ""
+msgstr "| PGM| utilizzare PGM come programma SCdaemon"
 
-#: agent/gpg-agent.c:192
-#, fuzzy
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
-msgstr "aggiorna il database della fiducia"
+msgstr "non utilizzare il SCdaemon"
 
-#: agent/gpg-agent.c:196
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
-msgstr "|NOME|imposta NOME come set di caratteri del terminale"
+msgstr "|NAME|accettare alcuni comandi tramite NAME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
-msgstr ""
+msgstr "ignorare le richieste di modifica del TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
-msgstr ""
+msgstr "ignorare le richieste di modifica della visualizzazione X"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
-msgstr ""
+msgstr "|N|scadenza PIN memorizzati nella cache dopo N secondi"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
-msgstr ""
+msgstr "non utilizzare la cache PIN durante la firma"
 
-#: agent/gpg-agent.c:233
-#, fuzzy
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "non consentire l'uso di una cache di password esterna"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
+"non consentire ai client di contrassegnare le chiavi come \"attendibili\""
 
-#: agent/gpg-agent.c:238
-#, fuzzy
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "consentire la preimpostazione della passphrase"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
-msgstr ""
+msgstr "non consentire al chiamante di eseguire l'override del pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
-msgstr ""
+msgstr "consentire la passphrase tramite Emacs"
 
-#: agent/gpg-agent.c:245
-#, fuzzy
-#| msgid "not supported"
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
-msgstr "non gestito"
+msgstr "abilitare il supporto ssh"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr ""
+msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
 
-#: agent/gpg-agent.c:250
-#, fuzzy
-#| msgid "not supported"
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
-msgstr "non gestito"
+msgstr "abilitare il supporto putty"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
-#, fuzzy
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
-msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
+msgstr "Segnalare i bug a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
-#, fuzzy
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @GPG_AGENT@ [opzioni] (-h per assistenza)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
+"Sintassi: @GPG_AGENT@ [opzioni] [comando [args]]\n"
+"Gestione delle chiavi segrete per @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
-msgstr ""
+msgstr "'%s' a livello di debug non valido specificato\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "file con le opzioni `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
-#, fuzzy, c-format
-#| msgid "reading options from `%s'\n"
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
+#, c-format
 msgid "reading options from '%s'\n"
-msgstr "lettura delle opzioni da `%s'\n"
+msgstr "opzioni di lettura da '%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is a deprecated option\n"
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
+#, c-format
 msgid "Note: '%s' is not considered an option\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+msgstr "Nota: '%s' non è considerato un'opzione\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
+#, c-format
 msgid "can't create socket: %s\n"
-msgstr "impossibile creare %s: %s\n"
+msgstr "impossibile creare il socket: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
-msgstr ""
+msgstr "il nome socket '%s' è troppo lungo\n"
 
-#: agent/gpg-agent.c:2240
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2215
+#, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
-msgstr "gpg-agent non è disponibile in questa sessione\n"
+msgstr "un gpg-agent è già in esecuzione - non iniziare uno nuovo\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
+#, c-format
 msgid "error getting nonce for the socket\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero di un errore per il socket\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
+#, c-format
 msgid "error binding socket to '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'associazione del socket a '%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
+#, c-format
 msgid "can't set permissions of '%s': %s\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr "impossibile impostare le autorizzazioni di '%s': %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
+#, c-format
 msgid "listening on socket '%s'\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "ascolto sul socket '%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
+#, c-format
 msgid "can't create directory '%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr "impossibile creare la directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
+#, c-format
 msgid "directory '%s' created\n"
-msgstr "%s: directory creata\n"
+msgstr "directory '%s' creata\n"
 
-#: agent/gpg-agent.c:2355
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2340
+#, c-format
 msgid "stat() failed for '%s': %s\n"
-msgstr "trustdb: read fallita (n=%d): %s\n"
+msgstr "stat() non riuscito per '%s': %s\n"
 
-#: agent/gpg-agent.c:2359
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2344
+#, c-format
 msgid "can't use '%s' as home directory\n"
-msgstr "%s: impossibile creare la directory: %s\n"
+msgstr "impossibile utilizzare '%s' come home directory\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
-#, fuzzy, c-format
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
+#, c-format
 msgid "error reading nonce on fd %d: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura del nonce su fd %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
-msgstr ""
+msgstr "gestore 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
-msgstr ""
+msgstr "gestore 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
-msgstr ""
+msgstr "gestore ssh 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
-msgstr ""
+msgstr "gestore ssh 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
-#, fuzzy, c-format
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
+#, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "npth_pselect non riuscito: %s - 1s in attesa\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
-#, fuzzy, c-format
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
+#, c-format
 msgid "%s %s stopped\n"
-msgstr "%s: saltata: %s\n"
+msgstr "%s %s arrestato\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
-#, fuzzy, c-format
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
+#, c-format
 msgid "no gpg-agent running in this session\n"
-msgstr "gpg-agent non è disponibile in questa sessione\n"
+msgstr "nessun gpg-agent in esecuzione in questa sessione\n"
 
-#: agent/preset-passphrase.c:101
-#, fuzzy
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
+"Sintassi: gpg-preset-passphrase [opzioni] KEYGRIP\n"
+"Manutenzione della cache delle password\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -702,9 +668,9 @@
 "@Comandi:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -714,90 +680,94 @@
 "Opzioni:\n"
 " "
 
-#: agent/protect-tool.c:155
-#, fuzzy
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: gpg-protect-tool [opzioni] (-h per assistenza)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
+"Sintassi: gpg-protect-tool [opzioni] [args]\n"
+"Strumento di manutenzione della chiave segreta\n"
 
-#: agent/protect-tool.c:694
-#, fuzzy
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr ""
+"Immettere la passphrase per rimuovere la protezione dell'oggetto PKCS.12."
 
-#: agent/protect-tool.c:699
-#, fuzzy
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr "Immettere la passphrase per proteggere il nuovo oggetto PKCS.12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
+"Immettere la passphrase per proteggere l'oggetto importato all'interno del "
+"sistema GnuPG."
 
-#: agent/protect-tool.c:710
-#, fuzzy
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr ""
+"Inserisci la passphrase o il PIN\n"
+"necessario per completare questa operazione."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
-#, fuzzy, c-format
+#: agent/protect-tool.c:730
+#, c-format
 msgid "cancelled\n"
-msgstr "Cancella"
+msgstr "annullato\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
-#, fuzzy, c-format
+#: agent/protect-tool.c:732
+#, c-format
 msgid "error while asking for the passphrase: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la richiesta della passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
-#, fuzzy, c-format
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
+#, c-format
 msgid "error opening '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'apertura di '%s': %s\n"
 
 #: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %d: %s\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "file '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
-#, fuzzy, c-format
+#: agent/trustlist.c:193 agent/trustlist.c:201
+#, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
-msgstr "errore di lettura: %s\n"
+msgstr "istruzione \"%s\" ignorata in '%s', riga %d\n"
 
-#: agent/trustlist.c:206
-#, fuzzy, c-format
+#: agent/trustlist.c:207
+#, c-format
 msgid "system trustlist '%s' not available\n"
-msgstr "parti della chiave segreta non sono disponibili\n"
+msgstr "elenco di attendibilità del sistema '%s' non disponibile\n"
 
-#: agent/trustlist.c:250
-#, fuzzy, c-format
+#: agent/trustlist.c:251
+#, c-format
 msgid "bad fingerprint in '%s', line %d\n"
-msgstr "errore di lettura: %s\n"
+msgstr "impronta digitale non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
-#, fuzzy, c-format
+#: agent/trustlist.c:276 agent/trustlist.c:283
+#, c-format
 msgid "invalid keyflag in '%s', line %d\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "keyflag non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
-#, fuzzy, c-format
+#: agent/trustlist.c:317 common/helpfile.c:136
+#, c-format
 msgid "error reading '%s', line %d: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura di '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
+"errore durante la lettura dell'elenco dei certificati radice attendibili\n"
 
 #. TRANSLATORS: This prompt is shown by the Pinentry
 #. and has one special property: A "%%0A" is used by
@@ -807,22 +777,23 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
+"Alla fine ti fidi di %% 0A \"% s\" %%0Aper certificare correttamente i "
+"certificati utente?"
 
-#: agent/trustlist.c:673 common/audit.c:467
-#, fuzzy
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
-msgstr "si|sì"
+msgstr "Sì"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. TRANSLATORS: This prompt is shown by the Pinentry and has
 #. one special property: A "%%0A" is used by Pinentry to
@@ -832,79 +803,87 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
 "fingerprint:%%0A  %s"
 msgstr ""
+"Verificare che il certificato identificato come:%%0A \"%s\"%%0Al'impronta "
+"digitale:%%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:721
+#: agent/trustlist.c:724
 msgid "Correct"
-msgstr ""
+msgstr "Corretto"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
-msgstr ""
+msgstr "Sbagliato"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
+"Nota: questa passphrase non è mai stata modificata.%0ASi prega di cambiarlo "
+"ora."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
+"Questa passphrase non è stata modificata%%0Ada %.4s-%.2s-%.2s.  Si prega di "
+"cambiarlo ora."
 
-#: agent/findkey.c:313 agent/findkey.c:320
-#, fuzzy
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
-msgstr "cambia la passphrase"
+msgstr "Modifica passphrase"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
-msgstr ""
+msgstr "Lo cambierò più tardi"
 
-#: agent/findkey.c:1504
-#, fuzzy, c-format
+#: agent/findkey.c:1522
+#, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr ""
+"Si desidera eliminare la chiave identificata da keygrip%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
-#, fuzzy
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
-msgstr "abilita una chiave"
+msgstr "Elimina chiave"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
+"Attenzione: questa chiave è elencata anche per l'uso con SSH!\n"
+"L'eliminazione della chiave potrebbe rimuovere la possibilità di accedere ai "
+"computer remoti."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr ""
+msgstr "DSA richiede che la lunghezza dell'hash sia un multiplo di 8 bit\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr ""
+msgstr "La chiave %s utilizza un hash unsafe (%u bit)\n"
 
 #: agent/pksign.c:202
 #, c-format
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
-msgstr ""
+msgstr "un hash di bit %zu non è valido per una chiave %u bit %s\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
@@ -914,114 +893,110 @@
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
-#, fuzzy, c-format
-#| msgid "protection algorithm %d%s is not supported\n"
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
+#, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+msgstr "l'algoritmo a chiave pubblica %d (%s) non è supportato\n"
 
 #: agent/cvt-openpgp.c:448
-#, fuzzy, c-format
-#| msgid "protection algorithm %d%s is not supported\n"
+#, c-format
 msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+msgstr "algoritmo di protezione %d (%s) non supportato\n"
 
 #: agent/cvt-openpgp.c:455
-#, fuzzy, c-format
-#| msgid "protection algorithm %d%s is not supported\n"
+#, c-format
 msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+msgstr "algoritmo hash di protezione %d (%s) non supportato\n"
 
 #: common/exechelp-posix.c:359 common/exechelp-w32.c:449
 #: common/exechelp-w32.c:473 common/exechelp-w32.c:503
-#, fuzzy, c-format
+#, c-format
 msgid "error creating a pipe: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la creazione di una pipe: %s\n"
 
 #: common/exechelp-posix.c:372 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:459 common/exechelp-w32.c:483
 #: common/exechelp-w32.c:513
-#, fuzzy, c-format
+#, c-format
 msgid "error creating a stream for a pipe: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la creazione di un flusso per una pipe: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
-#, fuzzy, c-format
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
+#, c-format
 msgid "error forking process: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante il processo di forking: %s\n"
 
 #: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+msgstr "in attesa della terminazione del processo %d non riuscita: %s\n"
 
 #: common/exechelp-posix.c:678 common/exechelp-posix.c:794
-#, fuzzy, c-format
+#, c-format
 msgid "error running '%s': probably not installed\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'esecuzione di '%s': probabilmente non installato\n"
 
 #: common/exechelp-posix.c:684 common/exechelp-posix.c:801
 #: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
-#, fuzzy, c-format
+#, c-format
 msgid "error running '%s': exit status %d\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'esecuzione di '%s': stato di uscita %d\n"
 
 #: common/exechelp-posix.c:692 common/exechelp-posix.c:809
-#, fuzzy, c-format
+#, c-format
 msgid "error running '%s': terminated\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'esecuzione di '%s': terminato\n"
 
 #: common/exechelp-posix.c:750 common/exechelp-w32.c:777
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for processes to terminate failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "attesa della terminazione dei processi non riuscita: %s\n"
 
 #: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
-#, fuzzy, c-format
+#, c-format
 msgid "error getting exit code of process %d: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr "errore durante l'osando di fine del processo %d: %s\n"
 
 #: common/simple-pwquery.c:261
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
+#, c-format
 msgid "can't connect to '%s': %s\n"
-msgstr "impossibile connettersi a `%s': %s\n"
+msgstr "impossibile connettersi a '%s': %s\n"
 
 #: common/simple-pwquery.c:271
-#, fuzzy, c-format
+#, c-format
 msgid "problem setting the gpg-agent options\n"
-msgstr "problema con l'agent: ha restituito 0x%lx\n"
+msgstr "problema durante l'impostazione delle opzioni gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: common/sysutils.c:250
-#, fuzzy, c-format
+#: common/sysutils.c:408
+#, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr "Avviso: proprietà non sicura su %s \"%s\"\n"
 
-#: common/sysutils.c:282
-#, fuzzy, c-format
+#: common/sysutils.c:440
+#, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr "Avviso: autorizzazioni non sicure su %s \"%s\"\n"
 
-#: common/sysutils.c:691
-#, fuzzy, c-format
+#: common/sysutils.c:881
+#, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "in attesa che il file '%s' diventi accessibile …\n"
 
-#: common/sysutils.c:717
-#, fuzzy, c-format
+#: common/sysutils.c:907
+#, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "ridenominazione di '%s' in '%s' non riuscita: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:45 common/yesno.c:82
 msgid "yes"
-msgstr "si|sì"
+msgstr "sì"
 
 #: common/yesno.c:46 common/yesno.c:87
 msgid "yY"
@@ -1039,7 +1014,7 @@
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:86
 msgid "quit"
-msgstr "quit"
+msgstr "esci"
 
 #: common/yesno.c:89
 msgid "qQ"
@@ -1048,438 +1023,431 @@
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:123
 msgid "okay|okay"
-msgstr ""
+msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:125
 msgid "cancel|cancel"
-msgstr ""
+msgstr "cancella|cancella"
 
 #: common/yesno.c:126
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #: common/yesno.c:127
-#, fuzzy
 msgid "cC"
-msgstr "c"
+msgstr "cC"
 
 #: common/miscellaneous.c:86
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
+"fuori dal nucleo nella memoria sicura durante l'allocazione di %lu byte"
 
 #: common/miscellaneous.c:89
 #, c-format
 msgid "out of core while allocating %lu bytes"
-msgstr ""
+msgstr "fuori dal core durante l'allocazione di %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
-#, fuzzy, c-format
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
+#, c-format
 msgid "error allocating enough memory: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "errore durante l'allocazione di memoria sufficiente: %s\n"
 
 #: common/miscellaneous.c:143
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
+msgstr "%s:%u: opzione obsoleta \"%s\" - non ha effetto\n"
 
 #: common/miscellaneous.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+msgstr "AVVISO: \"%s%s\" è un'opzione obsoleta - non ha alcun effetto\n"
 
 #: common/miscellaneous.c:618
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
-msgstr ""
+msgstr "flag di debug sconosciuto '%s' ignorato\n"
 
 #: common/asshelp.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for the %s to come up ... (%ds)\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "in attesa che venga in corso il %s... (%ds)\n"
 
 #: common/asshelp.c:347
-#, fuzzy, c-format
+#, c-format
 msgid "connection to %s established\n"
-msgstr "impossibile fare questo in modo batch\n"
+msgstr "connessione a %s stabilita\n"
 
 #: common/asshelp.c:430
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
-msgstr ""
+msgstr "nessun gpg-agent in esecuzione - avvio '%s'\n"
 
 #: common/asshelp.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "connection to agent is in restricted mode\n"
-msgstr "impossibile fare questo in modo batch\n"
+msgstr "connessione all'agente è in modalità limitata\n"
 
 #: common/asshelp.c:578
 #, c-format
 msgid "no running Dirmngr - starting '%s'\n"
-msgstr ""
+msgstr "nessun Dirmngr in esecuzione - avvio di '%s'\n"
 
 #. TRANSLATORS: Copy the prefix between the vertical bars
 #. verbatim.  It will not be printed.
 #: common/audit.c:474
 msgid "|audit-log-result|Good"
-msgstr ""
+msgstr "-audit-log-result|Buono"
 
 #: common/audit.c:477
 msgid "|audit-log-result|Bad"
-msgstr ""
+msgstr "-audit-log-result|Cattivo"
 
 #: common/audit.c:479
 msgid "|audit-log-result|Not supported"
-msgstr ""
+msgstr "-audit-log-result|Non supportato"
 
 #: common/audit.c:481
-#, fuzzy
 msgid "|audit-log-result|No certificate"
-msgstr "certificato danneggiato"
+msgstr "-audit-log-result|Nessun certificato"
 
 #: common/audit.c:483
-#, fuzzy
 msgid "|audit-log-result|Not enabled"
-msgstr "certificato danneggiato"
+msgstr "|-audit-log-result|Non abilitato"
 
 #: common/audit.c:485
 msgid "|audit-log-result|Error"
-msgstr ""
+msgstr "-audit-log-result|Errore"
 
 #: common/audit.c:487
-#, fuzzy
 msgid "|audit-log-result|Not used"
-msgstr "certificato danneggiato"
+msgstr "|audit-log-result| Non utilizzato"
 
 #: common/audit.c:489
-#, fuzzy
 msgid "|audit-log-result|Okay"
-msgstr "certificato danneggiato"
+msgstr "|audit-log-result|ok"
 
 #: common/audit.c:491
-#, fuzzy
 msgid "|audit-log-result|Skipped"
-msgstr "certificato danneggiato"
+msgstr "|audit-log-result|Saltato"
 
 #: common/audit.c:493
-#, fuzzy
 msgid "|audit-log-result|Some"
-msgstr "certificato danneggiato"
+msgstr "|audit-log-result|alcuni"
 
 #: common/audit.c:726
-#, fuzzy
 msgid "Certificate chain available"
-msgstr "certificato danneggiato"
+msgstr "Catena di certificati disponibile"
 
 #: common/audit.c:733
-#, fuzzy
 msgid "root certificate missing"
-msgstr "certificato danneggiato"
+msgstr "certificato radice mancante"
 
 #: common/audit.c:759
 msgid "Data encryption succeeded"
-msgstr ""
+msgstr "Crittografia dei dati riuscita"
 
 #: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
-#, fuzzy
 msgid "Data available"
-msgstr "Chiave disponibile presso: "
+msgstr "Dati disponibili"
 
 #: common/audit.c:767
-#, fuzzy
 msgid "Session key created"
-msgstr "%s: portachiavi creato\n"
+msgstr "Chiave di sessione creata"
 
 #: common/audit.c:772 common/audit.c:912 common/audit.c:919
-#, fuzzy, c-format
+#, c-format
 msgid "algorithm: %s"
-msgstr "armatura: %s\n"
+msgstr "algoritmo: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3555
+#, c-format
 msgid "unsupported algorithm: %s"
-msgstr ""
-"\n"
-"Algoritmi gestiti:\n"
+msgstr "algoritmo non supportato: %s"
 
 #: common/audit.c:778 common/audit.c:925
-#, fuzzy
 msgid "seems to be not encrypted"
-msgstr "non cifrato"
+msgstr "sembra non essere criptato"
 
 #: common/audit.c:784 common/audit.c:933
 msgid "Number of recipients"
-msgstr ""
+msgstr "Numero di destinatari"
 
 #: common/audit.c:792 common/audit.c:956
 #, c-format
 msgid "Recipient %d"
-msgstr ""
+msgstr "Destinatario %d"
 
 #: common/audit.c:825
 msgid "Data signing succeeded"
-msgstr ""
+msgstr "Firma dei dati riuscita"
 
 #: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
-#, fuzzy, c-format
+#, c-format
 msgid "data hash algorithm: %s"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "algoritmo hash dati: %s"
 
 #: common/audit.c:862
-#, fuzzy, c-format
+#, c-format
 msgid "Signer %d"
-msgstr "Firma scaduta il %s\n"
+msgstr "Firmatario %d"
 
 #: common/audit.c:866 common/audit.c:1065
-#, fuzzy, c-format
+#, c-format
 msgid "attr hash algorithm: %s"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "algoritmo hash attr: %s"
 
 #: common/audit.c:901
 msgid "Data decryption succeeded"
-msgstr ""
+msgstr "Decrittografia dei dati riuscita"
 
 #: common/audit.c:910
-#, fuzzy
 msgid "Encryption algorithm supported"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+msgstr "Algoritmo di crittografia supportato"
 
 #: common/audit.c:993
-#, fuzzy
 msgid "Data verification succeeded"
-msgstr "verifica della firma soppressa\n"
+msgstr "Verifica dei dati riuscita"
 
 #: common/audit.c:1002
-#, fuzzy
 msgid "Signature available"
-msgstr "Firma scaduta il %s\n"
+msgstr "Firma disponibile"
 
 #: common/audit.c:1024
-#, fuzzy
 msgid "Parsing data succeeded"
-msgstr "Firma valida da \""
+msgstr "Analisi dei dati riuscita"
 
 #: common/audit.c:1036
-#, fuzzy, c-format
+#, c-format
 msgid "bad data hash algorithm: %s"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "algoritmo hash dei dati non valido: %s"
 
 #: common/audit.c:1051
-#, fuzzy, c-format
+#, c-format
 msgid "Signature %d"
-msgstr "Firma scaduta il %s\n"
+msgstr "Firma %d"
 
 #: common/audit.c:1079
-#, fuzzy
 msgid "Certificate chain valid"
-msgstr "Questa chiave è scaduta!"
+msgstr "Catena di certificati valida"
 
 #: common/audit.c:1090
-#, fuzzy
 msgid "Root certificate trustworthy"
-msgstr "certificato danneggiato"
+msgstr "Certificato radice attendibile"
 
-#: common/audit.c:1111 sm/certchain.c:1079
-#, fuzzy
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
-msgstr "certificato danneggiato"
+msgstr "nessun CRL trovato per il certificato"
 
-#: common/audit.c:1114 sm/certchain.c:1089
-#, fuzzy
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
-msgstr "Chiave disponibile presso: "
+msgstr "il CRL disponibile è troppo vecchio"
 
-#: common/audit.c:1119
-#, fuzzy
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
-msgstr "certificato danneggiato"
+msgstr "Controllo CRL/OCSP dei certificati"
 
-#: common/audit.c:1139
-#, fuzzy
+#: common/audit.c:1140
 msgid "Included certificates"
-msgstr "certificato danneggiato"
+msgstr "Certificati inclusi"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
-msgstr ""
+msgstr "Nessuna voce del log di controllo."
 
-#: common/audit.c:1243
-#, fuzzy
+#: common/audit.c:1244
 msgid "Unknown operation"
-msgstr "versione sconosciuta"
+msgstr "Operazione sconosciuta"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
-msgstr ""
+msgstr "Gpg-Agente utilizzabile"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
-msgstr ""
+msgstr "Dirmngr utilizzabile"
 
-#: common/audit.c:1307
-#, fuzzy, c-format
+#: common/audit.c:1308
+#, c-format
 msgid "No help available for '%s'."
-msgstr "Non è disponibile un aiuto per `%s'"
+msgstr "Nessuna Guida disponibile per '%s'."
 
 #: common/helpfile.c:90
-#, fuzzy
 msgid "ignoring garbage line"
-msgstr "errore nella riga della coda\n"
+msgstr "ignorando la linea spazzatura"
 
-#: common/gettime.c:890
-#, fuzzy
+#: common/gettime.c:919
 msgid "[none]"
-msgstr "sconosciuto"
+msgstr "[nessuno]"
 
 #: common/ksba-io-support.c:347
-#, fuzzy, c-format
+#, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "Carattere radix64 non valido %02x saltato\n"
+msgstr "carattere radix64 non valido %02x ignorato\n"
 
-#: common/argparse.c:365
-#, fuzzy
+#: common/argparse.c:520
 msgid "argument not expected"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "argomento non previsto"
 
-#: common/argparse.c:367
-#, fuzzy
+#: common/argparse.c:522
 msgid "read error"
-msgstr "errore durante la lettura del file"
+msgstr "errore di lettura"
 
-#: common/argparse.c:369
-#, fuzzy
+#: common/argparse.c:524
 msgid "keyword too long"
-msgstr "riga troppo lunga\n"
+msgstr "parola chiave troppo lunga"
 
-#: common/argparse.c:371
-#, fuzzy
+#: common/argparse.c:526
 msgid "missing argument"
-msgstr "argomento non valido"
+msgstr "argomento mancante"
 
-#: common/argparse.c:373
-#, fuzzy
-#| msgid "invalid armor"
+#: common/argparse.c:528
 msgid "invalid argument"
-msgstr "armatura non valida"
+msgstr "argomento non valido"
 
-#: common/argparse.c:375
-#, fuzzy
+#: common/argparse.c:530
 msgid "invalid command"
-msgstr "comandi in conflitto\n"
+msgstr "comando non valido"
 
-#: common/argparse.c:377
-#, fuzzy
+#: common/argparse.c:532
 msgid "invalid alias definition"
-msgstr "opzioni di importazione non valide\n"
+msgstr "definizione di alias non valida"
 
-# ??? (Md)
-#: common/argparse.c:379
-#, fuzzy
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
-msgstr "non esaminato"
+msgstr "fuori dal nucleo"
+
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "comando non valido"
 
-#: common/argparse.c:381
+#: common/argparse.c:542 common/argparse.c:577
 #, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "comando sconosciuto '%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "armatura inaspettata: "
+
+#: common/argparse.c:546
 msgid "invalid option"
-msgstr "opzioni di importazione non valide\n"
+msgstr "opzione non valida"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
-msgstr ""
+msgstr "argomento mancante per l'opzione \"%.50s\"\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
-#, fuzzy, c-format
+#: common/argparse.c:558 g10/gpg.c:3490
+#, c-format
 msgid "invalid argument for option \"%.50s\"\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "argomento non valido per l'opzione \"%.50s\"\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
-msgstr ""
+msgstr "l'opzione \"%.50s\" non prevede un argomento\n"
 
-#: common/argparse.c:395
-#, fuzzy, c-format
+#: common/argparse.c:563
+#, c-format
 msgid "invalid command \"%.50s\"\n"
-msgstr "Comando non valido  (prova \"help\")\n"
+msgstr "comando non valido \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
-msgstr ""
+msgstr "l'opzione \"%.50s\" è ambigua\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
-msgstr ""
-
-# ??? (Md)
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "non esaminato"
+msgstr "il comando \"%.50s\" è ambiguo\n"
 
-#: common/argparse.c:403
-#, fuzzy, c-format
+#: common/argparse.c:581
+#, c-format
 msgid "invalid option \"%.50s\"\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "opzione non valida \"%.50s\"\n"
+
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Nota: nessun file di opzioni predefinito '%s'\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "file di opzioni '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
 
 #: common/utf8conv.c:123
-#, fuzzy, c-format
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "conversione da '%s' a '%s' non disponibile\n"
 
 #: common/utf8conv.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "iconv_open failed: %s\n"
-msgstr "impossibile aprire il file: %s\n"
+msgstr "iconv_open non riuscito: %s\n"
 
 #: common/utf8conv.c:385 common/utf8conv.c:651
-#, fuzzy, c-format
+#, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "conversione da '%s' a '%s' non riuscita: %s\n"
 
-#: common/dotlock.c:707
-#, fuzzy, c-format
+#: common/dotlock.c:724
+#, c-format
 msgid "failed to create temporary file '%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr "impossibile creare il file temporaneo '%s': %s\n"
 
-#: common/dotlock.c:771
-#, fuzzy, c-format
+#: common/dotlock.c:786
+#, c-format
 msgid "error writing to '%s': %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
+msgstr "errore durante la scrittura in '%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
-msgstr ""
+msgstr "rimozione del file di blocco non più utilizzato (creato da %d)\n"
 
-#: common/dotlock.c:1152
-#, fuzzy, c-format
+#: common/dotlock.c:1165
+#, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "in attesa di blocco (in attesa di %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
-msgstr ""
+msgstr "(deadlock?) "
 
-#: common/dotlock.c:1192
-#, fuzzy, c-format
+#: common/dotlock.c:1205
+#, c-format
 msgid "lock '%s' not made: %s\n"
-msgstr "chiave pubblica %08lX non trovata: %s\n"
+msgstr "blocco '%s' non effettuato: %s\n"
 
-#: common/dotlock.c:1219
-#, fuzzy, c-format
+#: common/dotlock.c:1232
+#, c-format
 msgid "waiting for lock %s...\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "attesa del blocco %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
-msgstr ""
+msgstr "%s è troppo vecchio (è necessario %s, con %s)\n"
 
 #: g10/armor.c:423
 #, c-format
@@ -1502,9 +1470,9 @@
 msgstr "header della firma in chiaro non valido\n"
 
 #: g10/armor.c:499
-#, fuzzy, c-format
+#, c-format
 msgid "unknown armor header: "
-msgstr "header dell'armatura: "
+msgstr "intestazione armatura sconosciuta: "
 
 #: g10/armor.c:552
 #, c-format
@@ -1512,9 +1480,9 @@
 msgstr "firme in chiaro annidate\n"
 
 #: g10/armor.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected armor: "
-msgstr "armatura inaspettata:"
+msgstr "armatura inaspettata: "
 
 #: g10/armor.c:700
 #, c-format
@@ -1522,9 +1490,9 @@
 msgstr "riga protetta con il trattino non valida: "
 
 #: g10/armor.c:872 g10/armor.c:1492
-#, fuzzy, c-format
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "Carattere radix64 non valido %02x saltato\n"
+msgstr "carattere radix64 non valido %02x ignorato\n"
 
 #: g10/armor.c:915
 #, c-format
@@ -1542,14 +1510,14 @@
 msgstr "CRC malformato\n"
 
 #: g10/armor.c:961 g10/armor.c:1529
-#, fuzzy, c-format
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "errore nel CRC; %06lx - %06lx\n"
+msgstr "Errore CRC; %06lX - %06lX\n"
 
 #: g10/armor.c:981
-#, fuzzy, c-format
+#, c-format
 msgid "premature eof (in trailer)\n"
-msgstr "eof prematura (nella coda)\n"
+msgstr "eof prematuro (nel rimorchio)\n"
 
 #: g10/armor.c:985
 #, c-format
@@ -1559,7 +1527,7 @@
 #: g10/armor.c:1305
 #, c-format
 msgid "no valid OpenPGP data found.\n"
-msgstr "Non sono stati trovati dati OpenPGP validi.\n"
+msgstr "non sono stati trovati dati OpenPGP validi.\n"
 
 #: g10/armor.c:1310
 #, c-format
@@ -1575,10 +1543,9 @@
 "un MTA buggato\n"
 
 #: g10/build-packet.c:1216
-#, fuzzy, c-format
-#| msgid "not human readable"
+#, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
-msgstr "non leggibile"
+msgstr "[ non leggibile (%zu byte: %s%s) ]"
 
 #: g10/build-packet.c:1268
 #, c-format
@@ -1595,9 +1562,9 @@
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
 #: g10/build-packet.c:1286 g10/build-packet.c:1382
-#, fuzzy, c-format
+#, c-format
 msgid "a notation name must not contain more than one '@' character\n"
-msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+msgstr "il nome di una notazione non deve contenere più di un carattere '@'\n"
 
 #: g10/build-packet.c:1304
 #, c-format
@@ -1605,19 +1572,15 @@
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
 #: g10/build-packet.c:1360
-#, fuzzy, c-format
+#, c-format
 msgid "a notation name may not contain an '=' character\n"
-msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+msgstr "il valore di una nota dell'utente deve contenere il carattere '='\n"
 
 #: g10/build-packet.c:1366
-#, fuzzy, c-format
-#| msgid ""
-#| "a notation name must have only printable characters or spaces, and end "
-#| "with an '='\n"
+#, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
-"il nome di una nota deve essere formato solo da caratteri stampabili o\n"
-"spazi e terminare con un '='\n"
+"un nome di notazione deve contenere solo caratteri o spazi stampabili\n"
 
 #: g10/build-packet.c:1425 g10/build-packet.c:1436
 #, c-format
@@ -1627,7 +1590,7 @@
 #: g10/call-agent.c:144 sm/call-agent.c:239
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
-msgstr ""
+msgstr "impossibile proxy %s richiesta al client\n"
 
 #: g10/call-agent.c:170
 msgid "Enter passphrase: "
@@ -1635,549 +1598,523 @@
 
 #: g10/call-agent.c:199 g10/call-dirmngr.c:153 sm/call-agent.c:98
 #: sm/call-dirmngr.c:165
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#, c-format
 msgid "error getting version from '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "errore durante il recupero della versione da '%s': %s\n"
 
 #: g10/call-agent.c:205 g10/call-dirmngr.c:159 sm/call-agent.c:104
 #: sm/call-dirmngr.c:171
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
-msgstr ""
+msgstr "il server '%s' è precedente a noi (%s < %s)"
 
 #: g10/call-agent.c:211 g10/call-dirmngr.c:165 g10/call-dirmngr.c:439
 #: sm/call-agent.c:110 sm/call-dirmngr.c:177
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
+#, c-format
 msgid "WARNING: %s\n"
-msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
+msgstr "AVVISO: %s\n"
 
 #: g10/call-agent.c:214 g10/call-dirmngr.c:168 sm/call-agent.c:113
 #: sm/call-dirmngr.c:180
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
+"Nota: i server obsoleti potrebbero non avere correzioni di sicurezza "
+"importanti.\n"
 
 #: g10/call-agent.c:216 g10/call-dirmngr.c:170 sm/call-agent.c:115
 #: sm/call-dirmngr.c:182
-#, fuzzy, c-format
-#| msgid "Please use the command \"toggle\" first.\n"
+#, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
-msgstr "Per favore usa prima il comando \"toggle\".\n"
+msgstr "Nota: utilizzare il comando \"%s\" per riavviarli.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
-#, fuzzy, c-format
-#| msgid "%s does not yet work with %s\n"
+#, c-format
 msgid "%s is not compliant with %s mode\n"
-msgstr "%s non funziona ancora con %s\n"
+msgstr "%s non è conforme alla modalità %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
-#, fuzzy, c-format
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
+#, c-format
 msgid "no dirmngr running in this session\n"
-msgstr "gpg-agent non è disponibile in questa sessione\n"
+msgstr "nessun dirmngr in esecuzione in questa sessione\n"
 
 #: g10/call-dirmngr.c:243
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#, c-format
 msgid "keyserver option \"%s\" may not be used in %s mode\n"
-msgstr "non è possibile usare %s in modalità %s\n"
+msgstr "l'opzione keyserver \"%s\" non può essere utilizzata in modalità %s\n"
 
 #: g10/call-dirmngr.c:417
 msgid "WKD uses a cached result"
-msgstr ""
+msgstr "WKD utilizza un risultato memorizzato nella cache"
 
 #: g10/call-dirmngr.c:420
 msgid "Tor is not running"
-msgstr ""
+msgstr "Tor non è in esecuzione"
 
 #: g10/call-dirmngr.c:422
-#, fuzzy
 msgid "Tor is not properly configured"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "Tor non è configurato correttamente"
 
 #: g10/call-dirmngr.c:424
-#, fuzzy
 msgid "DNS is not properly configured"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "DNS non è configurato correttamente"
 
 #: g10/call-dirmngr.c:426
 msgid "unacceptable HTTP redirect from server"
-msgstr ""
+msgstr "reindirizzamento HTTP inaccettabile dal server"
 
 #: g10/call-dirmngr.c:428
 msgid "unacceptable HTTP redirect from server was cleaned up"
-msgstr ""
+msgstr "il reindirizzamento HTTP dal server è stato pulito"
 
 #: g10/call-dirmngr.c:430
-#, fuzzy
-#| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
-msgstr "genera un certificato di revoca"
+msgstr "server utilizza un certificato non valido"
 
-#: g10/call-dirmngr.c:437
-#, fuzzy, c-format
-#| msgid "armor: %s\n"
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
+#, c-format
 msgid "Note: %s\n"
-msgstr "armatura: %s\n"
+msgstr "Nota: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
-#, fuzzy, c-format
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "la chiave segreta non è disponibile"
+msgstr "Scheda OpenPGP non disponibile: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "Scheda OpenPGP n. %s rilevata\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
-#, fuzzy, c-format
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
+#, c-format
 msgid "can't do this in batch mode\n"
-msgstr "impossibile fare questo in modo batch\n"
+msgstr "impossibile eseguire questa operazione in modalità batch\n"
 
 #: g10/card-util.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "This command is only available for version 2 cards\n"
-msgstr "Questo comando non è permesso in modalità %s.\n"
+msgstr "Questo comando è disponibile solo per le schede della versione 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
-#, fuzzy, c-format
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
+#, c-format
 msgid "Reset Code not or not anymore available\n"
-msgstr "parti della chiave segreta non sono disponibili\n"
+msgstr "Reimposta codice non più disponibile o meno\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
-msgstr ""
+msgstr "[non impostato]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
-msgstr ""
+msgstr "Sig."
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
-msgstr ""
+msgstr "Sig.ra."
 
-# ??? (Md)
-#: g10/card-util.c:610
-#, fuzzy
+#: g10/card-util.c:573
 msgid "not forced"
-msgstr "non esaminato"
+msgstr "non forzato"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
-msgstr ""
+msgstr "costretto"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Errore: al momento è consentito solo ASCII semplice.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Errore: il carattere \"<\" non può essere utilizzato.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Errore: gli spazi doppi non sono consentiti.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Cognome del titolare della carta: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Nome del titolare della carta: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Errore: nome combinato troppo lungo (limite è di %d caratteri).\n"
 
-#: g10/card-util.c:848
-#, fuzzy
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
-msgstr "non c'è una chiave pubblica corrispondente: %s\n"
+msgstr "URL per recuperare la chiave pubblica: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
+#, c-format
 msgid "error reading '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura di '%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
-#, fuzzy, c-format
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
+#, c-format
 msgid "error writing '%s': %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
+msgstr "errore durante la scrittura di '%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Dati di accesso (nome account): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
-msgstr ""
+msgstr "Dati DO privati: "
 
-#: g10/card-util.c:1125
-#, fuzzy
+#: g10/card-util.c:1088
 msgid "Language preferences: "
-msgstr "preferenze aggiornate"
+msgstr "Preferenze lingua: "
 
-#: g10/card-util.c:1133
-#, fuzzy
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
-msgstr "carattere non valido nella stringa delle preferenze\n"
+msgstr "Errore: lunghezza della stringa di preferenza non valida.\n"
 
-#: g10/card-util.c:1142
-#, fuzzy
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
-msgstr "carattere non valido nella stringa delle preferenze\n"
+msgstr "Errore: caratteri non validi nella stringa di preferenza.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
-msgstr ""
+msgstr "Salutazione (M - Mr., F - Ms., o spazio): "
 
-#: g10/card-util.c:1178
-#, fuzzy
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "|FPR|Risposta OCSP firmata da FPR\n"
 
-#: g10/card-util.c:1200
-#, fuzzy
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
-msgstr "mostra le impronte digitali"
+msgstr "Impronta digitale CA: "
 
-#: g10/card-util.c:1223
-#, fuzzy
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "Errore: impronta digitale formattata non valida.\n"
 
-#: g10/card-util.c:1273
-#, fuzzy, c-format
+#: g10/card-util.c:1236
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Generazione della chiave fallita: %s\n"
+msgstr "operazione chiave non possibile: %s\n"
 
-#: g10/card-util.c:1274
-#, fuzzy
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
-msgstr "Non sono stati trovati dati OpenPGP validi.\n"
+msgstr "non una scheda OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
-#, fuzzy, c-format
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr ""
+"errore durante il recupero delle informazioni sulla chiave corrente: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "Sostituire la chiave esistente? (y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
+"Nota: non vi è alcuna garanzia che la carta supporti la dimensione "
+"richiesta.\n"
+"      Se la generazione della chiave non riesce,\n"
+"      documentazione della carta per vedere quali dimensioni sono "
+"consentite.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
-#, fuzzy, c-format
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "Di che dimensioni vuoi la chiave? (1024) "
+msgstr "Che chiave vuoi? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
+msgstr "%s keysizes deve essere compreso nell'intervallo %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
-msgstr ""
+msgstr "Modifica dell'attributo chiave della scheda per: "
 
-#: g10/card-util.c:1450
-#, fuzzy
+#: g10/card-util.c:1413
 msgid "Signature key\n"
-msgstr "Firma scaduta il %s\n"
+msgstr "Chiave di firma\n"
 
-#: g10/card-util.c:1452
-#, fuzzy
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "Chiave di crittografia\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
-msgstr ""
+msgstr "Chiave di autenticazione\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
-#, fuzzy, c-format
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
+#, c-format
 msgid "   (%d) RSA\n"
-msgstr "   (%d) RSA (firma solo)\n"
+msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
-#, fuzzy, c-format
+#: g10/card-util.c:1421
+#, c-format
 msgid "   (%d) ECC\n"
-msgstr "   (%d) DSA e ElGamal (default)\n"
+msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
+"La scheda verrà ora configurata nuovamente per generare una chiave di %u "
+"bit\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
+"La scheda verrà ora configurata nuovamente per generare una chiave di tipo: "
+"%s\n"
 
-#: g10/card-util.c:1584
-#, fuzzy, c-format
+#: g10/card-util.c:1547
+#, c-format
 msgid "error changing key attribute for key %d: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr ""
+"errore durante la modifica dell'attributo chiave per la chiave %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
-#, fuzzy, c-format
+#: g10/card-util.c:1563 g10/card-util.c:2090
+#, c-format
 msgid "error getting card info: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr "errore durante il recupero delle informazioni sulla scheda: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
-#, fuzzy, c-format
-#| msgid "This command is not allowed while in %s mode.\n"
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
+#, c-format
 msgid "This command is not supported by this card\n"
-msgstr "Questo comando non è permesso in modalità %s.\n"
+msgstr "Questo comando non è supportato da questa scheda\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "Eseguire il backup off-card della chiave di crittografia? (Y/n) "
 
-#: g10/card-util.c:1666
-#, fuzzy, c-format
+#: g10/card-util.c:1629
+#, c-format
 msgid "Note: keys are already stored on the card!\n"
-msgstr "saltata: chiave pubblica già presente\n"
+msgstr "Nota: le chiavi sono già memorizzate sulla scheda!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "Sostituire le chiavi esistenti? (y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
 "   PIN = '%s'     Admin PIN = '%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"Si prega di notare che le impostazioni di fabbrica dei PIN sono\n"
+"   PIN : '%s'     PIN di amministrazione = '%s'\n"
+"È necessario modificarli utilizzando il comando --change-pin\n"
 
-#: g10/card-util.c:1716
-#, fuzzy
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
-msgstr "Per favore scegli che tipo di chiave vuoi:\n"
+msgstr "Selezionare il tipo di chiave da generare:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
-#, fuzzy
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
-msgstr "Firma scaduta il %s\n"
+msgstr "   (1) Chiave di firma\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
-#, fuzzy
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "   (2) Chiave di crittografia\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Chiave di autenticazione\n"
 
-#: g10/card-util.c:1805
-#, fuzzy
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
-msgstr "Per favore scegli il motivo della revoca:\n"
+msgstr "Si prega di selezionare dove memorizzare la chiave:\n"
 
-#: g10/card-util.c:1851
-#, fuzzy, c-format
+#: g10/card-util.c:1814
+#, c-format
 msgid "KEYTOCARD failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "KEYTOCARD non riuscito: %s\n"
 
-#: g10/card-util.c:1950
-#, fuzzy, c-format
+#: g10/card-util.c:1919
+#, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "saltata: chiave pubblica già presente\n"
+msgstr ""
+"Nota: Questo comando distrugge tutti i tasti memorizzati sulla scheda!\n"
 
-#: g10/card-util.c:1953
-#, fuzzy
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
-msgstr "Firmo davvero? "
+msgstr "Continuare? (Y/n) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
-msgstr ""
+msgstr "Fare davvero un reset di fabbrica? (immettere \"sì\") "
 
-#: g10/card-util.c:2136
-#, fuzzy, c-format
+#: g10/card-util.c:2113
+#, c-format
 msgid "error for setup KDF: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore per l'installazione KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/card-util.c:2167
-#, fuzzy
+#: g10/card-util.c:2144
 msgid "show admin commands"
-msgstr "comandi in conflitto\n"
+msgstr "mostra comandi di amministrazione"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:2170
-#, fuzzy
+#: g10/card-util.c:2147
 msgid "list all available data"
-msgstr "Chiave disponibile presso: "
+msgstr "elencare tutti i dati disponibili"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
-msgstr ""
+msgstr "cambiare il nome del titolare della carta"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "modificare l'URL per recuperare la chiave"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "recuperare la chiave specificata nell'URL della scheda"
 
-#: g10/card-util.c:2176
-#, fuzzy
+#: g10/card-util.c:2153
 msgid "change the login name"
-msgstr "cambia la data di scadenza"
+msgstr "modificare il nome di accesso"
 
-#: g10/card-util.c:2177
-#, fuzzy
+#: g10/card-util.c:2154
 msgid "change the language preferences"
-msgstr "cambia il valore di fiducia"
+msgstr "modificare le preferenze della lingua"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
-msgstr ""
+msgstr "cambiare il saluto del titolare della carta"
 
-#: g10/card-util.c:2180
-#, fuzzy
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
-msgstr "mostra le impronte digitali"
+msgstr "modificare un'impronta digitale CA"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "attivare/disattivare il flag PIN di forza della firma"
 
-#: g10/card-util.c:2182
-#, fuzzy
+#: g10/card-util.c:2159
 msgid "generate new keys"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "genera nuove chiavi"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
-msgstr ""
+msgstr "per modificare o sbloccare il PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
-msgstr ""
+msgstr "verificare il PIN ed elencare tutti i dati"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
-msgstr ""
+msgstr "sbloccare il PIN utilizzando un codice di ripristino"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
-msgstr ""
+msgstr "distruggere tutte le chiavi e i dati"
 
-#: g10/card-util.c:2187
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
-msgstr "|NOME|usa NOME come destinatario predefinito"
+msgstr "configurazione KDF per l'autenticazione PIN"
 
-#: g10/card-util.c:2188
-#, fuzzy
-#| msgid "change the ownertrust"
+#: g10/card-util.c:2165
 msgid "change the key attribute"
-msgstr "cambia il valore di fiducia"
+msgstr "modificare l'attributo chiave"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
-msgstr ""
+msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
-#, fuzzy
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
-msgstr "comandi in conflitto\n"
+msgstr "Comando solo amministratore\n"
 
-#: g10/card-util.c:2384
-#, fuzzy
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
-msgstr "comandi in conflitto\n"
+msgstr "I comandi di amministrazione sono consentiti\n"
 
-#: g10/card-util.c:2386
-#, fuzzy
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "I comandi di amministrazione non sono consentiti\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
-#, fuzzy, c-format
-#| msgid "can't open `%s'\n"
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
+#, c-format
 msgid "can't open '%s'\n"
-msgstr "impossibile aprire `%s'\n"
+msgstr "impossibile aprire '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
-#, fuzzy, c-format
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "chiave \"%s\" non trovata: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
 #: g10/delkey.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "chiave \"%s\" non trovata\n"
 
 #: g10/delkey.c:161 g10/delkey.c:168
 #, c-format
@@ -2185,54 +2122,55 @@
 msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
 #: g10/delkey.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
+msgstr "non può farlo in modalità batch senza \"--yes\"\n"
 
 #: g10/delkey.c:182
 msgid "Note: The public primary key and all its subkeys will be deleted.\n"
 msgstr ""
+"Nota: la chiave primaria pubblica e tutte le relative sottochiavi verranno "
+"eliminate.\n"
 
 #: g10/delkey.c:187
 msgid "Note: Only the shown public subkey will be deleted.\n"
-msgstr ""
+msgstr "Nota: verrà eliminata solo la sottochiave pubblica visualizzata.\n"
 
 #: g10/delkey.c:192
 msgid "Note: Only the secret part of the shown primary key will be deleted.\n"
 msgstr ""
+"Nota: verrà eliminata solo la parte segreta della chiave primaria "
+"visualizzata.\n"
 
 #: g10/delkey.c:197
 msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
 msgstr ""
+"Nota: verrà eliminata solo la parte segreta della sottochiave visualizzata.\n"
 
 #: g10/delkey.c:206
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Vuoi cancellare questa chiave dal portachiavi? "
+msgstr "Eliminare questa chiave dal keyring? (y/N) "
 
 #: g10/delkey.c:216
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "È una chiave segreta! - Vuoi cancellarla davvero? "
+msgstr "Questa è una chiave segreta! - davvero cancellare? (y/N) "
 
 #: g10/delkey.c:263
-#, fuzzy, c-format
+#, c-format
 msgid "deleting secret %s failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "eliminazione del segreto %s non riuscita: %s\n"
 
 #: g10/delkey.c:265
 msgid "key"
 msgstr "key"
 
 #: g10/delkey.c:265
-#, fuzzy
-#| msgid "Pubkey: "
 msgid "subkey"
-msgstr "A chiave pubblica: "
+msgstr "sottochiave"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
@@ -2257,97 +2195,100 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
-#, fuzzy, c-format
-#| msgid "`%s' already compressed\n"
+#: g10/encrypt.c:233 g10/encrypt.c:668
+#, c-format
 msgid "'%s' already compressed\n"
-msgstr "`%s' è già compresso\n"
+msgstr "'%s' già compresso\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
-#, fuzzy, c-format
-#| msgid "WARNING: `%s' is an empty file\n"
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#, c-format
 msgid "WARNING: '%s' is an empty file\n"
-msgstr "ATTENZIONE: `%s' è un file vuoto\n"
+msgstr "AVVISO: '%s' è un file vuoto\n"
 
-#: g10/encrypt.c:533
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"l'algoritmo di crittografia '%s' non può essere utilizzato in modalità %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "l'algoritmo digest '%s' non può essere utilizzato in modalità %s\n"
+
+#: g10/encrypt.c:549
+#, c-format
 msgid "reading from '%s'\n"
-msgstr "lettura da `%s'\n"
+msgstr "lettura da '%s'\n"
 
-#: g10/encrypt.c:581
-#, fuzzy, c-format
+#: g10/encrypt.c:597
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
-"del destinatario\n"
-
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n"
+"AVVISO: l'imposizione della crittografia simmetrica %s (%d) viola le "
+"preferenze del destinatario\n"
 
-#: g10/encrypt.c:624 sm/encrypt.c:489
-#, fuzzy, c-format
+#: g10/encrypt.c:640 sm/encrypt.c:490
+#, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+msgstr "AVVISO: la chiave %s non è adatta per la crittografia in modalità %s\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
-#, fuzzy, c-format
+#: g10/encrypt.c:751 g10/sign.c:1163
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
-"del destinatario\n"
+"AVVISO: l'algoritmo di compressione %s (%d) viola le preferenze dei "
+"destinatari\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#, c-format
 msgid "option '%s' may not be used in %s mode\n"
-msgstr "non è possibile usare %s in modalità %s\n"
+msgstr "l'opzione '%s' non può essere utilizzata in modalità %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2355,7 +2296,7 @@
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
@@ -2374,21 +2315,21 @@
 "sicuri del file delle opzioni\n"
 
 #: g10/exec.c:411
-#, fuzzy, c-format
+#, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "questa piattaforma richiede file temporanei quando si chiamano programmi "
 "esterni\n"
 
 #: g10/exec.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program '%s': %s\n"
-msgstr "impossibile eseguire %s \"%s\": %s\n"
+msgstr "impossibile eseguire il programma '%s': %s\n"
 
 #: g10/exec.c:492
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute shell '%s': %s\n"
-msgstr "impossibile eseguire %s \"%s\": %s\n"
+msgstr "impossibile eseguire la shell '%s': %s\n"
 
 #: g10/exec.c:583
 #, c-format
@@ -2411,73 +2352,63 @@
 msgstr "impossibile leggere la risposta del programma esterno: %s\n"
 
 #: g10/exec.c:672 g10/exec.c:679
-#, fuzzy, c-format
-#| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+#, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
+msgstr "AVVISO: impossibile rimuovere il file temporaneo (%s) '%s': %s\n"
 
 #: g10/exec.c:684
-#, fuzzy, c-format
-#| msgid "WARNING: unable to remove temp directory `%s': %s\n"
+#, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
+msgstr "AVVISO: impossibile rimuovere la directory temporanea '%s': %s\n"
 
 #: g10/export.c:119
-#, fuzzy
 msgid "export signatures that are marked as local-only"
-msgstr ""
-"\n"
-"La firma sarà marcata come irrevocabile.\n"
+msgstr "esportare firme contrassegnate come solo locali"
 
 #: g10/export.c:121
 msgid "export attribute user IDs (generally photo IDs)"
-msgstr ""
+msgstr "esportare gli ID utente degli attributi (in genere gli ID foto)"
 
 #: g10/export.c:123
-#, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
-msgstr "non sono state trovate chiavi di revoca per `%s'\n"
+msgstr "esportare le chiavi di revoca contrassegnate come \"sensibili\""
 
 #: g10/export.c:125
-#, fuzzy
 msgid "remove unusable parts from key during export"
-msgstr "chiave segreta inutilizzabile"
+msgstr "rimuovere parti inutilizzabili dalla chiave durante l'esportazione"
 
 #: g10/export.c:127
 msgid "remove as much as possible from key during export"
-msgstr ""
+msgstr "rimuovere il più possibile dalla chiave durante l'esportazione"
 
 #: g10/export.c:133
 msgid "use the GnuPG key backup format"
-msgstr ""
+msgstr "utilizzare il formato di backup della chiave GnuPG"
 
 #: g10/export.c:1291
-#, fuzzy
-#| msgid "%s: skipped: %s\n"
 msgid " - skipped"
-msgstr "%s: saltata: %s\n"
+msgstr " - saltato"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
-#, fuzzy, c-format
-#| msgid "writing to `%s'\n"
+#: g10/sign.c:1013 g10/sign.c:1327
+#, c-format
 msgid "writing to '%s'\n"
-msgstr "scrittura in `%s'\n"
+msgstr "scrittura in '%s'\n"
 
 #: g10/export.c:1769
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
+msgstr "chiave %s: materiale della chiave su scheda - ignorato\n"
 
 #: g10/export.c:1964
-#, fuzzy, c-format
+#, c-format
 msgid "exporting secret keys not allowed\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "esportazione di chiavi segrete non consentita\n"
 
 #: g10/export.c:2041
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
+msgstr "chiave %s: chiave di stile PGP 2.x - ignorata\n"
 
 #: g10/export.c:2135
 #, c-format
@@ -2486,296 +2417,277 @@
 
 #: g10/export.c:2432 g10/plaintext.c:153 g10/plaintext.c:162
 #: g10/plaintext.c:168 g10/plaintext.c:191
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
+#, c-format
 msgid "error creating '%s': %s\n"
-msgstr "errore creando `%s': %s\n"
+msgstr "errore durante la creazione di '%s': %s\n"
 
 #: g10/getkey.c:259
-#, fuzzy
 msgid "[User ID not found]"
-msgstr "[User ID non trovato]"
+msgstr "[ID utente non trovato]"
 
-#: g10/getkey.c:1290
-#, fuzzy, c-format
+#: g10/getkey.c:1297
+#, c-format
 msgid "automatically retrieved '%s' via %s\n"
-msgstr "errore creando `%s': %s\n"
+msgstr "recuperato automaticamente '%s' tramite %s\n"
 
-#: g10/getkey.c:1296
-#, fuzzy, c-format
+#: g10/getkey.c:1303
+#, c-format
 msgid "error retrieving '%s' via %s: %s\n"
-msgstr "errore creando `%s': %s\n"
+msgstr "errore durante il recupero di '%s' tramite %s: %s\n"
 
-#: g10/getkey.c:1298
-#, fuzzy
+#: g10/getkey.c:1305
 msgid "No fingerprint"
-msgstr "mostra le impronte digitali"
+msgstr "Nessuna impronta digitale"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
+"verifica della presenza di una nuova copia di una chiave scaduta tramite %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
-#, fuzzy, c-format
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "chiave segreta `%s' non trovata: %s\n"
+msgstr "chiave segreta \"%s\" non trovata: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
-#, fuzzy, c-format
+#: g10/getkey.c:1944 g10/pkclist.c:988
+#, c-format
 msgid "(check argument of option '%s')\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "(controllare l'argomento dell'opzione '%s')\n"
 
-#: g10/getkey.c:2013
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
+#: g10/getkey.c:2020
+#, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "|NOME|usa NOME come chiave segreta predefinita"
+msgstr "Avviso: impossibile utilizzare '%s' come chiave predefinita: %s\n"
 
-#: g10/getkey.c:2021
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
+#: g10/getkey.c:2028
+#, c-format
 msgid "using \"%s\" as default secret key for signing\n"
-msgstr "|NOME|usa NOME come chiave segreta predefinita"
+msgstr "utilizzo di \"%s\" come chiave segreta predefinita per la firma\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
-msgstr ""
+msgstr "tutti i valori passati a '%s' ignorati\n"
 
-#: g10/getkey.c:2859
-#, fuzzy, c-format
+#: g10/getkey.c:2880
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
+msgstr "Chiave non valida %s resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
-#, fuzzy, c-format
+#: g10/getkey.c:3730
+#, c-format
 msgid "using subkey %s instead of primary key %s\n"
-msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
+msgstr "utilizzando la sottochiave %s anziché la chiave primaria %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
-#, fuzzy, c-format
+#: g10/getkey.c:4275 g10/gpg.c:2107
+#, c-format
 msgid "valid values for option '%s':\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "valori validi per l'opzione '%s':\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
-#, fuzzy
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
-msgstr "fai una firma separata"
+msgstr "fare una firma"
 
-#: g10/gpg.c:441
-#, fuzzy
+#: g10/gpg.c:443
 msgid "make a clear text signature"
-msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
+msgstr "creare una firma di testo non crittografato"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:457
-#, fuzzy
+#: g10/gpg.c:459
 msgid "list and check key signatures"
-msgstr "controlla le firme delle chiavi"
+msgstr "elencare e controllare le firme delle chiavi"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:465
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "generare rapidamente una nuova coppia di chiavi"
 
-#: g10/gpg.c:468
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "aggiungere rapidamente un nuovo id utente"
 
-#: g10/gpg.c:473
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "revocare rapidamente un id utente"
 
-#: g10/gpg.c:476
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "impostare rapidamente una nuova data di scadenza"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
-msgstr ""
+msgstr "generazione completa della coppia di chiavi in primo piano"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:489
-#, fuzzy
-#| msgid "sign a key"
+#: g10/gpg.c:491
 msgid "quickly sign a key"
-msgstr "firma una chiave"
+msgstr "firmare rapidamente un tasto"
 
-#: g10/gpg.c:491
-#, fuzzy
-#| msgid "sign a key locally"
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
-msgstr "firma una chiave localmente"
+msgstr "firmare rapidamente una chiave localmente"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "revocare rapidamente un id utente"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
-#, fuzzy
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "esporta le chiavi a un keyserver"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importa le chiavi da un keyserver"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "cerca delle chiavi su un keyserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un keyserver"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
-msgstr ""
+msgstr "stampare lo stato della scheda"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
-msgstr ""
+msgstr "modificare i dati su una scheda"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
-msgstr ""
+msgstr "modificare il PIN di una carta"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:542
-#, fuzzy
+#: g10/gpg.c:546
 msgid "print message digests"
-msgstr "|algo [files]|stampa tutti i message digests"
+msgstr "stampare digest dei messaggi"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
-msgstr ""
+msgstr "eseguire in modalità server"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
-msgstr ""
+msgstr "|VALORE|impostare il criterio TOFU per una chiave"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
-#, fuzzy
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|NOME|cifra per NOME"
+msgstr "|USER-ID|encrypt per USER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
-#, fuzzy
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "usa questo user-id per firmare o decifrare"
+msgstr "|USER-ID|utilizzare USER-ID per firmare o decrittografare"
 
-#: g10/gpg.c:576
-#, fuzzy
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|imposta il livello di compressione (0 disab.)"
+msgstr "|N|Impostare il livello di compressione su N (0 disabilita)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
-#, fuzzy
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|scrittura dell'output in FILE"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "utilizzare un comportamento OpenPGP rigoroso"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2783,17 +2695,7 @@
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:691
-#, fuzzy
-#| msgid ""
-#| "@\n"
-#| "Examples:\n"
-#| "\n"
-#| " -se -r Bob [file]          sign and encrypt for user Bob\n"
-#| " --clear-sign [file]         make a clear text signature\n"
-#| " --detach-sign [file]       make a detached signature\n"
-#| " --list-keys [names]        show keys\n"
-#| " --fingerprint [names]      show fingerprints\n"
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2807,34 +2709,27 @@
 "@\n"
 "Esempi:\n"
 "\n"
-" -se -r Bob [file]          firma e cifra per l'utente Bob\n"
-" --clear-sign [file]         fai una firma mantenendo il testo in chiaro\n"
-" --detach-sign [file]       fai una firma separata\n"
-" --list-keys [nomi]         mostra le chiavi\n"
+"-se -r Bob [file]           firma e crittografa per l'utente Bob\n"
+" --cancella-segno [file]        fare una firma di testo non crittografato\n"
+" --detach-sign [file]       crea una firma disconnessa\n"
+" --list-keys [nomi]       mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:1084
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @GPG@ [opzioni] [file] (-h per assistenza)"
 
-#: g10/gpg.c:1087
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
-"Sintassi: gpg [opzioni] [files]\n"
-"firma, controlla, cifra o decifra\n"
-"l'operazione predefinita dipende dai dati di input\n"
+"Sintassi: @GPG@ [opzioni] [files]\n"
+"Firmare, controllare, crittografare o decrittografare\n"
+"Il funzionamento predefinito dipende dai dati di input\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2842,657 +2737,643 @@
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
-#, fuzzy, c-format
+#: g10/gpg.c:1199 sm/gpgsm.c:665
+#, c-format
 msgid "usage: %s [options] %s\n"
-msgstr "uso: gpg [opzioni] "
+msgstr "utilizzo: %s [opzioni] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1398
-#, fuzzy, c-format
+#: g10/gpg.c:1406
+#, c-format
 msgid "no = sign found in group definition '%s'\n"
-msgstr "non è stato trovato il segno = nella definizione del gruppo \"%s\"\n"
+msgstr "nessun segno = trovato nella definizione di gruppo '%s'\n"
 
-#: g10/gpg.c:1596
-#, fuzzy, c-format
+#: g10/gpg.c:1604
+#, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1599
-#, fuzzy, c-format
+#: g10/gpg.c:1607
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr "AVVISO: proprietà non sicura nel file di configurazione '%s'\n"
 
-#: g10/gpg.c:1602
-#, fuzzy, c-format
+#: g10/gpg.c:1610
+#, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr "AVVISO: proprietà non sicura nell'estensione '%s'\n"
 
-#: g10/gpg.c:1608
-#, fuzzy, c-format
+#: g10/gpg.c:1616
+#, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1611
-#, fuzzy, c-format
+#: g10/gpg.c:1619
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr "AVVISO: autorizzazioni non sicure per il file di configurazione '%s'\n"
 
-#: g10/gpg.c:1614
-#, fuzzy, c-format
+#: g10/gpg.c:1622
+#, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr "AVVISO: autorizzazioni non sicure per l'estensione '%s'\n"
 
-#: g10/gpg.c:1620
-#, fuzzy, c-format
+#: g10/gpg.c:1628
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1623
-#, fuzzy, c-format
+#: g10/gpg.c:1631
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr ""
+"AVVISO: proprietà della directory di inclusione non sicura nel file di "
+"configurazione '%s'\n"
 
-#: g10/gpg.c:1626
-#, fuzzy, c-format
+#: g10/gpg.c:1634
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
-msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
+msgstr ""
+"AVVISO: proprietà della directory di inclusione non sicura nell'estensione "
+"'%s'\n"
 
-#: g10/gpg.c:1632
-#, fuzzy, c-format
+#: g10/gpg.c:1640
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr ""
+"AVVISO: autorizzazioni della directory di inclusione non sicure nella "
+"directory homedir '%s'\n"
 
-#: g10/gpg.c:1635
-#, fuzzy, c-format
+#: g10/gpg.c:1643
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr ""
+"AVVISO: autorizzazioni della directory di inclusione non sicure nella "
+"directory homedir '%s'\n"
 
-#: g10/gpg.c:1638
-#, fuzzy, c-format
+#: g10/gpg.c:1646
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+msgstr ""
+"AVVISO: autorizzazioni della directory di inclusione non sicure per "
+"l'estensione '%s'\n"
 
-#: g10/gpg.c:1854
-#, fuzzy, c-format
+#: g10/gpg.c:1862
+#, c-format
 msgid "unknown configuration item '%s'\n"
-msgstr "elemento della configurazione sconosciuto \"%s\"\n"
+msgstr "elemento di configurazione sconosciuto '%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
-msgstr ""
+msgstr "visualizzare gli ID foto durante le elenchi dei tasti"
 
-#: g10/gpg.c:1973
-#, fuzzy
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
-msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
+msgstr ""
+"mostra le informazioni sull'utilizzo delle chiavi durante le inserzioni "
+"chiave"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
-msgstr ""
+msgstr "mostra URL dei criteri durante gli elenchi delle firme"
 
-#: g10/gpg.c:1977
-#, fuzzy
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
-msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
+msgstr "mostra tutte le notazioni durante gli elenchi delle firme"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
-msgstr ""
+msgstr "mostra notazioni standard IETF durante gli elenchi delle firme"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
+"mostra le notazioni fornite dall'utente durante gli elenchi delle firme"
 
-#: g10/gpg.c:1985
-#, fuzzy
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
-msgstr "l'URL della politica di firma indicato non è valido\n"
+msgstr "mostra gli URL preferiti del keyserver durante gli elenchi delle firme"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
-msgstr ""
+msgstr "mostra validità ID utente durante le inserzioni chiave"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
-msgstr ""
+msgstr "mostra ID utente revocati e scaduti negli elenchi di chiavi"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
-msgstr ""
+msgstr "mostra sottochiavi revocate e scadute negli elenchi di chiavi"
 
-#: g10/gpg.c:1993
-#, fuzzy
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
-msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
+msgstr "mostrare il nome del keyring negli elenchi delle chiavi"
 
-#: g10/gpg.c:1995
-#, fuzzy
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
-msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
+msgstr "mostra date di scadenza durante le inserzioni delle firme"
 
-#: g10/gpg.c:2110
-#, fuzzy, c-format
+#: g10/gpg.c:2118
+#, c-format
 msgid "unknown TOFU policy '%s'\n"
-msgstr "destinatario predefinito `%s' sconosciuto\n"
+msgstr "criterio TOFU sconosciuto '%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
-msgstr ""
-
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr ""
-"NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n"
+msgstr "(utilizzare \"help\" per elencare le scelte)\n"
 
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
-#, fuzzy, c-format
-#| msgid "NOTE: %s is not for normal use!\n"
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
+#, c-format
 msgid "Note: %s is not for normal use!\n"
-msgstr "NOTA: %s normalmente non deve essere usato!\n"
+msgstr "Nota: %s non è per uso normale!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
-#, fuzzy, c-format
+#: g10/gpg.c:3017 g10/gpg.c:3029
+#, c-format
 msgid "'%s' is not a valid signature expiration\n"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "'%s' non è una scadenza di firma valida\n"
 
-#: g10/gpg.c:3104
-#, fuzzy, c-format
+#: g10/gpg.c:3051
+#, c-format
 msgid "\"%s\" is not a proper mail address\n"
-msgstr "L'indirizzo di email non è valido\n"
+msgstr "\"%s\" non è un indirizzo di posta elettronica corretto\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
-#, fuzzy, c-format
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
+#, c-format
 msgid "invalid pinentry mode '%s'\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "modalità pinentry non valida '%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
-#, fuzzy, c-format
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
+#, c-format
 msgid "invalid request origin '%s'\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "origine richiesta non valida '%s'\n"
 
-#: g10/gpg.c:3196
-#, fuzzy, c-format
+#: g10/gpg.c:3143
+#, c-format
 msgid "'%s' is not a valid character set\n"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "'%s' non è un set di caratteri valido\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
-#, fuzzy, c-format
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
+#, c-format
 msgid "could not parse keyserver URL\n"
-msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+msgstr "impossibile analizzare l'URL del server dei chiavi\n"
 
-#: g10/gpg.c:3236
-#, fuzzy, c-format
+#: g10/gpg.c:3183
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: opzioni di esportazione non valide\n"
+msgstr "%s:%d: opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3239
-#, fuzzy, c-format
+#: g10/gpg.c:3186
+#, c-format
 msgid "invalid keyserver options\n"
-msgstr "opzioni di esportazione non valide\n"
+msgstr "opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
-#, fuzzy, c-format
+#: g10/gpg.c:3202 g10/gpg.c:3217
+#, c-format
 msgid "invalid filter option: %s\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "opzione di filtro non valida: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3276
-#, fuzzy, c-format
+#: g10/gpg.c:3223
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: opzioni di importazione non valide\n"
+msgstr "%s:%d: opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3279
-#, fuzzy, c-format
+#: g10/gpg.c:3226
+#, c-format
 msgid "invalid list options\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
-msgstr ""
+msgstr "visualizzare gli ID foto durante la verifica della firma"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
-msgstr ""
+msgstr "mostra URL dei criteri durante la verifica della firma"
 
-#: g10/gpg.c:3291
-#, fuzzy
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "mostra tutte le notazioni durante la verifica della firma"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
-msgstr ""
+msgstr "mostra notazioni standard IETF durante la verifica della firma"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
+"mostra le notazioni fornite dall'utente durante la verifica della firma"
 
-#: g10/gpg.c:3299
-#, fuzzy
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
-msgstr "l'URL della politica di firma indicato non è valido\n"
+msgstr "mostra gli URL preferiti del keyserver durante la verifica della firma"
 
-#: g10/gpg.c:3301
-#, fuzzy
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "mostra validità DELL'ID utente durante la verifica della firma"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
-msgstr ""
+msgstr "mostra ID utente revocati e scaduti nella verifica della firma"
 
-#: g10/gpg.c:3305
-#, fuzzy
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "mostra solo l'ID utente primario nella verifica della firma"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
-msgstr ""
+msgstr "convalidare le firme con i dati PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
-msgstr ""
+msgstr "elevare la fiducia delle firme con dati PKA validi"
 
-#: g10/gpg.c:3316
-#, fuzzy, c-format
+#: g10/gpg.c:3263
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: opzioni di esportazione non valide\n"
+msgstr "%s:%d: opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3319
-#, fuzzy, c-format
+#: g10/gpg.c:3266
+#, c-format
 msgid "invalid verify options\n"
-msgstr "opzioni di esportazione non valide\n"
+msgstr "opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:3531
-#, fuzzy, c-format
+#: g10/gpg.c:3478
+#, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: opzioni di esportazione non valide\n"
+msgstr "%s:%d: elenco di individuazione automatica della chiave non valido\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
-msgstr ""
+msgstr "elenco di individuazione automatica delle chiavi non valido\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
-msgstr ""
+msgstr "AVVISO: in esecuzione con l'ora di sistema falso: "
 
-#: g10/gpg.c:3770
-#, fuzzy, c-format
+#: g10/gpg.c:3712
+#, c-format
 msgid "will not run with insecure memory due to %s\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "non verrà eseguito con memoria non protetta a causa di %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/gpg.c:3817
-#, fuzzy, c-format
+#: g10/gpg.c:3759
+#, c-format
 msgid "selected compression algorithm is invalid\n"
-msgstr "l'algoritmo di cifratura selezionato non è valido\n"
+msgstr "algoritmo di compressione selezionato non valido\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3842
-#, fuzzy, c-format
+#: g10/gpg.c:3784
+#, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth deve essere tra 1 e 255\n"
+msgstr "max-cert-depth deve essere compreso tra 1 e 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3849
-#, fuzzy, c-format
-#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+#: g10/gpg.c:3791
+#, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n"
+msgstr "Nota: la modalità S2K semplice (0) è fortemente sconsigliata\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n"
-
-#: g10/gpg.c:3971
-#, fuzzy, c-format
+#: g10/gpg.c:3913
+#, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
-"non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n"
+"l'algoritmo di compressione '%s' non può essere utilizzato in modalità %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:4198
-#, fuzzy, c-format
+#: g10/gpg.c:4141
+#, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "decifratura fallita: %s\n"
+msgstr "crittografia simmetrica di '%s' non riuscita: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "non è possibile utilizzare --symmetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
-#, fuzzy, c-format
+#: g10/gpg.c:4173
+#, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
-msgstr "non è possibile usare %s in modalità %s\n"
+msgstr "non è possibile utilizzare --symmetric --encrypt in modalità %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
+"non è possibile utilizzare --symmetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
-#, fuzzy, c-format
+#: g10/gpg.c:4234
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
-msgstr "non è possibile usare %s in modalità %s\n"
+msgstr ""
+"non è possibile utilizzare --symmetric --sign --encrypt in modalità %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:4684
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
+#: g10/gpg.c:4646
+#, c-format
 msgid "export as ssh key failed: %s\n"
-msgstr "esportazione della chiave fallita: %s\n"
+msgstr "esportazione come chiave ssh non riuscita: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:4879
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
+#: g10/gpg.c:4841
+#, c-format
 msgid "invalid hash algorithm '%s'\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "algoritmo hash non valido '%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
-#, fuzzy, c-format
+#: g10/gpg.c:4993 g10/tofu.c:2153
+#, c-format
 msgid "error parsing key specification '%s': %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante l'analisi della specifica della chiave '%s': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
+"'%s' non sembra essere un ID chiave, un'impronta digitale o un keygrip "
+"valido\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
+"AVVISO: nessun comando fornito.  Cercando di indovinare cosa vuoi dire ...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non è valido\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non è valido\n"
 
-#: g10/gpg.c:5491
-#, fuzzy, c-format
+#: g10/gpg.c:5453
+#, c-format
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "l'URL della politica di firma indicato non è valido\n"
+msgstr "l'URL del keyserver preferito specificato non è valido\n"
 
-#: g10/gpgv.c:79
-#, fuzzy
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
-msgstr "prende le chiavi da questo portachiavi"
+msgstr "| FILE: prendere le chiavi dal file di tasti"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
-msgstr ""
+msgstr "|ALGO|rifiuta le firme fatte con ALGO"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:150
-#, fuzzy
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
-"Sintassi: gpg [opzioni] [file]\n"
-"Controlla le firme con le chiavi affidabili note\n"
+"Sintassi: gpgv [opzioni] [file]\n"
+"Controllare le firme rispetto alle chiavi attendibili note\n"
 
 #: g10/helptext.c:72
 msgid "No help available"
 msgstr "Non è disponibile un aiuto"
 
 #: g10/helptext.c:82
-#, fuzzy, c-format
-#| msgid "No help available for `%s'"
+#, c-format
 msgid "No help available for '%s'"
-msgstr "Non è disponibile un aiuto per `%s'"
+msgstr "Nessuna Guida disponibile per '%s'."
 
 #: g10/import.c:169
 msgid "import signatures that are marked as local-only"
-msgstr ""
+msgstr "importare firme contrassegnate come solo locali"
 
 #: g10/import.c:172
 msgid "repair damage from the pks keyserver during import"
-msgstr ""
+msgstr "riparare i danni dal keyserver pks durante l'importazione"
 
 #: g10/import.c:175
-#, fuzzy
 msgid "do not clear the ownertrust values during import"
-msgstr "aggiorna il database della fiducia"
+msgstr "non cancellare i valori ownertrust durante l'importazione"
 
 #: g10/import.c:178
-#, fuzzy
 msgid "do not update the trustdb after import"
-msgstr "aggiorna il database della fiducia"
+msgstr "non aggiornare il trustdb dopo l'importazione"
 
 #: g10/import.c:181
-#, fuzzy
 msgid "show key during import"
-msgstr "mostra le impronte digitali"
+msgstr "mostra chiave durante l'importazione"
 
 #: g10/import.c:184
 msgid "only accept updates to existing keys"
-msgstr ""
+msgstr "accettare solo gli aggiornamenti alle chiavi esistenti"
 
 #: g10/import.c:187
-#, fuzzy
 msgid "remove unusable parts from key after import"
-msgstr "chiave segreta inutilizzabile"
+msgstr "rimuovere le parti inutilizzabili dalla chiave dopo l'importazione"
 
 #: g10/import.c:190
 msgid "remove as much as possible from key after import"
-msgstr ""
+msgstr "rimuovere il più possibile dalla chiave dopo l'importazione"
 
 #: g10/import.c:193
 msgid "ignore key-signatures which are not self-signatures"
-msgstr ""
+msgstr "ignorare le firme chiave che non sono auto-firme"
 
 #: g10/import.c:196
 msgid "run import filters and export key immediately"
 msgstr ""
+"eseguire immediatamente i filtri di importazione e la chiave di esportazione"
 
 #: g10/import.c:199
 msgid "assume the GnuPG key backup format"
-msgstr ""
+msgstr "assumere il formato di backup della chiave GnuPG"
 
 #: g10/import.c:203
-#, fuzzy
 msgid "repair keys on import"
-msgstr "mostra le impronte digitali"
+msgstr "ripristinare le chiavi all'importazione"
 
 #: g10/import.c:380 g10/import.c:699
 #, c-format
@@ -3500,9 +3381,9 @@
 msgstr "salto un blocco di tipo %d\n"
 
 #: g10/import.c:716
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys processed so far\n"
-msgstr "Per ora sono state esaminate %lu chiavi\n"
+msgstr "%lu chiavi elaborate finora\n"
 
 #: g10/import.c:802
 #, c-format
@@ -3510,10 +3391,9 @@
 msgstr "Numero totale esaminato: %lu\n"
 
 #: g10/import.c:805
-#, fuzzy, c-format
-#| msgid "      skipped new keys: %lu\n"
+#, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
-msgstr "  nuove chiavi saltate: %lu\n"
+msgstr "    Chiavi PGP-2 ignorate: %lu\n"
 
 #: g10/import.c:807
 #, c-format
@@ -3553,7 +3433,7 @@
 #: g10/import.c:825
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "nuove revoche di chiavi: %lu\n"
+msgstr "  nuove revoche di chiavi: %lu\n"
 
 #: g10/import.c:827 sm/import.c:136
 #, c-format
@@ -3563,12 +3443,12 @@
 #: g10/import.c:829 sm/import.c:138
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "chiavi segrete importate: %lu\n"
+msgstr "  chiavi segrete importate: %lu\n"
 
 #: g10/import.c:831 sm/import.c:140
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "chiavi segrete non cambiate: %lu\n"
+msgstr " chiavi segrete non cambiate: %lu\n"
 
 #: g10/import.c:833 sm/import.c:142
 #, c-format
@@ -3576,14 +3456,14 @@
 msgstr "             importate: %lu\n"
 
 #: g10/import.c:835
-#, fuzzy, c-format
+#, c-format
 msgid "    signatures cleaned: %lu\n"
-msgstr "           nuove firme: %lu\n"
+msgstr "    firme pulite: %lu\n"
 
 #: g10/import.c:837
-#, fuzzy, c-format
+#, c-format
 msgid "      user IDs cleaned: %lu\n"
-msgstr "  chiavi segrete lette: %lu\n"
+msgstr "    ID utente puliti: %lu\n"
 
 #: g10/import.c:1264
 #, c-format
@@ -3591,172 +3471,175 @@
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
+"AVVISO: la chiave %s contiene le preferenze per\n"
+"algoritmi su questi ID utente:\n"
 
 #: g10/import.c:1306
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": preferenza per l'algoritmo di crittografia %s\n"
 
 #: g10/import.c:1321
-#, fuzzy, c-format
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgstr "        \"%s\": preferenza per l'algoritmo digest %s\n"
 
 #: g10/import.c:1333
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "          \"%s\": preferenza per l'algoritmo di compressione %s\n"
 
 #: g10/import.c:1346
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "si consiglia vivamente di aggiornare le preferenze e\n"
 
 #: g10/import.c:1348
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
+"ri-distribuire questa chiave per evitare potenziali problemi di mancata "
+"corrispondenza dell'algoritmo\n"
 
 #: g10/import.c:1373
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
+"è possibile aggiornare le preferenze con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
-#, fuzzy, c-format
+#: g10/import.c:1887 g10/import.c:3001
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "chiave %08lX: nessun user ID\n"
+msgstr "chiave %s: nessun ID utente\n"
 
 #: g10/import.c:1893
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: %s\n"
-msgstr "saltata `%s': %s\n"
+msgstr "chiave %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
-msgstr ""
+msgstr "rifiutato dallo screener di importazione"
 
 #: g10/import.c:1938
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
+msgstr "chiave %s: danneggiamento della sottochiave PKS riparato\n"
 
 #: g10/import.c:1959
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
+msgstr "chiave %s: accettato ID utente non autofirmato \"%s\"\n"
 
 #: g10/import.c:1969 g10/import.c:2000
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "chiave %08lX: nessun user ID valido\n"
+msgstr "chiave %s: nessun ID utente valido\n"
 
 #: g10/import.c:1971
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo può essere causato da una autofirma mancante\n"
 
-#: g10/import.c:2050 g10/import.c:3386
-#, fuzzy, c-format
+#: g10/import.c:2050 g10/import.c:3387
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
+msgstr "chiave %s: chiave pubblica non trovata: %s\n"
 
 #: g10/import.c:2056
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "chiave %08lX: nuova chiave - saltata\n"
+msgstr "chiave %s: nuova chiave - ignorata\n"
 
 #: g10/import.c:2068
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
-#, fuzzy, c-format
-#| msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
+#, c-format
 msgid "error writing keyring '%s': %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
+msgstr "errore durante la scrittura della chiave '%s': %s\n"
 
 #: g10/import.c:2123
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
+msgstr "chiave %s: chiave pubblica \"%s\" importata\n"
 
 #: g10/import.c:2150
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
+msgstr "chiave %s: non corrisponde alla nostra copia\n"
 
 #: g10/import.c:2218
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
+msgstr "chiave %s: \"%s\" 1 nuovo ID utente\n"
 
 #: g10/import.c:2221
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
+msgstr "chiave %s: \"%s\" %d nuovi ID utente\n"
 
 #: g10/import.c:2224
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "chiave %08lX: \"%s\" una nuova firma\n"
+msgstr "chiave %s: \"%s\" 1 nuova firma\n"
 
 #: g10/import.c:2227
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
+msgstr "chiave %s: \"%s\" %d nuove firme\n"
 
 #: g10/import.c:2230
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
+msgstr "chiave %s: \"%s\" 1 nuova sottochiave\n"
 
 #: g10/import.c:2233
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
+msgstr "chiave %s: \"%s\" %d nuove sottochiavi\n"
 
 #: g10/import.c:2236
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
+msgstr "chiave %s: \"%s\" %d firma pulita\n"
 
 #: g10/import.c:2239
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
+msgstr "chiave %s: \"%s\" %d firme pulite\n"
 
 #: g10/import.c:2242
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
+msgstr "chiave %s: \"%s\" %d ID utente pulito\n"
 
 #: g10/import.c:2245
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
+msgstr "chiave %s: \"%s\" %d ID utente puliti\n"
 
 #: g10/import.c:2281
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "chiave %08lX: \"%s\" non cambiata\n"
+msgstr "chiave %s: \"%s\" non modificata\n"
 
-#: g10/import.c:2639 g10/import.c:2834
-#, fuzzy, c-format
+#: g10/import.c:2640 g10/import.c:2835
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "chiave %08lX: chiave segreta importata\n"
+msgstr "chiave %s: chiave segreta importata\n"
 
-#: g10/import.c:2647
-#, fuzzy, c-format
-#| msgid "skipped: secret key already present\n"
+#: g10/import.c:2648
+#, c-format
 msgid "key %s: secret key already exists\n"
-msgstr "saltata: chiave pubblica già presente\n"
+msgstr "chiave %s: chiave segreta già esistente\n"
 
-#: g10/import.c:2655
-#, fuzzy, c-format
+#: g10/import.c:2656
+#, c-format
 msgid "key %s: error sending to agent: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "chiave %s: errore durante l'invio all'agente: %s\n"
 
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
@@ -3766,236 +3649,302 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
-msgstr ""
+msgstr "Per eseguire la migrazione di '%s', con ogni smart card: %s\n"
 
-#: g10/import.c:2971
-#, fuzzy, c-format
+#: g10/import.c:2972
+#, c-format
 msgid "secret key %s: %s\n"
-msgstr "chiave segreta `%s' non trovata: %s\n"
+msgstr "chiave segreta %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
-#, fuzzy, c-format
+#: g10/import.c:2993 g10/import.c:3032
+#, c-format
 msgid "importing secret keys not allowed\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "importazione di chiavi segrete non consentita\n"
 
-#: g10/import.c:3019
-#, fuzzy, c-format
+#: g10/import.c:3020
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
+msgstr "chiave %s: chiave segreta con crittografia non valida %d - ignorata\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Questa chiave è stata sostituita"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Questa chiave è stata compromessa"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "La chiave non è più usata"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "L'user ID non è più valido"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/import.c:3379
-#, fuzzy, c-format
+#: g10/import.c:3380
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
-"certificato di revoca\n"
+"chiave %s: nessuna chiave pubblica - impossibile applicare il certificato di "
+"revoca\n"
 
-#: g10/import.c:3410
-#, fuzzy, c-format
+#: g10/import.c:3411
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
+msgstr "chiave %s: impossibile individuare il blocco di chiave originale: %s\n"
 
-#: g10/import.c:3417
-#, fuzzy, c-format
+#: g10/import.c:3418
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
+msgstr "chiave %s: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:3437
-#, fuzzy, c-format
+#: g10/import.c:3438
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
+msgstr "chiave %s: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:3472
-#, fuzzy, c-format
+#: g10/import.c:3473
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
+msgstr "chiave %s: certificato di revoca \"%s\" importato\n"
 
-#: g10/import.c:3558
-#, fuzzy, c-format
+#: g10/import.c:3559
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "chiave %08lX: nessun user ID per la firma\n"
+msgstr "chiave %s: nessun ID utente per la firma\n"
 
-#: g10/import.c:3575
-#, fuzzy, c-format
+#: g10/import.c:3576
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
-"chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
+"chiave %s: algoritmo a chiave pubblica non supportato sull'ID utente \"%s\"\n"
 
-#: g10/import.c:3577
-#, fuzzy, c-format
+#: g10/import.c:3578
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
+msgstr "chiave %s: autode firma non valida sull'ID utente \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
-#, fuzzy, c-format
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
+msgstr "chiave %s: algoritmo a chiave pubblica non supportato\n"
 
-#: g10/import.c:3595
-#, fuzzy, c-format
+#: g10/import.c:3596
+#, c-format
 msgid "key %s: invalid direct key signature\n"
-msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
+msgstr "chiave %s: firma diretta della chiave non valida\n"
 
-#: g10/import.c:3609
-#, fuzzy, c-format
+#: g10/import.c:3610
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
+msgstr "chiave %s: nessuna sottochiave per l'associazione della chiave\n"
 
-#: g10/import.c:3624
-#, fuzzy, c-format
+#: g10/import.c:3625
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+msgstr "chiave %s: associazione di sottochiavi non valida\n"
 
-#: g10/import.c:3643
-#, fuzzy, c-format
+#: g10/import.c:3644
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
+msgstr "chiave %s: rimossa l'associazione di più sottochiavi\n"
 
-#: g10/import.c:3667
-#, fuzzy, c-format
+#: g10/import.c:3668
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
+msgstr "chiave %s: nessuna sottochiave per la revoca della chiave\n"
 
-#: g10/import.c:3680
-#, fuzzy, c-format
+#: g10/import.c:3681
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "chiave %08lX: revoca della subchiave non valida\n"
+msgstr "chiave %s: revoca della sottochiave non valida\n"
 
-#: g10/import.c:3695
-#, fuzzy, c-format
+#: g10/import.c:3696
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
+msgstr "chiave %s: rimossa la revoca di più sottochiavi\n"
 
-#: g10/import.c:3739
-#, fuzzy, c-format
+#: g10/import.c:3740
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "chiave %08lX: saltato l'user ID '"
+msgstr "chiave %s: ID utente ignorato \"%s\"\n"
 
-#: g10/import.c:3766
-#, fuzzy, c-format
+#: g10/import.c:3767
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "chiave %08lX: saltata la subchiave\n"
+msgstr "chiave %s: sottochiave ignorata\n"
 
-#: g10/import.c:3797
-#, fuzzy, c-format
+#: g10/import.c:3798
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
+msgstr "chiave %s: firma non esportabile (classe 0x%02X) - ignorata\n"
 
-#: g10/import.c:3808
-#, fuzzy, c-format
+#: g10/import.c:3809
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
+msgstr "chiave %s: certificato di revoca nella posizione errata - ignorato\n"
 
-#: g10/import.c:3826
-#, fuzzy, c-format
+#: g10/import.c:3827
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
+msgstr "chiave %s: certificato di revoca non valido: %s - ignorato\n"
 
-#: g10/import.c:3840
-#, fuzzy, c-format
+#: g10/import.c:3841
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
+msgstr "chiave %s: firma della sottochiave nella posizione errata - ignorata\n"
 
-#: g10/import.c:3848
-#, fuzzy, c-format
+#: g10/import.c:3849
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
+msgstr "chiave %s: classe di firma imprevista (0x%02X) - ignorata\n"
 
-#: g10/import.c:4021
-#, fuzzy, c-format
+#: g10/import.c:4022
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
+msgstr "chiave %s: rilevato ID utente duplicato - unito\n"
 
-#: g10/import.c:4086
-#, fuzzy, c-format
+#: g10/import.c:4087
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"ATTENZIONE: la chiave %08lX può essere stata revocata: scarico la chiave\n"
-"di revoca %08lX.\n"
+"AVVISO: la chiave %s può essere revocata: recupero della chiave di revoca "
+"%s\n"
 
-#: g10/import.c:4102
-#, fuzzy, c-format
+#: g10/import.c:4103
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"ATTENZIONE: la chiave %08lX può essere stata revocata: la chiave di\n"
-"revoca %08lX non è presente.\n"
+"AVVISO: la chiave %s può essere revocata: chiave di revoca %s non presente.\n"
 
-#: g10/import.c:4168
-#, fuzzy, c-format
+#: g10/import.c:4169
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
+msgstr "chiave %s: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:4206
-#, fuzzy, c-format
+#: g10/import.c:4207
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
+msgstr "chiave %s: aggiunta firma chiave diretta\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
-#, fuzzy, c-format
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "errore durante l'allocazione della memoria: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"impossibile controllare la firma con algoritmo a chiave pubblica non "
+"supportato (%d): %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"impossibile controllare la firma con l'algoritmo digest del messaggio non "
+"supportato %d: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (seguono le firme riordinate)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "chiave %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] ""
+"%d firma duplicata rimossa\n"
+"\n"
+msgstr[1] "%d firme duplicate rimosse\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d firma non controllata a causa di una chiave mancante\n"
+msgstr[1] "%d firme non controllate a causa di chiavi mancanti\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d firma non valida\n"
+msgstr[1] "%d firme non valide\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Firma %d riordinata\n"
+msgstr[1] "Firme %d riordinata\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Avviso: errori rilevati e controllati solo auto-firme, eseguire '%s' per "
+"controllare tutte le firme.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
+#, c-format
 msgid "error creating keybox '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "errore durante la creazione della casella della chiave '%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#: g10/keydb.c:434 g10/keydb.c:461
+#, c-format
 msgid "error creating keyring '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "errore durante la creazione della chiave '%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
-#, fuzzy, c-format
+#: g10/keydb.c:470 sm/keydb.c:210
+#, c-format
 msgid "keybox '%s' created\n"
-msgstr "portachiavi `%s' creato\n"
+msgstr "keybox '%s' creato\n"
 
-#: g10/keydb.c:470
-#, fuzzy, c-format
-#| msgid "keyring `%s' created\n"
+#: g10/keydb.c:472
+#, c-format
 msgid "keyring '%s' created\n"
-msgstr "portachiavi `%s' creato\n"
+msgstr "chiave '%s' creata\n"
 
-#: g10/keydb.c:861
-#, fuzzy, c-format
+#: g10/keydb.c:863
+#, c-format
 msgid "keyblock resource '%s': %s\n"
-msgstr "errore creando `%s': %s\n"
+msgstr "risorsa keyblock '%s': %s\n"
 
-#: g10/keydb.c:967
-#, fuzzy, c-format
+#: g10/keydb.c:969
+#, c-format
 msgid "error opening key DB: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'apertura della chiave DB: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
@@ -4009,27 +3958,26 @@
 msgstr "[autofirma]"
 
 #: g10/keyedit.c:384 g10/pkclist.c:274
-#, fuzzy
 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"
 msgstr ""
-"Per favore decidi quanto hai fiducia che questo utente firmi correttamente\n"
-"le chiavi di altri utenti (guardando il loro passaporto, controllando le\n"
-"impronte digitali da diverse fonti...)?\n"
-"\n"
+"Si prega di decidere fino a che punto si considera attendibile questo utente "
+"per verificare correttamente le chiavi di altri utenti\n"
+"(guardando i passaporti, controllando le impronte digitali da fonti diverse, "
+"ecc.)\n"
 
 #: g10/keyedit.c:388 g10/pkclist.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = Mi fido marginalmente\n"
+msgstr "  %d - Mi fido marginalmente\n"
 
 #: g10/keyedit.c:389 g10/pkclist.c:288
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = Mi fido completamente\n"
+msgstr "  %d - Mi fido completamente\n"
 
 #: g10/keyedit.c:407
 msgid ""
@@ -4037,15 +3985,19 @@
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"Immettere la profondità di questa firma di attendibilità.\n"
+"Una profondità maggiore di 1 consente alla chiave che si sta firmando di\n"
+"firme di attendibilità per vostro conto.\n"
 
 #: g10/keyedit.c:424
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
+"Inserisci un dominio per limitare questa firma o inserisci per nessuno.\n"
 
 #: g10/keyedit.c:552
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
-msgstr ""
+msgstr "Ignorare l'ID utente \"%s\", che non è un ID di testo.\n"
 
 #: g10/keyedit.c:560
 #, c-format
@@ -4073,14 +4025,13 @@
 msgstr "L'user ID \"%s\" non è autofirmato."
 
 #: g10/keyedit.c:645
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\" is signable.  "
-msgstr "L'user ID \"%s\" non è autofirmato."
+msgstr "L'ID utente \"%s\" è firmabile.  "
 
 #: g10/keyedit.c:647
-#, fuzzy
 msgid "Sign it? (y/N) "
-msgstr "Firmo davvero? "
+msgstr "Firmarlo? (y/N) "
 
 #: g10/keyedit.c:674
 #, c-format
@@ -4122,23 +4073,23 @@
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
 #: g10/keyedit.c:747
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" era già stato firmato localmente dalla chiave %08lX\n"
+msgstr "\"%s\" era già firmato localmente dalla chiave %s\n"
 
 #: g10/keyedit.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n"
+msgstr "\"%s\" è già stato firmato dalla chiave %s\n"
 
 #: g10/keyedit.c:756
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
 #: g10/keyedit.c:778
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Niente da firmare con la chiave %08lX\n"
+msgstr "Niente da firmare con la chiave %s\n"
 
 #: g10/keyedit.c:802
 msgid "This key has expired!"
@@ -4184,82 +4135,56 @@
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
 #: g10/keyedit.c:886
-#, fuzzy
 msgid "Your selection? (enter '?' for more information): "
-msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
+msgstr "La tua scelta? (inserire '?' per ulteriori informazioni): "
 
 #: g10/keyedit.c:913
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"Sei davvero sicuro di volere firmare questa chiave\n"
-"con la tua chiave: \""
+"Sei sicuro di voler firmare questa chiave con il tuo\n"
+"chiave \"%s\" (%s)\n"
 
 #: g10/keyedit.c:921
-#, fuzzy
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"Questa sarà una autofirma.\n"
+msgstr "Questa sarà un'auto-firma.\n"
 
 #: g10/keyedit.c:926
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"ATTENZIONE: la firma non sarà marcata come non esportabile.\n"
+msgstr "AVVISO: la firma non verrà contrassegnata come non esportabile.\n"
 
 #: g10/keyedit.c:933
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"ATTENZIONE: la firma sarà marcata come irrevocabile.\n"
+msgstr "AVVISO: la firma non verrà contrassegnata come non revocabile.\n"
 
 #: g10/keyedit.c:943
-#, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"La firma sarà marcata come non esportabile.\n"
+msgstr "La firma verrà contrassegnata come non esportabile.\n"
 
 #: g10/keyedit.c:950
-#, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"La firma sarà marcata come irrevocabile.\n"
+msgstr "La firma verrà contrassegnata come non revocabile.\n"
 
 #: g10/keyedit.c:957
-#, fuzzy
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"Non ho controllato per niente questa chiave.\n"
+msgstr "Non ho controllato questa chiave a tutti.\n"
 
 #: g10/keyedit.c:962
-#, fuzzy
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"Ho controllato questa chiave superficialmente.\n"
+msgstr "Ho controllato questa chiave casualmente.\n"
 
 #: g10/keyedit.c:967
-#, fuzzy
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"Ho controllato questa chiave molto attentamente.\n"
+msgstr "Ho controllato questa chiave con molta attenzione.\n"
 
 #: g10/keyedit.c:979
-#, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "Firmo davvero? "
+msgstr "Davvero firmare? (y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -4267,26 +4192,25 @@
 #: g10/keyedit.c:1117
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
+"Key ha solo elementi chiave stub o on-card - nessuna passphrase da "
+"modificare.\n"
 
 #: g10/keyedit.c:1149
-#, fuzzy, c-format
-#| msgid "error creating passphrase: %s\n"
+#, c-format
 msgid "key %s: error changing passphrase: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "chiave %s: errore durante la modifica della passphrase: %s\n"
 
 #: g10/keyedit.c:1261
 msgid "save and quit"
 msgstr "salva ed esci"
 
 #: g10/keyedit.c:1264
-#, fuzzy
 msgid "show key fingerprint"
-msgstr "mostra le impronte digitali"
+msgstr "mostra impronta digitale chiave"
 
 #: g10/keyedit.c:1265
-#, fuzzy
 msgid "show the keygrip"
-msgstr "Annotazione della firma: "
+msgstr "mostrare il keygrip"
 
 #: g10/keyedit.c:1266
 msgid "list key and user IDs"
@@ -4297,32 +4221,30 @@
 msgstr "scegli l'user ID N"
 
 #: g10/keyedit.c:1269
-#, fuzzy
 msgid "select subkey N"
-msgstr "scegli l'user ID N"
+msgstr "selezionare la sottochiave N"
 
 #: g10/keyedit.c:1270
-#, fuzzy
 msgid "check signatures"
-msgstr "revoca firme"
+msgstr "controllare le firme"
 
 #: g10/keyedit.c:1276
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
+"firmare gli ID utente selezionati [* vedere di seguito per i comandi "
+"correlati]"
 
 #: g10/keyedit.c:1281
-#, fuzzy
 msgid "sign selected user IDs locally"
-msgstr "firma la chiave localmente"
+msgstr "firmare gli ID utente selezionati localmente"
 
 #: g10/keyedit.c:1282
-#, fuzzy
 msgid "sign selected user IDs with a trust signature"
-msgstr "Suggerimento: seleziona gli user ID da firmare\n"
+msgstr "firmare gli ID utente selezionati con una firma di trust"
 
 #: g10/keyedit.c:1284
 msgid "sign selected user IDs with a non-revocable signature"
-msgstr ""
+msgstr "firmare gli ID utente selezionati con una firma non-revocabile"
 
 #: g10/keyedit.c:1286
 msgid "add a user ID"
@@ -4333,50 +4255,45 @@
 msgstr "aggiungi un ID fotografico"
 
 #: g10/keyedit.c:1289
-#, fuzzy
 msgid "delete selected user IDs"
-msgstr "cancella un user ID"
+msgstr "eliminare gli ID utente selezionati"
 
 #: g10/keyedit.c:1292
-#, fuzzy
 msgid "add a subkey"
-msgstr "addkey"
+msgstr "aggiungere una sottochiave"
 
 #: g10/keyedit.c:1295
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "aggiungere una chiave a una smart card"
 
 #: g10/keyedit.c:1297
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "spostare un tasto in una smart card"
 
 #: g10/keyedit.c:1299
 msgid "move a backup key to a smartcard"
-msgstr ""
+msgstr "spostare una chiave di backup in una smart card"
 
 #: g10/keyedit.c:1301
-#, fuzzy
 msgid "delete selected subkeys"
-msgstr "cancella una chiave secondaria"
+msgstr "eliminare le sottochiavi selezionate"
 
 #: g10/keyedit.c:1303
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
 #: g10/keyedit.c:1305
-#, fuzzy
 msgid "delete signatures from the selected user IDs"
-msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
+msgstr "eliminare le firme dagli ID utente selezionati"
 
 #: g10/keyedit.c:1307
-#, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
+msgstr ""
+"modificare la data di scadenza della chiave o delle sottochiavi selezionate"
 
 #: g10/keyedit.c:1309
-#, fuzzy
 msgid "flag the selected user ID as primary"
-msgstr "imposta l'user ID come primario"
+msgstr "contrassegnare l'ID utente selezionato come primario"
 
 #: g10/keyedit.c:1312
 msgid "list preferences (expert)"
@@ -4387,19 +4304,18 @@
 msgstr "elenca le preferenze (prolisso)"
 
 #: g10/keyedit.c:1315
-#, fuzzy
 msgid "set preference list for the selected user IDs"
-msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
+msgstr "impostare l'elenco delle preferenze per gli ID utente selezionati"
 
 #: g10/keyedit.c:1318
-#, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+msgstr ""
+"impostare l'URL del server delle chiavi preferito per gli ID utente "
+"selezionati"
 
 #: g10/keyedit.c:1320
-#, fuzzy
 msgid "set a notation for the selected user IDs"
-msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
+msgstr "impostare una notazione per gli ID utente selezionati"
 
 #: g10/keyedit.c:1322
 msgid "change the passphrase"
@@ -4410,52 +4326,48 @@
 msgstr "cambia il valore di fiducia"
 
 #: g10/keyedit.c:1328
-#, fuzzy
 msgid "revoke signatures on the selected user IDs"
-msgstr "Revoco davvero tutti gli user ID selezionati? "
+msgstr "revocare le firme sugli ID utente selezionati"
 
 #: g10/keyedit.c:1330
-#, fuzzy
 msgid "revoke selected user IDs"
-msgstr "revoca un user ID"
+msgstr "revocare gli ID utente selezionati"
 
 #: g10/keyedit.c:1333
-#, fuzzy
 msgid "revoke key or selected subkeys"
-msgstr "revoca una chiave secondaria"
+msgstr "revoca della chiave o delle sottochiavi selezionate"
 
 #: g10/keyedit.c:1335
-#, fuzzy
 msgid "enable key"
-msgstr "abilita una chiave"
+msgstr "chiave di abilitazione"
 
 #: g10/keyedit.c:1336
-#, fuzzy
 msgid "disable key"
-msgstr "disabilita una chiave"
+msgstr "tasto di disattivazione"
 
 #: g10/keyedit.c:1338
-#, fuzzy
 msgid "show selected photo IDs"
-msgstr "mostra l'ID fotografico"
+msgstr "mostra GLI ID foto selezionati"
 
 #: g10/keyedit.c:1340
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
+"compattare id utente inutilizzabili e rimuovere le firme inutilizzabili "
+"dalla chiave"
 
 #: g10/keyedit.c:1342
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
+"compattare gli ID utente inutilizzabili e rimuovere tutte le firme dalla "
+"chiave"
 
 #: g10/keyedit.c:1463
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
 #: g10/keyedit.c:1465
-#, fuzzy
-#| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
-msgstr "È disponibile una chiave segreta.\n"
+msgstr "Sono disponibili sottochiavi segrete.\n"
 
 #: g10/keyedit.c:1567
 msgid "Need the secret key to do this.\n"
@@ -4468,29 +4380,32 @@
 "  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
+"Il comando 'sign' può essere preceduto da una 'l' per le firme locali "
+"(lsign),\n"
+"  una 't' per le firme di trust (tsign), un 'nr' per le firme non "
+"revocabili\n"
+"  (nrsign), o qualsiasi altra combinazione (ltsign, tnrsign, ecc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
 #: g10/keyedit.c:1671
-#, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
-msgstr "Firmo davvero tutti gli user ID? "
+msgstr "Firmare davvero tutti gli ID utente di testo? (y/N) "
 
 #: g10/keyedit.c:1675
-#, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Firmo davvero tutti gli user ID? "
+msgstr "Firmare davvero tutti gli ID utente? (y/N) "
 
 #: g10/keyedit.c:1683
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
 #: g10/keyedit.c:1694
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown signature type '%s'\n"
-msgstr "classe della firma sconosciuta"
+msgstr "Tipo di firma sconosciuto '%s'\n"
 
 #: g10/keyedit.c:1718
 #, c-format
@@ -4504,264 +4419,258 @@
 #: g10/keyedit.c:1742 g10/keyedit.c:1766 g10/keyedit.c:1923 g10/keyedit.c:1963
 #, c-format
 msgid "(Use the '%s' command.)\n"
-msgstr ""
+msgstr "(Utilizzare il comando '%s'.)\n"
 
 #: g10/keyedit.c:1745
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
 #: g10/keyedit.c:1748
-#, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Tolgo davvero tutti gli user ID selezionati? "
+msgstr "Rimuovere davvero tutti gli ID utente selezionati? (y/N) "
 
 #: g10/keyedit.c:1749
-#, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "Tolgo davvero questo user ID? "
+msgstr "Rimuovere davvero questo ID utente? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
 #: g10/keyedit.c:1806
-#, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "Tolgo davvero questo user ID? "
+msgstr "Spostare davvero la chiave primaria? (y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
-#, fuzzy
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
-msgstr "Devi selezionare almeno una chiave.\n"
+msgstr "È necessario selezionare esattamente una chiave.\n"
 
 #: g10/keyedit.c:1846
 msgid "Command expects a filename argument\n"
-msgstr ""
+msgstr "Il comando prevede un argomento filename\n"
 
 #: g10/keyedit.c:1867
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open '%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "Impossibile aprire '%s': %s\n"
 
 #: g10/keyedit.c:1886
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading backup key from '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "Errore durante la lettura della chiave di backup da '%s': %s\n"
 
 #: g10/keyedit.c:1921
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
 #: g10/keyedit.c:1927
-#, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr "Vuoi davvero eliminare le chiavi selezionate? (y/N) "
 
 #: g10/keyedit.c:1929
-#, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Vuoi davvero cancellare questa chiave? "
+msgstr "Vuoi davvero eliminare questa chiave? (y/N) "
 
 #: g10/keyedit.c:1967
-#, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Revoco davvero tutti gli user ID selezionati? "
+msgstr "Revocare davvero tutti gli ID utente selezionati? (y/N) "
 
 #: g10/keyedit.c:1968
-#, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "Revoco davvero questo user ID? "
+msgstr "Revocare davvero questo ID utente? (y/N) "
 
 #: g10/keyedit.c:1986
-#, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "Vuoi davvero revocare questa chiave? "
+msgstr "Vuoi davvero revocare l'intera chiave? (y/N) "
 
 #: g10/keyedit.c:1997
-#, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "Vuoi davvero revocare le chiavi selezionate? "
+msgstr "Si desidera davvero revocare le sottochiavi selezionate? (y/N) "
 
 #: g10/keyedit.c:1999
-#, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "Vuoi davvero revocare questa chiave? "
+msgstr "Si desidera davvero revocare questa sottochiave? (y/N) "
 
 #: g10/keyedit.c:2057
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
+"L'attendibilità del proprietario potrebbe non essere impostata durante "
+"l'utilizzo di un database di trust fornito dall'utente\n"
 
 #: g10/keyedit.c:2102
-#, fuzzy
 msgid "Set preference list to:\n"
-msgstr "imposta la lista di preferenze"
+msgstr "Impostare l'elenco delle preferenze su:\n"
 
 #: g10/keyedit.c:2109
-#, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
+msgstr "Aggiornare davvero le preferenze per gli ID utente selezionati? (y/N) "
 
 #: g10/keyedit.c:2111
-#, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "Aggiorno davvero le preferenze? "
+msgstr "Aggiornare davvero le preferenze? (y/N) "
 
 #: g10/keyedit.c:2185
-#, fuzzy
 msgid "Save changes? (y/N) "
-msgstr "Salvo i cambiamenti? "
+msgstr "Salvare le modifiche? (y/N) "
 
 #: g10/keyedit.c:2189
-#, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "Esco senza salvare? "
+msgstr "Uscire senza salvare? (y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
 #: g10/keyedit.c:2448
-#, fuzzy, c-format
-#| msgid "You can't delete the last user ID!\n"
+#, c-format
 msgid "cannot revoke the last valid user ID.\n"
-msgstr "Non puoi cancellare l'ultimo user ID!\n"
+msgstr "non può revocare l'ultimo ID utente valido.\n"
 
 #: g10/keyedit.c:2475
-#, fuzzy, c-format
+#, c-format
 msgid "revoking the user ID failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "revoca dell'ID utente non riuscita: %s\n"
 
 #: g10/keyedit.c:2541
-#, fuzzy, c-format
+#, c-format
 msgid "setting the primary user ID failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "impostazione dell'ID utente primario non riuscita: %s\n"
 
 #: g10/keyedit.c:2572
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" is not a fingerprint\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "\"%s\" non è un'impronta digitale\n"
 
 #: g10/keyedit.c:2602
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "\"%s\" non è l'impronta digitale primaria\n"
 
 #: g10/keyedit.c:2738 g10/keyedit.c:2741
-#, fuzzy, c-format
-#| msgid "invalid value\n"
+#, c-format
 msgid "Invalid user ID '%s': %s\n"
-msgstr "valore non valido\n"
+msgstr "ID utente '%s' non valido: %s\n"
 
 #: g10/keyedit.c:2744
-#, fuzzy
-#| msgid "No such user ID.\n"
 msgid "No matching user IDs."
-msgstr "User ID inesistente.\n"
+msgstr "Nessun ID utente corrispondente."
 
 #: g10/keyedit.c:2744
-#, fuzzy
 msgid "Nothing to sign.\n"
-msgstr "Niente da firmare con la chiave %08lX\n"
+msgstr "Niente da firmare.\n"
+
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Non firmato da te.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2995
 #, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "controllo della firma creata fallito: %s\n"
+
+#: g10/keyedit.c:3116
+#, c-format
 msgid "'%s' is not a valid expiration time\n"
-msgstr "%s non è un set di caratteri valido\n"
+msgstr "'%s' non è un'ora di scadenza valida\n"
 
-#: g10/keyedit.c:2925
-#, fuzzy, c-format
+#: g10/keyedit.c:3159
+#, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "\"%s\" non è un'impronta digitale corretta\n"
 
-#: g10/keyedit.c:2949
-#, fuzzy, c-format
+#: g10/keyedit.c:3183
+#, c-format
 msgid "subkey \"%s\" not found\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "sottochiave \"%s\" non trovata\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Server delle chiavi preferito: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
-#, fuzzy
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
-msgstr "Nota: "
+msgstr "Notazioni: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3481
-#, fuzzy, c-format
+#: g10/keyedit.c:3741
+#, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
-msgstr "Questa chiave può essere revocata dalla chiave %s "
+msgstr "La seguente chiave è stata revocata su %s dalla chiave %s %s\n"
 
-#: g10/keyedit.c:3505
-#, fuzzy, c-format
+#: g10/keyedit.c:3765
+#, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "Questa chiave può essere revocata dalla chiave %s "
+msgstr "Questa chiave può essere revocata dalla chiave %s %s"
 
-#: g10/keyedit.c:3511
-#, fuzzy
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
-msgstr " (sensibile)"
+msgstr "(sensibile)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
-#, fuzzy, c-format
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
+#, c-format
 msgid "created: %s"
-msgstr "impossibile creare %s: %s\n"
+msgstr "creato: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
-#, fuzzy, c-format
+#: g10/keyedit.c:3816 g10/keylist.c:2149
+#, c-format
 msgid "revoked: %s"
-msgstr "[revocata]"
+msgstr "revocato: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
-#, fuzzy, c-format
+#: g10/keyedit.c:3818 g10/keylist.c:2155
+#, c-format
 msgid "expired: %s"
-msgstr "[scadenza: %s]"
+msgstr "scaduto: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "expires: %s"
-msgstr "[scadenza: %s]"
+msgstr "scadenza: %s"
 
-#: g10/keyedit.c:3562
-#, fuzzy, c-format
+#: g10/keyedit.c:3822
+#, c-format
 msgid "usage: %s"
-msgstr " fiducia: %c/%c"
+msgstr "utilizzo: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
-msgstr ""
+msgstr "scheda-no: "
 
-#: g10/keyedit.c:3629
-#, fuzzy, c-format
+#: g10/keyedit.c:3889
+#, c-format
 msgid "trust: %s"
-msgstr " fiducia: %c/%c"
+msgstr "attendibilità: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "validità: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4770,19 +4679,17 @@
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
-#, fuzzy
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
-msgstr "[revocata]"
+msgstr "revocato"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
-#, fuzzy
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
-msgstr "expire"
+msgstr "scaduto"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4792,18 +4699,17 @@
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
-msgstr ""
+msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
 
-#: g10/keyedit.c:3891
-#, fuzzy, c-format
-#| msgid "You can't change the expiration date of a v3 key\n"
+#: g10/keyedit.c:4151
+#, c-format
 msgid "You may want to change its expiration date too.\n"
-msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
+msgstr "Si consiglia di modificare la data di scadenza troppo.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4812,75 +4718,73 @@
 "ATTENZIONE: Questa è una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            può causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
-msgstr ""
+msgstr "Tale ID utente esiste già in questa chiave!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:4115
-#, fuzzy, c-format
-#| msgid "Deleted %d signature.\n"
+#: g10/keyedit.c:4375
+#, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
-msgstr[0] "Cancellata %d firma.\n"
-msgstr[1] "Cancellata %d firma.\n"
+msgstr[0] "Firma %d eliminata.\n"
+msgstr[1] "Firme %d eliminate.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:4154
-#, fuzzy
+#: g10/keyedit.c:4414
 msgid "invalid"
-msgstr "armatura non valida"
+msgstr "non valido"
 
-#: g10/keyedit.c:4156
-#, fuzzy, c-format
+#: g10/keyedit.c:4416
+#, c-format
 msgid "User ID \"%s\" compacted: %s\n"
-msgstr "L'user ID \"%s\" è stato revocato."
+msgstr "ID utente \"%s\" compattato: %s\n"
 
-#: g10/keyedit.c:4162
-#, fuzzy, c-format
+#: g10/keyedit.c:4422
+#, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
-msgstr[0] "L'user ID \"%s\" è stato revocato."
-msgstr[1] "L'user ID \"%s\" è stato revocato."
+msgstr[0] "ID utente \"%s\": firma %d rimossa\n"
+msgstr[1] "ID utente \"%s\": firme %d rimosse\n"
 
-#: g10/keyedit.c:4170
-#, fuzzy, c-format
+#: g10/keyedit.c:4430
+#, c-format
 msgid "User ID \"%s\": already minimized\n"
-msgstr "l'user ID \"%s\" è già stato revocato\n"
+msgstr "ID utente \"%s\": già ridotto a icona\n"
 
-#: g10/keyedit.c:4171
-#, fuzzy, c-format
+#: g10/keyedit.c:4431
+#, c-format
 msgid "User ID \"%s\": already clean\n"
-msgstr "l'user ID \"%s\" è già stato revocato\n"
+msgstr "ID utente \"%s\": già pulito\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4890,322 +4794,303 @@
 "            designato può causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di sè stessa\n"
 
-#: g10/keyedit.c:4331
-#, fuzzy, c-format
+#: g10/keyedit.c:4591
+#, c-format
 msgid "this key has already been designated as a revoker\n"
-msgstr ""
-"ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n"
+msgstr "questa chiave è già stata designata come revocatore\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:4355
-#, fuzzy
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
-"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
+"Sei sicuro di voler nominare questa chiave come revocatore designato? (y/N) "
 
-#: g10/keyedit.c:4423
-#, fuzzy
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
-"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
+"Si è sicuri di voler modificare l'ora di scadenza per più sottochiavi? (y/N) "
 
-#: g10/keyedit.c:4428
-#, fuzzy
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
-msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
+msgstr "Modifica dell'ora di scadenza per una sottochiave.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:4547
-#, fuzzy
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
-msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
+msgstr "Modifica dell'utilizzo di una sottochiave.\n"
 
-#: g10/keyedit.c:4550
-#, fuzzy
-#| msgid "Changing expiration time for the primary key.\n"
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
-msgstr "Cambio la data di scadenza per la chiave primaria.\n"
+msgstr "Modifica dell'utilizzo della chiave primaria.\n"
 
-#: g10/keyedit.c:4668
-#, fuzzy, c-format
+#: g10/keyedit.c:4928
+#, c-format
 msgid "signing subkey %s is already cross-certified\n"
-msgstr ""
-"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
-"incrociata\n"
+msgstr "la sottochiave di firma %s è già certificata incrociata\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
-msgstr ""
+msgstr "la sottochiave %s non firma e pertanto non deve essere certificata\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
-#, fuzzy, c-format
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
+msgstr "ignorare l'autode firma v3 sull'ID utente \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Immettere l'URL del server di chiavi preferito: "
 
-#: g10/keyedit.c:5082
-#, fuzzy
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Sei sicuro di volerla usare? (s/N) "
+msgstr "Sei sicuro di volerlo sostituire? (y/N) "
 
-#: g10/keyedit.c:5083
-#, fuzzy
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Sei sicuro di volerla usare? (s/N) "
+msgstr "Sei sicuro di volerlo eliminare? (y/N) "
 
-#: g10/keyedit.c:5143
-#, fuzzy
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
-msgstr "Annotazione della firma: "
+msgstr "Immettere la notazione: "
 
-#: g10/keyedit.c:5290
-#, fuzzy
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
-msgstr "Sovrascrivo (s/N)? "
+msgstr "Procedere? (y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:5422
-#, fuzzy, c-format
+#: g10/keyedit.c:5682
+#, c-format
 msgid "No user ID with hash %s\n"
-msgstr "Nessun user ID con l'indice %d\n"
+msgstr "Nessun ID utente con hash %s\n"
 
-#: g10/keyedit.c:5523
-#, fuzzy, c-format
+#: g10/keyedit.c:5783
+#, c-format
 msgid "No subkey with key ID '%s'.\n"
-msgstr "Nessun user ID con l'indice %d\n"
+msgstr "Nessuna sottochiave con ID di chiave '%s'.\n"
 
-#: g10/keyedit.c:5545
-#, fuzzy, c-format
+#: g10/keyedit.c:5805
+#, c-format
 msgid "No subkey with index %d\n"
-msgstr "Nessun user ID con l'indice %d\n"
+msgstr "Nessuna sottochiave con indice %d\n"
 
-#: g10/keyedit.c:5686
-#, fuzzy, c-format
+#: g10/keyedit.c:5946
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "user ID: \""
+msgstr "ID utente: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
-#, fuzzy, c-format
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   firmata da %08lX il %s%s%s\n"
+msgstr "firmato dalla chiave %s su %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   firmata da %08lX il %s%s\n"
-
-#: g10/keyedit.c:5765
-#, fuzzy, c-format
+#: g10/keyedit.c:6025
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "Non puoi cancellare l'ultimo user ID!\n"
+msgstr "Sono stati firmati questi ID utente sulla chiave %s:\n"
 
-#: g10/keyedit.c:5794
-#, fuzzy
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
-msgstr " (non esportabile)"
+msgstr " (non revocabile)"
 
-#: g10/keyedit.c:5801
-#, fuzzy, c-format
+#: g10/keyedit.c:6061
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   revocata da %08lX il %s\n"
+msgstr "revocato dalla chiave %s su %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
-msgstr ""
+msgstr "tentativo di revocare un ID non utente: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:6053
-#, fuzzy, c-format
-#| msgid "You can't delete the last user ID!\n"
+#: g10/keyedit.c:6313
+#, c-format
 msgid "Cannot revoke the last valid user ID.\n"
-msgstr "Non puoi cancellare l'ultimo user ID!\n"
+msgstr "Impossibile revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:6091
-#, fuzzy, c-format
+#: g10/keyedit.c:6351
+#, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "l'user ID \"%s\" è già stato revocato\n"
+msgstr "La chiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6153
-#, fuzzy, c-format
+#: g10/keyedit.c:6413
+#, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "l'user ID \"%s\" è già stato revocato\n"
+msgstr "La sottochiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6250
-#, fuzzy, c-format
+#: g10/keyedit.c:6510
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
-"Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
+"Visualizzazione dell'ID foto %s della dimensione %ld per la chiave %s (uid "
+"%d)\n"
 
-#: g10/keygen.c:170
-#, fuzzy, c-format
+#: g10/keygen.c:169
+#, c-format
 msgid "invalid value for option '%s'\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "valore non valido per l'opzione '%s'\n"
 
-#: g10/keygen.c:323
-#, fuzzy, c-format
+#: g10/keygen.c:322
+#, c-format
 msgid "preference '%s' duplicated\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "preferenza '%s' duplicata\n"
 
-#: g10/keygen.c:330
-#, fuzzy, c-format
+#: g10/keygen.c:329
+#, c-format
 msgid "too many cipher preferences\n"
-msgstr "ci sono troppe preferenze `%c'\n"
+msgstr "troppe preferenze di cifratura\n"
 
-#: g10/keygen.c:332
-#, fuzzy, c-format
+#: g10/keygen.c:331
+#, c-format
 msgid "too many digest preferences\n"
-msgstr "ci sono troppe preferenze `%c'\n"
+msgstr "troppe preferenze di digest\n"
 
-#: g10/keygen.c:334
-#, fuzzy, c-format
+#: g10/keygen.c:333
+#, c-format
 msgid "too many compression preferences\n"
-msgstr "ci sono troppe preferenze `%c'\n"
+msgstr "troppe preferenze di compressione\n"
 
-#: g10/keygen.c:494
-#, fuzzy, c-format
+#: g10/keygen.c:493
+#, c-format
 msgid "invalid item '%s' in preference string\n"
-msgstr "carattere non valido nella stringa delle preferenze\n"
+msgstr "elemento '%s' non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
+"AVVISO: alcuni programmi OpenPGP non sono in grado di gestire una chiave DSA "
+"con questa dimensione del digest\n"
 
-#: g10/keygen.c:1724
-#, fuzzy
+#: g10/keygen.c:1723
 msgid "Sign"
-msgstr "sign"
+msgstr "Firma"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
-msgstr ""
+msgstr "Certifica"
 
-#: g10/keygen.c:1730
-#, fuzzy
+#: g10/keygen.c:1729
 msgid "Encrypt"
-msgstr "cifra dati"
+msgstr "Crittografa"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
-msgstr ""
+msgstr "Autentica"
 
 #. TRANSLATORS: Please use only plain ASCII characters for the
 #. * translation.  If this is not possible use single digits.  The
@@ -5217,169 +5102,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "Azioni possibili per una chiave %s: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Azioni correnti consentite: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) Attivare o disattivare la funzionalità di firma\n"
 
-#: g10/keygen.c:1799
-#, fuzzy, c-format
+#: g10/keygen.c:1798
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (cifra solo)\n"
+msgstr "   (%c) Attivare/disattivare la funzionalità di crittografia\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Attivare/disattivare la funzionalità di autenticazione\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Finito\n"
 
-#: g10/keygen.c:1931
-#, fuzzy, c-format
+#: g10/keygen.c:1930
+#, c-format
 msgid "   (%d) RSA and RSA (default)\n"
-msgstr "   (%d) DSA e ElGamal (default)\n"
+msgstr "   (%d) RSA e RSA (impostazione predefinita)\n"
 
-#: g10/keygen.c:1935
-#, fuzzy, c-format
+#: g10/keygen.c:1934
+#, c-format
 msgid "   (%d) DSA and Elgamal\n"
-msgstr "   (%d) DSA e ElGamal (default)\n"
+msgstr "   (%d) DSA ed Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1946
-#, fuzzy, c-format
+#: g10/keygen.c:1945
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1954
-#, fuzzy, c-format
+#: g10/keygen.c:1953
+#, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "   (%d) DSA (impostare le proprie capacità)\n"
 
-#: g10/keygen.c:1956
-#, fuzzy, c-format
+#: g10/keygen.c:1955
+#, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "   (%d) RSA (imposta le tue funzionalità)\n"
 
-#: g10/keygen.c:1962
-#, fuzzy, c-format
+#: g10/keygen.c:1961
+#, c-format
 msgid "   (%d) ECC and ECC\n"
-msgstr "   (%d) DSA e ElGamal (default)\n"
+msgstr "   (%d) ECC ed ECC\n"
 
-#: g10/keygen.c:1964
-#, fuzzy, c-format
-#| msgid "   (%d) DSA (sign only)\n"
+#: g10/keygen.c:1963
+#, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1966
-#, fuzzy, c-format
+#: g10/keygen.c:1965
+#, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "  (%d) ECC (imposta le tue capacità)\n"
 
-#: g10/keygen.c:1968
-#, fuzzy, c-format
-#| msgid "   (%d) RSA (encrypt only)\n"
+#: g10/keygen.c:1967
+#, c-format
 msgid "  (%d) ECC (encrypt only)\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "  (%d) ECC (solo crittografia)\n"
 
-#: g10/keygen.c:1972
-#, fuzzy, c-format
+#: g10/keygen.c:1971
+#, c-format
 msgid "  (%d) Existing key\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "  (%d) Chiave esistente\n"
 
-#: g10/keygen.c:1974
-#, fuzzy, c-format
+#: g10/keygen.c:1973
+#, c-format
 msgid "  (%d) Existing key from card\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "   (%d) Chiave esistente dalla scheda\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
-#, fuzzy
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
-msgstr "Annotazione della firma: "
+msgstr "Immettere il keygrip: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
-msgstr ""
+msgstr "Keygrip non valido (previsto 40 cifre esadecimali)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
-#, fuzzy
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
-msgstr "Nessun user ID con l'indice %d\n"
+msgstr "Nessuna chiave con questa chiave\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
-#, fuzzy, c-format
+#, c-format
 msgid "error reading the card: %s\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
+msgstr "errore durante la lettura della scheda: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
-#, fuzzy, c-format
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
+#, c-format
 msgid "Serial number of the card: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "Numero di serie della scheda: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
-#, fuzzy
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
-msgstr "disabilita una chiave"
+msgstr "Chiavi disponibili:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
+#: g10/keygen.c:2297 g10/keygen.c:2311
+#, c-format
 msgid "rounded to %u bits\n"
-msgstr "arrotondate a %u bit\n"
+msgstr "arrotondato a %u bit\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr ""
+msgstr "Le chiavi %s possono essere lunghe tra %u e %u bit.\n"
 
-#: g10/keygen.c:2357
-#, fuzzy, c-format
+#: g10/keygen.c:2360
+#, c-format
 msgid "What keysize do you want for the subkey? (%u) "
-msgstr "Di che dimensioni vuoi la chiave? (1024) "
+msgstr "Quale dimensione della chiave si desidera per la sottochiave? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:2420
-#, fuzzy
-#| msgid "Please select what kind of key you want:\n"
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
-msgstr "Per favore scegli che tipo di chiave vuoi:\n"
+msgstr "Selezionare la curva ellittica desiderata:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5395,7 +5272,7 @@
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5411,40 +5288,38 @@
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:2647
-#, fuzzy, c-format
+#: g10/keygen.c:2650
+#, c-format
 msgid "Signature is valid for? (%s) "
-msgstr "Firma valida per? (0) "
+msgstr "La firma è valida per? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:2667
-#, fuzzy
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
-msgstr "%s non ha scadenza\n"
+msgstr "La chiave non scade affatto\n"
 
-#: g10/keygen.c:2668
-#, fuzzy
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
-msgstr "%s non ha scadenza\n"
+msgstr "La firma non scade affatto\n"
 
-#: g10/keygen.c:2673
-#, fuzzy, c-format
+#: g10/keygen.c:2676
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s scadrà il %s\n"
+msgstr "La chiave scade alle %s\n"
 
-#: g10/keygen.c:2674
-#, fuzzy, c-format
+#: g10/keygen.c:2677
+#, c-format
 msgid "Signature expires at %s\n"
-msgstr "Questa firma scadrà il %s\n"
+msgstr "La firma scade alle %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5452,24 +5327,25 @@
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:2691
-#, fuzzy
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
-msgstr "È giusto (s/n)? "
+msgstr "È corretto? (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
+"\n"
+"GnuPG deve costruire un ID utente per identificare la chiave.\n"
+"\n"
 
 #. TRANSLATORS: This string is in general not anymore used
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
-#, fuzzy
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5479,56 +5355,55 @@
 "\n"
 msgstr ""
 "\n"
-"Ti serve un User ID per identificare la tua chiave; il software costruisce "
-"l'user id a partire da Nome e Cognome, Commento e Indirizzo di Email "
-"indicati in questa forma:\n"
+"È necessario un ID utente per identificare la chiave; il software costruisce "
+"l'ID utente\n"
+"dal campo Nome reale, commento e indirizzo e-mail in questo modulo:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
-msgstr ""
+msgstr "I caratteri '%s' e '%s' non possono essere visualizzati nel nome\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:2877
-#, fuzzy, c-format
-#| msgid "You are using the `%s' character set.\n"
+#: g10/keygen.c:2880
+#, c-format
 msgid "You are using the '%s' character set.\n"
-msgstr "Stai usando il set di caratteri `%s'.\n"
+msgstr "Si sta utilizzando il set di caratteri '%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5539,7 +5414,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5554,35 +5429,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:2930
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5594,91 +5465,92 @@
 "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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
+"In cerca di creare una chiave per:\n"
+"    \"%s\"\n"
+"\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
-msgstr ""
+msgstr "Continuare? (Y/n) "
 
-#: g10/keygen.c:4306
-#, fuzzy, c-format
+#: g10/keygen.c:4310
+#, c-format
 msgid "A key for \"%s\" already exists\n"
-msgstr "`%s' è già compresso\n"
+msgstr "Esiste già una chiave per \"%s\"\n"
 
-#: g10/keygen.c:4311
-#, fuzzy
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
-msgstr "Uso lo stesso questa chiave? "
+msgstr "Creare comunque? (y/N) "
 
-#: g10/keygen.c:4317
-#, fuzzy, c-format
+#: g10/keygen.c:4321
+#, c-format
 msgid "creating anyway\n"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "creazione comunque\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
+"Nota: utilizzare \"%s %s\" per una finestra di dialogo di generazione di "
+"chiavi in primo piano.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:4827
-#, fuzzy, c-format
+#: g10/keygen.c:4831
+#, c-format
 msgid "can't create backup file '%s': %s\n"
-msgstr "impossibile creare `%s': %s\n"
+msgstr "impossibile creare il file di backup '%s': %s\n"
 
-#: g10/keygen.c:4847
-#, fuzzy, c-format
+#: g10/keygen.c:4851
+#, c-format
 msgid "Note: backup of card key saved to '%s'\n"
-msgstr "NOTA: chiave %08lX scaduta il %s\n"
+msgstr "Nota: backup della chiave della scheda salvata in '%s'\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
-#, fuzzy, c-format
-#| msgid "writing public key to `%s'\n"
+#: g10/keygen.c:5010 g10/keygen.c:5172
+#, c-format
 msgid "writing public key to '%s'\n"
-msgstr "scrittura della chiave pubblica in `%s'\n"
+msgstr "scrittura di chiave pubblica in '%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:5176
-#, fuzzy, c-format
-#| msgid "error writing public keyring `%s': %s\n"
+#: g10/keygen.c:5180
+#, c-format
 msgid "error writing public keyring '%s': %s\n"
-msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
+msgstr "errore durante la scrittura della chiave pubblica '%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:5225
-#, fuzzy
+#: g10/keygen.c:5229
 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 ""
-"Nota che questa chiave non può essere usata per cifrare. Forse vorrai usare\n"
-"il comando \"--edit-key\" per generare una chiave secondaria per questo "
-"scopo.\n"
+"Si noti che questa chiave non può essere utilizzata per la crittografia.  Si "
+"consiglia di utilizzare\n"
+"il comando \"--edit-key\" per generare una sottochiave a questo scopo.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5686,7 +5558,7 @@
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5694,26 +5566,25 @@
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
-#, fuzzy, c-format
-#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#: g10/keygen.c:5417 g10/keygen.c:5606
+#, c-format
 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"
+msgstr ""
+"Nota: la creazione di sottochiavi per le chiavi v3 non è conforme a OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
-#, fuzzy, c-format
+#: g10/keygen.c:5438 g10/keygen.c:5440
+#, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "Parti della chiave segreta non sono disponibili.\n"
+msgstr "Le parti segrete della chiave primaria vengono archiviate su scheda.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
-#, fuzzy
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
-msgstr "Crea davvero? "
+msgstr "Davvero creare? (y/N) "
 
 #: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
 msgid "never     "
@@ -5729,7 +5600,7 @@
 
 #: g10/keylist.c:374
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Server chiave preferito critico: "
 
 #: g10/keylist.c:427
 msgid "Critical signature notation: "
@@ -5740,619 +5611,598 @@
 msgstr "Annotazione della firma: "
 
 #: g10/keylist.c:475
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
-msgstr[0] "%d firme non corrette\n"
-msgstr[1] "%d firme non corrette\n"
-
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d firme non corrette\n"
-msgstr[1] "%d firme non corrette\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "una firma non controllata per mancanza della chiave\n"
-msgstr[1] "una firma non controllata per mancanza della chiave\n"
+msgstr[0] "%d buona firma\n"
+msgstr[1] "%d buone firme\n"
 
 #: g10/keylist.c:488
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
+#, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "una firma non controllata a causa di un errore\n"
-msgstr[1] "una firma non controllata a causa di un errore\n"
+msgstr[0] "Firma %d non controllata a causa di un errore\n"
+msgstr[1] ""
+"Firme %d non controllate a causa di errori\n"
+"\n"
 
 #: g10/keylist.c:576
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Avviso: chiave %lu ignorata a causa delle dimensioni grandi\n"
+msgstr[1] "Avviso: chiavi %lu ignorate a causa delle dimensioni grandi\n"
 
 #: g10/keylist.c:599
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
-#, fuzzy
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
-msgstr "     Impronta digitale ="
+msgstr "     Impronta digitale della chiave ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      Numero seriale della scheda ="
 
 #: g10/keyring.c:1470
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring '%s'\n"
-msgstr "controllo il portachiavi `%s'\n"
+msgstr "chiave di memorizzazione nella cache '%s'\n"
 
 #: g10/keyring.c:1546
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
-msgstr[0] "Sono state controllate %lu chiavi (%lu firme)\n"
+msgstr[0] "E' stata controllata %lu chiave (%lu firma)\n"
 msgstr[1] "Sono state controllate %lu chiavi (%lu firme)\n"
 
 #: g10/keyring.c:1562
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Chiave %lu memorizzata nella cache"
+msgstr[1] "Chiavi %lu memorizzata nella cache"
 
 #: g10/keyring.c:1564
-#, fuzzy, c-format
-#| msgid "1 bad signature\n"
+#, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
-msgstr[0] "una firma non corretta\n"
-msgstr[1] "una firma non corretta\n"
+msgstr[0] " (firma %lu)\n"
+msgstr[1] " (firme %lu)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
 #: g10/keyserver.c:91
 msgid "override proxy options set for dirmngr"
-msgstr ""
+msgstr "ignorare le opzioni proxy impostate per dirmngr"
 
 #: g10/keyserver.c:93
 msgid "include revoked keys in search results"
-msgstr ""
+msgstr "includere chiavi revocate nei risultati della ricerca"
 
 #: g10/keyserver.c:94
 msgid "include subkeys when searching by key ID"
-msgstr ""
+msgstr "includere le sottochiavi durante la ricerca in base all'ID chiave"
 
 #: g10/keyserver.c:96
 msgid "override timeout options set for dirmngr"
-msgstr ""
+msgstr "opzioni di timeout di override impostate per dirmngr"
 
 #: g10/keyserver.c:100
 msgid "automatically retrieve keys when verifying signatures"
-msgstr ""
+msgstr "recuperare automaticamente le chiavi durante la verifica delle firme"
 
 #: g10/keyserver.c:102
-#, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
-msgstr "l'URL della politica di firma indicato non è valido\n"
+msgstr "rispettare l'URL del keyserver preferito impostato sulla chiave"
 
 #: g10/keyserver.c:104
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
+"rispettare il record PKA impostato su una chiave durante il recupero delle "
+"chiavi"
 
 #: g10/keyserver.c:550
-#, fuzzy
 msgid "disabled"
-msgstr "disable"
+msgstr "disabilitato"
 
 #: g10/keyserver.c:754
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Immettere numeri, N)ext o Q)uit > "
 
 #: g10/keyserver.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "opzioni di esportazione non valide\n"
+msgstr "protocollo keyserver non valido (noi %d!=intestazione %d!)\n"
 
 #: g10/keyserver.c:1001 g10/keyserver.c:1116
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "\"%s\" non è un ID chiave:\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
-#, fuzzy, c-format
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
+#, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
-msgstr[0] "richiedo la chiave %08lX a %s\n"
-msgstr[1] "richiedo la chiave %08lX a %s\n"
+msgstr[0] "aggiornamento della chiave %d da %s\n"
+msgstr[1] ""
+"aggiornamento della chiavi %d da %s\n"
+"\n"
 
-#: g10/keyserver.c:1430
-#, fuzzy, c-format
+#: g10/keyserver.c:1445
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
+msgstr "AVVISO: impossibile aggiornare la chiave %s tramite %s: %s\n"
 
-#: g10/keyserver.c:1534
-#, fuzzy, c-format
+#: g10/keyserver.c:1549
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "chiave \"%s\" non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1537
-#, fuzzy, c-format
+#: g10/keyserver.c:1552
+#, c-format
 msgid "key not found on keyserver\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "chiave non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1709
-#, fuzzy, c-format
+#: g10/keyserver.c:1743
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "richiedo la chiave %08lX a %s\n"
+msgstr "richiesta della chiave %s dal server %s %s\n"
 
-#: g10/keyserver.c:1713
-#, fuzzy, c-format
+#: g10/keyserver.c:1747
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "richiedo la chiave %08lX a %s\n"
+msgstr "richiesta della chiave %s da %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
-#, fuzzy, c-format
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
+#, c-format
 msgid "no keyserver known\n"
-msgstr "opzioni di esportazione non valide\n"
+msgstr "nessun keyserver noto\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
-#, fuzzy, c-format
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "saltata `%s': %s\n"
+msgstr "\"%s\" ignorato: %s\n"
 
-#: g10/keyserver.c:1837
-#, fuzzy, c-format
+#: g10/keyserver.c:1871
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"firmata con la tua chiave %08lX il %s\n"
-"\n"
+msgstr "invio della chiave %s a %s\n"
 
-#: g10/keyserver.c:1878
-#, fuzzy, c-format
+#: g10/keyserver.c:1912
+#, c-format
 msgid "requesting key from '%s'\n"
-msgstr "richiedo la chiave %08lX a %s\n"
+msgstr "richiesta di chiave da '%s'\n"
 
-#: g10/keyserver.c:1894
-#, fuzzy, c-format
+#: g10/keyserver.c:1928
+#, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
+msgstr "AVVISO: impossibile recuperare l'URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:328
-#, fuzzy, c-format
+#: g10/mainproc.c:400
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "cifrato con l'algoritmo sconosciuto %d\n"
+msgstr "passphrase generata con algoritmo digest sconosciuto %d\n"
 
-#: g10/mainproc.c:401
-#, fuzzy, c-format
+#: g10/mainproc.c:481
+#, c-format
 msgid "public key is %s\n"
-msgstr "la chiave pubblica è %08lX\n"
+msgstr "la chiave pubblica è %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:510
-#, fuzzy, c-format
+#: g10/mainproc.c:590
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
+msgstr "crittografata con la chiave %u bit %s, ID %s, creata %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
-#, fuzzy, c-format
+#: g10/mainproc.c:594 g10/pkclist.c:228
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                alias \""
+msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
-#, fuzzy, c-format
+#: g10/mainproc.c:598
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "Cifrato con la chiave %s con ID %08lX\n"
+msgstr ""
+"crittografata con chiave %s, ID %s\n"
+"\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
-msgstr ""
+msgstr "AVVISO: più testo in chiaro visti\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
+"Suggerimento: Se questo messaggio è stato creato prima dell'anno 2003,\n"
+"probabile che questo messaggio sia legittimo.  Questo perché indietro\n"
+"quindi la protezione dell'integrità non è stata ampiamente utilizzata.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
-msgstr ""
+msgstr "Utilizzare comunque l'opzione '%s' per decrittografare.\n"
 
-#: g10/mainproc.c:711
-#, fuzzy, c-format
-#| msgid "decryption failed: %s\n"
+#: g10/mainproc.c:798
+#, c-format
 msgid "decryption forced to fail!\n"
-msgstr "decifratura fallita: %s\n"
+msgstr "decrittazione costretto a fallire!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:775
-#, fuzzy, c-format
-#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+#: g10/mainproc.c:886
+#, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
-msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
+msgstr "Nota: mittente richiesto \"solo per i tuoi occhi\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
-#, fuzzy, c-format
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
+#, c-format
 msgid "no signature found\n"
-msgstr "Firma valida da \""
+msgstr "nessuna firma trovata\n"
 
-#: g10/mainproc.c:1737
-#, fuzzy, c-format
+#: g10/mainproc.c:1852
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "Firma NON corretta da \""
+msgstr "Firma BAD da \"%s\""
 
-#: g10/mainproc.c:1739
-#, fuzzy, c-format
+#: g10/mainproc.c:1854
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Firma scaduta da \""
+msgstr "Firma scaduta da \"%s\""
 
-#: g10/mainproc.c:1741
-#, fuzzy, c-format
+#: g10/mainproc.c:1856
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Firma valida da \""
+msgstr "Firma valida da \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1870
-#, fuzzy, c-format
+#: g10/mainproc.c:1985
+#, c-format
 msgid "can't handle this ambiguous signature data\n"
-msgstr "impossibile gestire queste firme multiple\n"
+msgstr "impossibile gestire questi dati di firma ambigui\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
-#, fuzzy, c-format
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
+#, c-format
 msgid "Signature made %s\n"
-msgstr "Firma scaduta il %s\n"
+msgstr "Firma effettuata %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
-#, fuzzy, c-format
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                alias \""
+msgstr "               utilizzando la chiave %s %s\n"
 
-#: g10/mainproc.c:1898
-#, fuzzy, c-format
+#: g10/mainproc.c:2013
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
+msgstr "Firma effettuata %s utilizzando l'ID chiave %s %s\n"
 
-#: g10/mainproc.c:1904
-#, fuzzy, c-format
+#: g10/mainproc.c:2019
+#, c-format
 msgid "               issuer \"%s\"\n"
-msgstr "                alias \""
+msgstr "               autorità emittente \"%s\"\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
-msgstr ""
+msgstr "Nota: utilizzare '%s' per utilizzare queste informazioni\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:2248
-#, fuzzy, c-format
+#: g10/mainproc.c:2363
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                alias \""
+msgstr "                 aka \"%s\""
 
-#: g10/mainproc.c:2323
-#, fuzzy, c-format
-#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+#: g10/mainproc.c:2438
+#, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
-msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n"
+msgstr "AVVISO: questa chiave non è adatta per l'accesso in modalità %s\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadrà il %s\n"
 
-#: g10/mainproc.c:2356
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#: g10/mainproc.c:2471
+#, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgstr "Firma %s, algoritmo digest %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:2360
-#, fuzzy
-#| msgid "unknown pubkey algorithm"
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
-msgstr "algoritmo della chiave pubblica sconosciuto"
+msgstr ", algoritmo a chiave "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
+"AVVISO: non è una firma disconnessa; il file '%s' NON è stato verificato!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sarà controllata solo la prima.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
-#, fuzzy, c-format
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
+#, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "impossibile aprire il file: %s\n"
+msgstr "fstat di '%s' non riuscito in %s: %s\n"
 
-#: g10/misc.c:171
-#, fuzzy, c-format
+#: g10/misc.c:175
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "trustdb: read fallita (n=%d): %s\n"
+msgstr "fstat(%d) non riuscito in %s: %s\n"
 
-#: g10/misc.c:280
-#, fuzzy, c-format
+#: g10/misc.c:284
+#, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
+msgstr "AVVISO: utilizzo dell'algoritmo a chiave pubblica sperimentale %s\n"
 
-#: g10/misc.c:287
-#, fuzzy, c-format
+#: g10/misc.c:291
+#, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr ""
-"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
+msgstr "AVVISO: le chiavi Elgamal sign-encrypt sono deprecate\n"
 
-#: g10/misc.c:301
-#, fuzzy, c-format
+#: g10/misc.c:305
+#, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "algoritmo di cifratura non implementato"
+msgstr "AVVISO: utilizzo dell'algoritmo di crittografia sperimentale %s\n"
 
-#: g10/misc.c:320
-#, fuzzy, c-format
+#: g10/misc.c:323
+#, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgstr "AVVISO: utilizzo dell'algoritmo digest sperimentale %s\n"
 
-#: g10/misc.c:329
-#, fuzzy, c-format
+#: g10/misc.c:331
+#, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr ""
-"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
+msgstr "AVVISO: l'algoritmo digest %s è deprecato\n"
 
-#: g10/misc.c:354
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#: g10/misc.c:360
+#, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgstr "Nota: le firme che utilizzano l'algoritmo %s vengono rifiutate\n"
 
-#: g10/misc.c:370
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#: g10/misc.c:376
+#, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgstr ""
+"Nota: le firme di chiave di terze parti che utilizzano l'algoritmo %s "
+"vengono rifiutate\n"
 
-#: g10/misc.c:394
-#, fuzzy, c-format
+#: g10/misc.c:400
+#, c-format
 msgid "(reported error: %s)\n"
-msgstr "errore di lettura: %s\n"
+msgstr "(errore segnalato: %s)\n"
 
-#: g10/misc.c:397
-#, fuzzy, c-format
+#: g10/misc.c:403
+#, c-format
 msgid "(reported error: %s <%s>)\n"
-msgstr "errore di lettura: %s\n"
+msgstr "(errore segnalato: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
-msgstr ""
+msgstr "(ulteriori informazioni: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" è una opzione deprecata\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:1099
-#, fuzzy, c-format
+#: g10/misc.c:1184
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+msgstr "AVVISO: \"%s\" è un comando deprecato - non utilizzarlo\n"
 
-#: g10/misc.c:1109
-#, fuzzy, c-format
+#: g10/misc.c:1194
+#, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+msgstr "%s:%u: \"%s\" è obsoleto in questo file - ha effetto solo in %s\n"
 
-#: g10/misc.c:1113
-#, fuzzy, c-format
+#: g10/misc.c:1198
+#, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+msgstr ""
+"AVVISO: \"%s%s\" è un'opzione obsoleta- non ha alcun effetto ad eccezione di "
+"%s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
-#, fuzzy
+#: g10/misc.c:1287
 msgid "uncompressed|none"
-msgstr "Non compresso"
+msgstr "non compresso|nessuno"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio può non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1484
-#, fuzzy, c-format
+#: g10/misc.c:1569
+#, c-format
 msgid "ambiguous option '%s'\n"
-msgstr "lettura delle opzioni da `%s'\n"
+msgstr "opzione ambigua '%s'\n"
 
-#: g10/misc.c:1509
-#, fuzzy, c-format
+#: g10/misc.c:1594
+#, c-format
 msgid "unknown option '%s'\n"
-msgstr "destinatario predefinito `%s' sconosciuto\n"
+msgstr "opzione sconosciuta '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
+"La chiave pubblica ECDSA dovrebbe essere in codifica SEC multipla di 8 bit\n"
 
-#: g10/misc.c:1769
-#, fuzzy, c-format
+#: g10/misc.c:1854
+#, c-format
 msgid "unknown weak digest '%s'\n"
-msgstr "classe della firma sconosciuta"
+msgstr "digest debole sconosciuto '%s'\n"
 
 #: g10/openfile.c:78
-#, fuzzy, c-format
-#| msgid "File `%s' exists. "
+#, c-format
 msgid "File '%s' exists. "
-msgstr "Il file `%s' esiste. "
+msgstr "Il file '%s' esiste. "
 
 #: g10/openfile.c:82
-#, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "Sovrascrivo (s/N)? "
+msgstr "Sovrascrivere? (y/N) "
 
 #: g10/openfile.c:117
 #, c-format
@@ -6369,92 +6219,91 @@
 msgstr "scrivo su stdout\n"
 
 #: g10/openfile.c:360
-#, fuzzy, c-format
-#| msgid "assuming signed data in `%s'\n"
+#, c-format
 msgid "assuming signed data in '%s'\n"
-msgstr "suppongo che i dati firmati siano in `%s'\n"
+msgstr "presupponendo i dati firmati in '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente è potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1670
-#, fuzzy, c-format
-#| msgid "Critical signature notation: "
+#: g10/parse-packet.c:1708
+#, c-format
 msgid "Unknown critical signature notation: "
-msgstr "Annotazione critica della firma: "
+msgstr "Notazione della firma critica sconosciuta: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
-#, fuzzy, c-format
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
+#, c-format
 msgid "problem with the agent: %s\n"
-msgstr "problema con l'agent: ha restituito 0x%lx\n"
+msgstr "problema con l'agente: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:496
-#, fuzzy, c-format
+#: g10/passphrase.c:510
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (key ID principale %08lX)"
+msgstr " (ID chiave principale %s)"
 
-#: g10/passphrase.c:503
-#, fuzzy
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr "Immettere la passphrase per sbloccare la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:507
-#, fuzzy
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr "Immettere la passphrase per importare la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:512
-#, fuzzy
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr "Immettere la passphrase per esportare la sottochiave segreta OpenPGP:"
 
-#: g10/passphrase.c:515
-#, fuzzy
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
-msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+msgstr "Immettere la passphrase per esportare la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:520
-#, fuzzy
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr ""
+"Si desidera eliminare definitivamente la chiave della sottochiave segreta "
+"OpenPGP:"
 
-#: g10/passphrase.c:523
-#, fuzzy
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr "Si desidera eliminare definitivamente la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:532
-#, fuzzy, c-format
+#: g10/passphrase.c:546
+#, c-format
 msgid ""
 "%s\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s,\n"
 "created %s%s.\n"
 "%s"
-msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
+msgstr ""
+"%s\n"
+"\"%.*s\"\n"
+"%u-bit chiave %s, ID %s,\n"
+"creato %s%s.\n"
+"%s"
 
 #: g10/photoid.c:77
 msgid ""
@@ -6478,30 +6327,29 @@
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
 #: g10/photoid.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file '%s': %s\n"
-msgstr "impossibile aprire il file: %s\n"
+msgstr "impossibile aprire il file JPEG '%s': %s\n"
 
 #: g10/photoid.c:131
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "Questo JPEG è davvero grande (%d byte) !\n"
 
 #: g10/photoid.c:133
-#, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Sei sicuro di volerla usare? (s/N) "
+msgstr "Sei sicuro di volerlo usare? (y/N) "
 
 #: g10/photoid.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a JPEG file\n"
-msgstr "\"%s\": non è un file JPEG\n"
+msgstr "'%s' non è un file JPEG\n"
 
 #: g10/photoid.c:168
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto è giusta? (s/N/q) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
@@ -6521,52 +6369,47 @@
 msgstr "iImMqQsS"
 
 #: g10/pkclist.c:224
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"Nessun valore di fiducia assegnato a:\n"
-"%4u%c/%08lX %s \""
+msgstr "Nessun valore di attendibilità assegnato a:\n"
 
 #: g10/pkclist.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                alias \""
+msgstr "  aka \"%s\"\n"
 
 #: g10/pkclist.c:267
-#, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Questa chiave probabilmente appartiene al proprietario\n"
+msgstr ""
+"Quanto si considera attendibile che questa chiave appartenga effettivamente "
+"all'utente denominato?\n"
 
 #: g10/pkclist.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = Non lo so\n"
+msgstr "  %d = Non so o non dirò\n"
 
 #: g10/pkclist.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = NON mi fido\n"
+msgstr "  %d = Non mi fido\n"
 
 #: g10/pkclist.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = Mi fido definitivamente\n"
+msgstr "  %d = Mi fido in ultima analisi\n"
 
 #: g10/pkclist.c:296
-#, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " m = torna al menù principale\n"
+msgstr "  m = torna al menu principale\n"
 
 #: g10/pkclist.c:299
-#, fuzzy
 msgid "  s = skip this key\n"
-msgstr " s = salta questa chiave\n"
+msgstr "  s = salta questa chiave\n"
 
 #: g10/pkclist.c:300
-#, fuzzy
 msgid "  q = quit\n"
-msgstr " q = abbandona\n"
+msgstr "  q = uscire\n"
 
 #: g10/pkclist.c:304
 #, c-format
@@ -6574,36 +6417,38 @@
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"Il livello di attendibilità minimo per questa chiave è: %s\n"
+"\n"
 
 #: g10/pkclist.c:310 g10/revoke.c:805
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
 #: g10/pkclist.c:331
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
+msgstr "Vuoi davvero impostare questa chiave per la massima fiducia? (y/N) "
 
 #: g10/pkclist.c:345
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
 #: g10/pkclist.c:434
-#, fuzzy, c-format
+#, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
+"%s: non esiste alcuna garanzia che questa chiave appartenga all'utente "
+"denominato\n"
 
 #: g10/pkclist.c:439
-#, fuzzy, c-format
+#, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
+"%s: garanzia limitata che questa chiave appartenga all'utente denominato\n"
 
 #: g10/pkclist.c:445
-#, fuzzy, c-format
+#, c-format
 msgid "This key probably belongs to the named user\n"
-msgstr "Questa chiave probabilmente appartiene al proprietario\n"
+msgstr "Questa chiave probabilmente appartiene all'utente denominato\n"
 
 #: g10/pkclist.c:450
 #, c-format
@@ -6614,35 +6459,33 @@
 #, c-format
 msgid "%s: This key is bad!  It has been marked as untrusted!\n"
 msgstr ""
+"%s: questa chiave non è valido!  È stato contrassegnato come non "
+"attendibile!\n"
 
 #: g10/pkclist.c:484
-#, fuzzy
 msgid ""
 "This key is bad!  It has been marked as untrusted!  If you\n"
 "*really* know what you are doing, you may answer the next\n"
 "question with yes.\n"
 msgstr ""
-"NON è sicuro che la chiave appartenga alla persona indicata.\n"
-"nell'user ID. Se sai *davvero* cosa stai facendo, puoi\n"
-"rispondere sì alla prossima domanda.\n"
-"\n"
+"Questa chiave è cattiva!  È stato contrassegnato come non attendibile!  Se "
+"si\n"
+"\"davvero, sai quello che stai facendo, potresti rispondere al prossimo\n"
+"domanda con sì.\n"
 
 #: g10/pkclist.c:489
-#, fuzzy
 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"
 "you may answer the next question with yes.\n"
 msgstr ""
-"NON è sicuro che la chiave appartenga alla persona indicata.\n"
-"nell'user ID. Se sai *davvero* cosa stai facendo, puoi\n"
-"rispondere sì alla prossima domanda.\n"
-"\n"
+"NON è certo che la chiave appartenga alla persona denominata\n"
+"nell'ID utente.  Se sai davvero quello che stai facendo,\n"
+"si può rispondere alla prossima domanda con sì.\n"
 
 #: g10/pkclist.c:508
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "Uso lo stesso questa chiave? "
+msgstr "Utilizzare comunque questa chiave? (y/N) "
 
 #: g10/pkclist.c:562
 #, c-format
@@ -6668,9 +6511,9 @@
 msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n"
 
 #: g10/pkclist.c:582
-#, fuzzy, c-format
+#, c-format
 msgid "         This could mean that the signature is forged.\n"
-msgstr "         Questo può significare che la firma è stata falsificata.\n"
+msgstr "         Questo potrebbe significare che la firma è contraffatta.\n"
 
 #: g10/pkclist.c:588
 #, c-format
@@ -6685,22 +6528,22 @@
 #: g10/pkclist.c:613
 #, c-format
 msgid "Note: Verified signer's address is '%s'\n"
-msgstr ""
+msgstr "Nota: l'indirizzo del firmatario verificato è '%s'\n"
 
 #: g10/pkclist.c:620
 #, c-format
 msgid "Note: Signer's address '%s' does not match DNS entry\n"
-msgstr ""
+msgstr "Nota: l'indirizzo del firmatario '%s' non corrisponde alla voce DNS\n"
 
 #: g10/pkclist.c:632
 #, c-format
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-msgstr ""
+msgstr "trustlevel adattato a FULL a causa di informazioni PKA valide\n"
 
 #: g10/pkclist.c:640
 #, c-format
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-msgstr ""
+msgstr "trustlevel modificato MAI a causa di informazioni PKA non valido\n"
 
 #: g10/pkclist.c:651
 #, c-format
@@ -6757,20 +6600,22 @@
 msgstr "%s: saltata: chiave pubblica già presente\n"
 
 #: g10/pkclist.c:986
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
+#, c-format
 msgid "can't encrypt to '%s'\n"
-msgstr "impossibile connettersi a `%s': %s\n"
+msgstr "impossibile crittografare in '%s'\n"
 
 #: g10/pkclist.c:1001
-#, fuzzy, c-format
+#, c-format
 msgid "option '%s' given, but no valid default keys given\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr ""
+"l'opzione '%s' specificata, ma non sono state fornite chiavi predefinite "
+"valide\n"
 
 #: g10/pkclist.c:1008
-#, fuzzy, c-format
+#, c-format
 msgid "option '%s' given, but option '%s' not given\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr ""
+"l'opzione '%s' specificata, ma l'opzione '%s' non è stata specificata\n"
 
 #: g10/pkclist.c:1111
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
@@ -6778,7 +6623,7 @@
 
 #: g10/pkclist.c:1135
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Destinatari correnti:\n"
 
 #: g10/pkclist.c:1161
 msgid ""
@@ -6807,24 +6652,24 @@
 msgstr "saltata: chiave pubblica già impostata\n"
 
 #: g10/pkclist.c:1265
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "destinatario predefinito `%s' sconosciuto\n"
+msgstr "destinatario predefinito sconosciuto \"%s\"\n"
 
 #: g10/pkclist.c:1314
 #, c-format
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1667
-#, fuzzy, c-format
+#: g10/pkclist.c:1677
+#, c-format
 msgid "Note: key %s has no %s feature\n"
-msgstr "chiave %08lX: nessun user ID\n"
+msgstr "Nota: la chiave %s non ha funzionalità %s\n"
 
-#: g10/pkclist.c:1692
-#, fuzzy, c-format
+#: g10/pkclist.c:1702
+#, c-format
 msgid "Note: key %s has no preference for %s\n"
-msgstr "chiave %08lX: nessun user ID\n"
+msgstr "Nota: la chiave %s non ha preferenze per %s\n"
 
 #: g10/plaintext.c:85
 #, c-format
@@ -6851,57 +6696,56 @@
 msgstr "non ci sono dati firmati\n"
 
 #: g10/plaintext.c:723
-#, fuzzy, c-format
-#| msgid "can't open signed data `%s'\n"
+#, c-format
 msgid "can't open signed data '%s'\n"
-msgstr "impossibile aprire i dati firmati `%s'\n"
+msgstr "impossibile aprire i dati firmati '%s'\n"
 
 #: g10/plaintext.c:758
-#, fuzzy, c-format
+#, c-format
 msgid "can't open signed data fd=%d: %s\n"
-msgstr "impossibile aprire i dati firmati `%s'\n"
+msgstr "impossibile aprire i dati firmati fd=%d: %s\n"
 
 #: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
-msgstr "chiave %08lX: nessun user ID\n"
+msgstr "la chiave %s non è adatta per la decrittografia in modalità %s\n"
 
 #: g10/pubkey-enc.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
+msgstr "destinatario anonimo; tentativo di chiave segreta %s...\n"
 
 #: g10/pubkey-enc.c:150
 #, c-format
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non è gestita\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s è sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:396
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:393
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
-"NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
+"AVVISO: algoritmo di crittografia %s non trovato nelle preferenze del "
+"destinatario\n"
 
-#: g10/pubkey-enc.c:429
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:426
+#, c-format
 msgid "Note: secret key %s expired at %s\n"
-msgstr "NOTA: chiave %08lX scaduta il %s\n"
+msgstr "Nota: chiave segreta %s scaduta alle %s\n"
 
-#: g10/pubkey-enc.c:436
-#, fuzzy, c-format
-#| msgid "NOTE: key has been revoked"
+#: g10/pubkey-enc.c:433
+#, c-format
 msgid "Note: key has been revoked"
-msgstr "NOTA: la chiave è stata revocata"
+msgstr "Nota: la chiave è stata revocata"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
 #: g10/revoke.c:500
@@ -6910,9 +6754,9 @@
 msgstr "build_packet fallito: %s\n"
 
 #: g10/revoke.c:143
-#, fuzzy, c-format
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "chiave %08lX: nessun user ID\n"
+msgstr "la chiave %s non ha ID utente\n"
 
 #: g10/revoke.c:311
 msgid "To be revoked by:\n"
@@ -6923,15 +6767,12 @@
 msgstr "(Questa è una chiave di revoca sensibile)\n"
 
 #: g10/revoke.c:321
-#, fuzzy
-#| msgid "Secret key is available.\n"
 msgid "Secret key is not available.\n"
-msgstr "È disponibile una chiave segreta.\n"
+msgstr "La chiave segreta non è disponibile.\n"
 
 #: g10/revoke.c:326
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Creare un certificato di revoca per questa chiave? "
+msgstr "Creare un certificato di revoca designato per questa chiave? (y/N) "
 
 #: g10/revoke.c:335 g10/revoke.c:746
 msgid "ASCII armored output forced.\n"
@@ -6947,14 +6788,13 @@
 msgstr "Certificato di revoca creato.\n"
 
 #: g10/revoke.c:420
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "non sono state trovate chiavi di revoca per `%s'\n"
+msgstr "nessuna chiave di revoca trovata per \"%s\"\n"
 
 #: g10/revoke.c:565
-#, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "Creare un certificato di revoca per questa chiave? "
+msgstr "Questo è un certificato di revoca per la chiave OpenPGP:"
 
 #: g10/revoke.c:581
 msgid ""
@@ -6962,6 +6802,10 @@
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
+"Un certificato di revoca è una sorta di \"interruttore di emergenza\" per\n"
+"dichiarare pubblicamente che una certa chiave non deve essere più usata.\n"
+"Non è possibile ritirare un certificato di revoca una volta che è stato\n"
+"pubblicato."
 
 #: g10/revoke.c:584
 msgid ""
@@ -6971,6 +6815,12 @@
 "a reason for the revocation.  For details see the description of\n"
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
+"Utilizzare per revocare questa chiave in caso di compromissione o perdita "
+"di\n"
+"la chiave segreta.  Tuttavia, se la chiave segreta è ancora accessibile,\n"
+"è meglio generare un nuovo certificato di revoca e dare\n"
+"un motivo per la revoca.  Per i dettagli, vedere la descrizione di\n"
+"del comando gpg \"--generate-revocation\" nel manuale GnuPG."
 
 #: g10/revoke.c:590
 msgid ""
@@ -6978,17 +6828,19 @@
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
+"Per evitare un uso accidentale di questo file, sono stati aggiunti due\n"
+"punti prima dei 5 trattini in basso. Rimuovere tali due punti con un\n"
+"editor di testo prima di importare e pubblicare il certificato di revoca."
 
 #: g10/revoke.c:609
-#, fuzzy, c-format
-#| msgid "Revocation certificate created.\n"
+#, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
-msgstr "Certificato di revoca creato.\n"
+msgstr "certificato di revoca archiviato come '%s.rev'\n"
 
 #: g10/revoke.c:653
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found\n"
-msgstr "chiave segreta `%s' non trovata: %s\n"
+msgstr "chiave segreta \"%s\" non trovata\n"
 
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
@@ -6996,18 +6848,16 @@
 #: g10/revoke.c:680
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
-msgstr ""
+msgstr "'%s' corrisponde a più chiavi segrete:\n"
 
 #: g10/revoke.c:707
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#, c-format
 msgid "error searching the keyring: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "errore durante la ricerca del portachiave: %s\n"
 
 #: g10/revoke.c:730
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Creare un certificato di revoca per questa chiave? "
+msgstr "Creare un certificato di revoca per questa chiave? (y/N) "
 
 #: g10/revoke.c:754
 msgid ""
@@ -7056,9 +6906,8 @@
 msgstr "(Non è stata data una descrizione)\n"
 
 #: g10/revoke.c:876
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "Va bene così? "
+msgstr "Va bene così? (y/N) "
 
 #: g10/seskey.c:62 sm/encrypt.c:124
 #, c-format
@@ -7069,130 +6918,125 @@
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
-"ho provato %d volte!\n"
+"impossibile evitare una chiave debole per il cifrario simmetrico; ho provato "
+"%d volte!\n"
 
 #: g10/seskey.c:306
 #, c-format
 msgid "%s key %s uses an unsafe (%zu bit) hash\n"
-msgstr ""
+msgstr "La chiave %s %s utilizza un hash non sicuro (%zu bit)\n"
 
 #: g10/seskey.c:324
 #, c-format
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
+"La chiave %s %s richiede un bit %zu o un hash superiore (l'hash è %s)\n"
 
 #: g10/sig-check.c:161
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
+#, c-format
 msgid "key %s may not be used for signing in %s mode\n"
-msgstr "non è possibile usare %s in modalità %s\n"
+msgstr "impossibile utilizzare la chiave %s per l'accesso in modalità %s\n"
 
 #: g10/sig-check.c:199
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr ""
-"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
-"incrociata\n"
+msgstr "AVVISO: la sottochiave di firma %s non è certificata incrociata\n"
 
 #: g10/sig-check.c:201
-#, fuzzy, c-format
+#, c-format
 msgid "please see %s for more information\n"
-msgstr " i = mostrami ulteriori informazioni\n"
+msgstr "per ulteriori informazioni, vedere %s\n"
 
 #: g10/sig-check.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
-"non valida\n"
+"AVVISO: la firma della sottochiave %s ha una certificazione incrociata non "
+"valida\n"
 
 #: g10/sig-check.c:331
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgid_plural "public key %s is %lu seconds newer than the signature\n"
-msgstr[0] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
-msgstr[1] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
+msgstr[0] "la chiave pubblica %s è %lu seconda più recente della firma\n"
+msgstr[1] "le chiavi pubbliche %s sono %lu seconda più recente della firma\n"
 
 #: g10/sig-check.c:339
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu day newer than the signature\n"
 msgid_plural "public key %s is %lu days newer than the signature\n"
-msgstr[0] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
-msgstr[1] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
+msgstr[0] "la chiave pubblica %s è %lu più recente della firma\n"
+msgstr[1] "le chiavi pubbliche %s sono %lu più recente della firma\n"
 
 #: g10/sig-check.c:353 g10/sign.c:361
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgid_plural ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr[0] ""
-"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
-"con l'orologio)\n"
+"la chiave %s è stata creata %lu secondo in futuro (problema di curvatura "
+"dell'ora o orologio)\n"
 msgstr[1] ""
-"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
-"con l'orologio)\n"
+"le chiavi %s sono stata create %lu secondo in futuro (problema di curvatura "
+"dell'ora o orologio)\n"
 
 #: g10/sig-check.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
 "key %s was created %lu days in the future (time warp or clock problem)\n"
 msgstr[0] ""
-"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
-"con l'orologio)\n"
+"la chiave %s è stata creata %lu giorno in futuro (problema di curvatura "
+"dell'ora o orologio)\n"
 msgstr[1] ""
-"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
-"con l'orologio)\n"
+"le chiavi %s sono state create %lu giorni in futuro (problema di curvatura "
+"dell'ora o orologio)\n"
 
 #: g10/sig-check.c:380
-#, fuzzy, c-format
+#, c-format
 msgid "Note: signature key %s expired %s\n"
-msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
+msgstr "Nota: chiave di firma %s scaduta %s\n"
 
 #: g10/sig-check.c:391
-#, fuzzy, c-format
+#, c-format
 msgid "Note: signature key %s has been revoked\n"
-msgstr "NOTA: la chiave è stata revocata"
+msgstr "Nota: la chiave di firma %s è stata revocata\n"
 
-#: g10/sig-check.c:482
-#, fuzzy, c-format
-#| msgid "standalone signature of class 0x%02x\n"
+#: g10/sig-check.c:480
+#, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
-msgstr "firma solitaria di classe 0x%02x\n"
+msgstr "firma chiave non valida dalla chiave %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
-#, fuzzy, c-format
-#| msgid "standalone signature of class 0x%02x\n"
+#: g10/sig-check.c:492
+#, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
-msgstr "firma solitaria di classe 0x%02x\n"
+msgstr "firma dati non valida dalla chiave %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
-#, fuzzy, c-format
+#: g10/sig-check.c:559
+#, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"si suppone una firma non valida della chiave %08lX a causa di un\n"
-"bit critico sconosciuto\n"
+"presupponendo una firma non valida dalla chiave %s a causa di un bit critico "
+"sconosciuto\n"
 
-#: g10/sig-check.c:1158
-#, fuzzy, c-format
+#: g10/sig-check.c:1156
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
-"chiave %08lX: non c'è una subchiave per il pacchetto di revoca della "
-"subchiave\n"
+"chiave %s: nessuna sottochiave per la firma di revoca della sottochiave\n"
 
-#: g10/sig-check.c:1161
-#, fuzzy, c-format
+#: g10/sig-check.c:1159
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
-"chiave %08lX: non c'è una subchiave per la firma di collegamento della "
-"subchiave\n"
+"chiave %s: nessuna sottochiave per la firma di associazione della "
+"sottochiave\n"
 
 #: g10/sign.c:96
 #, c-format
@@ -7202,42 +7046,40 @@
 "inespansa.\n"
 
 #: g10/sign.c:122
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"ATTENZIONE: Impossibile espandere i %% nell'URL della policy (troppo "
-"lunga).\n"
-"Usata inespansa.\n"
+"AVVISO: impossibile espandere l'URL del criterio %%(troppo grande).  "
+"Utilizzo nonexpanded.\n"
 
 #: g10/sign.c:145
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"ATTENZIONE: Impossibile espandere i %% nell'URL della policy (troppo "
-"lunga).\n"
-"Usata inespansa.\n"
+"AVVISO: impossibile espandere %%l'URL del keyserver preferito (troppo "
+"grande).  Utilizzo nonexpanded.\n"
 
-#: g10/sign.c:470
-#, fuzzy, c-format
+#: g10/sign.c:476
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "Firma %s da: \"%s\"\n"
+msgstr "Firma %s/%s da: \"%s\"\n"
 
-#: g10/sign.c:1033
-#, fuzzy, c-format
+#: g10/sign.c:1046
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
+"AVVISO: l'algoritmo digest %s (%d) viola le preferenze dei destinatari\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sarà usato il cifrario %s\n"
@@ -7250,9 +7092,9 @@
 "finto!\n"
 
 #: g10/skclist.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "saltata `%s': doppia\n"
+msgstr "\"%s\" ignorato: duplicato\n"
 
 #: g10/skclist.c:224
 #, c-format
@@ -7260,13 +7102,12 @@
 msgstr "saltata: chiave pubblica già presente\n"
 
 #: g10/skclist.c:243
-#, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"saltata %s: questa è una chiave ElGamal generata da PGP che NON è sicura per "
-"le firme!\n"
+"si tratta di una chiave Elgamal generata da PGP che non è sicura per le "
+"firme!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -7281,60 +7122,57 @@
 "# (Usa \"gpg --import-ownertrust\" per ripristinarli)\n"
 
 #: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "error in '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore in '%s': %s\n"
 
 #: g10/tdbdump.c:162
-#, fuzzy
 msgid "line too long"
-msgstr "riga troppo lunga\n"
+msgstr "linea troppo lunga"
 
 #: g10/tdbdump.c:170
 msgid "colon missing"
-msgstr ""
+msgstr "due punti mancanti"
 
 #: g10/tdbdump.c:176
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "impronta digitale non valida"
 
 #: g10/tdbdump.c:181
-#, fuzzy
 msgid "ownertrust value missing"
-msgstr "importa i valori di fiducia"
+msgstr "cambia il valore di fiducia"
 
 #: g10/tdbdump.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in '%s': %s\n"
-msgstr "errore cercando il record della fiducia: %s\n"
+msgstr "errore durante la ricerca del record di attendibilità in '%s': %s\n"
 
 #: g10/tdbdump.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "read error in '%s': %s\n"
-msgstr "errore di lettura: %s\n"
+msgstr "errore di lettura in '%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
-#, fuzzy, c-format
+#: g10/tdbio.c:144 sm/keydb.c:336
+#, c-format
 msgid "can't create lock for '%s'\n"
-msgstr "impossibile creare `%s': %s\n"
+msgstr "impossibile creare il blocco per '%s'\n"
 
 #: g10/tdbio.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock '%s'\n"
-msgstr "impossibile aprire `%s'\n"
+msgstr "impossibile bloccare '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
@@ -7349,107 +7187,106 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
-#, fuzzy, c-format
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
+#, c-format
 msgid "can't access '%s': %s\n"
-msgstr "impossibile chiudere `%s': %s\n"
+msgstr "impossibile accedere a '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: è stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:824
-#, fuzzy, c-format
-#| msgid "NOTE: trustdb not writable\n"
+#: g10/tdbio.c:826
+#, c-format
 msgid "Note: trustdb not writable\n"
-msgstr "NOTA: il trustdb non è scrivibile\n"
+msgstr "Nota: trustdb non scrivibile\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, 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:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, 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:983
+#: g10/tdbio.c:985
 #, 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:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non è un file di trustdb\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1928
-#, fuzzy, c-format
+#: g10/tdbio.c:1930
+#, c-format
 msgid "Error: The trustdb is corrupted.\n"
-msgstr "%s: creato il trustdb\n"
+msgstr "Errore: trustdb danneggiato.\n"
 
 #: g10/textfilter.c:146
 #, c-format
@@ -7462,78 +7299,79 @@
 msgstr "linea di input più lunga di %d caratteri\n"
 
 #: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
-#, fuzzy, c-format
+#, c-format
 msgid "error beginning transaction on TOFU database: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'avvio della transazione nel database TOFU: %s\n"
 
 #: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
 #, c-format
 msgid "error committing transaction on TOFU database: %s\n"
-msgstr ""
+msgstr "errore durante il commit della transazione nel database TOFU: %s\n"
 
 #: g10/tofu.c:354 g10/tofu.c:887
 #, c-format
 msgid "error rolling back transaction on TOFU database: %s\n"
-msgstr ""
+msgstr "errore durante il rollback della transazione nel database TOFU: %s\n"
 
 #: g10/tofu.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported TOFU database version: %s\n"
-msgstr ""
-"\n"
-"Algoritmi gestiti:\n"
+msgstr "versione del database TOFU non supportata: %s\n"
 
 #: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
 #, c-format
 msgid "TOFU DB error"
-msgstr ""
+msgstr "Errore DB TOFU"
 
 #: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2351 g10/tofu.c:2370
 #: g10/tofu.c:2383 g10/tofu.c:2395 g10/tofu.c:2410 g10/tofu.c:2422
 #: g10/tofu.c:3017 g10/tofu.c:3034 g10/tofu.c:3071 g10/tofu.c:3088
 #: g10/tofu.c:3400
-#, fuzzy, c-format
+#, c-format
 msgid "error reading TOFU database: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura del database TOFU: %s\n"
 
 #: g10/tofu.c:715 g10/tofu.c:723
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
+#, c-format
 msgid "error determining TOFU database's version: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr ""
+"errore durante la determinazione della versione del database TOFU: %s\n"
 
 #: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
-#, fuzzy, c-format
-#| msgid "%s: error writing dir record: %s\n"
+#, c-format
 msgid "error initializing TOFU database: %s\n"
-msgstr "%s: errore durante la scrittura del dir record: %s\n"
+msgstr "errore durante l'inizializzazione del database TOFU: %s\n"
 
 #: g10/tofu.c:955
-#, fuzzy, c-format
+#, c-format
 msgid "error opening TOFU database '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'apertura del database TOFU '%s': %s\n"
 
 #: g10/tofu.c:1148 g10/tofu.c:3454 g10/tofu.c:3600
-#, fuzzy, c-format
+#, c-format
 msgid "error updating TOFU database: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'aggiornamento del database TOFU: %s\n"
 
 #: g10/tofu.c:1327
 #, c-format
 msgid ""
 "This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
+"Questa è la prima volta che l'indirizzo di posta elettronica \"%s\" viene "
+"utilizzato con la chiave %s."
 
 #: g10/tofu.c:1336
 #, c-format
 msgid "The email address \"%s\" is associated with %d key!"
 msgid_plural "The email address \"%s\" is associated with %d keys!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "L'indirizzo di posta elettronica \"%s\" è associato alla chiave %d!"
+msgstr[1] "L'indirizzo di posta elettronica \"%s\" è associato alla chiavi %d!"
 
 #: g10/tofu.c:1342
 msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
+"  poiché la politica di questo legame era \"automatica\", è stata modificata "
+"in \"chiedere\"."
 
 #: g10/tofu.c:1348
 #, c-format
@@ -7541,253 +7379,253 @@
 "Please indicate whether this email address should be associated with key %s "
 "or whether you think someone is impersonating \"%s\"."
 msgstr ""
+"Indicare se questo indirizzo di posta elettronica deve essere associato alla "
+"chiave %s o se si ritiene che qualcuno sia \"%s\"."
 
 #: g10/tofu.c:1608
-#, fuzzy, c-format
+#, c-format
 msgid "error gathering other user IDs: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la raccolta di altri ID utente: %s\n"
 
 #: g10/tofu.c:1618
-#, fuzzy
-#| msgid "list key and user IDs"
 msgid "This key's user IDs:\n"
-msgstr "elenca le chiavi e gli user ID"
+msgstr "ID utente di questa chiave:\n"
 
 #: g10/tofu.c:1634 g10/tofu.c:1799
-#, fuzzy, c-format
-#| msgid "Policy: "
+#, c-format
 msgid "policy: %s"
-msgstr "Policy: "
+msgstr "criterio: %s"
 
 #: g10/tofu.c:1725
-#, fuzzy, c-format
+#, c-format
 msgid "error gathering signature stats: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la raccolta delle statistiche di firma: %s\n"
 
 #: g10/tofu.c:1729
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
+"L'indirizzo di posta elettronica \"%s\" è associato alla chiave %d!\n"
 msgstr[1] ""
+"L'indirizzo di posta elettronica \"%s\" è associato alle chiavi %d!\n"
 
 #: g10/tofu.c:1747
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
-msgstr ""
+msgstr "Statistiche per le chiavi con indirizzo di posta elettronica \"%s\":\n"
 
 #: g10/tofu.c:1797
-#, fuzzy
-#| msgid "list keys"
 msgid "this key"
-msgstr "elenca le chiavi"
+msgstr "questa chiave"
 
 #: g10/tofu.c:1823
-#, fuzzy, c-format
+#, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
-msgstr[0] "|algo [files]|stampa tutti i message digests"
-msgstr[1] "|algo [files]|stampa tutti i message digests"
+msgstr[0] "Messaggio %d verificato."
+msgstr[1] "Messaggi %d verificati."
 
 #: g10/tofu.c:1827
-#, fuzzy, c-format
-#| msgid "encrypted with %lu passphrases\n"
+#, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
-msgstr[0] "cifratto con %lu passphrase\n"
-msgstr[1] "cifratto con %lu passphrase\n"
+msgstr[0] "Messaggio %d crittografato."
+msgstr[1] "Messaggi %d crittografati."
 
 #: g10/tofu.c:1834
-#, fuzzy, c-format
+#, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
-msgstr[0] "|algo [files]|stampa tutti i message digests"
-msgstr[1] "|algo [files]|stampa tutti i message digests"
+msgstr[0] "Messaggio %d verificato in futuro."
+msgstr[1] "Messaggi %d verificati in futuro."
 
 #: g10/tofu.c:1838
-#, fuzzy, c-format
+#, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
-msgstr[0] "|algo [files]|stampa tutti i message digests"
-msgstr[1] "|algo [files]|stampa tutti i message digests"
+msgstr[0] "Messaggio %d crittografato in futuro."
+msgstr[1] "Messaggi %d crittografati in futuro."
 
 #: g10/tofu.c:1852
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Messaggi verificati nell'ultimo %d giorno: %d."
+msgstr[1] "Messaggi verificati negli ultimi %d giorni: %d."
 
 #: g10/tofu.c:1858
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Messaggi crittografati nell'ultimo %d giorno: %d."
+msgstr[1] "Messaggi crittografati negli ultimi %d giorni: %d."
 
 #: g10/tofu.c:1868
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Messaggi verificati nell'ultimo %d mese: %d."
+msgstr[1] "Messaggi verificati nell'ultimo %d mesi: %d."
 
 #: g10/tofu.c:1874
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Messaggi crittografati nell'ultimo %d mese: %d."
+msgstr[1] "Messaggi crittografati negli ultimi %d mesi: %d."
 
 #: g10/tofu.c:1884
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Messaggi verificati nell'ultimo %d anno: %d."
+msgstr[1] "Messaggi verificati negli ultimi %d anni: %d."
 
 #: g10/tofu.c:1890
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Messaggi crittografati nell'ulltimo %d anno: %d."
+msgstr[1] "Messaggi crittografati negli ultimi %d anni: %d."
 
 #: g10/tofu.c:1898
 #, c-format
 msgid "Messages verified in the past: %d."
-msgstr ""
+msgstr "Messaggi verificati in passato: %d."
 
 #: g10/tofu.c:1902
-#, fuzzy, c-format
+#, c-format
 msgid "Messages encrypted in the past: %d."
-msgstr "|algo [files]|stampa tutti i message digests"
+msgstr "Messaggi crittografati in passato: %d."
 
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
 #: g10/tofu.c:1919
 msgid "TOFU detected a binding conflict"
-msgstr ""
+msgstr "TOFU ha rilevato un conflitto di binding"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
 #: g10/tofu.c:1961
 msgid "gGaAuUrRbB"
-msgstr ""
+msgstr "gGaAuUrRbB"
 
 #: g10/tofu.c:1967
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
-msgstr ""
+msgstr "(G)ood, (A)ccept una volta, (U)nknown, (R)espellere una volta, (B)ad? "
 
 #: g10/tofu.c:1975
 msgid "Defaulting to unknown.\n"
-msgstr ""
+msgstr "Impostazione predefinita sconosciuta.\n"
 
 #: g10/tofu.c:2090 g10/tofu.c:2225
 #, c-format
 msgid "TOFU db corruption detected.\n"
-msgstr ""
+msgstr "Rilevato danneggiamento del database TOFU.\n"
 
 #: g10/tofu.c:2825
-#, fuzzy, c-format
+#, c-format
 msgid "error changing TOFU policy: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la modifica del criterio TOFU: %s\n"
 
 #: g10/tofu.c:2876
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~anno"
+msgstr[1] "%lld~anni"
 
 #: g10/tofu.c:2881
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~mese"
+msgstr[1] "%lld‪‪~mesi"
 
 #: g10/tofu.c:2886
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~settimana"
+msgstr[1] "%lld‪‪~settimane"
 
 #: g10/tofu.c:2891
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~giorno"
+msgstr[1] "%lld~giorni"
 
 #: g10/tofu.c:2896
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~ora"
+msgstr[1] "%lld~ore"
 
 #: g10/tofu.c:2901
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~minuto"
+msgstr[1] "%lld~minuti"
 
 #: g10/tofu.c:2903
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~secondo"
+msgstr[1] "%lld~secondi"
 
 #: g10/tofu.c:3141
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
-msgstr ""
+msgstr "%s: verificata 0: firme e 0 messaggi crittografati."
 
 #: g10/tofu.c:3147
-#, fuzzy, c-format
-#| msgid "Deleted %d signatures.\n"
+#, c-format
 msgid "%s: Verified 0 signatures."
-msgstr "Cancellate %d firme.\n"
+msgstr "%s: firme 0 verificate."
 
 #: g10/tofu.c:3161
-#, fuzzy
-#| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
-msgstr "cifratto con %lu passphrase\n"
+msgstr "Messaggi crittografati 0."
 
 #: g10/tofu.c:3177
-#, fuzzy, c-format
-#| msgid "Policy: "
+#, c-format
 msgid "(policy: %s)"
-msgstr "Policy: "
+msgstr "(criterio: %s)"
 
 #: g10/tofu.c:3211
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
+"Attenzione: dobbiamo ancora vedere un messaggio firmato utilizzando questa "
+"chiave e ID utente!\n"
 
 #: g10/tofu.c:3214
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
+"Attenzione: abbiamo visto solo un messaggio firmato utilizzando questa "
+"chiave e ID utente!\n"
 
 #: g10/tofu.c:3218
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
+"Attenzione: non è ancora necessario crittografare un messaggio a questa "
+"chiave!\n"
 
 #: g10/tofu.c:3221
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
-msgstr ""
+msgstr "Attenzione: hai crittografato solo un messaggio per questa chiave!\n"
 
 #: g10/tofu.c:3250
 #, c-format
@@ -7804,167 +7642,184 @@
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
+"Attenzione: se pensi di aver visto più firme da questa chiave e id utente, "
+"allora questa chiave potrebbe essere un falso!  Esaminare attentamente "
+"l'indirizzo e-mail per piccole variazioni.  Se la chiave è sospetta, "
+"utilizzare\n"
+"  %s\n"
+"per contrassegnarlo come cattivo.\n"
 msgstr[1] ""
+"Attenzione: se pensi di aver visto più firme da questa chiave e id utente, "
+"allora questa chiave potrebbe essere un falso!  Esaminare attentamente "
+"l'indirizzo e-mail per piccole variazioni.  Se la chiave è sospetta, "
+"utilizzare\n"
+"  %s\n"
+"per contrassegnarlo come cattivo.\n"
 
 #: g10/tofu.c:3335 g10/tofu.c:3498 g10/tofu.c:3704 g10/tofu.c:3757
 #: g10/tofu.c:3898 g10/tofu.c:3975 g10/tofu.c:4013
-#, fuzzy, c-format
+#, c-format
 msgid "error opening TOFU database: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'apertura del database TOFU: %s\n"
 
 #: g10/tofu.c:3531
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
-msgstr ""
+msgstr "AVVISO: crittografia a %s, che non dispone di ID utente non revocati\n"
 
-#: g10/trustdb.c:232
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid long keyID\n"
+#: g10/trustdb.c:229
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "`%s' non è un key ID lungo valido\n"
+msgstr "'%s' non è un keyID lungo valido\n"
 
-#: g10/trustdb.c:255
-#, fuzzy, c-format
+#: g10/trustdb.c:252
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "chiave %08lX: accettata come chiave affidabile\n"
+msgstr "chiave %s: accettata come chiave attendibile\n"
 
-#: g10/trustdb.c:293
-#, fuzzy, c-format
+#: g10/trustdb.c:290
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "chiave %08lX: appare nel trustdb più di una volta\n"
+msgstr "chiave %s si verifica più di una volta nel trustdb\n"
 
-#: g10/trustdb.c:308
-#, fuzzy, c-format
+#: g10/trustdb.c:305
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
-"chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
+"chiave %s: nessuna chiave pubblica per la chiave attendibile - ignorata\n"
 
-#: g10/trustdb.c:319
-#, fuzzy, c-format
+#: g10/trustdb.c:316
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "chiavi marcate definitivamente affidabili.\n"
+msgstr "chiave %s contrassegnata come considerata attendibile\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non è del tipo richiesto %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
+"È possibile provare a creare nuovamente il trustdb utilizzando i comandi:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
-msgstr ""
+msgstr "Se ciò non funziona, consultare il manuale\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
+"impossibile utilizzare il modello di trust sconosciuto (%d) - presupponendo "
+"il modello di trust %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
-msgstr ""
+msgstr "utilizzo del modello di trust %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "non è necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
 
-#: g10/trustdb.c:573
-#, fuzzy, c-format
+#: g10/trustdb.c:570
+#, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
-msgstr "non è necessario un controllo del trustdb\n"
+msgstr "non è necessario un controllo trustdb con il modello di trust '%s'\n"
 
-#: g10/trustdb.c:589
-#, fuzzy, c-format
+#: g10/trustdb.c:586
+#, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
-msgstr "non è necessario un controllo del trustdb\n"
+msgstr ""
+"non è necessario un aggiornamento trustdb con il modello di trust '%s'\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
-#, fuzzy, c-format
+#: g10/trustdb.c:810 g10/trustdb.c:1397
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "chiave pubblica %08lX non trovata: %s\n"
+msgstr "chiave pubblica %s non trovata: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:1976
-#, fuzzy, c-format
+#: g10/trustdb.c:1959
+#, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
-msgstr[0] "Per ora sono state esaminate %lu chiavi\n"
-msgstr[1] "Per ora sono state esaminate %lu chiavi\n"
+msgstr[0] "Chiave %d elaborata"
+msgstr[1] "Chiavi %d elaborate"
 
-#: g10/trustdb.c:1979
-#, fuzzy, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
+#: g10/trustdb.c:1962
+#, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
-msgstr[0] "%d chiavi processate (%d conteggi di validità azzerati)\n"
-msgstr[1] "%d chiavi processate (%d conteggi di validità azzerati)\n"
+msgstr[0] " (%d conteggio di validità cancellato)\n"
+msgstr[1] " (%d conteggi di validità cancellati)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2063
-#, fuzzy, c-format
+#: g10/trustdb.c:2046
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
+msgstr "chiave pubblica della chiave attendibile %s non trovata\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"profondità: %d  valido: %3d  firmato: %3d  trust: %d-, %dq, %dn, %dm, %df, "
+"%du\n"
 
-#: g10/trustdb.c:2262
-#, fuzzy, c-format
+#: g10/trustdb.c:2245
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "trust record %lu, req type %d: write fallita: %s\n"
+msgstr ""
+"impossibile aggiornare il record della versione trustdb: scrittura non "
+"riuscita: %s\n"
 
 #: g10/trust.c:125
 msgid "undefined"
-msgstr ""
+msgstr "non definito"
 
 #: g10/trust.c:126
-#, fuzzy
 msgid "never"
-msgstr "mai       "
+msgstr "mai"
 
 #: g10/trust.c:127
 msgid "marginal"
-msgstr ""
+msgstr "marginale"
 
 #: g10/trust.c:128
 msgid "full"
-msgstr ""
+msgstr "intero"
 
 #: g10/trust.c:129
 msgid "ultimate"
-msgstr ""
+msgstr "definitivo"
 
 #. TRANSLATORS: these strings are similar to those in
 #. trust_value_to_string(), but are a fixed length.  This is needed to
@@ -7976,43 +7831,39 @@
 #. uid are both NULL, or neither are NULL.
 #: g10/trust.c:166
 msgid "10 translator see trust.c:uid_trust_string_fixed"
-msgstr ""
+msgstr "10 traduttore vedere trust.c:uid_trust_string_fixed"
 
 #: g10/trust.c:169
-#, fuzzy
 msgid "[ revoked]"
-msgstr "[revocata]"
+msgstr "[ revocato]"
 
 #: g10/trust.c:171 g10/trust.c:177
-#, fuzzy
 msgid "[ expired]"
-msgstr "[scaduta]"
+msgstr "[ scaduto]"
 
 #: g10/trust.c:176
-#, fuzzy
 msgid "[ unknown]"
-msgstr "sconosciuto"
+msgstr "[ sconosciuto]"
 
 #: g10/trust.c:178
 msgid "[  undef ]"
-msgstr ""
+msgstr "[  undef ]"
 
 #: g10/trust.c:179
-#, fuzzy
 msgid "[  never ]"
-msgstr "mai       "
+msgstr "[  mai ]"
 
 #: g10/trust.c:180
 msgid "[marginal]"
-msgstr ""
+msgstr "[marginale]"
 
 #: g10/trust.c:181
 msgid "[  full  ]"
-msgstr ""
+msgstr "[  completo  ]"
 
 #: g10/trust.c:182
 msgid "[ultimate]"
-msgstr ""
+msgstr "[ultimo]"
 
 #: g10/verify.c:116
 #, c-format
@@ -8031,731 +7882,745 @@
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
 #: g10/verify.c:260
-#, fuzzy, c-format
+#, c-format
 msgid "can't open fd %d: %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile aprire fd %d: %s\n"
 
 #: kbx/kbxutil.c:92
 msgid "set debugging flags"
-msgstr ""
+msgstr "impostare i flag di debug"
 
 #: kbx/kbxutil.c:93
 msgid "enable full debugging"
-msgstr ""
+msgstr "abilitare il debug completo"
 
 #: kbx/kbxutil.c:117
-#, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: kbxutil [opzioni] [file] (-h per assistenza)"
 
 #: kbx/kbxutil.c:120
-#, fuzzy
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr ""
+"Sintassi: kbxutil [opzioni] [files]\n"
+"Elencare, esportare, importare i dati di Keybox\n"
+
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNumero: %s%%0ATitolare: %s%s"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Tentativi rimanenti: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Immettere il PIN per la chiave per creare firme qualificate."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Si prega di inserire il PIN per le chiavi standard."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
+msgstr "Modulo RSA mancante o non di dimensione %d bit\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
+msgstr "Esponente pubblico RSA mancante o superiore a %d bit\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "Errore di richiamata PIN: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
-msgstr ""
+msgstr "il NullPIN non è ancora stato modificato\n"
 
-#: scd/app-nks.c:1127
-#, fuzzy
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
-msgstr "cambia la passphrase"
+msgstr "|N|Immettere un nuovo PIN per le chiavi standard."
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "cambia la passphrase"
-
-#: scd/app-nks.c:1134
-#, fuzzy
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
-msgstr "Per favore scegli il motivo della revoca:\n"
+msgstr ""
+"|N|Inserisci un nuovo codice di sblocco del PIN (PUK) per i tasti standard."
 
-#: scd/app-nks.c:1136
-#, fuzzy
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
-msgstr "Per favore scegli il motivo della revoca:\n"
+msgstr "|P|Inserisci il codice di sblocco del PIN (PUK) per i tasti standard."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
+msgstr "|N|Immettere un nuovo PIN per la chiave per creare firme qualificate."
 
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
+"|NP|Inserisci un nuovo codice di sblocco PIN (PUK) per la chiave per creare "
+"firme qualificate."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
+"|P|Inserisci il codice di sblocco del PIN (PUK) per la chiave per creare "
+"firme qualificate."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
-#, fuzzy, c-format
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
+#, c-format
 msgid "error getting new PIN: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero del nuovo PIN: %s\n"
 
-#: scd/app-openpgp.c:827
-#, fuzzy, c-format
+#: scd/app-openpgp.c:860
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "impossibile memorizzare l'impronta digitale: %s\n"
 
-#: scd/app-openpgp.c:840
-#, fuzzy, c-format
+#: scd/app-openpgp.c:873
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "rebuild della cache del portachiavi fallito: %s\n"
+msgstr "impossibile memorizzare la data di creazione: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "errore durante il recupero dello stato CHV dalla scheda\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
-msgstr ""
+msgstr "risposta non contiene il modulo RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+msgstr "risposta non contiene l'esponente pubblico RSA\n"
 
-#: scd/app-openpgp.c:1510
-#, fuzzy, c-format
-#| msgid "remove keys from the public keyring"
+#: scd/app-openpgp.c:1547
+#, c-format
 msgid "response does not contain the EC public key\n"
-msgstr "rimuove le chiavi dal portachiavi pubblico"
+msgstr "risposta non contiene la chiave pubblica CE\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
-msgstr ""
+msgstr "risposta non contiene i dati della chiave pubblica\n"
 
-#: scd/app-openpgp.c:1710
-#, fuzzy, c-format
+#: scd/app-openpgp.c:1772
+#, c-format
 msgid "reading public key failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "lettura della chiave pubblica non riuscita: %s\n"
 
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
-msgstr ""
-
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
+msgstr "%sNumero: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
-msgstr ""
+msgstr "utilizzando il PIN predefinito come %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
+"impossibile utilizzare il PIN predefinito come %s: %s - disabilitazione "
+"dell'ulteriore utilizzo predefinito\n"
 
-#: scd/app-openpgp.c:2224
-#, fuzzy
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
-msgstr "cambia la passphrase"
+msgstr "||Si prega di sbloccare la carta"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "Il PIN per CHV%d è troppo breve; la lunghezza minima è %d\n"
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
-#, fuzzy, c-format
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "invio al keyserver fallito: %s\n"
+msgstr "verifica CHV%d non riuscita: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "carta è bloccata in modo permanente!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr[0] ""
+"%d tentativo di PIN di amministrazione rimanente prima che la scheda venga "
+"bloccata in modo permanente\n"
 msgstr[1] ""
+"%d tentativi di PIN di amministrazione rimanenti prima che la schede vengano "
+"bloccate in modo permanente\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
-#, fuzzy
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
-msgstr "cambia la passphrase"
+msgstr "|A|Inserisci il PIN di amministratore"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "l'accesso ai comandi di amministrazione non è configurato\n"
 
-#: scd/app-openpgp.c:2736
-#, fuzzy
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
-msgstr "cambia la passphrase"
+msgstr "||Inserisci il PIN"
 
-#: scd/app-openpgp.c:2785
-#, fuzzy
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
-msgstr "Per favore scegli il motivo della revoca:\n"
+msgstr "||Inserisci il Codice reset per la carta"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
-msgstr ""
+msgstr "Il codice di reimpostazione è troppo breve; la lunghezza minima è %d\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-openpgp.c:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
-msgstr ""
+msgstr "|RN|Nuovo codice di ripristino"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
-msgstr ""
+msgstr "|AN|Nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
-msgstr ""
+msgstr "|N|Nuovo PIN"
 
-#: scd/app-openpgp.c:2900
-#, fuzzy
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "cambia la passphrase"
+msgstr "||Inserisci il PIN di amministratore e il nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:2901
-#, fuzzy
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
-msgstr "cambia la passphrase"
+msgstr "||Inserisci il PIN e il nuovo PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
+#, c-format
 msgid "error reading application data\n"
-msgstr "errore leggendo il keyblock: %s\n"
+msgstr "errore durante la lettura dei dati dell'applicazione\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
+#, c-format
 msgid "error reading fingerprint DO\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
+msgstr "errore durante la lettura dell'impronta digitale DO\n"
 
-#: scd/app-openpgp.c:2979
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3064
+#, c-format
 msgid "key already exists\n"
-msgstr "`%s' è già compresso\n"
+msgstr "chiave già esistente\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
-msgstr ""
+msgstr "chiave esistente verrà sostituita\n"
 
-#: scd/app-openpgp.c:2985
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3070
+#, c-format
 msgid "generating new key\n"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "generazione di una nuova chiave\n"
 
-#: scd/app-openpgp.c:2987
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3072
+#, c-format
 msgid "writing new key\n"
-msgstr "genera una nuova coppia di chiavi"
+msgstr "genera una nuova coppia di chiavi\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
-msgstr ""
+msgstr "timestamp di creazione mancante\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
+msgstr "RSA primo %s mancante o non di dimensione %d bit\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
-#, fuzzy, c-format
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
+#, c-format
 msgid "failed to store the key: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "impossibile archiviare la chiave: %s\n"
 
-#: scd/app-openpgp.c:3886
-#, fuzzy, c-format
-#| msgid "unsupported URI"
+#: scd/app-openpgp.c:3991
+#, c-format
 msgid "unsupported curve\n"
-msgstr "URI non gestito"
+msgstr "curva non supportata\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
-msgstr ""
+msgstr "si prega di attendere mentre la chiave viene generata …\n"
 
-#: scd/app-openpgp.c:4163
-#, fuzzy, c-format
+#: scd/app-openpgp.c:4269
+#, c-format
 msgid "generating key failed\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "generazione della chiave non riuscita\n"
 
-#: scd/app-openpgp.c:4169
-#, fuzzy, c-format
+#: scd/app-openpgp.c:4275
+#, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
-msgstr[0] "Generazione della chiave fallita: %s\n"
-msgstr[1] "Generazione della chiave fallita: %s\n"
+msgstr[0] "generazione della chiave completata (%d secondo)\n"
+msgstr[1] ""
+"generazione della chiavi completate (%d secondi)\n"
+"\n"
+"\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+msgstr "struttura non valida della scheda OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
-msgstr ""
+msgstr "impronta digitale sulla carta non corrisponde a quello richiesto\n"
 
-#: scd/app-openpgp.c:4368
-#, fuzzy, c-format
+#: scd/app-openpgp.c:4558
+#, c-format
 msgid "card does not support digest algorithm %s\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgstr "scheda non supporta l'algoritmo digest %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
-msgstr ""
+msgstr "firme create finora: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
+"la verifica del PIN di amministrazione è attualmente vietata tramite questo "
+"comando\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
-#, fuzzy, c-format
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
+#, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "Non sono stati trovati dati OpenPGP validi.\n"
+msgstr "impossibile accedere a %s - scheda OpenPGP non valida?\n"
 
 #: scd/app-dinsig.c:299
-#, fuzzy
 msgid "||Please enter your PIN at the reader's pinpad"
-msgstr "cambia la passphrase"
+msgstr "||Inserisci il tuo PIN sul pinpad del lettore"
 
 #. 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:528
 msgid "|N|Initial New PIN"
-msgstr ""
+msgstr "|N|Nuovo PIN iniziale"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
-msgstr ""
+msgstr "eseguire in modalità multi server (in primo piano)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
+msgstr "|LEVEL| impostare il livello di debug su LEVEL"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
-#, fuzzy
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|scrittura di un registro in FILE"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
-msgstr ""
+msgstr "|N|connessione al lettore alla porta N"
 
-#: scd/scdaemon.c:139
-#, fuzzy
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
-msgstr "|NOME|usa NOME come destinatario predefinito"
+msgstr "|NAME|utilizzare NAME come driver ct-API"
 
-#: scd/scdaemon.c:141
-#, fuzzy
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|NOME|usa NOME come destinatario predefinito"
+msgstr "|NAME|utilizzare NAME come driver PC/SC"
 
-#: scd/scdaemon.c:144
-#, fuzzy
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
-msgstr "non usa per niente il terminale"
+msgstr "non utilizzare il driver CCID interno"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr ""
+msgstr "|N|scollegare la scheda dopo N secondi di inattività"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
-msgstr ""
+msgstr "non utilizzare il pinpad di un lettore"
 
-#: scd/scdaemon.c:158
-#, fuzzy
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
-msgstr "comandi in conflitto\n"
+msgstr "negare l'uso dei comandi della scheda di amministrazione"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
-msgstr ""
+msgstr "utilizzare l'input a lunghezza variabile per il pinpad"
 
-#: scd/scdaemon.c:307
-#, fuzzy
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @SCDAEMON@ [opzioni] (-h per assistenza)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
+"Sintassi: scdaemon [opzioni] [comando [args]]\n"
+"Daemon smartcard per @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
+"si prega di utilizzare l'opzione '--daemon' per eseguire il programma in "
+"background\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
-msgstr ""
+msgstr "gestore per fd %d avviato\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
-msgstr ""
+msgstr "gestore per fd %d terminato\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
-msgstr ""
+msgstr "modello di convalida richiesto dal certificato: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
-msgstr ""
+msgstr "catena"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
-#, fuzzy
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
-msgstr "help"
+msgstr "shell"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
-#, fuzzy, c-format
+#: sm/certchain.c:260 dirmngr/validate.c:144
+#, c-format
 msgid "critical certificate extension %s is not supported"
-msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
+msgstr "la versione %s del protocollo di gpg-agent non è gestita"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
-msgstr ""
+msgstr "certificato dell'autorità emittente non è contrassegnato come CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
-msgstr ""
+msgstr "criteri contrassegnati critici senza criteri configurati"
 
-#: sm/certchain.c:343
-#, fuzzy, c-format
+#: sm/certchain.c:347
+#, c-format
 msgid "failed to open '%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile aprire '%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
-#, fuzzy, c-format
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#, c-format
 msgid "Note: non-critical certificate policy not allowed"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "Nota: i criteri di certificato non critici non sono consentiti"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
-#, fuzzy, c-format
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#, c-format
 msgid "certificate policy not allowed"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "criteri certificato non consentiti"
+
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "non è riuscito a ottenere l'impronta digitale\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
-msgstr ""
+msgstr "ricerca dell'emittente in una posizione esterna\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
-msgstr ""
+msgstr "numero di emittenti corrispondenti: %d\n"
+
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "impossibile ottenere authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
-msgstr ""
+msgstr "ricerca dell'autorità emittente dalla cache di Dirmngr\n"
 
-#: sm/certchain.c:701
-#, fuzzy, c-format
+#: sm/certchain.c:816
+#, c-format
 msgid "number of matching certificates: %d\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "numero di certificati corrispondenti: %d\n"
 
-#: sm/certchain.c:704
-#, fuzzy, c-format
+#: sm/certchain.c:819
+#, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "ricerca chiave solo cache dirmngr non riuscita: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
-#, fuzzy, c-format
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
+#, c-format
 msgid "failed to allocate keyDB handle\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "impossibile allocare l'handle keyDB\n"
 
-#: sm/certchain.c:1069
-#, fuzzy
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
-msgstr "NOTA: la chiave è stata revocata"
+msgstr "certificato è stato revocato"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
-msgstr ""
+msgstr "lo stato del certificato è sconosciuto"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
-msgstr ""
+msgstr "assicurarsi che il \"dirmngr\" sia installato correttamente\n"
 
-#: sm/certchain.c:1097
-#, fuzzy, c-format
+#: sm/certchain.c:1253
+#, c-format
 msgid "checking the CRL failed: %s"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "controllo del CRL non riuscito: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
-msgstr ""
+msgstr "certificato con validità non valida: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
-msgstr ""
+msgstr "certificato non ancora valido"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
-#, fuzzy
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgstr "certificato radice non ancora valido"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
-msgstr ""
+msgstr "certificato intermedio non ancora valido"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
-#, fuzzy, c-format
+#: sm/certchain.c:1312 dirmngr/validate.c:526
+#, c-format
 msgid "certificate has expired"
-msgstr "Questa chiave è scaduta!"
+msgstr "certificato è scaduto"
 
-#: sm/certchain.c:1157
-#, fuzzy
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
-msgstr "Questa chiave è scaduta!"
+msgstr "certificato radice scaduto"
 
-#: sm/certchain.c:1158
-#, fuzzy
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
-msgstr "Questa chiave è scaduta!"
+msgstr "certificato intermedio scaduto"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
-msgstr ""
+msgstr "attributi obbligatori del certificato mancanti: %s%s%s"
 
-#: sm/certchain.c:1209
-#, fuzzy
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
-msgstr "Questa chiave è scaduta!"
+msgstr "certificato con validità non valida"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
-msgstr ""
+msgstr "firma non creata durante la durata del certificato"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
-msgstr ""
+msgstr "certificato non creato durante la durata dell'emittente"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
+"certificato intermedio non creato durante la durata dell'autorità emittente"
 
-#: sm/certchain.c:1253
-#, fuzzy, c-format
+#: sm/certchain.c:1409
+#, c-format
 msgid "  (  signature created at "
-msgstr "           nuove firme: %lu\n"
+msgstr " (  firma creata alle "
 
-#: sm/certchain.c:1254
-#, fuzzy, c-format
+#: sm/certchain.c:1410
+#, c-format
 msgid "  (certificate created at "
-msgstr "Certificato di revoca creato.\n"
+msgstr "  (certificato creato alle "
 
-#: sm/certchain.c:1257
-#, fuzzy, c-format
+#: sm/certchain.c:1413
+#, c-format
 msgid "  (certificate valid from "
-msgstr "certificato danneggiato"
+msgstr "  (certificato valido da "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
-msgstr ""
+msgstr "  (     emittente valido da "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
-#, fuzzy, c-format
+#: sm/certchain.c:1444 dirmngr/validate.c:577
+#, c-format
 msgid "fingerprint=%s\n"
-msgstr "mostra le impronte digitali"
+msgstr "impronta digitale=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
-msgstr ""
+msgstr "certificato radice è stato contrassegnato come attendibile\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
-msgstr ""
+msgstr "contrassegno interattivo come attendibile non abilitato in gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
+"contrassegno interattivo come attendibile disabilitato per questa sessione\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
+"AVVISO: ora di creazione della firma non nota - presupponendo l'ora corrente"
 
-#: sm/certchain.c:1439
-#, fuzzy
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
-msgstr "genera un certificato di revoca"
+msgstr "nessuna autorità emittente trovata nel certificato"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
-msgstr ""
+msgstr "certificato autofirmato ha una firma BAD"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
-msgstr ""
+msgstr "certificato radice non contrassegnato come attendibile"
 
-#: sm/certchain.c:1602
-#, fuzzy, c-format
+#: sm/certchain.c:1758
+#, c-format
 msgid "checking the trust list failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "controllo dell'elenco di attendibilità non riuscito: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
-msgstr ""
+msgstr "catena di certificati troppo lunga\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
-msgstr ""
+msgstr "certificato dell'autorità emittente non trovato"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
-#, fuzzy, c-format
+#: sm/certchain.c:1834 dirmngr/validate.c:668
+#, c-format
 msgid "certificate has a BAD signature"
-msgstr "verifica una firma"
+msgstr "certificato ha una firma BAD"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
-msgstr ""
+msgstr "trovato un altro possibile certificato CA corrispondente - riprovare"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
-msgstr ""
+msgstr "catena di certificati più lunga di quella consentita dalla CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
-#, fuzzy, c-format
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
+#, c-format
 msgid "certificate is good\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "certificato è buono\n"
 
-#: sm/certchain.c:1812
-#, fuzzy, c-format
+#: sm/certchain.c:1968
+#, c-format
 msgid "intermediate certificate is good\n"
-msgstr "Certificato di revoca creato.\n"
+msgstr "certificato intermedio è buono\n"
 
-#: sm/certchain.c:1813
-#, fuzzy, c-format
+#: sm/certchain.c:1969
+#, c-format
 msgid "root certificate is good\n"
-msgstr "certificato danneggiato"
+msgstr "certificato radice è buono\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
-msgstr ""
+msgstr "passaggio al modello a catena"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
-msgstr ""
+msgstr "modello di convalida utilizzato: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
-msgstr ""
+msgstr "un hash di bit %u non è valido per una chiave %u bit %s\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "fuori dal nucleo\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
-msgstr ""
+msgstr "(questo è l'algoritmo MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
-#, fuzzy
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
-msgstr "no"
+msgstr "nessuno"
 
-#: sm/certdump.c:552 sm/certdump.c:617
-#, fuzzy
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "[Errore - codifica non valida]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
-msgstr ""
+msgstr "[Errore - fuori dal nucleo]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
-msgstr ""
+msgstr "[Errore - Nessun nome]"
 
-#: sm/certdump.c:623
-#, fuzzy
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "[Errore - DN non valido]"
 
-#: sm/certdump.c:836
-#, fuzzy, c-format
+#: sm/certdump.c:915
+#, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
 "certificate:\n"
@@ -8763,189 +8628,205 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 msgstr ""
-"Ti serve una passphrase per sbloccare la chiave segreta dell'utente:\n"
-"\"%.*s\"\n"
-"%u-bit %s key, ID %08lX, created %s%s\n"
+"Immettere la passphrase per sbloccare la chiave segreta per il certificato "
+"X.509:\n"
+"\"%s\"\n"
+"S/N %s, ID 0x%08lX,\n"
+"creato %s, scade %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
+"nessun utilizzo chiave specificato - supponendo che tutti gli utilizzi\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
-#, fuzzy, c-format
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
+#, c-format
 msgid "error getting key usage information: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr ""
+"errore durante il recupero delle informazioni sull'utilizzo della chiave: "
+"%s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
+"certificato non avrebbe dovuto essere utilizzato per la certificazione\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
+"certificato non deve essere stato utilizzato per la firma della risposta "
+"OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
-msgstr ""
+msgstr "certificato non avrebbe dovuto essere utilizzato per la crittografia\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
-msgstr ""
+msgstr "certificato non avrebbe dovuto essere utilizzato per la firma\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
-msgstr ""
+msgstr "certificato non è utilizzabile per la crittografia\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
-msgstr ""
+msgstr "certificato non è utilizzabile per la firma\n"
 
-#: sm/certreqgen.c:464
-#, fuzzy, c-format
+#: sm/certreqgen.c:465
+#, c-format
 msgid "line %d: invalid algorithm\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: algoritmo non valido\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
-msgstr ""
+msgstr "riga %d: lunghezza chiave non valida %u (valida da %d a %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
-msgstr ""
+msgstr "riga %d: nessun nome soggetto specificato\n"
 
-#: sm/certreqgen.c:505
-#, fuzzy, c-format
+#: sm/certreqgen.c:508
+#, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr ""
+"riga %d: etichetta del nome soggetto non valida '%.*s'\n"
+"\n"
 
-#: sm/certreqgen.c:508
-#, fuzzy, c-format
+#: sm/certreqgen.c:511
+#, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: nome soggetto '%s' non valido in pos %d\n"
 
-#: sm/certreqgen.c:525
-#, fuzzy, c-format
+#: sm/certreqgen.c:528
+#, c-format
 msgid "line %d: not a valid email address\n"
-msgstr "L'indirizzo di email non è valido\n"
+msgstr "riga %d: indirizzo di posta elettronica non valido\n"
 
-#: sm/certreqgen.c:544
-#, fuzzy, c-format
+#: sm/certreqgen.c:547
+#, c-format
 msgid "line %d: invalid serial number\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: numero di serie non valido\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
+"riga %d: etichetta del nome dell'autorità emittente non valida '%.*s'\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
-msgstr ""
+msgstr "riga %d: nome autorità emittente '%s' non valido in pos %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
-#, fuzzy, c-format
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
+#, c-format
 msgid "line %d: invalid date given\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: data specificata non valida\n"
 
-#: sm/certreqgen.c:599
-#, fuzzy, c-format
+#: sm/certreqgen.c:602
+#, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr ""
+"riga %d: errore durante l'osando di firmare la chiave da keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:618
-#, fuzzy, c-format
+#: sm/certreqgen.c:621
+#, c-format
 msgid "line %d: invalid hash algorithm given\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: algoritmo hash non valido specificato\n"
 
-#: sm/certreqgen.c:633
-#, fuzzy, c-format
+#: sm/certreqgen.c:636
+#, c-format
 msgid "line %d: invalid authority-key-id\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: authority-key-id non valido\n"
 
-#: sm/certreqgen.c:648
-#, fuzzy, c-format
+#: sm/certreqgen.c:651
+#, c-format
 msgid "line %d: invalid subject-key-id\n"
-msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+msgstr "riga %d: id-chiave-soggetto non valido\n"
 
-#: sm/certreqgen.c:686
-#, fuzzy, c-format
+#: sm/certreqgen.c:689
+#, c-format
 msgid "line %d: invalid extension syntax\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "riga %d: sintassi di estensione non valida\n"
 
-#: sm/certreqgen.c:699
-#, fuzzy, c-format
+#: sm/certreqgen.c:702
+#, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr ""
+"riga %d: errore durante la lettura della chiave '%s' dalla scheda: %s\n"
 
-#: sm/certreqgen.c:712
-#, fuzzy, c-format
+#: sm/certreqgen.c:715
+#, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr ""
+"riga %d: errore durante il recupero della chiave da parte della chiave '%s': "
+"%s\n"
 
-#: sm/certreqgen.c:729
-#, fuzzy, c-format
+#: sm/certreqgen.c:732
+#, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
-msgstr "Generazione della chiave fallita: %s\n"
+msgstr "riga %d: generazione chiave non riuscita: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
 msgstr ""
+"Per completare questa richiesta di certificato, inserire la passphrase per "
+"la chiave appena creata ancora una volta.\n"
 
 #: sm/certreqgen-ui.c:159
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) Existing key\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "  (%d) Chiave esistente\n"
 
 #: sm/certreqgen-ui.c:160
 #, c-format
 msgid "   (%d) Existing key from card\n"
-msgstr ""
+msgstr "   (%d) Chiave esistente dalla scheda\n"
 
 #: sm/certreqgen-ui.c:318
 #, c-format
 msgid "Possible actions for a %s key:\n"
-msgstr ""
+msgstr "Azioni possibili per una chiave %s: \n"
 
 #: sm/certreqgen-ui.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) sign, encrypt\n"
-msgstr "   (%d) RSA (firma e cifra)\n"
+msgstr "    (%d) segno, cifra\n"
 
 #: sm/certreqgen-ui.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) sign\n"
-msgstr "   (%d) DSA (firma solo)\n"
+msgstr "   (%d) segno\n"
 
 #: sm/certreqgen-ui.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) encrypt\n"
-msgstr "   (%d) RSA (cifra solo)\n"
+msgstr "   (%d) crittografa\n"
 
 #: sm/certreqgen-ui.c:345
 msgid "Enter the X.509 subject name: "
-msgstr ""
+msgstr "Immettere il nome soggetto X.509: "
 
 #: sm/certreqgen-ui.c:349
-#, fuzzy
 msgid "No subject name given\n"
-msgstr "(Non è stata data una descrizione)\n"
+msgstr "Nessun nome soggetto dato\n"
 
 #: sm/certreqgen-ui.c:353
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid subject name label '%.*s'\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "Etichetta del nome del soggetto non valida '%.*s'.\n"
 
 #. TRANSLATORS: The 22 in the second string is the
 #. length of the first string up to the "%s".  Please
@@ -8953,377 +8834,352 @@
 #. second string is merely passed to atoi so you can
 #. drop everything after the number.
 #: sm/certreqgen-ui.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid subject name '%s'\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "Nome soggetto '%s' non valido\n"
 
 #: sm/certreqgen-ui.c:364
 msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
-msgstr ""
+msgstr "22 traduttore: vedere certreg-ui.c:gpgsm_gencertreq_tty"
 
 #: sm/certreqgen-ui.c:376
-#, fuzzy
 msgid "Enter email addresses"
-msgstr "Indirizzo di Email: "
+msgstr "Immettere gli indirizzi di posta elettronica"
 
 #: sm/certreqgen-ui.c:377
-#, fuzzy
 msgid " (end with an empty line):\n"
-msgstr ""
-"\n"
-"Inserisci l'user ID. Termina con una riga vuota: "
+msgstr " (terminare con una riga vuota):\n"
 
 #: sm/certreqgen-ui.c:381
-#, fuzzy
 msgid "Enter DNS names"
-msgstr "Inserire il nuovo nome del file"
+msgstr "Immettere i nomi DNS"
 
 #: sm/certreqgen-ui.c:382 sm/certreqgen-ui.c:387
-#, fuzzy
 msgid " (optional; end with an empty line):\n"
-msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
+msgstr " (opzionale; terminare con una riga vuota):\n"
 
 #: sm/certreqgen-ui.c:386
 msgid "Enter URIs"
-msgstr ""
+msgstr "Immettere gli URI"
 
 #: sm/certreqgen-ui.c:393
-#, fuzzy
 msgid "Create self-signed certificate? (y/N) "
-msgstr "Creare un certificato di revoca per questa chiave? "
+msgstr "Creare un certificato autofirmato? (y/N) "
 
 #: sm/certreqgen-ui.c:420
 msgid "These parameters are used:\n"
-msgstr ""
+msgstr "Vengono utilizzati i seguenti parametri:\n"
 
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
-msgstr ""
+msgstr "Creazione di un certificato autofirmato.  "
 
 #: sm/certreqgen-ui.c:440
-#, fuzzy
-#| msgid "Revocation certificate created.\n"
 msgid "Now creating certificate request.  "
-msgstr "Certificato di revoca creato.\n"
+msgstr "Creazione della richiesta di certificato.  "
 
 #: sm/certreqgen-ui.c:441
 msgid "This may take a while ...\n"
-msgstr ""
+msgstr "Questo potrebbe richiedere un po' ...\n"
 
 #: sm/certreqgen-ui.c:452
 msgid "Ready.\n"
-msgstr ""
+msgstr "Pronto.\n"
 
 #: sm/certreqgen-ui.c:455
 msgid "Ready.  You should now send this request to your CA.\n"
-msgstr ""
+msgstr "Pronto.  È ora necessario inviare questa richiesta alla CA.\n"
 
 #: sm/certreqgen-ui.c:461
 #, c-format
 msgid "resource problem: out of core\n"
-msgstr ""
+msgstr "problema delle risorse: fuori dal nucleo\n"
 
 #: sm/decrypt.c:341
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
-msgstr ""
+msgstr "(questo è l'algoritmo RC2)\n"
 
 #: sm/decrypt.c:343
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
-msgstr ""
+msgstr "(questo non sembra essere un messaggio crittografato)\n"
 
 #: sm/delete.c:51 sm/delete.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "certificate '%s' not found: %s\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "certificato '%s' non trovato: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
-#, fuzzy, c-format
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
+#, c-format
 msgid "error locking keybox: %s\n"
-msgstr "errore leggendo il keyblock: %s\n"
+msgstr "errore durante il blocco della keybox: %s\n"
 
 #: sm/delete.c:143
-#, fuzzy, c-format
+#, c-format
 msgid "duplicated certificate '%s' deleted\n"
-msgstr "Certificato di revoca creato.\n"
+msgstr "certificato duplicato '%s' eliminato\n"
 
 #: sm/delete.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "certificate '%s' deleted\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "certificato '%s' eliminato\n"
 
 #: sm/delete.c:175
-#, fuzzy, c-format
+#, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "eliminazione del certificato \"%s\" non riuscita: %s\n"
 
 #: sm/encrypt.c:330
-#, fuzzy, c-format
+#, c-format
 msgid "no valid recipients given\n"
-msgstr "(Non è stata data una descrizione)\n"
+msgstr "nessun destinatario valido dato\n"
 
-#: sm/gpgsm.c:213
-#, fuzzy
+#: sm/gpgsm.c:215
 msgid "list external keys"
-msgstr "elenca le chiavi segrete"
+msgstr "elencare le chiavi esterne"
 
-#: sm/gpgsm.c:215
-#, fuzzy
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
-msgstr "certificato danneggiato"
+msgstr "catena di certificati valida"
 
-#: sm/gpgsm.c:223
-#, fuzzy
+#: sm/gpgsm.c:225
 msgid "import certificates"
-msgstr "certificato danneggiato"
+msgstr "importa certificati"
 
-#: sm/gpgsm.c:224
-#, fuzzy
+#: sm/gpgsm.c:226
 msgid "export certificates"
-msgstr "certificato danneggiato"
+msgstr "esporta certificati"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
-msgstr ""
+msgstr "registrare una smart card"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
-msgstr ""
+msgstr "passare un comando al dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
-msgstr ""
+msgstr "richiamare gpg-protect-tool"
 
-#: sm/gpgsm.c:254
-#, fuzzy
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
-msgstr "crea un output ascii con armatura"
+msgstr "creare output codificato in base 64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
-msgstr ""
+msgstr "presupporre che l'input sia in formato PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
-msgstr ""
+msgstr "presupporre che l'input sia in formato base 64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
-msgstr ""
+msgstr "presupporre che l'input sia in formato binario"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
-msgstr ""
+msgstr "non consultare mai una CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
-msgstr ""
+msgstr "verificare la validità utilizzando OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
-msgstr ""
+msgstr "|N|numero di certificati da includere"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
-msgstr ""
+msgstr "|FILE|prendere le informazioni sui criteri da FILE"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
-msgstr ""
+msgstr "non controllare le politiche dei certificati"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
-msgstr ""
+msgstr "recupera i certificati degli emittenti mancanti"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
-msgstr ""
+msgstr "|FILE|scrittura di un registro in modalità server in FILE"
 
-#: sm/gpgsm.c:317
-#, fuzzy
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|scrittura di un registro di controllo in FILE"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "risponde \"sì\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:325
-#, fuzzy
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
-msgstr "aggiungi questo portachiavi alla lista"
+msgstr "|FILE|aggiungere il tasto all'elenco dei keyring"
 
-#: sm/gpgsm.c:328
-#, fuzzy
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NOME|usa NOME come chiave segreta predefinita"
+msgstr "|USER-ID|utilizzare USER-ID come chiave segreta predefinita"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
-#, fuzzy
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|HOST|cerca le chiavi in questo keyserver"
+msgstr "|SPEC|utilizzare questo keyserver per cercare le chiavi"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|usa l'algoritmo di cifratura NOME"
+msgstr "|NAME|usa l'algoritmo di cifratura NAME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|usa l'algoritmo di message digest NOME"
+msgstr "|NAME|usa l'algoritmo di message digest NAME"
 
-#: sm/gpgsm.c:564
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @GPGSM@ [opzioni] [file] (-h per assistenza)"
 
-#: sm/gpgsm.c:567
-#, fuzzy
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 msgstr ""
-"Sintassi: gpg [opzioni] [files]\n"
-"firma, controlla, cifra o decifra\n"
-"l'operazione predefinita dipende dai dati di input\n"
+"Sintassi: @GPGSM@ [opzioni] [files]\n"
+"Firmare, controllare, crittografare o decrittografare utilizzando il "
+"protocollo S/MIME\n"
+"Il funzionamento predefinito dipende dai dati di input\n"
 
-#: sm/gpgsm.c:771
-#, fuzzy, c-format
+#: sm/gpgsm.c:777
+#, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
-msgstr "impossibile connettersi a `%s': %s\n"
+msgstr "Nota: impossibile eseguire la crittografia in '%s': %s\n"
 
-#: sm/gpgsm.c:782
-#, fuzzy, c-format
+#: sm/gpgsm.c:788
+#, c-format
 msgid "unknown validation model '%s'\n"
-msgstr "destinatario predefinito `%s' sconosciuto\n"
+msgstr "modello di convalida sconosciuto '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
-#, fuzzy, c-format
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
+#, c-format
 msgid "%s:%u: no hostname given\n"
-msgstr "(Non è stata data una descrizione)\n"
+msgstr "%s: %u: nessun nome host specificato\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
-msgstr ""
+msgstr "%s:%u: password fornita senza utente\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
-#, fuzzy, c-format
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
+#, c-format
 msgid "%s:%u: skipping this line\n"
-msgstr " s = salta questa chiave\n"
+msgstr "%s:%u: ignorare questa riga\n"
 
-#: sm/gpgsm.c:1443
-#, fuzzy, c-format
+#: sm/gpgsm.c:1449
+#, c-format
 msgid "could not parse keyserver\n"
-msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+msgstr "impossibile analizzare il keyserver\n"
 
-#: sm/gpgsm.c:1705
-#, fuzzy, c-format
+#: sm/gpgsm.c:1712
+#, c-format
 msgid "importing common certificates '%s'\n"
-msgstr "scrittura in `%s'\n"
+msgstr "importazione di certificati comuni '%s'\n"
 
-#: sm/gpgsm.c:1748
-#, fuzzy, c-format
+#: sm/gpgsm.c:1755
+#, c-format
 msgid "can't sign using '%s': %s\n"
-msgstr "impossibile chiudere `%s': %s\n"
+msgstr "impossibile firmare utilizzando '%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
-msgstr ""
+msgstr "comando non valido (non esiste alcun comando implicito)\n"
 
 #: sm/import.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "total number processed: %lu\n"
-msgstr "Numero totale esaminato: %lu\n"
+msgstr "numero totale elaborato: %lu\n"
 
 #: sm/import.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "error storing certificate\n"
-msgstr "genera un certificato di revoca"
+msgstr "errore durante l'archiviazione del certificato\n"
 
 #: sm/import.c:254
 #, c-format
 msgid "basic certificate checks failed - not imported\n"
-msgstr ""
+msgstr "controlli certificati di base non riusciti - non importati\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
-#, fuzzy, c-format
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
+#, c-format
 msgid "error getting stored flags: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero dei flag memorizzati: %s\n"
 
 #: sm/import.c:531 sm/import.c:563
-#, fuzzy, c-format
+#, c-format
 msgid "error importing certificate: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante l'importazione del certificato: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
-#, fuzzy, c-format
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
+#, c-format
 msgid "error reading input: %s\n"
-msgstr "errore leggendo `%s': %s\n"
-
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "errore durante la lettura dell'input: %s\n"
 
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
-msgstr ""
+msgstr "problema durante la ricerca del certificato esistente: %s\n"
 
-#: sm/keydb.c:1180
-#, fuzzy, c-format
+#: sm/keydb.c:1160
+#, c-format
 msgid "error finding writable keyDB: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la ricerca della chiave scrivibile keyDB: %s\n"
 
-#: sm/keydb.c:1188
-#, fuzzy, c-format
+#: sm/keydb.c:1168
+#, c-format
 msgid "error storing certificate: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante l'archiviazione del certificato: %s\n"
 
-#: sm/keydb.c:1240
-#, fuzzy, c-format
+#: sm/keydb.c:1220
+#, c-format
 msgid "problem re-searching certificate: %s\n"
-msgstr "rev? problema controllando la revoca: %s\n"
+msgstr "problema durante la ri-ricerca del certificato: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
-#, fuzzy, c-format
+#: sm/keydb.c:1241 sm/keydb.c:1330
+#, c-format
 msgid "error storing flags: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'archiviazione dei flag: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
-msgstr ""
+msgstr "Errore - "
 
 #: sm/misc.c:58
 #, c-format
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr ""
+msgstr "GPG_TTY non è stato impostato - utilizzando forse falso default\n"
 
 #: sm/qualified.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "invalid formatted fingerprint in '%s', line %d\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "impronta digitale formattata non valida in '%s', riga %d\n"
 
 #: sm/qualified.c:123
-#, fuzzy, c-format
+#, c-format
 msgid "invalid country code in '%s', line %d\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "codice paese non valido in '%s', riga %d\n"
 
 #: sm/qualified.c:206
 #, c-format
@@ -9335,13 +9191,21 @@
 "\n"
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
+"Si sta per creare una firma utilizzando il certificato:\n"
+"\"%s\"\n"
+"In questo modo verrà creata una firma qualificata per legge equiparata a una "
+"firma scritta a mano.\n"
+"\n"
+"%s%sSono davvero sicuri di voler eseguire questa operazione?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
+"Si noti che questo software non è ufficialmente approvato per creare o "
+"verificare tali firme.\n"
 
 #: sm/qualified.c:282
 #, c-format
@@ -9350,4127 +9214,2121 @@
 "\"%s\"\n"
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
+"Si sta per creare una firma utilizzando il certificato:\n"
+"\"%s\"\n"
+"Si noti che questo certificato NON creerà una firma qualificata!"
 
 #: sm/sign.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+msgstr ""
+"algoritmo hash %d (%s) per firmatario %d non supportato; utilizzando %s\n"
 
 #: sm/sign.c:508
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr ""
+msgstr "algoritmo hash utilizzato per firmatario %d: %s (%s)\n"
 
 #: sm/sign.c:560
-#, fuzzy, c-format
+#, c-format
 msgid "checking for qualified certificate failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "controllo del certificato qualificato non riuscito: %s\n"
 
-#: sm/verify.c:486
-#, fuzzy, c-format
+#: sm/verify.c:463
+#, c-format
 msgid "Signature made "
-msgstr "Firma scaduta il %s\n"
+msgstr "Firma fatta "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
-msgstr ""
+msgstr "[data non specificata]"
 
-#: sm/verify.c:491
-#, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+#: sm/verify.c:479
+#, c-format
+msgid "algorithm:"
+msgstr "algoritmo:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
+"firma non valida: l'attributo digest del messaggio non corrisponde a uno "
+"calcolato\n"
 
-#: sm/verify.c:631
-#, fuzzy, c-format
+#: sm/verify.c:656
+#, c-format
 msgid "Good signature from"
-msgstr "Firma valida da \""
+msgstr "Buona firma da"
 
-#: sm/verify.c:632
-#, fuzzy, c-format
+#: sm/verify.c:657
+#, c-format
 msgid "                aka"
-msgstr "                alias \""
+msgstr "                 aka"
 
-#: sm/verify.c:650
-#, fuzzy, c-format
+#: sm/verify.c:675
+#, c-format
 msgid "This is a qualified signature\n"
-msgstr ""
-"\n"
-"Questa sarà una autofirma.\n"
+msgstr "Questa è una firma qualificata\n"
 
 #: dirmngr/certcache.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "can't initialize certificate cache lock: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "impossibile inizializzare il blocco della cache dei certificati: %s\n"
 
 #: dirmngr/certcache.c:135
 #, c-format
 msgid "can't acquire read lock on the certificate cache: %s\n"
 msgstr ""
+"impossibile acquisire il blocco di lettura sulla cache dei certificati: %s\n"
 
 #: dirmngr/certcache.c:146
 #, c-format
 msgid "can't acquire write lock on the certificate cache: %s\n"
 msgstr ""
+"impossibile acquisire il blocco in scrittura sulla cache dei certificati: "
+"%s\n"
 
 #: dirmngr/certcache.c:157
 #, c-format
 msgid "can't release lock on the certificate cache: %s\n"
-msgstr ""
+msgstr "impossibile rilasciare il blocco sulla cache dei certificati: %s\n"
 
 #: dirmngr/certcache.c:297
 #, c-format
 msgid "dropping %u certificates from the cache\n"
-msgstr ""
+msgstr "eliminazione di %u certificati dalla cache\n"
 
 #: dirmngr/certcache.c:415 dirmngr/certcache.c:505 dirmngr/certcache.c:615
-#, fuzzy, c-format
-#| msgid "can't create `%s': %s\n"
+#, c-format
 msgid "can't parse certificate '%s': %s\n"
-msgstr "impossibile creare `%s': %s\n"
+msgstr "impossibile analizzare il certificato '%s': %s\n"
 
 #: dirmngr/certcache.c:423 dirmngr/certcache.c:512 dirmngr/certcache.c:626
-#, fuzzy, c-format
+#, c-format
 msgid "certificate '%s' already cached\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "certificato '%s' già memorizzato nella cache\n"
 
 #: dirmngr/certcache.c:430 dirmngr/certcache.c:520 dirmngr/certcache.c:635
-#, fuzzy, c-format
+#, c-format
 msgid "trusted certificate '%s' loaded\n"
-msgstr "Certificato di revoca creato.\n"
+msgstr "certificato attendibile '%s' caricato\n"
 
 #: dirmngr/certcache.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "certificate '%s' loaded\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "certificato '%s' caricato\n"
 
 #: dirmngr/certcache.c:436 dirmngr/certcache.c:522 dirmngr/certcache.c:637
-#, fuzzy, c-format
+#, c-format
 msgid "  SHA1 fingerprint = %s\n"
-msgstr "mostra le impronte digitali"
+msgstr "  impronta digitale SHA1 - %s\n"
 
 #: dirmngr/certcache.c:439 dirmngr/certcache.c:525 dirmngr/certcache.c:640
 msgid "   issuer ="
-msgstr ""
+msgstr "   emittente ="
 
 #: dirmngr/certcache.c:440 dirmngr/certcache.c:526 dirmngr/certcache.c:641
 msgid "  subject ="
-msgstr ""
+msgstr "  oggetto ="
 
 #: dirmngr/certcache.c:444 dirmngr/certcache.c:514 dirmngr/certcache.c:629
-#, fuzzy, c-format
+#, c-format
 msgid "error loading certificate '%s': %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il caricamento del certificato '%s': %s\n"
 
-#: dirmngr/certcache.c:816
-#, fuzzy, c-format
+#: dirmngr/certcache.c:819
+#, c-format
 msgid "permanently loaded certificates: %u\n"
-msgstr "certificato danneggiato"
+msgstr "certificati caricati in modo permanente: %u\n"
 
-#: dirmngr/certcache.c:818
-#, fuzzy, c-format
+#: dirmngr/certcache.c:821
+#, c-format
 msgid "    runtime cached certificates: %u\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "   certificati runtime memorizzati nella cache: %u\n"
 
-#: dirmngr/certcache.c:820
-#, fuzzy, c-format
+#: dirmngr/certcache.c:823
+#, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "           certificati attendibili: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
-#, fuzzy, c-format
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
+#, c-format
 msgid "certificate already cached\n"
-msgstr "Certificato di revoca creato.\n"
+msgstr "certificato già memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:850
-#, fuzzy, c-format
+#: dirmngr/certcache.c:853
+#, c-format
 msgid "certificate cached\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "certificato memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
-#, fuzzy, c-format
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
+#, c-format
 msgid "error caching certificate: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la memorizzazione nella cache del certificato: %s\n"
 
-#: dirmngr/certcache.c:935
-#, fuzzy, c-format
+#: dirmngr/certcache.c:938
+#, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "stringa di impronta digitale SHA1 non valida '%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#, c-format
 msgid "error fetching certificate by S/N: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero del certificato da parte di S/N: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#, c-format
 msgid "error fetching certificate by subject: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero del certificato per oggetto: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#, c-format
 msgid "no issuer found in certificate\n"
-msgstr "genera un certificato di revoca"
+msgstr "nessuna autorità emittente trovata nel certificato\n"
 
-#: dirmngr/certcache.c:1701
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1704
+#, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero di authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
+#: dirmngr/crlcache.c:212
+#, c-format
 msgid "creating directory '%s'\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr "creazione della directory '%s'\n"
 
-#: dirmngr/crlcache.c:220
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:216
+#, c-format
 msgid "error creating directory '%s': %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "errore durante la creazione della directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:244
+#, c-format
 msgid "ignoring database dir '%s'\n"
-msgstr "errore nella riga della coda\n"
+msgstr "ignorare il dir del database '%s'\n"
 
-#: dirmngr/crlcache.c:257
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:253
+#, c-format
 msgid "error reading directory '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura della directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:278
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:274
+#, c-format
 msgid "removing cache file '%s'\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "rimozione del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:287
-#, fuzzy, c-format
-#| msgid "enarmoring failed: %s\n"
+#: dirmngr/crlcache.c:283
+#, c-format
 msgid "not removing file '%s'\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "non rimuove il file '%s'\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#, c-format
 msgid "error closing cache file: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la chiusura del file della cache: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#, c-format
 msgid "failed to open cache dir file '%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile aprire il file dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:424
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:420
+#, c-format
 msgid "error creating new cache dir file '%s': %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr ""
+"errore durante la creazione del nuovo file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:431
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
+#: dirmngr/crlcache.c:427
+#, c-format
 msgid "error writing new cache dir file '%s': %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr ""
+"errore durante la scrittura del nuovo file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:438
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:434
+#, c-format
 msgid "error closing new cache dir file '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr ""
+"errore durante la chiusura del nuovo file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:443
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
+#: dirmngr/crlcache.c:439
+#, c-format
 msgid "new cache dir file '%s' created\n"
-msgstr "creato un nuovo file di configurazione `%s'\n"
+msgstr "nuovo file dir della cache '%s' creato\n"
 
-#: dirmngr/crlcache.c:448
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:444
+#, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr "impossibile riass desiderare il file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
-msgstr ""
+msgstr "il primo record di '%s' non è la versione\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
-msgstr ""
+msgstr "vecchia versione della directory della cache - pulizia\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
-msgstr ""
+msgstr "vecchia versione della directory della cache - rinuncia\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
-msgstr ""
+msgstr "campo aggiuntivo rilevato nel record crl '%s' della riga %u\n"
 
-#: dirmngr/crlcache.c:626
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:622
+#, c-format
 msgid "invalid line detected in '%s' line %u\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "riga non valida rilevata nella riga '%s' %u\n"
 
-#: dirmngr/crlcache.c:635
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:631
+#, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
-msgstr "Certificato di revoca creato.\n"
+msgstr "voce duplicata rilevata '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
-msgstr ""
+msgstr "tipo di record non supportato nella riga '%s' %u ignorato\n"
 
-#: dirmngr/crlcache.c:676
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:672
+#, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "hash dell'autorità emittente non valido '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:682
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:678
+#, c-format
 msgid "no issuer DN in '%s' line %u\n"
-msgstr "errore di lettura: %s\n"
+msgstr "nessun DN emittente '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:689
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:685
+#, c-format
 msgid "invalid timestamp in '%s' line %u\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "timestamp non valido '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:695
-#, fuzzy, c-format
-#| msgid "WARNING: invalid size of random_seed file - not used\n"
+#: dirmngr/crlcache.c:691
+#, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
-msgstr ""
-"ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
+msgstr "AVVISO: hash del file di cache non valido %s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
-msgstr ""
+msgstr "errori rilevati nel file dir della cache\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
-msgstr ""
+msgstr "si prega di controllare il motivo ed eliminare manualmente quel file\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr "impossibile creare il file dir della cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:940
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:936
+#, c-format
 msgid "error closing '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la chiusura di '%s': %s\n"
 
-#: dirmngr/crlcache.c:952
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
+#: dirmngr/crlcache.c:948
+#, c-format
 msgid "error renaming '%s' to '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la ridenominazione di '%s' in '%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1002
+#, c-format
 msgid "can't hash '%s': %s\n"
-msgstr "impossibile chiudere `%s': %s\n"
+msgstr "impossibile eseguire l'hashing '%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1010
+#, c-format
 msgid "error setting up MD5 hash context: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'impostazione del contesto hash MD5: %s\n"
 
-#: dirmngr/crlcache.c:1030
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1026
+#, c-format
 msgid "error hashing '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'hashing di '%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1054
+#, c-format
 msgid "invalid formatted checksum for '%s'\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "checksum formattato non valido per '%s'\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
-msgstr ""
+msgstr "troppi file della cache aperti; non può più aprire\n"
 
-#: dirmngr/crlcache.c:1129
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1125
+#, c-format
 msgid "opening cache file '%s'\n"
-msgstr "firma fallita: %s\n"
+msgstr "apertura del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:1148
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1144
+#, c-format
 msgid "error opening cache file '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'apertura del file di cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
+"errore durante l'inizializzazione del file di cache '%s' per la lettura: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
-msgstr ""
+msgstr "chiamata unlock_db_file su un file chiuso\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
-msgstr ""
+msgstr "chiamata unlock_db_file su un file sbloccato\n"
 
-#: dirmngr/crlcache.c:1234
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1230
+#, c-format
 msgid "failed to create a new cache object: %s\n"
-msgstr "%s: creazione della tabella hash fallita: %s\n"
+msgstr "impossibile creare un nuovo oggetto cache: %s\n"
 
-#: dirmngr/crlcache.c:1291
-#, fuzzy, c-format
-#| msgid "No help available for `%s'"
+#: dirmngr/crlcache.c:1287
+#, c-format
 msgid "no CRL available for issuer id %s\n"
-msgstr "Non è disponibile un aiuto per `%s'"
+msgstr "nessun CRL disponibile per l'ID emittente %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
+"CRL memorizzato nella cache per l'ID emittente %s troppo vecchio; "
+"aggiornamento richiesto\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
+"force-crl-refresh attivo e %d minuti per l'ID autorità emittente %s; "
+"aggiornamento richiesto\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
+"force-crl-refresh attivo per l'ID autorità emittente %s; aggiornamento "
+"richiesto\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
-msgstr ""
+msgstr "impossibile utilizzare il CRL disponibile per l'ID emittente %s\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
+"CRL memorizzato nella cache per l'ID emittente %s manomesso; abbiamo bisogno "
+"di aggiornare\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
-msgstr ""
+msgstr "AVVISO: lunghezza del record della cache non valida per S/N "
 
-#: dirmngr/crlcache.c:1362
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1358
+#, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "problema durante la lettura del record della cache per S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
-msgstr ""
+msgstr "S/N %s non valido. motivo: %02X data%15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
-msgstr ""
+msgstr "S/N %s è valido, non è elencato nel CRL\n"
 
-#: dirmngr/crlcache.c:1384
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1380
+#, c-format
 msgid "error getting data from cache file: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+msgstr "errore durante il recupero dei dati dal file di cache: %s\n"
 
-#: dirmngr/crlcache.c:1554
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
-#, fuzzy, c-format
-#| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
-msgstr "risposta non valida dall'agent\n"
+msgstr "ha ottenuto un'espressione S non valida da libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#, c-format
 msgid "converting S-expression failed: %s\n"
-msgstr "impossibile aprire il file: %s\n"
+msgstr "conversione dell'espressione S non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "algoritmo hash sconosciuto '%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open per l'algoritmo %d non riuscito: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#, c-format
 msgid "creating S-expression failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "creazione dell'espressione S non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:1705
-#, fuzzy, c-format
-#| msgid "build_packet failed: %s\n"
+#: dirmngr/crlcache.c:1871
+#, c-format
 msgid "ksba_crl_parse failed: %s\n"
-msgstr "build_packet fallito: %s\n"
+msgstr "ksba_crl_parse non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:1720
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1886
+#, c-format
 msgid "error getting update times of CRL: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante l'aggiornamento del CRL: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
-msgstr ""
+msgstr "orari di aggiornamento di questo CRL: this:%s next-%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
+"nextUpdate non specificato; assumendo un periodo di validità di un giorno\n"
 
-#: dirmngr/crlcache.c:1751
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1917
+#, c-format
 msgid "error getting CRL item: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero dell'elemento CRL: %s\n"
 
-#: dirmngr/crlcache.c:1766
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1932
+#, c-format
 msgid "error inserting item into temporary cache file: %s\n"
-msgstr "scrittura in `%s'\n"
+msgstr ""
+"errore durante l'inserimento dell'elemento nel file di cache temporaneo: %s\n"
 
-#: dirmngr/crlcache.c:1793
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1959
+#, c-format
 msgid "no CRL issuer found in CRL: %s\n"
-msgstr "genera un certificato di revoca"
+msgstr "nessuna autorità emittente CRL trovata nel CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
+"individuazione del certificato dell'autorità emittente CRL da parte di "
+"authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
-#, fuzzy, c-format
-#| msgid "signature verification suppressed\n"
+#: dirmngr/crlcache.c:2020
+#, c-format
 msgid "CRL signature verification failed: %s\n"
-msgstr "verifica della firma soppressa\n"
+msgstr "Verifica della firma CRL non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:1866
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2032
+#, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr ""
+"errore durante il controllo della validità del certificato dell'autorità "
+"emittente CRL: %s\n"
 
-#: dirmngr/crlcache.c:2008
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2174
+#, c-format
 msgid "ksba_crl_new failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "ksba_crl_new non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2015
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2181
+#, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "ksba_crl_set_reader non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2049
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2215
+#, c-format
 msgid "removed stale temporary cache file '%s'\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr "rimosso il file di cache temporanea non più obsoleto '%s'\n"
 
-#: dirmngr/crlcache.c:2053
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2219
+#, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
+msgstr ""
+"problema durante la rimozione del file di cache temporanea non più obsoleto "
+"'%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2229
+#, c-format
 msgid "error creating temporary cache file '%s': %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la creazione del file di cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2073
-#, fuzzy, c-format
-#| msgid "update secret failed: %s\n"
+#: dirmngr/crlcache.c:2239
+#, c-format
 msgid "crl_parse_insert failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "crl_parse_insert non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2083
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2249
+#, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
-msgstr "scrittura in `%s'\n"
+msgstr ""
+"errore durante il completamento del file di cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2090
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2256
+#, c-format
 msgid "error closing temporary cache file '%s': %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la chiusura del file della cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
+"AVVISO: nuovo CRL ancora troppo vecchio; è scaduto su %s - il caricamento è "
+"stato completato comunque\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
-msgstr ""
+msgstr "nuovo CRL ancora troppo vecchio; è scaduto su %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
-msgstr ""
+msgstr "estensione CRL critica sconosciuta %s\n"
 
-#: dirmngr/crlcache.c:2145
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2311
+#, c-format
 msgid "error reading CRL extensions: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura delle estensioni CRL: %s\n"
 
-#: dirmngr/crlcache.c:2196
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2362
+#, c-format
 msgid "creating cache file '%s'\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "creazione del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:2228
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2394
+#, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "problema durante la ridenominazione di '%s' in '%s': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
+"aggiornamento del file DIR non riuscito - la voce della cache andrà persa "
+"con il successivo avvio del programma\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
-msgstr ""
+msgstr "Inizio dump CRL (recuperato tramite %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
+" ERRORE: il CRL non verrà utilizzato perché era ancora troppo vecchio dopo "
+"un aggiornamento!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
+" ERRORE: il CRL non verrà utilizzato a causa di un'estensione critica "
+"sconosciuta!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
-msgstr ""
+msgstr " ERRORE: il CRL non verrà utilizzato\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
+" ERRORE: questo CRL memorizzato nella cache potrebbe essere stato "
+"manomesso!\n"
 
-#: dirmngr/crlcache.c:2333
-#, fuzzy, c-format
-#| msgid "WARNING: invalid size of random_seed file - not used\n"
+#: dirmngr/crlcache.c:2499
+#, c-format
 msgid " WARNING: invalid cache record length\n"
-msgstr ""
-"ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
+msgstr " AVVISO: lunghezza del record della cache non valida\n"
 
-#: dirmngr/crlcache.c:2340
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2506
+#, c-format
 msgid "problem reading cache record: %s\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
+msgstr "problema durante la lettura del record della cache: %s\n"
 
-#: dirmngr/crlcache.c:2351
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2517
+#, c-format
 msgid "problem reading cache key: %s\n"
-msgstr "rev? problema controllando la revoca: %s\n"
+msgstr "problema durante la lettura della chiave della cache: %s\n"
 
-#: dirmngr/crlcache.c:2382
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2548
+#, c-format
 msgid "error reading cache entry from db: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura della voce della cache dal database: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
-msgstr ""
+msgstr "Fine dump CRL\n"
 
-#: dirmngr/crlcache.c:2506
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2672
+#, c-format
 msgid "crl_fetch via DP failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "crl_fetch tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2517
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2683
+#, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "crl_cache_insert tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2577
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2743
+#, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "crl_cache_insert tramite autorità emittente non riuscita: %s\n"
 
 #: dirmngr/crlfetch.c:75
 #, c-format
 msgid "reader to file mapping table full - waiting\n"
-msgstr ""
+msgstr "lettore alla tabella di mapping file piena - in attesa\n"
 
 #: dirmngr/crlfetch.c:171 dirmngr/crlfetch.c:230 dirmngr/crlfetch.c:268
 #: dirmngr/crlfetch.c:300
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
-msgstr ""
+msgstr "Accesso CRL non possibile a causa della disabilitata di %s\n"
 
 #: dirmngr/crlfetch.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "error retrieving '%s': %s\n"
-msgstr "errore creando `%s': %s\n"
+msgstr "errore durante il recupero di '%s': %s\n"
 
 #: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper-ce.c:492
 #: dirmngr/ldap-wrapper.c:884 dirmngr/misc.c:573
-#, fuzzy, c-format
-#| msgid "%s: error writing dir record: %s\n"
+#, c-format
 msgid "error initializing reader object: %s\n"
-msgstr "%s: errore durante la scrittura del dir record: %s\n"
+msgstr "errore durante l'inizializzazione dell'oggetto lettore: %s\n"
 
 #: dirmngr/crlfetch.c:237 dirmngr/crlfetch.c:263 dirmngr/crlfetch.c:295
 #: dirmngr/crlfetch.c:322
-#, fuzzy, c-format
+#, c-format
 msgid "CRL access not possible due to Tor mode\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "Accesso CRL non possibile a causa della modalità Tor\n"
 
 #: dirmngr/crlfetch.c:327
-#, fuzzy, c-format
+#, c-format
 msgid "certificate search not possible due to disabled %s\n"
-msgstr "chiave `%s' non trovata: %s\n"
-
-#: dirmngr/dirmngr-client.c:71
-msgid "use OCSP instead of CRLs"
 msgstr ""
+"ricerca del certificato non possibile a causa della disabilitata di %s\n"
 
 #: dirmngr/dirmngr-client.c:72
-msgid "check whether a dirmngr is running"
-msgstr ""
+msgid "use OCSP instead of CRLs"
+msgstr "utilizzare OCSP anziché CRL"
 
 #: dirmngr/dirmngr-client.c:73
-#, fuzzy
-msgid "add a certificate to the cache"
-msgstr "Certificato di revoca creato.\n"
+msgid "check whether a dirmngr is running"
+msgstr "controllare se un dirmngr è in esecuzione"
 
 #: dirmngr/dirmngr-client.c:74
-#, fuzzy
-msgid "validate a certificate"
-msgstr "certificato danneggiato"
+msgid "add a certificate to the cache"
+msgstr "aggiungere un certificato alla cache"
 
 #: dirmngr/dirmngr-client.c:75
-#, fuzzy
-msgid "lookup a certificate"
-msgstr "certificato danneggiato"
+msgid "validate a certificate"
+msgstr "convalidare un certificato"
 
 #: dirmngr/dirmngr-client.c:76
-#, fuzzy
-msgid "lookup only locally stored certificates"
-msgstr "certificato danneggiato"
+msgid "lookup a certificate"
+msgstr "ricerca di un certificato"
 
 #: dirmngr/dirmngr-client.c:77
-msgid "expect an URL for --lookup"
-msgstr ""
+msgid "lookup only locally stored certificates"
+msgstr "ricerca solo di certificati archiviati localmente"
 
 #: dirmngr/dirmngr-client.c:78
-msgid "load a CRL into the dirmngr"
-msgstr ""
+msgid "expect an URL for --lookup"
+msgstr "previsto un URL per --lookup"
 
 #: dirmngr/dirmngr-client.c:79
-msgid "special mode for use by Squid"
-msgstr ""
+msgid "load a CRL into the dirmngr"
+msgstr "caricare un CRL nel dirmngr"
 
 #: dirmngr/dirmngr-client.c:80
-#, fuzzy
+msgid "special mode for use by Squid"
+msgstr "modalità speciale per l'uso da parte di Squid"
+
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
-msgstr "certificato danneggiato"
+msgstr "prevedere certificati in formato PEM"
 
-#: dirmngr/dirmngr-client.c:82
-#, fuzzy
-#| msgid "Enter the user ID of the designated revoker: "
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
-msgstr "Inserisci l'user ID del revocatore designato: "
+msgstr "forzare l'uso del risponditore OCSP predefinito"
 
-#: dirmngr/dirmngr-client.c:169
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr ""
+"Utilizzo: dirmngr-client [opzioni] [certfile-pattern] (-h per assistenza)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
 "The process returns 0 if the certificate is valid, 1 if it is\n"
 "not valid and other error codes for general failures\n"
 msgstr ""
+"Sintassi: dirmngr-client [opzioni] [certfile-pattern]\n"
+"Testare un certificato X.509 rispetto a un CRL o eseguire un controllo OCSP\n"
+"Il processo restituisce 0 se il certificato è valido, 1 se è\n"
+"non validi e altri codici di errore per gli errori generali\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
+#, c-format
 msgid "error reading certificate from stdin: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante la lettura del certificato da stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:289
+#, c-format
 msgid "error reading certificate from '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura del certificato da '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
-msgstr ""
+msgstr "certificato troppo grande per avere un senso\n"
 
-#: dirmngr/dirmngr-client.c:310
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
+#: dirmngr/dirmngr-client.c:318
+#, c-format
 msgid "can't connect to the dirmngr: %s\n"
-msgstr "impossibile connettersi a `%s': %s\n"
+msgstr "impossibile connettersi al dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
-#, fuzzy, c-format
-#| msgid "update failed: %s\n"
+#: dirmngr/dirmngr-client.c:340
+#, c-format
 msgid "lookup failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "ricerca non riuscita: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:355
+#, c-format
 msgid "loading CRL '%s' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "caricamento CRL '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
-msgstr ""
+msgstr "un daemon dirmngr è in funzione\n"
 
-#: dirmngr/dirmngr-client.c:397
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:405
+#, c-format
 msgid "validation of certificate failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "convalida del certificato non riuscita: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
+#, c-format
 msgid "certificate is valid\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "catena di certificati valida\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
+#, c-format
 msgid "certificate has been revoked\n"
-msgstr "NOTA: la chiave è stata revocata"
+msgstr "certificato è stato revocato\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
+#, c-format
 msgid "certificate check failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "controllo del certificato non riuscito: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
-#, fuzzy, c-format
-#| msgid "can't stat `%s': %s\n"
+#: dirmngr/dirmngr-client.c:436
+#, c-format
 msgid "got status: '%s'\n"
-msgstr "impossibile eseguire stat su `%s': %s\n"
+msgstr "stato ottenuto: '%s'\n"
 
-#: dirmngr/dirmngr-client.c:443
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
+#: dirmngr/dirmngr-client.c:451
+#, c-format
 msgid "error writing base64 encoding: %s\n"
-msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+msgstr "errore durante la scrittura della codifica base64: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
-#, fuzzy, c-format
+#: dirmngr/dirmngr-client.c:709
+#, c-format
 msgid "unsupported inquiry '%s'\n"
-msgstr ""
-"\n"
-"Algoritmi gestiti:\n"
+msgstr "richiesta '%s' non supportata\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
-msgstr ""
+msgstr "previsto nome file assoluto\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
-msgstr ""
+msgstr "ricerca di '%s'\n"
 
 #: dirmngr/dirmngr.c:170
 msgid "list the contents of the CRL cache"
-msgstr ""
+msgstr "elencare il contenuto della cache CRL"
 
 #: dirmngr/dirmngr.c:171
-#, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|carica CRL da FILE nella cache"
 
 #: dirmngr/dirmngr.c:172
 msgid "|URL|fetch a CRL from URL"
-msgstr ""
+msgstr "|URL|recupero di un CRL dall'URL"
 
 #: dirmngr/dirmngr.c:173
 msgid "shutdown the dirmngr"
-msgstr ""
+msgstr "arrestare il dirmngr"
 
 #: dirmngr/dirmngr.c:174
 msgid "flush the cache"
-msgstr ""
+msgstr "svuotare la cache"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
-msgstr ""
+msgstr "|FILE|scrittura dei registri in modalità server in FILE"
 
-#: dirmngr/dirmngr.c:190
-#, fuzzy
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
-msgstr "Esco senza salvare? "
+msgstr "eseguire senza chiedere a un utente"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
-msgstr ""
+msgstr "forzare il caricamento di CRL obsoleti"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
-msgstr ""
+msgstr "consentire l'invio di richieste OCSP"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
-msgstr ""
+msgstr "consentire il controllo della versione del software online"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
-msgstr ""
+msgstr "inibire l'uso di HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
-msgstr ""
+msgstr "inibire l'uso di LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
-msgstr ""
+msgstr "ignorare i punti di distribuzione CRL HTTP"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
-msgstr ""
+msgstr "ignorare i punti di distribuzione CRL LDAP"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
-msgstr ""
+msgstr "ignorare gli URL del servizio OCSP contenuti nel certificato"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
-msgstr ""
+msgstr "|URL|reindirizza tutte le richieste HTTP all'URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
-msgstr ""
+msgstr "|HOST|utilizzare HOST per le query LDAP"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
-msgstr ""
+msgstr "non utilizzare host di fallback con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
-#, fuzzy
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|lettura dell'elenco dei server LDAP da FILE"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
+"aggiungere nuovi server individuati nei punti di distribuzione CRL "
+"all'elenco dei server"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
-msgstr ""
+msgstr "|N|imposta il timeout LDAP su N secondi"
 
-#: dirmngr/dirmngr.c:220
-#, fuzzy
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
-msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+msgstr "|URL|utilizzare risponditore OCSP all'URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
-msgstr ""
+msgstr "|FPR|Risposta OCSP firmata da FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
-msgstr ""
+msgstr "|N|Non restituire più di N elementi in una query"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
+msgstr "|FILE|utilizzare i certificati CA in FILE per HKP su TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
-msgstr ""
+msgstr "instradare tutto il traffico di rete tramite Tor"
 
-#: dirmngr/dirmngr.c:263
-#, fuzzy
-#| msgid ""
-#| "@\n"
-#| "(See the man page for a complete listing of all commands and options)\n"
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
 "options)\n"
 msgstr ""
 "@\n"
-"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
+"(Vedere il manuale \"info\" per un elenco completo di tutti i comandi e le "
+"opzioni)\n"
 
-#: dirmngr/dirmngr.c:401
-#, fuzzy
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @DIRMNGR@ [opzioni] (-h per assistenza)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
+"Sintassi: @DIRMNGR@ [opzioni] [comando [args]]\n"
+"Accesso keyserver, CRL e OCSP per @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
-msgstr ""
+msgstr "i livelli di debug validi sono: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
+#, c-format
 msgid "usage: %s [options] "
-msgstr "uso: gpg [opzioni] "
+msgstr "utilizzo: %s [opzioni] "
 
-#: dirmngr/dirmngr.c:1218
-#, fuzzy, c-format
-#| msgid "%s not allowed with %s!\n"
+#: dirmngr/dirmngr.c:1212
+#, c-format
 msgid "colons are not allowed in the socket name\n"
-msgstr "Non è permesso usare %s con %s!\n"
+msgstr "due punti non sono consentiti nel nome del socket\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
+#, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "recupero CRL da '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
+#, c-format
 msgid "processing CRL from '%s' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "elaborazione CRL da '%s' non riuscita: %s\n"
 
-#: dirmngr/dirmngr.c:1652
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1645
+#, c-format
 msgid "%s:%u: line too long - skipped\n"
-msgstr "riga troppo lunga\n"
+msgstr "%s:%u: riga troppo lunga - ignorata\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
+#, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "errore: impronta digitale non valida\n"
+msgstr "%s:%u: rilevata impronta digitale non valida\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
+#, c-format
 msgid "%s:%u: read error: %s\n"
-msgstr "errore di lettura: %s\n"
+msgstr "%s: %u: errore di lettura: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
-msgstr ""
+msgstr "%s: %u: Garbage alla fine della riga ignorato\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
+"SIGHUP ricevuto - rilezione delle cache di configurazione e svuotamento\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
-msgstr ""
+msgstr "SIGUSR2 ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
-msgstr ""
+msgstr "SIGTERM ricevuto - arresto …\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
-msgstr ""
+msgstr "SIGTERM ricevuto - connessioni ancora %d attive\n"
 
-# ??? (Md)
-#: dirmngr/dirmngr.c:1916
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1912
+#, c-format
 msgid "shutdown forced\n"
-msgstr "non esaminato"
+msgstr "arresto forzato\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
-msgstr ""
+msgstr "SIGINT ricevuto - arresto immediato\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
-msgstr ""
+msgstr "segnale %d ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
-msgstr ""
+msgstr "restituire tutti i valori in un formato orientato ai record"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
+msgstr "|NOME|Ignorare la parte host e connettersi tramite NOME"
 
-#: dirmngr/dirmngr_ldap.c:141
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
-msgstr "|NOME|imposta NOME come set di caratteri del terminale"
+msgstr "Nome:connessione all'host NOME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
-msgstr ""
+msgstr "|N|Connessione alla porta N"
 
-#: dirmngr/dirmngr_ldap.c:143
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
-msgstr "|NOME|usa NOME come destinatario predefinito"
+msgstr "Nome:utilizzare nome utente per l'autenticazione"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
-msgstr ""
+msgstr "|PASS|utilizzare la password PASS per l'autenticazione"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
+msgstr "prendere la password da $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
-msgstr ""
+msgstr "|STRINGA|stringa DN query"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
-msgstr ""
+msgstr "| STRINGA: utilizzare STRING come espressione di filtro"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
-msgstr ""
+msgstr "| STRINGA: restituisce l'attributo STRING"
 
-#: dirmngr/dirmngr_ldap.c:208
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: dirmngr_ldap [opzioni] [URL] (-h per assistenza)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
+"Sintassi: dirmngr_ldap [opzioni] [URL]\n"
+"Helper LDAP interno per Dirmngr\n"
+"L'interfaccia e le opzioni possono cambiare senza preavviso\n"
 
-#: dirmngr/dirmngr_ldap.c:336
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
+#: dirmngr/dirmngr_ldap.c:340
+#, c-format
 msgid "invalid port number %d\n"
-msgstr "opzioni di importazione non valide\n"
+msgstr "numero di porta non valido %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
-msgstr ""
+msgstr "risultato dell'analisi per l'attributo '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
+#, c-format
 msgid "error writing to stdout: %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
+msgstr "errore durante la scrittura in stdout: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
-msgstr ""
+msgstr "           attributo disponibile '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:514
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:518
+#, c-format
 msgid "attribute '%s' not found\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "attributo '%s' non trovato\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
-msgstr ""
+msgstr "trovato attributo '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:630
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
+#: dirmngr/dirmngr_ldap.c:634
+#, c-format
 msgid "processing url '%s'\n"
-msgstr "lettura da `%s'\n"
+msgstr "elaborazione url '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
+#: dirmngr/dirmngr_ldap.c:636
+#, c-format
 msgid "          user '%s'\n"
-msgstr "         senza user ID: %lu\n"
+msgstr "         utente '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:634
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:638
+#, c-format
 msgid "          pass '%s'\n"
-msgstr "                alias \""
+msgstr "         passare '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:636
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:640
+#, c-format
 msgid "          host '%s'\n"
-msgstr "                alias \""
+msgstr "         host '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:637
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
+#: dirmngr/dirmngr_ldap.c:641
+#, c-format
 msgid "          port %d\n"
-msgstr "             importate: %lu\n"
+msgstr "         porta %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:643
+#, c-format
 msgid "            DN '%s'\n"
-msgstr "                alias \""
+msgstr "          DN '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
-msgstr ""
+msgstr "        filtro '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
+#, c-format
 msgid "          attr '%s'\n"
-msgstr "                alias \""
+msgstr "          attr '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:655
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:659
+#, c-format
 msgid "no host name in '%s'\n"
-msgstr "(Non è stata data una descrizione)\n"
+msgstr "nessun nome host in '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
-msgstr ""
+msgstr "nessun attributo specificato per la query '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:666
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
+#: dirmngr/dirmngr_ldap.c:670
+#, c-format
 msgid "WARNING: using first attribute only\n"
-msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
+msgstr "AVVISO: utilizzo solo del primo attributo\n"
 
-#: dirmngr/dirmngr_ldap.c:675
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:679
+#, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "Impossibile eseguire LDAP in '%s:%d': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:702
+#, c-format
 msgid "binding to '%s:%d' failed: %s\n"
-msgstr "creazione dell'armatura fallita: %s\n"
+msgstr "binding a '%s:%d' non riuscito: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
+#: dirmngr/dirmngr_ldap.c:729
+#, c-format
 msgid "searching '%s' failed: %s\n"
-msgstr "rimozione dell'armatura fallita: %s\n"
+msgstr "ricerca '%s' non riuscita: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
-#, fuzzy, c-format
+#: dirmngr/dirmngr_ldap.c:761
+#, c-format
 msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\": non è un file JPEG\n"
+msgstr "'%s' non è un URL LDAP\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
+msgstr "'%s' è un URL LDAP non valido\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
-#, fuzzy, c-format
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
+#, c-format
 msgid "error accessing '%s': http status %u\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'accesso a '%s': stato http %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
+msgstr "URL '%s' reindirizzato a '%s' (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
-#, fuzzy, c-format
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
+#, c-format
 msgid "too many redirections\n"
-msgstr "ci sono troppe preferenze `%c'\n"
+msgstr "troppi reindirizzamenti\n"
 
-#: dirmngr/http.c:3727
-#, fuzzy, c-format
-#| msgid "writing to `%s'\n"
+#: dirmngr/http.c:3747
+#, c-format
 msgid "redirection changed to '%s'\n"
-msgstr "scrittura in `%s'\n"
-
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
+msgstr "reindirizzamento modificato in '%s'\n"
 
 #: dirmngr/ldap-wrapper.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "error printing log line: %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
+msgstr "errore durante la stampa della riga di registro: %s\n"
 
 #: dirmngr/ldap-wrapper.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "error reading log from ldap wrapper %d: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura del registro dal wrapper ldap %d: %s\n"
 
 #: dirmngr/ldap-wrapper.c:454
 #, c-format
 msgid "ldap wrapper %d ready"
-msgstr ""
+msgstr "wrapper ldap %d pronto"
 
 #: dirmngr/ldap-wrapper.c:463
 #, c-format
 msgid "ldap wrapper %d ready: timeout\n"
-msgstr ""
+msgstr "wrapper ldap %d pronto: timeout\n"
 
 #: dirmngr/ldap-wrapper.c:466
 #, c-format
 msgid "ldap wrapper %d ready: exitcode=%d\n"
-msgstr ""
+msgstr "wrapper ldap %d pronto: exitcode:%d\n"
 
 #: dirmngr/ldap-wrapper.c:475
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for ldap wrapper %d failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "in attesa del wrapper ldap %d non riuscito: %s\n"
 
 #: dirmngr/ldap-wrapper.c:487
 #, c-format
 msgid "ldap wrapper %d stalled - killing\n"
-msgstr ""
+msgstr "wrapper ldap %d bloccato - killing\n"
 
 #: dirmngr/ldap.c:91
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
-msgstr ""
+msgstr "char non valido 0x%02x nel nome host - non aggiunto\n"
 
 #: dirmngr/ldap.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
-msgstr "cerco \"%s\" sul server HKP %s\n"
+msgstr "aggiunta di '%s:%d' all'elenco dei server ldap\n"
 
 #: dirmngr/ldap.c:98 dirmngr/misc.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "malloc failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "malloc non riuscito: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr ""
+msgstr "start_cert_fetch: modello '%s' non valido\n"
 
 #: dirmngr/ldap.c:839
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
-msgstr ""
+msgstr "ldap_search raggiunto il limite di dimensioni del server\n"
 
 #: dirmngr/misc.c:172
-#, fuzzy, c-format
-#| msgid "%s: invalid file version %d\n"
+#, c-format
 msgid "invalid canonical S-expression found\n"
-msgstr "%s: versione %d del file non valida\n"
+msgstr "trovata espressione S canonica non valida\n"
 
 #: dirmngr/misc.c:196 dirmngr/misc.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "gcry_md_open failed: %s\n"
-msgstr "impossibile aprire il file: %s\n"
+msgstr "gcry_md_open non riuscito: %s\n"
 
 #: dirmngr/misc.c:201 dirmngr/misc.c:235
-#, fuzzy, c-format
-#| msgid "update secret failed: %s\n"
+#, c-format
 msgid "oops: ksba_cert_hash failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "oops: ksba_cert_hash non riuscito: %s\n"
 
 #: dirmngr/misc.c:528
 #, c-format
 msgid "bad URL encoding detected\n"
-msgstr ""
+msgstr "rilevata codifica URL non valida\n"
 
 #: dirmngr/ocsp.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "error reading from responder: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura dal risponditore: %s\n"
 
 #: dirmngr/ocsp.c:98
 #, c-format
 msgid "response from server too large; limit is %d bytes\n"
-msgstr ""
+msgstr "risposta dal server troppo grande; limite è %d byte\n"
 
 #: dirmngr/ocsp.c:148
-#, fuzzy, c-format
+#, c-format
 msgid "OCSP request not possible due to Tor mode\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "Richiesta OCSP non possibile a causa della modalità Tor\n"
 
 #: dirmngr/ocsp.c:154
 #, c-format
 msgid "OCSP request not possible due to disabled HTTP\n"
-msgstr ""
+msgstr "Richiesta OCSP non possibile a causa di HTTP disabilitato\n"
 
 #: dirmngr/ocsp.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "error setting OCSP target: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'impostazione della destinazione OCSP: %s\n"
 
 #: dirmngr/ocsp.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "error building OCSP request: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la creazione della richiesta OCSP: %s\n"
 
 #: dirmngr/ocsp.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "error connecting to '%s': %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
+msgstr "errore durante la connessione a '%s': %s\n"
 
 #: dirmngr/ocsp.c:218 dirmngr/ocsp.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "error reading HTTP response for '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la lettura della risposta HTTP per '%s': %s\n"
 
 #: dirmngr/ocsp.c:281
-#, fuzzy, c-format
+#, c-format
 msgid "error parsing OCSP response for '%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'analisi della risposta OCSP per '%s': %s\n"
 
 #: dirmngr/ocsp.c:306 dirmngr/ocsp.c:337
 #, c-format
 msgid "OCSP responder at '%s' status: %s\n"
-msgstr ""
+msgstr "Risponditore OCSP allo stato '%s': %s\n"
 
 #: dirmngr/ocsp.c:322
 #, c-format
 msgid "failed to establish a hashing context for OCSP: %s\n"
-msgstr ""
+msgstr "impossibile stabilire un contesto di hashing per OCSP: %s\n"
 
 #: dirmngr/ocsp.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "hashing the OCSP response for '%s' failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "hash della risposta OCSP per '%s' non riuscito: %s\n"
 
 #: dirmngr/ocsp.c:376
 #, c-format
 msgid "not signed by a default OCSP signer's certificate"
-msgstr ""
+msgstr "non firmato da un certificato del firmatario OCSP predefinito"
 
 #: dirmngr/ocsp.c:522
-#, fuzzy, c-format
+#, c-format
 msgid "allocating list item failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "allocazione della voce di elenco non riuscita: %s\n"
 
 #: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
-#, fuzzy, c-format
+#, c-format
 msgid "error getting responder ID: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "errore durante il recupero dell'ID risponditore: %s\n"
 
 #: dirmngr/ocsp.c:584
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
+"non è stato trovato alcun certificato adatto per verificare la risposta "
+"OCSP\n"
 
 #: dirmngr/ocsp.c:623 dirmngr/validate.c:648
-#, fuzzy, c-format
+#, c-format
 msgid "issuer certificate not found: %s\n"
-msgstr "chiave `%s' non trovata: %s\n"
+msgstr "certificato dell'autorità emittente non trovato: %s\n"
 
 #: dirmngr/ocsp.c:633
 #, c-format
 msgid "caller did not return the target certificate\n"
-msgstr ""
+msgstr "chiamante non ha restituito il certificato di destinazione\n"
 
 #: dirmngr/ocsp.c:640
-#, fuzzy, c-format
+#, c-format
 msgid "caller did not return the issuing certificate\n"
-msgstr "genera un certificato di revoca"
+msgstr "chiamante non ha restituito il certificato di emissione\n"
 
 #: dirmngr/ocsp.c:650
-#, fuzzy, c-format
+#, c-format
 msgid "failed to allocate OCSP context: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
-
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: impossibile acedere a: %s\n"
+msgstr "impossibile allocare il contesto OCSP: %s\n"
 
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
-msgstr ""
+msgstr "nessun risponditore OCSP predefinito definito\n"
 
 #: dirmngr/ocsp.c:695
-#, fuzzy, c-format
-#| msgid "no default secret keyring: %s\n"
+#, c-format
 msgid "no default OCSP signer defined\n"
-msgstr "nessun portachiavi segreto predefinito: %s\n"
+msgstr "nessun firmatario OCSP predefinito definito\n"
 
 #: dirmngr/ocsp.c:702
 #, c-format
 msgid "using default OCSP responder '%s'\n"
-msgstr ""
+msgstr "utilizzando il risponditore OCSP predefinito '%s'\n"
 
 #: dirmngr/ocsp.c:707
-#, fuzzy, c-format
-#| msgid "using cipher %s\n"
+#, c-format
 msgid "using OCSP responder '%s'\n"
-msgstr "uso il cifrario %s\n"
+msgstr "utilizzo del risponditore OCSP '%s'\n"
 
 #: dirmngr/ocsp.c:764
-#, fuzzy, c-format
+#, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr ""
+"errore durante il recupero dello stato OCSP per il certificato di "
+"destinazione: %s\n"
 
 #: dirmngr/ocsp.c:789
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
-msgstr ""
+msgstr "lo stato del certificato è: %s  (questo: %s  successivo= %s)\n"
 
 #: dirmngr/ocsp.c:790
 msgid "good"
-msgstr ""
+msgstr "buono"
 
 #: dirmngr/ocsp.c:796
-#, fuzzy, c-format
+#, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
-msgstr "NOTA: la chiave è stata revocata"
+msgstr "il certificato è stato revocato alle: %s a causa di: %s\n"
 
 #: dirmngr/ocsp.c:831
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
-msgstr ""
+msgstr "Il risponditore OCSP ha restituito uno stato in futuro\n"
 
 #: dirmngr/ocsp.c:843
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
-msgstr ""
+msgstr "Il risponditore OCSP ha restituito uno stato non corrente\n"
 
 #: dirmngr/ocsp.c:858
 #, c-format
 msgid "OCSP responder returned an too old status\n"
-msgstr ""
+msgstr "Il risponditore OCSP ha restituito uno stato troppo vecchio\n"
 
 #: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
-#, fuzzy, c-format
+#, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "firma fallita: %s\n"
+msgstr "assuan_inquire(%s) non riuscito: %s\n"
 
 #: dirmngr/server.c:1158
 msgid "ldapserver missing"
-msgstr ""
+msgstr "ldapserver mancante"
 
 #: dirmngr/server.c:1224
 msgid "serialno missing in cert ID"
-msgstr ""
+msgstr "serialno mancante nell'ID certificato"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
-#, fuzzy, c-format
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
+#, c-format
 msgid "assuan_inquire failed: %s\n"
-msgstr "firma fallita: %s\n"
+msgstr "assuan_inquire non riuscito: %s\n"
 
 #: dirmngr/server.c:1516
-#, fuzzy, c-format
+#, c-format
 msgid "fetch_cert_by_url failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "fetch_cert_by_url non riuscito: %s\n"
 
 #: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
-#, fuzzy, c-format
+#, c-format
 msgid "error sending data: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'invio dei dati: %s\n"
 
 #: dirmngr/server.c:1666
-#, fuzzy, c-format
+#, c-format
 msgid "start_cert_fetch failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "start_cert_fetch non riuscito: %s\n"
 
 #: dirmngr/server.c:1699
-#, fuzzy, c-format
+#, c-format
 msgid "fetch_next_cert failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "fetch_next_cert non riuscito: %s\n"
 
 #: dirmngr/server.c:1726
 #, c-format
 msgid "max_replies %d exceeded\n"
-msgstr ""
+msgstr "max_replies %d superato\n"
 
-#: dirmngr/server.c:2857
-#, fuzzy, c-format
+#: dirmngr/server.c:2856
+#, c-format
 msgid "can't allocate control structure: %s\n"
-msgstr "impossibile creare `%s': %s\n"
+msgstr "impossibile allocare la struttura di controllo: %s\n"
 
-#: dirmngr/server.c:2868
-#, fuzzy, c-format
+#: dirmngr/server.c:2867
+#, c-format
 msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: creazione della tabella hash fallita: %s\n"
+msgstr "impossibile allocare il contesto assuan: %s\n"
 
-#: dirmngr/server.c:2889
-#, fuzzy, c-format
-#| msgid "failed to initialize the TrustDB: %s\n"
+#: dirmngr/server.c:2888
+#, c-format
 msgid "failed to initialize the server: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "impossibile inizializzare il server: %s\n"
 
-#: dirmngr/server.c:2897
-#, fuzzy, c-format
+#: dirmngr/server.c:2896
+#, c-format
 msgid "failed to the register commands with Assuan: %s\n"
-msgstr "rebuild della cache del portachiavi fallito: %s\n"
+msgstr "impossibile eseguire i comandi di registro con Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
-msgstr ""
+msgstr "Problema di accettazione assuan: %s\n"
 
-#: dirmngr/server.c:2949
-#, fuzzy, c-format
-#| msgid "signing failed: %s\n"
+#: dirmngr/server.c:2948
+#, c-format
 msgid "Assuan processing failed: %s\n"
-msgstr "firma fallita: %s\n"
+msgstr "Elaborazione Assuan non riuscita: %s\n"
 
 #: dirmngr/validate.c:238
 #, c-format
 msgid "accepting root CA not marked as a CA"
-msgstr ""
+msgstr "accettazione della CA principale non contrassegnata come CA"
 
 #: dirmngr/validate.c:264
-#, fuzzy, c-format
-#| msgid "checking the trustdb\n"
+#, c-format
 msgid "CRL checking too deeply nested\n"
-msgstr "controllo il trustdb\n"
+msgstr "Controllo CRL troppo profondo\n"
 
 #: dirmngr/validate.c:282
 msgid "not checking CRL for"
-msgstr ""
+msgstr "non controlla CRL per"
 
 #: dirmngr/validate.c:287
-#, fuzzy
 msgid "checking CRL for"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "controllo CRL per"
 
 #: dirmngr/validate.c:556
-#, fuzzy, c-format
+#, c-format
 msgid "selfsigned certificate has a BAD signature"
-msgstr "verifica una firma"
+msgstr "certificato autofirmato ha una firma BAD"
 
 #: dirmngr/validate.c:590
-#, fuzzy, c-format
+#, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
-msgstr "controllo della firma creata fallito: %s\n"
+msgstr "controllo dell'affidabilità del certificato radice non riuscito: %s\n"
 
 #: dirmngr/validate.c:769
-#, fuzzy, c-format
+#, c-format
 msgid "certificate chain is good\n"
-msgstr "la preferenza %c%lu è doppia\n"
+msgstr "catena di certificati è buono\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
-msgstr ""
+msgstr "certificato non deve essere stato utilizzato per la firma CRL\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
-#, fuzzy
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
-msgstr "quit"
+msgstr "tranquilla"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
-msgstr ""
+msgstr "stampare i dati esendo codificati"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
-msgstr ""
+msgstr "decodificare le righe di dati ricevute"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
-msgstr ""
+msgstr "collegare al dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
-msgstr ""
+msgstr "|NAME|connessione al socket Assuan NOME"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
-msgstr ""
+msgstr "|ADDR|connessione al server Assuan presso ADDR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
-msgstr ""
+msgstr "eseguire il server Assuan specificato sulla riga di comando"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
-msgstr ""
+msgstr "non utilizzare la modalità di connessione estesa"
 
-#: tools/gpg-connect-agent.c:92
-#, fuzzy
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
-msgstr "|FILE|carica il modulo di estensione FILE"
+msgstr "|FILE|esegui comandi da FILE all'avvio"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
-msgstr ""
+msgstr "eseguire /subst all'avvio"
 
-#: tools/gpg-connect-agent.c:205
-#, fuzzy
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @GPG@-connect-agent [opzioni] (-h per assistenza)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
+"Sintassi: @GPG@-connect-agent [opzioni]\n"
+"Connettersi a un agente in esecuzione e inviare comandi\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
-msgstr ""
+msgstr "l'opzione \"%s\" richiede un programma e argomenti facoltativi\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr ""
+msgstr "opzione \"%s\" ignorata a causa di \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
-#, fuzzy, c-format
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
+#, c-format
 msgid "receiving line failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgstr "linea di ricezione non riuscita: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
-#, fuzzy, c-format
+#: tools/gpg-connect-agent.c:1465
+#, c-format
 msgid "line too long - skipped\n"
-msgstr "riga troppo lunga\n"
+msgstr "linea troppo lunga - saltata\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
-msgstr ""
+msgstr "linea accorciata a causa del carattere Nul incorporato\n"
 
-#: tools/gpg-connect-agent.c:1839
-#, fuzzy, c-format
+#: tools/gpg-connect-agent.c:1844
+#, c-format
 msgid "unknown command '%s'\n"
-msgstr "destinatario predefinito `%s' sconosciuto\n"
+msgstr "comando sconosciuto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
-#, fuzzy, c-format
+#: tools/gpg-connect-agent.c:1862
+#, c-format
 msgid "sending line failed: %s\n"
-msgstr "firma fallita: %s\n"
+msgstr "riga di invio non riuscita: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
-#, fuzzy, c-format
+#: tools/gpg-connect-agent.c:2259
+#, c-format
 msgid "error sending standard options: %s\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'invio delle opzioni standard: %s\n"
 
 #: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
 #: tools/gpgconf-comp.c:804 tools/gpgconf-comp.c:906
 msgid "Options controlling the diagnostic output"
-msgstr ""
+msgstr "Opzioni che controllano l'output diagnostico"
 
 #: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
 #: tools/gpgconf-comp.c:817 tools/gpgconf-comp.c:929
 msgid "Options controlling the configuration"
-msgstr ""
+msgstr "Opzioni che controllano la configurazione"
 
 #: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
 #: tools/gpgconf-comp.c:849 tools/gpgconf-comp.c:942
 msgid "Options useful for debugging"
-msgstr ""
+msgstr "Opzioni utili per il debug"
 
 #: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:862
 msgid "Options controlling the security"
-msgstr ""
+msgstr "Opzioni che controllano la sicurezza"
 
 #: tools/gpgconf-comp.c:537
 msgid "|N|expire SSH keys after N seconds"
-msgstr ""
+msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
 
 #: tools/gpgconf-comp.c:541
 msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
+msgstr "|N|imposta la durata massima della cache del PIN su N secondi"
 
 #: tools/gpgconf-comp.c:545
 msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
+msgstr "|N|set durata massima del tasto SSH su N secondi"
 
 #: tools/gpgconf-comp.c:569
 msgid "Options enforcing a passphrase policy"
-msgstr ""
+msgstr "Opzioni che applicano un criterio di passphrase"
 
 #: tools/gpgconf-comp.c:572
 msgid "do not allow bypassing the passphrase policy"
-msgstr ""
+msgstr "non consentire l'esclusione dei criteri di passphrase"
 
 #: tools/gpgconf-comp.c:576
 msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
+msgstr "|N|Lunghezza minima richiesta per le nuove passphrase su N"
 
 #: tools/gpgconf-comp.c:580
 msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
+msgstr "|N|Per una nuova passphrase è necessario almeno N caratteri non alfa"
 
 #: tools/gpgconf-comp.c:584
 msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
+msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
 
 #: tools/gpgconf-comp.c:588
-#, fuzzy
 msgid "|N|expire the passphrase after N days"
-msgstr "|N|usa il modo N per la passphrase"
+msgstr "| La passphrase dopo N giorni"
 
 #: tools/gpgconf-comp.c:592
-#, fuzzy
 msgid "do not allow the reuse of old passphrases"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr "non consentono il riutilizzo di vecchie passphrase"
 
 #: tools/gpgconf-comp.c:596
 msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
+msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
 
 #: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:819
 msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|usa NOME come chiave segreta predefinita"
+msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
 #: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:822
-#, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NOME|cifra per NOME"
+msgstr "Anche nome-crittografare all'ID utente NOME"
 
 #: tools/gpgconf-comp.c:713
 msgid "|SPEC|set up email aliases"
-msgstr ""
+msgstr "|SPEC|configurare gli alias di posta elettronica"
 
 #: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:981
 msgid "Configuration for Keyservers"
-msgstr ""
+msgstr "Configurazione per Keyservers"
 
 #: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:983
-#, fuzzy
 msgid "|URL|use keyserver at URL"
-msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+msgstr "| URL: utilizzare keyserver all'URL"
 
 #: tools/gpgconf-comp.c:754
 msgid "allow PKA lookups (DNS requests)"
-msgstr ""
+msgstr "consentire ricerche PKA (richieste DNS)"
 
 #: tools/gpgconf-comp.c:757
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
+"|MECHANISMS|utilizzare MECHANISMS per individuare le chiavi in base "
+"all'indirizzo di posta elettronica"
 
 #: tools/gpgconf-comp.c:760
-#, fuzzy
-#| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
-msgstr "importa le chiavi da un keyserver"
+msgstr "importare la chiave mancante da una firma"
 
 #: tools/gpgconf-comp.c:763
-#, fuzzy
 msgid "include the public key in signatures"
-msgstr "controlla le firme delle chiavi"
+msgstr "includere la chiave pubblica nelle firme"
 
 #: tools/gpgconf-comp.c:770 tools/gpgconf-comp.c:831
 msgid "disable all access to the dirmngr"
-msgstr ""
+msgstr "disabilitare tutti gli accessi al dirmngr"
 
 #: tools/gpgconf-comp.c:834
-#, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
+msgstr "Nome: utilizzare il nome di codifica per le passphrase PKCS-12"
 
 #: tools/gpgconf-comp.c:870
 msgid "do not check CRLs for root certificates"
-msgstr ""
+msgstr "non controllare i certificati radice nei CRL"
 
 #: tools/gpgconf-comp.c:919
 msgid "Options controlling the format of the output"
-msgstr ""
+msgstr "Opzioni che controllano il formato dell'output"
 
 #: tools/gpgconf-comp.c:961
 msgid "Options controlling the interactivity and enforcement"
-msgstr ""
+msgstr "Opzioni che controllano l'interattività e l'applicazione"
 
 #: tools/gpgconf-comp.c:974
 msgid "Options controlling the use of Tor"
-msgstr ""
+msgstr "Opzioni che controllano l'uso di Tor"
 
 #: tools/gpgconf-comp.c:988
 msgid "Configuration for HTTP servers"
-msgstr ""
+msgstr "Configurazione per i server HTTP"
 
 #: tools/gpgconf-comp.c:999
 msgid "use system's HTTP proxy setting"
-msgstr ""
+msgstr "utilizzare l'impostazione proxy HTTP del sistema"
 
 #: tools/gpgconf-comp.c:1004
 msgid "Configuration of LDAP servers to use"
-msgstr ""
+msgstr "Configurazione dei server LDAP da utilizzare"
 
 #: tools/gpgconf-comp.c:1033
 msgid "LDAP server list"
-msgstr ""
+msgstr "Elenco server LDAP"
 
 #: tools/gpgconf-comp.c:1041
 msgid "Configuration for OCSP"
-msgstr ""
+msgstr "Configurazione per OCSP"
 
 #: tools/gpgconf-comp.c:1094
 msgid "OpenPGP"
-msgstr ""
+msgstr "OpenPGP"
 
 #: tools/gpgconf-comp.c:1095
 msgid "Private Keys"
-msgstr ""
+msgstr "Chiavi private"
 
 #: tools/gpgconf-comp.c:1096
 msgid "Smartcards"
-msgstr ""
+msgstr "Smartcard"
 
 #: tools/gpgconf-comp.c:1097
 msgid "S/MIME"
-msgstr ""
+msgstr "S/MIME"
 
 #: tools/gpgconf-comp.c:1098
-#, fuzzy
-#| msgid "network error"
 msgid "Network"
-msgstr "errore di rete"
+msgstr "Rete"
 
 #: tools/gpgconf-comp.c:1099
-#, fuzzy
 msgid "Passphrase Entry"
-msgstr "passphrase errata"
+msgstr "Voce passphrase"
 
 #: tools/gpgconf-comp.c:1278
-#, fuzzy
 msgid "Component not suitable for launching"
-msgstr "chiave pubblica non trovata"
+msgstr "Componente non adatto per il lancio"
 
 #: tools/gpgconf-comp.c:1284
 #, c-format
 msgid "Configuration file of component %s is broken\n"
-msgstr ""
+msgstr "Il file di configurazione del componente %s è interrotto\n"
 
 #: tools/gpgconf-comp.c:1287
-#, fuzzy, c-format
-#| msgid "Please use the command \"toggle\" first.\n"
+#, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
-msgstr "Per favore usa prima il comando \"toggle\".\n"
+msgstr "Nota: utilizzare il comando \"%s%s\" per ottenere i dettagli.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
-msgstr ""
+msgstr "Verifica esterna del componente %s non riuscita"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
-msgstr ""
+msgstr "Si noti che le specifiche del gruppo vengono ignorate\n"
 
-#: tools/gpgconf-comp.c:4194
-#, fuzzy, c-format
+#: tools/gpgconf-comp.c:4195
+#, c-format
 msgid "error closing '%s'\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante la chiusura di '%s'\n"
 
-#: tools/gpgconf-comp.c:4196
-#, fuzzy, c-format
+#: tools/gpgconf-comp.c:4197
+#, c-format
 msgid "error parsing '%s'\n"
-msgstr "errore leggendo `%s': %s\n"
+msgstr "errore durante l'analisi di '%s'\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
-msgstr ""
+msgstr "elencare tutti i componenti"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
-msgstr ""
+msgstr "controllare tutti i programmi"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
-msgstr ""
+msgstr "|COMPONENT|opzioni di elenco"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
-msgstr ""
+msgstr "|COMPONENT|modifica delle opzioni"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
-msgstr ""
+msgstr "|COMPONENT|Opzioni di controllo"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
-msgstr ""
+msgstr "applicare valori predefiniti globali"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
-msgstr ""
+msgstr "|FILE|aggiornare i file di configurazione utilizzando FILE"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
-msgstr ""
+msgstr "ottenere le directory di configurazione per @GPGCONF @"
 
-#: tools/gpgconf.c:89
-#, fuzzy
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
-msgstr "elemento della configurazione sconosciuto \"%s\"\n"
+msgstr "file di configurazione globale dell'elenco"
 
-#: tools/gpgconf.c:91
-#, fuzzy
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
-msgstr "elemento della configurazione sconosciuto \"%s\"\n"
+msgstr "controllare il file di configurazione globale"
 
-#: tools/gpgconf.c:93
-#, fuzzy
-#| msgid "update the trust database"
+#: tools/gpgconf.c:96
 msgid "query the software version database"
-msgstr "aggiorna il database della fiducia"
+msgstr "interrogare il database delle versioni software"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
-msgstr ""
+msgstr "ricaricare tutto o un determinato componente"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
-msgstr ""
+msgstr "lanciare un determinato componente"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
-msgstr ""
+msgstr "uccidere un determinato componente"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
-msgstr ""
+msgstr "attivare le modifiche in fase di esecuzione, se possibile"
 
-#: tools/gpgconf.c:139
-#, fuzzy
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr "Utilizzo: @GPGCONF@ [opzioni] (-h per assistenza)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
+"Sintassi: @GPGCONF@ [opzioni]\n"
+"Gestire le opzioni di configurazione per gli strumenti del @GNUPG@ sistema\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
-msgstr ""
+msgstr "È necessario un argomento componente"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
-#, fuzzy
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
-msgstr "chiave pubblica non trovata"
+msgstr "Componente non trovato"
 
-#: tools/gpgconf.c:772
-#, fuzzy
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
-msgstr "scrittura della chiave segreta in `%s'\n"
-
-#: tools/symcryptrun.c:166
-#, fuzzy
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-"@Comandi:\n"
-" "
-
-#: tools/symcryptrun.c:168
-#, fuzzy
-msgid "decryption modus"
-msgstr "decifratura corretta\n"
-
-#: tools/symcryptrun.c:169
-#, fuzzy
-msgid "encryption modus"
-msgstr "decifratura corretta\n"
+msgstr "Nessun argomento consentito"
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
-
-#: tools/symcryptrun.c:174
-#, fuzzy
-msgid "program filename"
-msgstr "--store [nomefile]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
-
-#: tools/symcryptrun.c:221
-#, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "Non è permesso usare %s con %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "impossibile aprire il file: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "impossibile aprire `%s': %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
-
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "errore leggendo `%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "errore leggendo `%s': %s\n"
-
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "l'esecuzione remota dei programmi non è gestita\n"
-
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
-
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
-
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
-
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "impossibile creare %s: %s\n"
-
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "impossibile creare %s: %s\n"
-
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
-
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
-
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
-
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
-
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
-
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
-
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "impossibile creare `%s': %s\n"
-
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "impossibile creare `%s': %s\n"
-
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
-
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
-
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "l'algoritmo di protezione %d%s non è gestito\n"
-
-#: tools/gpg-check-pattern.c:144
-#, fuzzy
+#: tools/gpg-check-pattern.c:147
 msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+msgstr ""
+"Utilizzo: gpg-check-pattern [opzioni] patternfile (-h per assistenza)\n"
 
-#: tools/gpg-check-pattern.c:147
+#: tools/gpg-check-pattern.c:150
 msgid ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
+"Sintassi: gpg-check-pattern [opzioni] patternfile\n"
+"Controllare una passphrase data su stdin rispetto al patternfile\n"
 
-#, fuzzy
-#~| msgid "you may not use %s while in %s mode\n"
-#~ msgid ""
-#~ "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
-#~ msgstr "non è possibile usare %s in modalità %s\n"
-
-#, fuzzy
-#~ msgid "male"
-#~ msgstr "abilita"
-
-#, fuzzy
-#~ msgid "female"
-#~ msgstr "abilita"
-
-#, fuzzy
-#~ msgid "unspecified"
-#~ msgstr "Nessuna ragione specificata"
-
-#, fuzzy
-#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
-#~ msgstr "errore nella creazione della passhprase: %s\n"
-
-#, fuzzy
-#~ msgid "error creating 'encryptions' TOFU table: %s\n"
-#~ msgstr "errore leggendo `%s': %s\n"
-
-#, fuzzy
-#~ msgid "resetting keydb: %s\n"
-#~ msgstr "errore scrivendo il portachiavi `%s': %s\n"
-
-#, fuzzy
-#~ msgid "error setting TOFU binding's policy to %s\n"
-#~ msgstr "errore leggendo `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%s: Verified %ld~signature in the past %s."
-#~ msgid_plural "%s: Verified %ld~signatures in the past %s."
-#~ msgstr[0] "|algo [files]|stampa tutti i message digests"
-#~ msgstr[1] "|algo [files]|stampa tutti i message digests"
-
-#, fuzzy
-#~ msgid "Encrypted %ld~message in the past %s."
-#~ msgid_plural "Encrypted %ld~messages in the past %s."
-#~ msgstr[0] "|algo [files]|stampa tutti i message digests"
-#~ msgstr[1] "|algo [files]|stampa tutti i message digests"
-
-#, fuzzy
-#~| msgid "error writing public keyring `%s': %s\n"
-#~ msgid "error setting policy for key %s, user id \"%s\": %s"
-#~ msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
-
-#, fuzzy
-#~ msgid "error looking up: %s\n"
-#~ msgstr "errore leggendo `%s': %s\n"
-
-#, fuzzy
-#~| msgid "error creating keyring `%s': %s\n"
-#~ msgid "Warning: %s appears in the keyring %d times\n"
-#~ msgstr "errore creando il portachiavi `%s': %s\n"
-
-#, fuzzy
-#~ msgid "error retrieving '%s': http status %u\n"
-#~ msgstr "errore leggendo `%s': %s\n"
-
-#, fuzzy
-#~ msgid "npth_select failed: %s - waiting 1s\n"
-#~ msgstr "aggiornamento della chiave segreta fallito: %s\n"
-
-#, fuzzy
-#~ msgid "reading from ldap wrapper %d failed: %s\n"
-#~ msgstr "cancellazione del keyblock fallita: %s\n"
-
-#, fuzzy
-#~ msgid "What keysize do you want for the Signature key? (%u) "
-#~ msgstr "Di che dimensioni vuoi la chiave? (1024) "
-
-#, fuzzy
-#~ msgid "What keysize do you want for the Encryption key? (%u) "
-#~ msgstr "Di che dimensioni vuoi la chiave? (1024) "
-
-#, fuzzy
-#~ msgid "What keysize do you want for the Authentication key? (%u) "
-#~ msgstr "Di che dimensioni vuoi la chiave? (1024) "
-
-#, fuzzy
-#~ msgid "listen() failed: %s\n"
-#~ msgstr "aggiornamento fallito: %s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "Firma %s, algoritmo di digest %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Firma valida da \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "saltata `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "L'user ID \"%s\" è stato revocato."
-#~ msgstr[1] "L'user ID \"%s\" è stato revocato."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Firma valida da \""
-#~ msgstr[1] "Firma valida da \""
-
-#, fuzzy
-#~| msgid "new configuration file `%s' created\n"
-#~ msgid "new configuration file '%s' created\n"
-#~ msgstr "creato un nuovo file di configurazione `%s'\n"
-
-#, fuzzy
-#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
-#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
-#~ msgstr ""
-#~ "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
-#~ "esecuzione del programma\n"
-
-#, fuzzy
-#~| msgid "Key generation failed: %s\n"
-#~ msgid "User ID revocation failed: %s\n"
-#~ msgstr "Generazione della chiave fallita: %s\n"
-
-#, fuzzy
-#~ msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
-#~ msgstr "cambia la passphrase"
-
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
-
-#~ msgid "--store [filename]"
-#~ msgstr "--store [nomefile]"
-
-#~ msgid "--symmetric [filename]"
-#~ msgstr "--symmetric [nomefile]"
-
-#~ msgid "--encrypt [filename]"
-#~ msgstr "--encrypt [nomefile]"
-
-#, fuzzy
-#~ msgid "--symmetric --encrypt [filename]"
-#~ msgstr "--sign --encrypt [nomefile]"
-
-#~ msgid "--sign [filename]"
-#~ msgstr "--sign [nomefile]"
-
-#~ msgid "--sign --encrypt [filename]"
-#~ msgstr "--sign --encrypt [nomefile]"
-
-#, fuzzy
-#~ msgid "--symmetric --sign --encrypt [filename]"
-#~ msgstr "--sign --encrypt [nomefile]"
-
-#~ msgid "--sign --symmetric [filename]"
-#~ msgstr "--sign --symmetric [nomefile]"
-
-#~ msgid "--clear-sign [filename]"
-#~ msgstr "--clear-sign [nomefile]"
-
-#~ msgid "--decrypt [filename]"
-#~ msgstr "--decrypt [nomefile]"
-
-#~ msgid "--sign-key user-id"
-#~ msgstr "--sign-key user-id"
-
-#~ msgid "--lsign-key user-id"
-#~ msgstr "--lsign-key user-id"
-
-#~ msgid "--edit-key user-id [commands]"
-#~ msgstr "--edit-key user-id [comandi]"
-
-#, fuzzy
-#~ msgid "--passwd <user-id>"
-#~ msgstr "--sign-key user-id"
-
-#~ msgid "[filename]"
-#~ msgstr "[nomefile]"
-
-#, fuzzy
-#~ msgid "shadowing the key failed: %s\n"
-#~ msgstr "cancellazione del keyblock fallita: %s\n"
-
-#, fuzzy
-#~ msgid "available TOFU policies:\n"
-#~ msgstr "disabilita una chiave"
-
-#, fuzzy
-#~ msgid "%ld message signed"
-#~ msgid_plural "%ld messages signed"
-#~ msgstr[0] "|algo [files]|stampa tutti i message digests"
-#~ msgstr[1] "|algo [files]|stampa tutti i message digests"
-
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problema di comunicazione con gpg-agent\n"
-
-#, fuzzy
-#~ msgid "canceled by user\n"
-#~ msgstr "interrotto dall'utente\n"
-
-#, fuzzy
-#~ msgid "problem with the agent\n"
-#~ msgstr "problema con l'agent: ha restituito 0x%lx\n"
-
-#, fuzzy
-#~ msgid "problem with the agent (unexpected response \"%s\")\n"
-#~ msgstr "problema con l'agent: ha restituito 0x%lx\n"
-
-#, fuzzy
-#~ msgid "unknown TOFU DB format '%s'\n"
-#~ msgstr "destinatario predefinito `%s' sconosciuto\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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"
+#~ msgid "Note: old default options file '%s' ignored\n"
 #~ msgstr ""
-#~ "Ti serve una passphrase per sbloccare la chiave segreta dell'utente:\n"
-#~ "\"%.*s\"\n"
-#~ "%u-bit %s key, ID %08lX, created %s%s\n"
+#~ "Nota: il vecchio file di opzioni predefinito '%s' è stato ignorato\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "You need a passphrase to unlock the secret key for\n"
-#~ "user: \"%s\"\n"
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
 #~ msgstr ""
-#~ "\n"
-#~ "Ti serve una passphrase per sbloccare la chiave segreta\n"
-#~ "dell'utente: \""
+#~ "@Comandi:\n"
+#~ " "
 
-#, fuzzy
-#~ msgid "%u-bit %s key, ID %s, created %s"
-#~ msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
+#~ msgid "decryption modus"
+#~ msgstr "modus di decrittazione"
 
-#, fuzzy
-#~| msgid "can't create directory `%s': %s\n"
-#~ msgid "can't access directory '%s': %s\n"
-#~ msgstr "impossibile creare la directory `%s': %s\n"
+#~ msgid "encryption modus"
+#~ msgstr "modus di crittografia"
 
-#~ msgid "you found a bug ... (%s:%d)\n"
-#~ msgstr "hai trovato un bug... (%s:%d)\n"
+#~ msgid "tool class (confucius)"
+#~ msgstr "classe di utensili (confucio)"
 
-#, fuzzy
-#~| msgid "%d user IDs without valid self-signatures detected\n"
-#~ msgid "%d user ID without valid self-signature detected\n"
-#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
-#~ msgstr[0] "Trovati %d user ID senza autofirme valide\n"
-#~ msgstr[1] "Trovati %d user ID senza autofirme valide\n"
-
-#~ msgid "moving a key signature to the correct place\n"
-#~ msgstr "spostamento della firma di una chiave nel posto corretto\n"
+#~ msgid "program filename"
+#~ msgstr "nome file del programma"
 
-#~ msgid "%d signatures not checked due to missing keys\n"
-#~ msgstr "%d firme non controllate per mancanza delle chiavi\n"
+#~ msgid "secret key file (required)"
+#~ msgstr "file di chiave segreta (obbligatorio)"
 
-#~ msgid "%d signatures not checked due to errors\n"
-#~ msgstr "%d firme non controllate a causa di errori\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nome del file di input (stdin predefinito)"
 
-#~ msgid "1 user ID without valid self-signature detected\n"
-#~ msgstr "Trovato un user ID senza autofirma valida\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed\n"
-#~ msgstr "L'user ID \"%s\" è stato revocato."
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Utilizzo: symcryptrun [opzioni] (-h per assistenza)"
 
 #~ msgid ""
-#~ "You need a Passphrase to protect your secret key.\n"
-#~ "\n"
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
 #~ msgstr ""
-#~ "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
-#~ "\n"
+#~ "Sintassi: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[opzioni...] COMANDO [file di input]\n"
+#~ "Chiamare un semplice strumento di crittografia simmetrica\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a passphrase to protect the off-card backup of the new "
-#~ "encryption key."
-#~ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s su %s interrotto con stato %i\n"
 
-#~ msgid "passphrase not correctly repeated; try again"
-#~ msgstr "passphrase non ripetuta correttamente; prova ancora"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s su %s non riuscito con stato %i\n"
 
-#~ msgid "%s.\n"
-#~ msgstr "%s.\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "impossibile creare la directory temporanea '%s': %s\n"
 
-#~ 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"
-#~ "using this program with the option \"--edit-key\".\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Non hai specificato una passphrase - questa è probabilmente una "
-#~ "*cattiva*\n"
-#~ "idea! Lo farò io comunque. Puoi cambiarla in ogni momento, usando questo\n"
-#~ "programma con l'opzione \"--edit-key\".\n"
-#~ "\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "impossibile aprire %s per la scrittura: %s\n"
 
-#, fuzzy
-#~ msgid "storing key onto card failed: %s\n"
-#~ msgstr "cancellazione del keyblock fallita: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "errore durante la scrittura in %s: %s\n"
 
-#, fuzzy
-#~| msgid "1 bad signature\n"
-#~ msgid "1 good signature\n"
-#~ msgstr "una firma non corretta\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "errore durante la lettura da %s: %s\n"
 
-#, fuzzy
-#~ msgid "%lu keys cached (%lu signatures)\n"
-#~ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "errore durante la chiusura di %s: %s\n"
 
-#, fuzzy
-#~ msgid "refreshing 1 key from %s\n"
-#~ msgstr "richiedo la chiave %08lX a %s\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "no --opzione di programma fornita\n"
 
-#, fuzzy
-#~ msgid "sending key %s to %s server %s\n"
-#~ msgstr "cerco \"%s\" sul server HKP %s\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "solo --decrypt e --encrypt sono supportati\n"
 
-#, fuzzy
-#~ msgid "public key %s is %lu seconds newer than the signature\n"
-#~ msgstr "la chiave pubblica %08lX è più recente della firma di %lu secondi\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "nessuna opzione --keyfile fornita\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "key %s was created %lu seconds in the future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o "
-#~ "problema\n"
-#~ "con l'orologio)\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "impossibile allocare il vettore args\n"
 
-#, fuzzy
-#~| msgid "can't open the keyring"
-#~ msgid "Failed to open the keyring DB.\n"
-#~ msgstr "impossibile aprire il portachiavi"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "impossibile creare la pipe: %s\n"
 
-#, fuzzy
-#~ msgid "Failed to parse '%s'.\n"
-#~ msgstr "impossibile aprire `%s': %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "impossibile creare pty: %s\n"
 
-#, fuzzy
-#~ msgid "error looking up secret key \"%s\": %s\n"
-#~ msgstr "errore leggendo il keyblock segreto `%s': %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "non poteva dividere: %s\n"
 
-#, fuzzy
-#~ msgid "Please select at most one subkey.\n"
-#~ msgstr "Seleziona al massimo una chiave secondaria.\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv non riuscito: %s\n"
 
-#, fuzzy
-#~ msgid "malformed %s environment variable\n"
-#~ msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "selezione non riuscita: %s\n"
 
-#, fuzzy
-#~ msgid "dirmngr protocol version %d is not supported\n"
-#~ msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "lettura non riuscita: %s\n"
 
-#, fuzzy
-#~ msgid "toggle between the secret and public key listings"
-#~ msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "lettura pty non riuscita: %s\n"
 
-#, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "passphrase errata"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid non riuscito: %s\n"
 
-#, fuzzy
-#~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
-#~ msgstr ""
-#~ "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
-#~ "esecuzione del programma\n"
-
-#~ msgid "gpg-agent is not available in this session\n"
-#~ msgstr "gpg-agent non è disponibile in questa sessione\n"
-
-#, fuzzy
-#~ msgid "use a standard location for the socket"
-#~ msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
-
-#, fuzzy
-#~ msgid "Usage: gpg-agent [options] (-h for help)"
-#~ msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-
-#~ msgid "malformed GPG_AGENT_INFO environment variable\n"
-#~ msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "figlio interrotto con stato %i\n"
 
-#~ msgid "gpg-agent protocol version %d is not supported\n"
-#~ msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "impossibile allocare la stringa nel file: %s\n"
 
-#, fuzzy
-#~ msgid "can't fdopen pipe for reading: %s\n"
-#~ msgstr "impossibile aprire il file: %s\n"
-
-#, fuzzy
-#~ msgid "error creating socket: %s\n"
-#~ msgstr "errore creando `%s': %s\n"
-
-#, fuzzy
-#~ msgid "host not found"
-#~ msgstr "[User ID non trovato]"
-
-#, fuzzy
-#~ msgid "unknown key protection algorithm\n"
-#~ msgstr "algoritmo di protezione sconosciuto\n"
-
-#, fuzzy
-#~ msgid "secret parts of key are not available\n"
-#~ msgstr "Parti della chiave segreta non sono disponibili.\n"
-
-#, fuzzy
-#~ msgid "secret key already stored on a card\n"
-#~ msgstr "saltata: chiave pubblica già presente\n"
-
-#, fuzzy
-#~ msgid "error writing key to card: %s\n"
-#~ msgstr "errore scrivendo il portachiavi `%s': %s\n"
-
-#~ msgid ""
-#~ "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-#~ msgstr ""
-#~ "in modalità --pgp2 puoi cifrare solo per chiavi RSA non più lunghe di "
-#~ "2048 bit\n"
-
-#~ msgid ""
-#~ "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-#~ msgstr ""
-#~ "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
-#~ "stai cifrando.\n"
-
-#, fuzzy
-#~ msgid "remove the passphrase from exported subkeys"
-#~ msgstr "revoca una chiave secondaria"
-
-#, fuzzy
-#~ msgid "key %s: not protected - skipped\n"
-#~ msgstr "chiave %08lX: non protetta - saltata\n"
-
-#, fuzzy
-#~ msgid "failed to unprotect the subkey: %s\n"
-#~ msgstr "inizializzazione del trustdb fallita: %s\n"
-
-#, fuzzy
-#~ msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-#~ msgstr ""
-#~ "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
-
-#~ msgid "too many entries in pk cache - disabled\n"
-#~ msgstr "troppe voci nella pk cache - disabilitata\n"
-
-#, fuzzy
-#~ msgid "no secret subkey for public subkey %s - ignoring\n"
-#~ msgstr ""
-#~ "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
-
-#, fuzzy
-#~ msgid "key %s: secret key without public key - skipped\n"
-#~ msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-
-#~ msgid "usage: gpg [options] "
-#~ msgstr "uso: gpg [opzioni] "
-
-#~ msgid ""
-#~ "you can only make detached or clear signatures while in --pgp2 mode\n"
-#~ msgstr "nella modalità --pgp2 puoi fare solo firme in chiaro o separate\n"
-
-#~ msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-#~ msgstr ""
-#~ "nella modalità --pgp2 non puoi firmare e cifrare contemporaneamente\n"
-
-#~ msgid ""
-#~ "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-#~ msgstr ""
-#~ "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
-
-#~ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-#~ msgstr ""
-#~ "nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un "
-#~ "messaggio\n"
-
-#, fuzzy
-#~ msgid "create a public key when importing a secret key"
-#~ msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
-
-#, fuzzy
-#~ msgid "key %s: already in secret keyring\n"
-#~ msgstr "chiave %08lX: già nel portachiavi segreto\n"
-
-#, fuzzy
-#~ msgid "key %s: secret key not found: %s\n"
-#~ msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
-
-#, fuzzy
-#~ msgid "NOTE: a key's S/N does not match the card's one\n"
-#~ msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
-
-#, fuzzy
-#~ msgid "NOTE: primary key is online and stored on card\n"
-#~ msgstr "saltata: chiave pubblica già presente\n"
-
-#, fuzzy
-#~ msgid "NOTE: secondary key is online and stored on card\n"
-#~ msgstr "saltata: chiave pubblica già presente\n"
-
-#~ msgid ""
-#~ "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-#~ "mode.\n"
-#~ msgstr ""
-#~ "In modalità -pgp2 non è possibile fare firme OpenPGP su chiavi in stile "
-#~ "PGP 2.x.\n"
-
-#~ msgid "This would make the key unusable in PGP 2.x.\n"
-#~ msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
-
-#~ msgid "This key is not protected.\n"
-#~ msgstr "Questa chiave non è protetta.\n"
-
-#~ msgid "Key is protected.\n"
-#~ msgstr "La chiave è protetta.\n"
-
-#~ msgid "Can't edit this key: %s\n"
-#~ msgstr "Impossibile modificare questa chiave: %s\n"
-
-#~ msgid ""
-#~ "Enter the new passphrase for this secret key.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Inserisci la nuova passphrase per questa chiave segreta.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "You don't want a passphrase - this is probably a *bad* idea!\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Non vuoi una passphrase - questa è probabilmente una *cattiva* idea!\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Do you really want to do this? (y/N) "
-#~ msgstr "Vuoi veramente farlo?"
-
-#~ msgid "Please remove selections from the secret keys.\n"
-#~ msgstr "Togli le selezioni dalle chiavi segrete.\n"
-
-#~ msgid "No corresponding signature in secret ring\n"
-#~ msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-
-#, fuzzy
-#~ msgid "writing secret key stub to `%s'\n"
-#~ msgstr "scrittura della chiave segreta in `%s'\n"
-
-#~ msgid "writing secret key to `%s'\n"
-#~ msgstr "scrittura della chiave segreta in `%s'\n"
-
-#~ msgid "no writable secret keyring found: %s\n"
-#~ msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
-
-#~ msgid "WARNING: 2 files with confidential information exists.\n"
-#~ msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
-
-#~ msgid "%s is the unchanged one\n"
-#~ msgstr "%s è quello non modificato\n"
-
-#~ msgid "%s is the new one\n"
-#~ msgstr "%s è quello nuovo\n"
-
-#~ msgid "Please fix this possible security flaw\n"
-#~ msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
-
-#, fuzzy
-#~ msgid "searching for names from %s server %s\n"
-#~ msgstr "cerco \"%s\" sul server HKP %s\n"
-
-#, fuzzy
-#~ msgid "searching for names from %s\n"
-#~ msgstr "cerco \"%s\" sul server HKP %s\n"
-
-#, fuzzy
-#~ msgid "searching for \"%s\" from %s server %s\n"
-#~ msgstr "cerco \"%s\" sul server HKP %s\n"
-
-#, fuzzy
-#~ msgid "searching for \"%s\" from %s\n"
-#~ msgstr "cerco \"%s\" sul server HKP %s\n"
-
-#, fuzzy
-#~ msgid "keyserver timed out\n"
-#~ msgstr "errore del keyserver"
-
-#, fuzzy
-#~ msgid "keyserver internal error\n"
-#~ msgstr "errore del keyserver"
-
-#, fuzzy
-#~ msgid "keyserver communications error: %s\n"
-#~ msgstr "ricezione dal keyserver fallita: %s\n"
-
-#, fuzzy
-#~ msgid "WARNING: unable to parse URI %s\n"
-#~ msgstr ""
-#~ "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
-
-#~ msgid "invalid root packet detected in proc_tree()\n"
-#~ msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
-
-#~ msgid "the IDEA cipher plugin is not present\n"
-#~ msgstr "il plugin per il cifrario IDEA non è presente\n"
-
-#~ msgid "no corresponding public key: %s\n"
-#~ msgstr "non c'è una chiave pubblica corrispondente: %s\n"
-
-#~ msgid "public key does not match secret key!\n"
-#~ msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
-
-#~ msgid "unknown protection algorithm\n"
-#~ msgstr "algoritmo di protezione sconosciuto\n"
-
-#~ msgid "NOTE: This key is not protected!\n"
-#~ msgstr "NOTA: Questa chiave non è protetta!\n"
-
-#, fuzzy
-#~ msgid "protection digest %d is not supported\n"
-#~ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
-
-#~ msgid "Invalid passphrase; please try again"
-#~ msgstr "Passphrase non valida; riprova"
-
-#~ msgid "%s ...\n"
-#~ msgstr "%s ...\n"
-
-#~ msgid "WARNING: Weak key detected - please change passphrase again.\n"
-#~ msgstr ""
-#~ "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
-#~ "passphrase.\n"
-
-#~ msgid ""
-#~ "generating the deprecated 16-bit checksum for secret key protection\n"
-#~ msgstr ""
-#~ "genero il checksum a 16 bit deprecato per la protezione della chiave "
-#~ "segreta\n"
-
-#~ msgid ""
-#~ "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-#~ msgstr ""
-#~ "nella modalità --pgp2 puoi fare firme separate solo con chiavi in stile "
-#~ "PGP 2.x\n"
-
-#~ msgid ""
-#~ "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-#~ msgstr ""
-#~ "In modalità -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2."
-#~ "x\n"
-
-#, fuzzy
-#~ msgid "Usage: scdaemon [options] (-h for help)"
-#~ msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-
-#, fuzzy
-#~ msgid "Usage: gpgsm [options] [files] (-h for help)"
-#~ msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-
-#, fuzzy
-#~ msgid "usage: gpgconf [options] "
-#~ msgstr "uso: gpg [opzioni] "
-
-#, fuzzy
-#~ msgid "failed to allocated keyDB handle\n"
-#~ msgstr "inizializzazione del trustdb fallita: %s\n"
-
-#~ msgid "Command> "
-#~ msgstr "Comando> "
-
-#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-#~ msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n"
-
-#~ msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-#~ msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
-
-#, fuzzy
-#~ msgid "Please report bugs to "
-#~ msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
-
-#, fuzzy
-#~ msgid "DSA keypair will have %u bits.\n"
-#~ msgstr "La coppia DSA avrà 1024 bit.\n"
-
-#~ msgid "Repeat passphrase\n"
-#~ msgstr "Ripeti la passphrase\n"
-
-#, fuzzy
-#~ msgid "read options from file"
-#~ msgstr "lettura delle opzioni da `%s'\n"
-
-#~ msgid "|[file]|make a signature"
-#~ msgstr "|[file]|fai una firma"
-
-#, fuzzy
-#~ msgid "|[FILE]|make a signature"
-#~ msgstr "|[file]|fai una firma"
-
-#, fuzzy
-#~ msgid "|[FILE]|make a clear text signature"
-#~ msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "usa la chiave predefinita come destinatario predefinito"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "forza l'uso di firme v3"
-
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "usa sempre un MDC per cifrare"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "aggiungi questo portachiavi segreto alla lista"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr "|FILE|carica il modulo di estensione FILE"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|usa l'algoritmo di compressione N"
-
-#, fuzzy
-#~ msgid "remove key from the public keyring"
-#~ msgstr "rimuove le chiavi dal portachiavi pubblico"
-
-#~ msgid ""
-#~ "It's up to you to assign a value here; this value will never be exported\n"
-#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
-#~ "nothing\n"
-#~ "to do with the (implicitly created) web-of-certificates."
-#~ msgstr ""
-#~ "E compito tuo assegnare un valore; questo valore non sarà mai esportato "
-#~ "a\n"
-#~ "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che "
-#~ "fare\n"
-#~ "con il web-of-certificates (creato implicitamente)."
-
-#~ 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"
-#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
-#~ "ultimately trusted\n"
-#~ msgstr ""
-#~ "Per costruire il Web-Of-Trust, GnuPG ha bisogno di sapere quali chiavi "
-#~ "sono\n"
-#~ "definitivamente affidabili - di solito quelle per cui hai accesso alla "
-#~ "chiave\n"
-#~ "segreta.\n"
-#~ "Rispondi \"sì\" per impostare questa chiave come definitivamente "
-#~ "affidabile\n"
-
-#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-#~ msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
-
-#~ msgid ""
-#~ "Enter the user ID of the addressee to whom you want to send the message."
-#~ msgstr ""
-#~ "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
-
-#~ 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"
-#~ "Please consult your security expert first."
-#~ msgstr ""
-#~ "In generale non è una buona idea usare la stessa chiave per le firme e "
-#~ "la\n"
-#~ "cifratura. Questo algoritmo dovrebbe solo essere usato in determinati "
-#~ "campi.\n"
-#~ "Per favore consulta prima il tuo esperto di sicurezza."
-
-#~ msgid "Enter the size of the key"
-#~ msgstr "Inserisci le dimensioni della chiave"
-
-#~ msgid "Answer \"yes\" or \"no\""
-#~ msgstr "Rispondi \"si\" o \"no\""
-
-#~ 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"
-#~ "get a good error response - instead the system tries to interpret\n"
-#~ "the given value as an interval."
-#~ msgstr ""
-#~ "Inserisci il valore richiesto come indicato dal prompt.\n"
-#~ "È possibile inserire una data in formato ISO (YYYY-MM-DD) ma non avrai "
-#~ "un\n"
-#~ "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
-#~ "dato come un intervallo."
-
-#~ msgid "Enter the name of the key holder"
-#~ msgstr "Inserisci il nome del proprietario della chiave"
-
-#~ msgid "please enter an optional but highly suggested email address"
-#~ msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
-
-#~ msgid "Please enter an optional comment"
-#~ msgstr "Inserisci un commento opzionale"
-
-#~ msgid ""
-#~ "N  to change the name.\n"
-#~ "C  to change the comment.\n"
-#~ "E  to change the email address.\n"
-#~ "O  to continue with key generation.\n"
-#~ "Q  to to quit the key generation."
-#~ msgstr ""
-#~ "N  per cambiare il nome.\n"
-#~ "C  per cambiare il commento.\n"
-#~ "E  per cambiare l'indirizzo di email.\n"
-#~ "O  per continuare con la generazione della chiave.\n"
-#~ "Q  per abbandonare il processo di generazione della chiave."
-
-#~ msgid ""
-#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-#~ msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
-
-#~ 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"
-#~ "know how carefully you verified this.\n"
-#~ "\n"
-#~ "\"0\" means you make no particular claim as to how carefully you verified "
-#~ "the\n"
-#~ "    key.\n"
-#~ "\n"
-#~ "\"1\" means you believe the key is owned by the person who claims to own "
-#~ "it\n"
-#~ "    but you could not, or did not verify the key at all.  This is useful "
-#~ "for\n"
-#~ "    a \"persona\" verification, where you sign the key of a pseudonymous "
-#~ "user.\n"
-#~ "\n"
-#~ "\"2\" means you did casual verification of the key.  For example, this "
-#~ "could\n"
-#~ "    mean that you verified the key fingerprint and checked the user ID on "
-#~ "the\n"
-#~ "    key against a photo ID.\n"
-#~ "\n"
-#~ "\"3\" means you did extensive verification of the key.  For example, this "
-#~ "could\n"
-#~ "    mean that you verified the key fingerprint with the owner of the key "
-#~ "in\n"
-#~ "    person, and that you checked, by means of a hard to forge document "
-#~ "with a\n"
-#~ "    photo ID (such as a passport) that the name of the key owner matches "
-#~ "the\n"
-#~ "    name in the user ID on the key, and finally that you verified (by "
-#~ "exchange\n"
-#~ "    of email) that the email address on the key belongs to the key "
-#~ "owner.\n"
-#~ "\n"
-#~ "Note that the examples given above for levels 2 and 3 are *only* "
-#~ "examples.\n"
-#~ "In the end, it is up to you to decide just what \"casual\" and \"extensive"
-#~ "\"\n"
-#~ "mean to you when you sign other keys.\n"
-#~ "\n"
-#~ "If you don't know what the right answer is, answer \"0\"."
-#~ msgstr ""
-#~ "Quando firmi l'user ID di una chiave dovresti prima verificare che "
-#~ "questa\n"
-#~ "appartiene alla persona indicata nell'user ID. È utile agli altri sapere\n"
-#~ "con quanta attenzione lo hai verificato.\n"
-#~ "\n"
-#~ "\"0\" significa che non fai particolari affermazioni sull'attenzione con "
-#~ "cui\n"
-#~ "    hai ferificato la chiave.\n"
-#~ "\n"
-#~ "\"1\" significa che credi che la chiave sia posseduta dalla persona che "
-#~ "dice di\n"
-#~ "    possederla, ma non hai o non hai potuto verificare per niente la "
-#~ "chiave.\n"
-#~ "\n"
-#~ "\"2\" significa che hai fatto una verifica superficiale della chiave. Per "
-#~ "esempio\n"
-#~ "    potrebbe significare che hai verificato l'impronta digitale e "
-#~ "confrontato\n"
-#~ "    l'user ID della chiave con un documento di identità con fotografia.\n"
-#~ "\n"
-#~ "\"3\" significa che hai fatto una verifica approfondita della chiave. Per "
-#~ "esempio\n"
-#~ "    potrebbe significare che hai verificato di persona l'impronta "
-#~ "digitale con\n"
-#~ "    il possessore della chiave e hai controllato, per esempio per mezzo "
-#~ "di\n"
-#~ "    un documento di identità con fotografia difficile da falsificare "
-#~ "(come\n"
-#~ "    un passaporto), che il nome del proprietario della chiave corrisponde "
-#~ "a\n"
-#~ "    quello nell'user ID della chiave, e per finire che hai verificato\n"
-#~ "    (scambiando dei messaggi) che l'indirizzo di email sulla chiave "
-#~ "appartiene\n"
-#~ "    al proprietario.\n"
-#~ "\n"
-#~ "Nota che gli esempi indicati per i livelli 2 e 3 sono *solo* esempi. Alla "
-#~ "fine\n"
-#~ "sta a te decidere cosa significano \"superficiale\" e \"approfondita\" "
-#~ "quando\n"
-#~ "firmi chiavi di altri.\n"
-#~ "\n"
-#~ "Se non sai cosa rispondere, rispondi \"0\"."
-
-#, fuzzy
-#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-#~ msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
-
-#~ msgid ""
-#~ "Answer \"yes\" if you really want to delete this user ID.\n"
-#~ "All certificates are then also lost!"
-#~ msgstr ""
-#~ "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
-#~ "Tutti i certificati saranno persi!"
-
-#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
-#~ msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
-
-#~ msgid ""
-#~ "This is a valid signature on the key; you normally don't want\n"
-#~ "to delete this signature because it may be important to establish a\n"
-#~ "trust connection to the key or another key certified by this key."
-#~ msgstr ""
-#~ "Questa è una firma valida per la chiave. Normalmente non vorresti "
-#~ "cancellare\n"
-#~ "questa firma perchè può essere importante per stabilire una connessione "
-#~ "di\n"
-#~ "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
-
-#~ msgid ""
-#~ "This signature can't be checked because you don't have the\n"
-#~ "corresponding key.  You should postpone its deletion until you\n"
-#~ "know which key was used because this signing key might establish\n"
-#~ "a trust connection through another already certified key."
-#~ msgstr ""
-#~ "Questa firma non può essere verificata perchè non hai la chiave "
-#~ "corrispondente.\n"
-#~ "Dovresti rimandare la sua cancellazione finchè non saprai quale chiave è "
-#~ "stata\n"
-#~ "usata perchè questa chiave potrebbe stabilire una connessione di fiducia\n"
-#~ "attraverso una chiave già certificata."
-
-#~ msgid ""
-#~ "The signature is not valid.  It does make sense to remove it from\n"
-#~ "your keyring."
-#~ msgstr "La firma non è valida. Ha senso rimuoverla dal tuo portachiavi."
-
-#~ msgid ""
-#~ "This is a signature which binds the user ID to the key. It is\n"
-#~ "usually not a good idea to remove such a signature.  Actually\n"
-#~ "GnuPG might not be able to use this key anymore.  So do this\n"
-#~ "only if this self-signature is for some reason not valid and\n"
-#~ "a second one is available."
-#~ msgstr ""
-#~ "Questa è una firma che collega l'user id alla chiave. Solitamente non è "
-#~ "una\n"
-#~ "buona idea rimuovere questo tipo di firma. In realtà GnuPG potrebbe non "
-#~ "essere\n"
-#~ "più in grado di usare questa chiave. Quindi fallo solo se questa "
-#~ "autofirma non\n"
-#~ "è valida per qualche ragione e ne è disponibile un'altra."
-
-#~ msgid ""
-#~ "Change the preferences of all user IDs (or just of the selected ones)\n"
-#~ "to the current list of preferences.  The timestamp of all affected\n"
-#~ "self-signatures will be advanced by one second.\n"
-#~ msgstr ""
-#~ "Cambia le preferenze di tutti gli user ID (o solo di quelli selezionati) "
-#~ "con\n"
-#~ "la lista di preferenze corrente. L'orario di tutte le autofirme "
-#~ "coinvolte\n"
-#~ "sarà aumentato di un secondo.\n"
-
-#~ msgid "Please enter the passphrase; this is a secret sentence \n"
-#~ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
-
-#~ msgid ""
-#~ "Please repeat the last passphrase, so you are sure what you typed in."
-#~ msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
-
-#~ msgid "Give the name of the file to which the signature applies"
-#~ msgstr "Inserisci il nome del file a cui si riferisce la firma."
-
-#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
-#~ msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
-
-#~ msgid ""
-#~ "Please enter a new filename. If you just hit RETURN the default\n"
-#~ "file (which is shown in brackets) will be used."
-#~ msgstr ""
-#~ "Inserisci il nuovo nome del file. Se premi INVIO sarà usato il nome\n"
-#~ "predefinito (quello indicato tra parentesi)."
-
-#~ msgid ""
-#~ "You should specify a reason for the certification.  Depending on the\n"
-#~ "context you have the ability to choose from this list:\n"
-#~ "  \"Key has been compromised\"\n"
-#~ "      Use this if you have a reason to believe that unauthorized persons\n"
-#~ "      got access to your secret key.\n"
-#~ "  \"Key is superseded\"\n"
-#~ "      Use this if you have replaced this key with a newer one.\n"
-#~ "  \"Key is no longer used\"\n"
-#~ "      Use this if you have retired this key.\n"
-#~ "  \"User ID is no longer valid\"\n"
-#~ "      Use this to state that the user ID should not longer be used;\n"
-#~ "      this is normally used to mark an email address invalid.\n"
-#~ msgstr ""
-#~ "Dovresti specificare un motivo per questa certificazione. A seconda del\n"
-#~ "contesto hai la possibilità di scegliere tra questa lista:\n"
-#~ "  \"Key has been compromised\"\n"
-#~ "      Usa questo se hai un motivo per credere che una persona non "
-#~ "autorizzata\n"
-#~ "      abbia avuto accesso alla tua chiave segreta.\n"
-#~ "  \"Key is superseded\"\n"
-#~ "      Usa questo se hai sostituito questa chiave con una più recente.\n"
-#~ "  \"Key is no longer used\"\n"
-#~ "      Usa questo se hai mandato in pensione questa chiave.\n"
-#~ "  \"User ID is no longer valid\"\n"
-#~ "      Usa questo per affermare che l'user ID non dovrebbe più essere "
-#~ "usato;\n"
-#~ "      solitamente è usato per indicare un indirizzo di email non valido.\n"
-
-#~ msgid ""
-#~ "If you like, you can enter a text describing why you issue this\n"
-#~ "revocation certificate.  Please keep this text concise.\n"
-#~ "An empty line ends the text.\n"
-#~ msgstr ""
-#~ "Se vuoi, puoi digitare un testo che descrive perché hai emesso\n"
-#~ "questo certificato di revoca. Per favore sii conciso.\n"
-#~ "Una riga vuota termina il testo.\n"
-
-#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-#~ msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
-
-#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-#~ msgstr ""
-#~ "impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2."
-#~ "x)\n"
-
-#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-#~ msgstr ""
-#~ "impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
-
-#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-#~ msgstr ""
-#~ "impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
-#~ "PGP 2.x)\n"
-
-#, fuzzy
-#~ msgid "shelll"
-#~ msgstr "help"
-
-#, fuzzy
-#~ msgid ""
-#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
-#~ msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
-
-#, fuzzy
-#~ msgid "key generation is not available from the commandline\n"
-#~ msgstr "gpg-agent non è disponibile in questa sessione\n"
-
-#, fuzzy
-#~ msgid "please use the script \"%s\" to generate a new key\n"
-#~ msgstr "Per favore scegli che tipo di chiave vuoi:\n"
-
-#, fuzzy
-#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-#~ msgstr ""
-#~ "l'estensione crittografica \"%s\" non è stata caricata a causa dei\n"
-#~ "permessi insicuri.\n"
-
-#, fuzzy
-#~ msgid ".\n"
-#~ msgstr "%s.\n"
-
-#~ msgid "problem with the agent - disabling agent use\n"
-#~ msgstr "problema con l'agent - uso dell'agent disattivato\n"
-
-#, fuzzy
-#~ msgid "can't query passphrase in batch mode\n"
-#~ msgstr "impossibile chiedere la password in modo batch\n"
-
-#~ msgid "Repeat passphrase: "
-#~ msgstr "Ripeti la passphrase: "
-
-#~ msgid "-k[v][v][v][c] [user-id] [keyring]"
-#~ msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
-
-#, fuzzy
-#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
-#~ msgstr "impossibile generare un numero primo di meno di %d bit\n"
-
-#~ msgid "can't generate a prime with less than %d bits\n"
-#~ msgstr "impossibile generare un numero primo di meno di %d bit\n"
-
-#~ msgid "no entropy gathering module detected\n"
-#~ msgstr "non è stato trovato il modulo per raccogliere l'entropia\n"
-
-#, fuzzy
-#~ msgid "can't lock `%s': %s\n"
-#~ msgstr "impossibile aprire `%s'\n"
-
-#~ msgid "`%s' is not a regular file - ignored\n"
-#~ msgstr "`%s' non è un file regolare - ignorato\n"
-
-#~ msgid "note: random_seed file is empty\n"
-#~ msgstr "nota: il file random_seed è vuoto\n"
-
-#~ msgid "can't read `%s': %s\n"
-#~ msgstr "impossibile leggere `%s': %s\n"
-
-#~ msgid "note: random_seed file not updated\n"
-#~ msgstr "nota: il file random_seed non è stato aggiornato\n"
-
-#~ msgid "can't write `%s': %s\n"
-#~ msgstr "impossibile scrivere su `%s': %s\n"
-
-#~ msgid "can't close `%s': %s\n"
-#~ msgstr "impossibile chiudere `%s': %s\n"
-
-#~ msgid "WARNING: using insecure random number generator!!\n"
-#~ msgstr ""
-#~ "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
-
-#~ msgid ""
-#~ "The random number generator is only a kludge to let\n"
-#~ "it run - it is in no way a strong RNG!\n"
-#~ "\n"
-#~ "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Il generatore di numeri casuali è solo un ripiego per fare\n"
-#~ "funzionare il programma - non è assolutamente un RNG forte!\n"
-#~ "\n"
-#~ "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Please wait, entropy is being gathered. Do some work if it would\n"
-#~ "keep you from getting bored, because it will improve the quality\n"
-#~ "of the entropy.\n"
-#~ msgstr ""
-#~ "Attendi, sto raccogliendo entropia. Se può evitare di annoiarti lavora un "
-#~ "po',\n"
-#~ "visto che questo migliorerà la qualità dell'entropia.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Not enough random bytes available.  Please do some other work to give\n"
-#~ "the OS a chance to collect more entropy! (Need %d more bytes)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Non ci sono abbastanza byte casuali disponibili. Per favore fai qualche\n"
-#~ "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
-#~ "(Servono altri %d byte)\n"
-
-#, fuzzy
-#~ msgid "card reader not available\n"
-#~ msgstr "la chiave segreta non è disponibile"
-
-#, fuzzy
-#~ msgid "NOTE: %s is not available in this version\n"
-#~ msgstr "gpg-agent non è disponibile in questa sessione\n"
-
-#, fuzzy
-#~ msgid "         algorithms on these user IDs:\n"
-#~ msgstr "Non puoi cancellare l'ultimo user ID!\n"
-
-#~ msgid "general error"
-#~ msgstr "errore generale"
-
-#~ msgid "unknown packet type"
-#~ msgstr "pacchetto di tipo sconosciuto"
-
-#~ msgid "unknown digest algorithm"
-#~ msgstr "algoritmo del digest sconosciuto"
-
-#~ msgid "bad public key"
-#~ msgstr "chiave pubblica errata"
-
-#~ msgid "bad secret key"
-#~ msgstr "chiave segreta errata"
-
-#~ msgid "bad signature"
-#~ msgstr "firma errata"
-
-#~ msgid "checksum error"
-#~ msgstr "codice di controllo errato"
-
-#~ msgid "unknown cipher algorithm"
-#~ msgstr "algoritmo di cifratura sconosciuto"
-
-#~ msgid "invalid packet"
-#~ msgstr "pacchetto non valido"
-
-#~ msgid "no such user id"
-#~ msgstr "l'user id non esiste"
-
-#~ msgid "secret key not available"
-#~ msgstr "la chiave segreta non è disponibile"
-
-#~ msgid "wrong secret key used"
-#~ msgstr "è stata usata la chiave segreta sbagliata"
-
-#~ msgid "bad key"
-#~ msgstr "chiave sbagliata"
-
-#~ msgid "file write error"
-#~ msgstr "errore durante la scrittura del file"
-
-#~ msgid "unknown compress algorithm"
-#~ msgstr "algoritmo di compressione sconosciuto"
-
-#~ msgid "file open error"
-#~ msgstr "errore durante l'apertura del file"
-
-#~ msgid "file create error"
-#~ msgstr "errore durante la creazione del file"
-
-#~ msgid "unimplemented pubkey algorithm"
-#~ msgstr "algoritmo della chiave pubblica non implementato"
-
-#~ msgid "unimplemented cipher algorithm"
-#~ msgstr "algoritmo di cifratura non implementato"
-
-#~ msgid "unknown signature class"
-#~ msgstr "classe della firma sconosciuta"
-
-#~ msgid "trust database error"
-#~ msgstr "errore nel database della fiducia"
-
-#~ msgid "resource limit"
-#~ msgstr "limite della risorsa"
-
-#~ msgid "invalid keyring"
-#~ msgstr "portachiavi non valido"
-
-#~ msgid "malformed user id"
-#~ msgstr "user id malformato"
-
-#~ msgid "file close error"
-#~ msgstr "errore durante la chiusura del file"
-
-#~ msgid "file rename error"
-#~ msgstr "errore durante la rinominazione del file"
-
-#~ msgid "file delete error"
-#~ msgstr "errore durante la cancellazione del file"
-
-#~ msgid "unexpected data"
-#~ msgstr "dati inattesi"
-
-#~ msgid "timestamp conflict"
-#~ msgstr "date in conflitto"
-
-#~ msgid "unusable pubkey algorithm"
-#~ msgstr "algoritmo della chiave pubblica non utilizzabile"
-
-#~ msgid "file exists"
-#~ msgstr "il file esiste"
-
-#~ msgid "weak key"
-#~ msgstr "chiave debole"
-
-#~ msgid "bad URI"
-#~ msgstr "URI non valida"
-
-# ??? (Md)
-#~ msgid "not processed"
-#~ msgstr "non esaminato"
-
-#~ msgid "unusable public key"
-#~ msgstr "chiave pubblica inutilizzabile"
-
-#~ msgid "unusable secret key"
-#~ msgstr "chiave segreta inutilizzabile"
-
-#~ msgid "keyserver error"
-#~ msgstr "errore del keyserver"
-
-#, fuzzy
-#~ msgid "no card"
-#~ msgstr "non cifrato"
-
-#, fuzzy
-#~ msgid "no data"
-#~ msgstr "non ci sono dati firmati\n"
-
-#~ msgid "... this is a bug (%s:%d:%s)\n"
-#~ msgstr "... questo è un bug (%s:%d:%s)\n"
-
-#~ msgid "operation is not possible without initialized secure memory\n"
-#~ msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
-
-#~ msgid "(you may have used the wrong program for this task)\n"
-#~ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
-
-#~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-#~ msgstr ""
-#~ "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
-#~ "html\n"
-
-#, fuzzy
-#~ msgid "all export-clean-* options from above"
-#~ msgstr "leggi le opzioni dal file"
-
-#, fuzzy
-#~ msgid "all import-clean-* options from above"
-#~ msgstr "leggi le opzioni dal file"
-
-#, fuzzy
-#~ msgid "expired: %s)"
-#~ msgstr "[scadenza: %s]"
-
-#, fuzzy
-#~ msgid "key %s: expired signature from key %s - skipped\n"
-#~ msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
-
-#, fuzzy
-#~ msgid "Unable to clean `%s'\n"
-#~ msgstr "impossibile eseguire %s \"%s\": %s\n"
-
-#, fuzzy
-#~ msgid "No user IDs are removable.\n"
-#~ msgstr "l'user ID \"%s\" è già stato revocato\n"
-
-#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-#~ msgstr "passphrase errata o algoritmo di cifratura sconosciuto (%d)\n"
-
-#~ msgid "can't set client pid for the agent\n"
-#~ msgstr "impossibile impostare il pid del client dell'agent\n"
-
-#~ msgid "can't get server read FD for the agent\n"
-#~ msgstr "impossibile ottenere il FD di lettura dell'agent\n"
-
-#~ msgid "can't get server write FD for the agent\n"
-#~ msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
-
-#~ msgid "select secondary key N"
-#~ msgstr "scegli la chiave secondaria N"
-
-#~ msgid "list signatures"
-#~ msgstr "elenca le firme"
-
-#~ msgid "sign the key"
-#~ msgstr "firma la chiave"
-
-#~ msgid "add a secondary key"
-#~ msgstr "aggiungi una chiave secondaria"
-
-#~ msgid "delete signatures"
-#~ msgstr "cancella le firme"
-
-#~ msgid "change the expire date"
-#~ msgstr "cambia la data di scadenza"
-
-#~ msgid "set preference list"
-#~ msgstr "imposta la lista di preferenze"
-
-#~ msgid "updated preferences"
-#~ msgstr "preferenze aggiornate"
-
-#~ msgid "No secondary key with index %d\n"
-#~ msgstr "Nessuna chiave secondaria con l'indice %d\n"
-
-#~ msgid "--nrsign-key user-id"
-#~ msgstr "--nrsign-key user-id"
-
-#~ msgid "--nrlsign-key user-id"
-#~ msgstr "--nrlsign-key user-id"
-
-#~ msgid "sign the key non-revocably"
-#~ msgstr "firma la chiave irrevocabilmente"
-
-#~ msgid "sign the key locally and non-revocably"
-#~ msgstr "firma la chiave localmente e irrevocabilmente"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "list"
-#~ msgstr "list"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "debug"
-#~ msgstr "debug"
-
-#, fuzzy
-#~ msgid "name"
-#~ msgstr "abilita"
-
-#, fuzzy
-#~ msgid "login"
-#~ msgstr "lsign"
-
-#, fuzzy
-#~ msgid "cafpr"
-#~ msgstr "fpr"
-
-#, fuzzy
-#~ msgid "forcesig"
-#~ msgstr "revsig"
-
-#, fuzzy
-#~ msgid "generate"
-#~ msgstr "errore generale"
-
-#~ msgid "passwd"
-#~ msgstr "passwd"
-
-#~ msgid "save"
-#~ msgstr "save"
-
-#~ msgid "fpr"
-#~ msgstr "fpr"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "check"
-#~ msgstr "check"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "sign"
-#~ msgstr "sign"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#, fuzzy
-#~ msgid "tsign"
-#~ msgstr "sign"
-
-#~ msgid "lsign"
-#~ msgstr "lsign"
-
-#~ msgid "nrsign"
-#~ msgstr "nrsign"
-
-#~ msgid "nrlsign"
-#~ msgstr "nrlsign"
-
-#~ msgid "adduid"
-#~ msgstr "adduid"
-
-#~ msgid "addphoto"
-#~ msgstr "addphoto"
-
-#~ msgid "deluid"
-#~ msgstr "deluid"
-
-#~ msgid "delphoto"
-#~ msgstr "delphoto"
-
-#, fuzzy
-#~ msgid "addcardkey"
-#~ msgstr "addkey"
-
-#~ msgid "delkey"
-#~ msgstr "delkey"
-
-#~ msgid "addrevoker"
-#~ msgstr "addrevoker"
-
-#~ msgid "delsig"
-#~ msgstr "delsign"
-
-#~ msgid "expire"
-#~ msgstr "expire"
-
-#~ msgid "primary"
-#~ msgstr "primary"
-
-#~ msgid "toggle"
-#~ msgstr "toggle"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "pref"
-#~ msgstr "pref"
-
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
-#~ msgid "setpref"
-#~ msgstr "setpref"
-
-#~ msgid "updpref"
-#~ msgstr "updpref"
-
-#, fuzzy
-#~ msgid "keyserver"
-#~ msgstr "errore del keyserver"
-
-#~ msgid "trust"
-#~ msgstr "trust"
-
-#~ msgid "revsig"
-#~ msgstr "revsig"
-
-#~ msgid "revuid"
-#~ msgstr "revuid"
-
-#~ msgid "revkey"
-#~ msgstr "revkey"
-
-#~ msgid "disable"
-#~ msgstr "disable"
-
-#~ msgid "enable"
-#~ msgstr "abilita"
-
-#~ msgid "showphoto"
-#~ msgstr "showphoto"
-
-#~ msgid "digest algorithm `%s' is read-only in this release\n"
-#~ msgstr "in questa versione l'algoritmo digest `%s' è in sola lettura\n"
-
-#~ msgid ""
-#~ "About to generate a new %s keypair.\n"
-#~ "              minimum keysize is  768 bits\n"
-#~ "              default keysize is 1024 bits\n"
-#~ "    highest suggested keysize is 2048 bits\n"
-#~ msgstr ""
-#~ "Sto per generare una nuova coppia di chiavi %s.\n"
-#~ "               la dimensione minima è  768 bit\n"
-#~ "          la dimensione predefinita è 1024 bit\n"
-#~ "  la dimensione massima consigliata è 2048 bit\n"
-
-#~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
-
-#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr ""
-#~ "la chiave è troppo corta; 1024 è il minimo valore permesso per RSA.\n"
-
-#~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
-
-#~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n"
-
-#~ msgid ""
-#~ "Keysizes larger than 2048 are not suggested because\n"
-#~ "computations take REALLY long!\n"
-#~ msgstr ""
-#~ "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
-#~ "VERAMENTE lunghi!\n"
-
-#, fuzzy
-#~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
-
-#~ msgid ""
-#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
-#~ "very vulnerable to attacks!\n"
-#~ msgstr ""
-#~ "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e "
-#~ "dalla tua tastiera sono molto vulnerabili ad attacchi!\n"
-
-#~ msgid "Experimental algorithms should not be used!\n"
-#~ msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
-
-#~ msgid ""
-#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
-#~ msgstr ""
-#~ "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "mi dispiace, non è possibile fare questo in modo batch\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "impossibile aprire il file: %s\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "chiave %08lX: la chiave è stata revocata!\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "chiave %08lX: la subchiave è stata revocata!\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: la chiave è scaduta\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (firma solo)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (firma e cifra)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (cifra solo)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (firma e cifra)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: impossibile aprire: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: ATTENZIONE: file vuoto\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = Mi fido marginalmente\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = Mi fido completamente\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "firmata localmente con la tua chiave %08lX il %s\n"
-#~ "\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: impossibile creare il lock\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: impossibile creare il lock\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: impossibile creare: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "Se vuoi usare comunque questa chiave revocata, rispondi \"si\"."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Impossibile aprire la foto \"%s\": %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "errore: mancano due punti\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "errore: non c'è il valore della fiducia\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (key ID principale %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! la subchiave è stata revocata: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- trovata una revoca falsificata\n"
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr "[scadenza: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr "[scadenza: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[revocata]"
-
-#~ msgid ""
-#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
-#~ msgstr ""
-#~ "ATTENZIONE: il digest `%s' non fa parte di OpenPGP.\n"
-#~ "Da usare a proprio rischio!\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[file]|cifra i file"
-
-#~ msgid "store only"
-#~ msgstr "immagazzina soltanto"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[file]|decifra i file"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "firma una chiave irrevocabilmente"
-
-#~ msgid "sign a key locally and non-revocably"
-#~ msgstr "firma una chiave localmente e irrevocabilmente"
-
-#~ msgid "list only the sequence of packets"
-#~ msgstr "elenca solo la sequenza dei pacchetti"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr "esporta i valori di fiducia"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "aggiornamento non presidiato del database della fiducia"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "ripara un database della fiducia rovinato"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr "rimuovi l'armatura a un file o a stdin"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "crea l'armatura a un file o a stdin"
-
-#~ msgid "do not force v3 signatures"
-#~ msgstr "non forza l'uso di firme v3"
-
-#~ msgid "force v4 key signatures"
-#~ msgstr "forza l'uso di firme v4"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "non forza l'uso di firme v4"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr "non usa mai un MDC per cifrare"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "usa gpg-agent"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr "|[file]|scrivi le informazioni di stato nel file"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr "emula il modo descritto in RFC 1991"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr ""
-#~ "imposta tutte le opzioni di pacchetto,\n"
-#~ "cifrario e digest per OpenPGP"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr ""
-#~ "imposta tutte le opzioni di pacchetto, cifrario e digest per PGP 2.x"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "elimina il campo keyid dei pacchetti cifrati"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "Mostra le fotografie"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "Non mostra le fotografie"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr "Imposta la riga di comando per vedere le fotografie"
-
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
-#~ msgstr ""
-#~ "in questa versione l'algoritmo di compressione `%s' è in sola lettura\n"
-
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
-
-#~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
-#~ msgstr ""
-#~ "%08lX: Non è sicuro che questa chiave appartenga veramente al "
-#~ "proprietario\n"
-#~ "ma è accettata comunque\n"
-
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "la preferenza %c%lu non è valida\n"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
-
-#~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
-#~ msgstr ""
-#~ "NOTA: trovata una chiave primaria Elgamal - importarla può essere lungo\n"
-
-#~ msgid " (default)"
-#~ msgstr " (predefinito)"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "inviata con successo a `%s' (status=%u)\n"
-
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "invio a `%s' fallito: status=%u\n"
-
-#~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "questo keyserver non gestisce --search-keys\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "impossibile cercare sul keyserver: %s\n"
-
-#~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
-#~ msgstr ""
-#~ "chiave %08lX: questa è una chiave ElGamal generata da PGP che NON è "
-#~ "sicura per le firme!\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "la chiave %08lX è stata creata %lu secondo nel futuro (salto nel tempo\n"
-#~ "o problema con l'orologio)\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "la chiave %08lX è stata creata %lu secondi nel futuro (salto nel tempo\n"
-#~ "o problema con l'orologio)\n"
-
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "chiavi %08lX marcate come definitivamente affidabile\n"
-
-#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-#~ msgstr "ignorata la firma dalla chiave per firme Elgamal %08lX a %08lX\n"
-
-#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-#~ msgstr "ignorata la firma da %08lX alla chiave per firme Elgamal %08lX\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr ""
-#~ "controllo al livello %d firmato=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-
-#~ msgid ""
-#~ "Select the algorithm to use.\n"
-#~ "\n"
-#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-#~ "for signatures.  This is the suggested algorithm because verification of\n"
-#~ "DSA signatures are much faster than those of ElGamal.\n"
-#~ "\n"
-#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-#~ "only\n"
-#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
-#~ "selected in a special way to create a safe key for signatures: this "
-#~ "program\n"
-#~ "does this but other OpenPGP implementations are not required to "
-#~ "understand\n"
-#~ "the signature+encryption flavor.\n"
-#~ "\n"
-#~ "The first (primary) key must always be a key which is capable of "
-#~ "signing;\n"
-#~ "this is the reason why the encryption only ElGamal key is not available "
-#~ "in\n"
-#~ "this menu."
-#~ msgstr ""
-#~ "Seleziona l'algoritmo da usare.\n"
-#~ "\n"
-#~ "DSA (alias DSS) è un algoritmo usabile solo per firmare. E l'algoritmo\n"
-#~ "suggerito perché verificare firme DSA è molto più veloce di quelle "
-#~ "ElGamal.\n"
-#~ "\n"
-#~ "ElGamal è un algoritmo usabile per firmare e cifrare.\n"
-#~ "OpenPGP distingue tra due versioni di questo algoritmo: una solo per "
-#~ "firmare\n"
-#~ "e una per firmare e cifrare. In realtà è sempre lo stesso, ma per creare\n"
-#~ "firme sicure per la cifratura occorre scegliere in un modo particolare "
-#~ "alcuni\n"
-#~ "parametri: questo programma lo fa ma non è richiesto che altre "
-#~ "implementazioni\n"
-#~ "di OpenPGP capiscano la versione per firmare e cifrare.\n"
-#~ "\n"
-#~ "La prima chiave (primaria) deve sempre essere una chiave in grado di "
-#~ "firmare;\n"
-#~ "questo è il motivo per cui le chiavi ElGamal solo per cifrare non sono\n"
-#~ "disponibili in questo menù."
-
-#~ msgid ""
-#~ "Although these keys are defined in RFC2440 they are not suggested\n"
-#~ "because they are not supported by all programs and signatures created\n"
-#~ "with them are quite large and very slow to verify."
-#~ msgstr ""
-#~ "Anche se queste chiavi sono definite da RFC2400 non sono suggerite perché "
-#~ "non\n"
-#~ "sono gestite da tutti i programmi e le firme create sono grandi e lunghe "
-#~ "da\n"
-#~ "verificare."
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "non può allocare la stringa del file di uscita: %s\n"
 
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "Per ora sono state controllate %lu chiavi (%lu firme)\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "e' necessario specificare %s o %s\n"
 
-#~ msgid "key incomplete\n"
-#~ msgstr "chiave incompleta\n"
+#~ msgid "no class provided\n"
+#~ msgstr "nessuna classe fornita\n"
 
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "chiave %08lX incompleta\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "la classe %s non è supportata\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/ja.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/ja.gmo sont différents
diff -Nru gnupg2-2.2.20/po/ja.po gnupg2-2.2.27/po/ja.po
--- gnupg2-2.2.20/po/ja.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/ja.po	2021-01-11 18:47:18.000000000 +0100
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.2.20\n"
+"Project-Id-Version: gnupg 2.2.23\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2020-03-19 09:27+0900\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-11-12 12:59+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "pinentryのロックの獲得に失敗しました: %s\n"
@@ -31,45 +31,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|キャンセル(_C)"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|パスワードマネージャに保管(_S)"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "本当に画面にパスフレーズを見えるようにしますか?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|パスフレーズを見えるようにする"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|パスフレーズを隠す"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "品質:"
 
@@ -79,11 +79,11 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -91,7 +91,7 @@
 "あなたのPINを入力してください(このセッションで秘密鍵のロックを解除するために"
 "使われます)"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -99,17 +99,17 @@
 "あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
 "るために使われます)"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "一致しません - もう一度"
 
@@ -117,36 +117,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (現在 %d / 最大 %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "繰り返し:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PINが長すぎます"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "パスフレーズが長すぎます"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "PINに無効な文字があります"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PINが短すぎます"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "不正なPINです"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "パスフレーズが不正です"
 
@@ -155,31 +159,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s'が作成できません: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s'が開けません: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -240,7 +244,7 @@
 "パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A   %s"
 "%%0A   %s%%0Aを保護します。"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
@@ -366,17 +370,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 安全とは言えないパスフレーズが入力されました。"
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "新しい鍵を保護するために、%0Aパスフレーズを入力してください。"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "新しいパスフレーズを入力してください"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -384,132 +388,132 @@
 "@オプション:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "デーモン・モードで実行 (バックグラウンド)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "サーバ・モードで実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "スーパーバイズド・モードで実行"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "冗長"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "いくらかおとなしく"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh-形式のコマンド出力"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh-形式のコマンド出力"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|FILEからオプションを読み込みます"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "コンソールからデタッチしない"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "サーバのログ・ファイルを使う"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|PGMをPIN入力プログラムとして使う"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "SCdaemonを使わない"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAMEからのコマンドを受け付ける"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "TTYの変更要求を無視する"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "Xディスプレイの変更要求を無視する"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|N秒後に保持したPINを無効とする"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "署名に対してPINの保持を使わない"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "外部のパスワードキャッシュの使用を認めない"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "パスフレーズの事前設定を認める"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先してパスフレーズ入力を認めない"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Emacsを通じてパスフレーズを催促することを認める"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "sshサポートを有功にする"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|ssh署名の表示にALGOを使う"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "puttyサポートを有功にする"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "バグは <@EMAIL@> までご報告ください。\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -517,147 +521,135 @@
 "形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@の秘密鍵の管理\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "無効なdebug-level '%s'が与えられました\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "注意: デフォルトのオプション・ファイル '%s' がありません\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "オプション・ファイル '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' からオプションを読み込みます\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注意: '%s'はオプションとは考えられません\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "ソケットが作成できません: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "ソケット名'%s'は長すぎます\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ソケットのナンス取得エラー\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'でソケットのバインドのエラー: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s'の許可が設定できません: %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ソケット'%s'でlisten\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "ディレクトリ'%s'が作成できません: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'が作成されました\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'でstat()が失敗しました: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s'をホーム・ディレクトリに使えません\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %dでナンスの読み込みエラー: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 停止しました\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "このセッションでgpg-agentは実行されていません\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "使い方: gpg-preset-passphrase [オプション] KEYGRIP (ヘルプは -h)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -665,8 +657,8 @@
 "形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
 "パスワードキャッシュの管理\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -674,9 +666,9 @@
 "@コマンド:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -686,11 +678,11 @@
 "オプション:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "使い方: gpg-protect-tool [オプション] (ヘルプは -h)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -698,16 +690,16 @@
 "形式: gpg-protect-tool [オプション] [引数]\n"
 "秘密鍵管理ツール\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "パスフレーズを入力してください。PKCS#12オブジェクトを解除します。"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "パスフレーズを入力してください。新しいPKCS#12オブジェクトを解除します。"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -715,7 +707,7 @@
 "GnuPGシステムにインポートされたオブジェクトを保護するためにパスフレーズを入力"
 "してください"
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -723,18 +715,18 @@
 "パスフレーズまたはPINを入力してください。\n"
 "この操作を完了するのに必要です。"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "キャンセルされました\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "'%s'を開く際、エラー: %s\n"
@@ -744,32 +736,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "ファイル'%s'(行 %d): %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ステートメント \"%s\" は'%s'で無視されました(行 %d)\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "システム信用リスト'%s'が得られません\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "'%s'の不正なフィンガープリント (行 %d)\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "'%s'の無効な鍵フラグ(行 %d)\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "'%s'の読み込みエラー(行 %d): %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "信用されたルート証明書のリストの読み込みエラ−\n"
@@ -782,18 +774,18 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "究極的にこれを信用し%%0A  \"%s\"%%0A正にユーザの証明書と保証しますか?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "はい"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "いいえ"
@@ -806,7 +798,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -818,20 +810,20 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "正しい"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "誤り"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注意: パスフレーズは変更されていません。%0A今、変更してください。"
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -840,26 +832,26 @@
 "このパスフレーズは%.4s-%.2s-%.2sから変更されていません。%%0A今、変更してくだ"
 "さい。"
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "パスフレーズを変更する"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "後で変更する"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "本当にこの鍵: keygrip%%0A  %s%%0A  %%C%%0Aを削除しますか?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "鍵を削除する"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -867,12 +859,12 @@
 "警告: この鍵はSSHの使用にもリストされています!\n"
 "この鍵を削除するとリモート・マシンのアクセスの能力を失うかもしれません。"
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSAは8ビットの倍数のハッシュ長を必要とします\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s 鍵は安全でない(%uビット)ハッシュを使用しています\n"
@@ -882,7 +874,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zuビットのハッシュは%uビットの%s鍵には無効です\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "作成された署名の検査に失敗しました: %s\n"
@@ -892,7 +884,7 @@
 msgid "secret key parts are not available\n"
 msgstr "秘密部分が得られません\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公開鍵アルゴリズム%d (%s)はサポートされていません\n"
@@ -921,7 +913,7 @@
 msgstr "パイプのストリーム作成エラー: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
@@ -967,27 +959,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agentオプションの設定の問題\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "コア・ダンプを無効にできません: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告: '%s'の安全でない所有 \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ファイル'%s'がアクセスできるのを待ちます...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
@@ -1047,7 +1039,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "%luバイトの確保においてメモリが足りません"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "十分なメモリの確保のエラー: %s\n"
@@ -1162,7 +1154,7 @@
 msgstr "アルゴリズム: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "サポートされていないアルゴリズム: %s"
@@ -1237,39 +1229,39 @@
 msgid "Root certificate trustworthy"
 msgstr "信頼できるルート証明書"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "証明書に対するCRLがありません"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "利用できるCRLは古すぎます"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "証明書のCRL/OCSP確認"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "含まれる証明書"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "監査ログのエントリはありません。"
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "不明な操作"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent利用可能"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr利用可能"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "'%s'のヘルプはありません。"
@@ -1278,7 +1270,7 @@
 msgid "ignoring garbage line"
 msgstr "ガベージ行を無視します"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[未設定]"
 
@@ -1287,82 +1279,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "無効な64進文字%02Xをスキップしました\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "引数は期待されていません"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "読み込みエラー"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "キーワードが長すぎます"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "無効な引数"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "無効なコマンド"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "無効なエイリアス定義です"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "メモリがありません"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "無効なコマンド"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "不明のコマンド'%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "予期せぬ外装: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "無効なオプション"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"に引数がありません\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"には無効な引数です\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "オプション\"%.50s\"は引数をとりません\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "無効なコマンド \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "オプション\"%.50s\"はあいまいです\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "コマンド\"%.50s\"はあいまいです\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "メモリがありません\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "無効なオプション \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "注意: デフォルトのオプション・ファイル '%s' がありません\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "オプション・ファイル '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1378,42 +1402,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "'%s'から'%s'への変換に失敗: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "一時ファイル'%s'が作成できません: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "'%s'の書き込みエラー: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "古い lockfile (%d により作成)を除去します\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "lockを待ちます (%d%s により保持) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(デッドロック?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock '%s' は作成されませんでした: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "lock %s を待ちます...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
@@ -1594,13 +1617,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "注意: \"%s\"コマンドを使って再起動してください。\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%sは%sモードに準拠しません\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "このセッションでdirmngrは実行されていません\n"
@@ -1638,23 +1661,23 @@
 msgid "server uses an invalid certificate"
 msgstr "サーバは無効な証明書を使っています"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, c-format
 msgid "Note: %s\n"
 msgstr "注意: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGPカードが利用できません: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGPカードno. %sを検出\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "これはバッチ・モードではできません\n"
@@ -1664,136 +1687,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "リセット・コードが(もはや)利用可能ではありません\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "あなたの選択は? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "強制なし"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "強制"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "エラー： 普通のASCIIだけが今、許可されています。\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "エラー: \"<\"文字は使えません。\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "エラー: 二重の空白は禁止です。\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "カード所有者の姓 (surname): "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "カード所有者の名 (given name): "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "エラー: つないだ名前が長すぎます (上限%d文字)。\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "公開鍵を取得するURL: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "'%s'の読み込みエラー: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "'%s'の書き込みエラー: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "ログイン・データ (アカウント名): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "プライベート DO データ: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "言語の優先指定: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "敬称 (M = Mr., F = Ms., あるいは空白): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "エラー: 無効な応答。\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CAのフィンガープリント: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "エラー: 無効な形式のフィンガープリント。\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "鍵は操作できません: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "OpenPGPカードでありません"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "現行鍵情報の取得エラー: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "既存の鍵を置き換えしますか? (y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1803,98 +1826,98 @@
 "      鍵生成が成功しない場合、あなたのカードに関する技術文書を確認し、\n"
 "      利用できる鍵長について確認ください。\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "鍵長は? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%uビットに切り上げます\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "こちらのカード鍵の属性を変更します: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "署名鍵\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "暗号化鍵\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "認証鍵\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "ご希望の鍵の種類を選択してください:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "無効な選択です。\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "カードは、今、%uビットの鍵を生成するように再コンフィグされます\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 "カードは、今、こちらのタイプの鍵を生成するように再コンフィグされます: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "鍵%dの属性を変更する際にエラー: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "カード情報の取得エラー: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "このカードでは、このコマンドはサポートされていません。\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "暗号化鍵のカード外バックアップを作成しますか? (Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注意: 秘密鍵はもうカードに保管してあります!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "既存の鍵を置き換えますか? (y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1905,165 +1928,165 @@
 "   PIN = '%s'     管理者PIN = '%s'\n"
 "次のコマンドを使って変更すべきです --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "生成する鍵の型を選択してください:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) 署名鍵\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 暗号化鍵\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 認証鍵\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "鍵を保管する場所を選択してください:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARDが失敗しました: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注意: このコマンドはカードに保管してあるすべての鍵を破壊します!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "続けますか? (y/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "KDF設定のエラー: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "このメニューを終了"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "管理コマンドを表示"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "このヘルプを表示"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "全有効データを表示"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "カード所有者の名前の変更"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "鍵を取得するURLの変更"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "カードURLで指定された鍵の取得"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "ログイン名の変更"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "言語の優先指定の変更"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr "カード所有者の敬称の変更"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "CAフィンガープリントの変更"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "署名強制PINフラグを反転"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "新しい鍵を生成"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "PINブロックの解除や変更のメニュー"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "PINを確認しすべてのデータを表示する"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "PINをリセット・コードでブロックを解除する"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "すべての鍵とデータを破壊します"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "PIN認証のKDFを設定する"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "鍵の属性の変更"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "管理者専用コマンド\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "管理者コマンドが許可されています\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "管理者コマンドは禁止されています\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無効なコマンド (\"help\"を参照)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "このコマンドで--outputは機能しません\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s'が開けません\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "鍵\"%s\"が見つかりません: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2122,8 +2145,8 @@
 msgstr "副鍵: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新に失敗しました: %s\n"
@@ -2148,55 +2171,61 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "パスフレーズの作成エラー: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2Kモードのため、共通鍵ESKパケットを使えません\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "暗号方式 %s を使います\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s'はもう圧縮済みです\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "*警告*: '%s'は空のファイルです\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "'%s'から読み込み\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "*警告*: 鍵%sは、%sモードでは、暗号化に適しません\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2204,38 +2233,38 @@
 msgstr ""
 "*警告*: 圧縮アルゴリズム %s (%d) の強制が、受取人の優先指定をそむきます\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s暗号化 受信者:\"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "オプション'%s'を%sモードで使うことはできません\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s暗号化済みデータ\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "不明のアルゴリズム%dによる暗号化\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "*警告*: メッセージは共通鍵暗号方式の弱い鍵で暗号化されています。\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "暗号化パケットの取扱いで障害\n"
@@ -2328,7 +2357,7 @@
 msgstr " - スキップされました"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "'%s'への書き込み\n"
@@ -2363,262 +2392,266 @@
 msgid "[User ID not found]"
 msgstr "[ユーザIDが見つかりません]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "'%s'を %s から自動取得\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "'%s'を %s から取得する際のエラー: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "フィンガープリントがありません"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "%s から失効した鍵の新しいコピーを確認します。\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(オプション'%s'の引数を確認ください)\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告: デフォルトの秘密鍵として '%s' を用いません: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "デフォルトの署名用の秘密鍵として\"%s\"を用います\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "'%s'に渡されたすべての値は無視されました\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副鍵%s(主鍵%sではなく)を用います\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "オプション'%s'に有効な値:\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "署名を作成"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "クリア・テクスト署名を作成"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "分遣署名を作成"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "データを暗号化"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "暗号化には共通鍵暗号方式のみを使用"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "データを復号 (デフォルト)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "署名を検証"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "鍵の一覧"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "鍵と署名の一覧"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "鍵署名の検査と一覧"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "鍵とフィンガープリントの一覧"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "秘密鍵の一覧"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "新しい鍵ペアを生成"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "すばやく新しい鍵ペアを生成"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "すばやく新しいユーザIDを追加"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "すばやくユーザIDを失効"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "すばやく新しい有効期限を設定"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "全機能の鍵ペアを生成"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生成"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "公開鍵リングから鍵を削除"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "秘密鍵リングから鍵を削除"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
-msgstr "鍵にすばやく署名"
+msgstr "すばやく鍵に署名"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
-msgstr "鍵へすばやくローカルに署名"
+msgstr "すばやく鍵へローカルに署名"
+
+#: g10/gpg.c:495
+msgid "quickly revoke a key signature"
+msgstr "すばやく鍵への署名を失効"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "鍵に署名"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "鍵へローカルに署名"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "鍵への署名や編集"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "パスフレーズの変更"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "鍵をエクスポートする"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "鍵サーバに鍵をエクスポートする"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "鍵サーバから鍵をインポートする"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "鍵サーバの鍵を検索する"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "鍵サーバから鍵を全部更新する"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "鍵のインポート/マージ"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "カード・ステイタスを表示"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "カードのデータを変更"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "カードのPINを変更"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "メッセージ・ダイジェストを表示"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "サーバ・モードで実行"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|TOFUポリシーを鍵に設定する"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "ASCII形式の外装を作成"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|USER-ID用に暗号化"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|出力をFILEに書き出す"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "無変更"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "上書き前に確認"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "厳密なOpenPGPの振舞を採用"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2626,7 +2659,7 @@
 "@\n"
 "(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2646,11 +2679,11 @@
 " --list-keys [名前]         鍵を表示\n"
 " --fingerprint [名前]       フィンガープリントを表示\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2660,7 +2693,7 @@
 "署名、検査、暗号化または復号\n"
 "デフォルトの操作は、入力データに依存\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2668,572 +2701,561 @@
 "\n"
 "サポートしているアルゴリズム:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "公開鍵: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "暗号方式: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "ハッシュ: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "使い方: %s [オプション] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "対立するコマンド\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない所有\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない所有\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない許可\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない許可\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "不明のコンフィグレーション項目'%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "鍵の一覧時にフォトIDを表示する"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "署名の一覧時にポリシーURLを表示する"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "署名の一覧時にすべての注釈を表示する"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "署名の一覧時にIETF標準注釈を表示する"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "署名の一覧時にユーザの注釈を表示する"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署名の一覧時に優先鍵サーバURLを表示する"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "鍵の一覧時にユーザIDの有効性を表示する"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "鍵の一覧に鍵リングの名前を表示する"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "署名の一覧時に有効期限の日付を表示する"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "不明のTOFUポリシー'%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "注意: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注意: 普通%sは使いません!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s'は、有効な署名表現ではありません\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\"は正しいメール・アドレスではありません\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無効な pinentry mode '%s'です\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "無効な送信元要求 '%s' です\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s'は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "鍵サーバのURLを解析不能\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無効な鍵サーバ・オプションです\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効なインポート・オプションです\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "無効なインポート・オプションです\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "無効なフィルタ・オプションです: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効なエクスポート・オプションです\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "無効なエクスポート・オプションです\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効な一覧オプションです\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "無効な一覧オプションです\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "署名の検証時にフォトIDを表示する"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "署名の検証時にポリシーURLを表示する"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "署名の検証時にすべての注釈を表示する"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "署名の検証時にIETF標準注釈を表示する"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "署名の検証時にユーザの注釈を表示する"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署名の検証時に優先鍵サーバURLを表示する"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "署名の検証時にユーザIDの有効性を表示する"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "署名の検証時にプライマリ・ユーザIDだけをを表示する"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "PKAデータで署名を検証する"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "有効なPKAデータで署名の信用度を上昇させる"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効な検証オプションです\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無効な検証オプションです\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%sに設定不能\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効な auto-key-locate リストです\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無効な auto-key-locate リストです\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %sは%sより優先\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%sは%sとともに使うことはできません!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%sは%sとともに使っても無意味です!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s のため、セキュアでないメモリで実行しません\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "選択された暗号アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "選択された圧縮アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-neededは正の値が必要です\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neededは1より大きな値が必要です\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意: 単純なS2Kモード(0)の使用には強く反対します\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無効なデフォルトの優先指定\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無効な個人用暗号方式の優先指定\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無効な個人用ダイジェストの優先指定\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無効な個人用圧縮の優先指定\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%sは%sではまだ機能しません\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベースの初期化に失敗しました: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "鍵サーバへの送信に失敗しました: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "鍵サーバからの受信に失敗しました: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "鍵のエクスポートに失敗しました: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "鍵サーバの検索に失敗しました: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "鍵サーバの更新に失敗しました: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去に失敗しました: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装に失敗しました: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "鍵指定'%s'の構文解析エラー: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s'は有効な鍵ID, フィンガープリント、keygripではないようです。\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "*警告*: コマンドが指定されていません。なにを意味しているのか当ててみま"
 "す ...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "開始します。メッセージを打ってください ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "あたえられた証明書ポリシーURLは無効です\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "あたえられた署名ポリシーURLは無効です\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定された優先鍵サーバURLは無効です\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|鍵リングFILEの鍵を扱います"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "日時の矛盾を警告だけにします"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|このFDにステイタス情報を書き出す"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|ALGOで作成された署名を拒絶する"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "使い方: gpgv [オプション] [ファイル] (ヘルプは -h)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3427,7 +3449,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "以下で、優先指定を更新できます: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "鍵%s: ユーザIDがありません\n"
@@ -3437,7 +3459,7 @@
 msgid "key %s: %s\n"
 msgstr "鍵  %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "インポートの検査で拒否されました"
 
@@ -3461,7 +3483,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "これはおそらく自己署名のないせいでしょう\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
@@ -3476,7 +3498,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "鍵リング'%s'の書き込みエラー: %s\n"
@@ -3546,17 +3568,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "鍵%s:\"%s\"変更なし\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "鍵%s: 秘密鍵をインポートしました\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "鍵 %s: 秘密鍵はもうあります\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
@@ -3569,227 +3591,287 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "秘密鍵 %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "秘密鍵のインポートは禁止です\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "理由は指定されていません"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "鍵がとりかわっています"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "鍵(の信頼性)が損なわれています"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "鍵はもはや使われていません"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "ユーザIDがもはや有効でありません"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "失効理由: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "失効のコメント: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "鍵%s: 無効な直接鍵署名\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "鍵%s: 無効な副鍵の対応です\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "鍵%s: 多重副鍵の対応を削除します\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "鍵%s: 無効な副鍵失効です\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "鍵%s: スキップした副鍵\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "鍵%s:\"%s\"失効証明書の追加\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "鍵%s: 直接鍵署名を追加\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "メモリの確保のエラー: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr "(順番を変えた署名が続きます)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "鍵  %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d個の重複した署名が除去されました\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "鍵がないため%d個の署名は検査しません\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d個の不正な署名\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d個の正しい署名\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を確"
+"認ください。\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "keybox'%s'の作成エラー: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "鍵リング'%s'の作成エラー: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox'%s'が作成されました\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "鍵リング'%s'ができました\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock リソース'%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "鍵DBを開く際のエラー: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
@@ -4024,8 +4106,8 @@
 msgid "Really sign? (y/N) "
 msgstr "本当に署名しますか? (y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署名に失敗しました: %s\n"
@@ -4216,7 +4298,7 @@
 "  't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
 "  (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "鍵は、失効されています。"
 
@@ -4269,7 +4351,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "この主鍵を本当に移動しますか? (y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "鍵をきっかり1つ選択してください。\n"
 
@@ -4344,7 +4426,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "保存せずに終了しますか? (y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "鍵は無変更なので更新は不要です。\n"
@@ -4387,104 +4469,118 @@
 msgid "Nothing to sign.\n"
 msgstr "署名するものがありません。\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "あなたによって署名されていません。\n"
+
+#: g10/keyedit.c:2995
+#, c-format
+msgid "revoking the key signature failed: %s\n"
+msgstr "鍵の署名の失効に失敗しました: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s'は、有効な有効期限ではありません\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\"は正しいフィンガープリントではありません\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "副鍵\"%s\"が見つかりません\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "ダイジェスト: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "機能: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "鍵サーバ 修正しない"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "優先鍵サーバ: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "注釈: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "この鍵は、%s鍵%sによって失効可能です"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(機密指定)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "作成: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "失効: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "期限切れ: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "有効期限: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "利用法: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "カード番号: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "信用: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "有効性: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "この鍵は使用禁止に設定されています"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4492,17 +4588,17 @@
 "プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
 "ということを念頭においてください。\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "失効"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "期限切れ"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4511,17 +4607,17 @@
 "*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
 "              ユーザIDが主になると仮定する場合があります。\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "その有効期限も変更したいでしょう\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4531,70 +4627,70 @@
 "は、\n"
 "        この鍵を拒否するかもしれません。\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "それでも追加したいですか? (y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "この正しい署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "この無効な署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "この不明の署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "この自己署名を本当に削除しますか? (y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d個の署名を削除しました。\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "何も削除していません。\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "無効"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ユーザID \"%s\": 既に最小化されています\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4604,274 +4700,270 @@
 "では、\n"
 "        この鍵を拒否するかもしれません。\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "指名失効者のユーザIDを入力してください: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "指名失効者には、その鍵自体を任命できません\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "この鍵は失効者としてもう指名されています\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副鍵の有効期限を変更します。\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "主鍵の有効期限を変更します。\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3鍵の有効期限は変更できません\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "副鍵の使用法を変更します。\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "主鍵の使用法を変更します。\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "署名する副鍵%sはすでに相互証明されています\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザIDをきっかりひとつ選択してください。\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先鍵サーバURLを入力してください: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当に置き換えたいですか? (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当に削除したいですか? (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "注釈を入力: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "進みますか? (y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番のユーザIDはありません\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "ハッシュ%sのユーザIDはありません\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "鍵ID'%s'の副鍵はありません\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番の副鍵はありません\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザID:\"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%sで%s%s%sに署名されています\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (エクスポート不可)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "この署名は%sで期限切れです。\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "それでも本当に失効したいですか? (y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "あなたによって署名されていません。\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "これらのユーザIDに鍵%sで署名しました:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (失効不可)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "あなたの鍵%sで%sに失効されています\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "これらの署名を失効しようとしています:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当に作成しますか? (y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "秘密鍵がありません\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ユーザIDでないものを失効しようとしました: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザID\"%s\"は、もう失効されています\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "最後の有効なユーザIDは失効できません。\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "鍵 %s は、もう失効されています。\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "副鍵 %s は、もう失効されています。\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "オプション'%s'に無効な値です\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "優先指定'%s'の重複\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "暗号方式の優先指定が多すぎます\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "ダイジェストの優先指定が多すぎます\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "圧縮の優先指定が多すぎます\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "優先指定の文字列に無効な項目'%s'があります\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "直接署名を書き込みます\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "自己署名を書き込みます\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "鍵対応への署名を書き込みます\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "無効な鍵長。%uビットにします\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "鍵長を%uビットに丸めます\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -4879,19 +4971,19 @@
 "*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
 "きません\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -4905,161 +4997,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "鍵%sに認められた操作: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "現在の認められた操作: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 署名機能を反転する\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 暗号機能を反転する\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 認証機能を反転する\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 完了\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA と RSA (デフォルト)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA と Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (署名のみ)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (署名のみ)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (暗号化のみ)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (暗号化のみ)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (機能をあなた自身で設定)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (機能をあなた自身で設定)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC と ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (署名のみ)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (機能をあなた自身で設定)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (暗号化のみ)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) 既存の鍵\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "  (%d) カードに存在する鍵\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "keygripを入力: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "このkeygripの鍵はありません\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "カードの読み込みエラー: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "カードのシリアル番号: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "利用可能な鍵:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "%uビットに切り上げます\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "副鍵の鍵長は? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "要求された鍵長は%uビット\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "ご希望の楕円曲線を選択してください:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5075,7 +5167,7 @@
 "      <n>m = 鍵は n か月間で期限切れ\n"
 "      <n>y = 鍵は n 年間で期限切れ\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5091,38 +5183,38 @@
 "      <n>m = 署名は n か月間で期限切れ\n"
 "      <n>y = 署名は n 年間で期限切れ\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "鍵の有効期間は? (0)"
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "署名の有効期間は? (%s)"
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "無効な値\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "鍵は無期限です\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "署名は無期限です\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "鍵は%sで期限切れとなります\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "署名は%sで期限切れとなります\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5130,11 +5222,11 @@
 "このシステムでは、2038年以降の日付を表示することはできませんが、\n"
 "2106年まで正しく処理されます。\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "これで正しいですか? (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5148,7 +5240,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5164,49 +5256,49 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "本名: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "名前に無効な文字があります\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "名前を数字で始めてはいけません\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "名前は5文字以上でなければなりません\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "電子メール・アドレス: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "有効な電子メール・アドレスではありません\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "コメント: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "コメントに無効な文字があります\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "あなたは文字集合'%s'を使っています。\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5217,7 +5309,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
 
@@ -5232,31 +5324,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "まずエラーを修正してください\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5267,13 +5359,13 @@
 "す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
 "成器に十分なエントロピーを供給する機会を与えることができます。\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "鍵の生成に失敗しました: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5284,64 +5376,64 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "続けますか? (Y/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" の鍵はもうあります\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "それでも鍵を作成しますか? (y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "いずれにしろ鍵を作成\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "鍵の生成が取り消されました。\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注意: カード鍵のバックアップが'%s'へ保存されます\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "'%s'へ公開鍵を書き込みます\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5349,34 +5441,34 @@
 "この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
 "\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鍵の秘密部分が利用できません。\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鍵の秘密部分はカード上に保存されています。\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "本当に作成しますか? (y/N) "
 
@@ -5410,18 +5502,6 @@
 msgid_plural "%d good signatures\n"
 msgstr[0] "正しい署名%d個\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d個の不正な署名\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "鍵がないため%d個の署名は検査しません\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5438,29 +5518,29 @@
 msgid "Keyring"
 msgstr "鍵リング"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr " 主鍵フィンガープリント:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr " 副鍵フィンガープリント:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "  主鍵フィンガープリント:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "  副鍵フィンガープリント:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "   フィンガープリント ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "   カードシリアル番号 ="
 
@@ -5487,7 +5567,7 @@
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu個の不正な署名)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鍵リングができました\n"
@@ -5538,138 +5618,138 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\"鍵IDではありません: スキップします\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "%d本の鍵を%sから更新\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "*警告*: 鍵%sを%s経由で更新できません: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "鍵\"%s\"が鍵サーバに見つかりません\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "鍵が鍵サーバに見つかりません\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "鍵%sを%sからサーバ%sに要求\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "鍵%sを%sに要求\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "鍵サーバがわかりません\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\"をスキップしました: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "鍵%sを%sへ送信\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "鍵を'%s'から要求\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "*警告*: URI %s からデータを取れません: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "変な長さの暗号化済みセッション鍵 (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 暗号化済みセッション鍵\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "不明のダイジェスト・アルゴリズムで生成されたパスフレーズ %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "公開鍵は%sです\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公開鍵による暗号化済みデータ: 正しいDEKです\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-ビット%s鍵, ID %s, 日付%sに暗号化されました\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s鍵, ID %sで暗号化されました\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公開鍵の復号に失敗しました: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "*警告*: 複数のプレインテクストが見られます\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu 個のパスフレーズで暗号化\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 個のパスフレーズで暗号化\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s暗号化済みデータを仮定\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA暗号方式は利用不能なので、楽天的ですが%sで代用しようとしています\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "*警告*: メッセージの完全性は保護されていません\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5679,271 +5759,271 @@
 "このメッセージはおそらく正当でしょう。当時、整合性の保護機能は\n"
 "広く使われてはいなかったためです。\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "それでも復号するにはオプション '%s' を使います。\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "復号は強制的に失敗とされました!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "復号に成功\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復号に失敗しました: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意: 送信者は\"極秘とする\"ように求めています\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "元のファイル名='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "署名が見つかりません\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\"からの*不正な*署名"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\"からの期限切れの署名"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"からの正しい署名"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "署名の検証を省略\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "このあいまいな署名データは取り扱えません\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%sに施された署名\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s鍵%sを使用\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%sに%s鍵ID %sで施された署名\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               発行者\"%s\"\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "以下に鍵があります: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注意: この情報を利用するには '%s' を使ってください\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[不確定]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                別名\"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "*警告*: この鍵は%sモードでの署名に適しません!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "期限切れの署名 %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "この署名は%sで期限切れとなります\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "バイナリ"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "不明の"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr "、鍵アルゴリズム "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "署名を検査できません: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "分遣署名でありません\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "クラス0x%02xのスタンドアロン署名\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "古い形式 (PGP 2.x) の署名\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "'%s'のfstatが%sで失敗しました: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)が%sで失敗しました: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "*警告*: 実験的公開鍵アルゴリズム%sを使用します\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "*警告*: Elgamal署名+暗号化鍵は廃止されています\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "*警告*: 実験的暗号アルゴリズム %s を使用します\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "*警告*: 実験的ダイジェスト・アルゴリズム %sを使用\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "*警告*: ダイジェスト・アルゴリズム %s は廃止されています\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "注意: アルゴリズム %s を用いた署名は拒否されました\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "注意: アルゴリズム %s を用いた第三者の鍵への署名は拒否されました\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(報告されたエラー: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(報告されたエラー: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(より詳細な情報: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 廃止されたオプション\"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "*警告*: \"%s\"は、廃止されたオプションです\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "\"%s%s\"を代わりに使ってください\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "*警告*: \"%s\" は、廃止されているコマンドです - 使わないでください\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: \"%s\"は、このファイルで使われなくなりました - %sになんの効果もありま"
 "せん\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -5951,36 +6031,36 @@
 "*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もあり"
 "ません\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "無圧縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "無圧縮|なし"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "このメッセージは、%sでは使用できません\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "あいまいなオプション'%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "不明のオプション'%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "不明の弱いダイジェスト'%s'\n"
@@ -6013,71 +6093,71 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "署名されたデータが'%s'にあると想定します\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "公開鍵のアルゴリズム%dは、取り扱えません\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "*警告*: 潜在的にセキュアでない共通鍵暗号化セッション鍵です\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "不明なクリティカルな署名注釈: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "エージェントに問題: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "パスフレーズを入力\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "ユーザによる取消し\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主鍵ID %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "OpenPGPの秘密鍵のロックを解除するためにパスフレーズを入力してください:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "OpenPGPの秘密鍵をインポートするためにパスフレーズを入力してください:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "OpenPGPの秘密副鍵をエクスポートするためにパスフレーズを入力してください:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "OpenPGPの秘密鍵をエクスポートするためにパスフレーズを入力してください:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "選択したOpenPGP副鍵を本当に永久に削除しますか? (y/N) "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "選択したOpenPGP秘密鍵を本当に永久に削除しますか? (y/N) "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6133,7 +6213,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "この写真は正しいですか (y/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "フォトIDが表示不能!\n"
@@ -6429,12 +6509,12 @@
 msgid "no valid addressees\n"
 msgstr "有効な宛先がありません\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注意: 鍵%sには %s の機能がありません\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
@@ -6488,27 +6568,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "終了。匿名の受取人用です。\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEKの旧式エンコーディングは、サポートしていません\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "暗号アルゴリズム%d%sは不明か使用禁止です\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "*警告*: 暗号アルゴリズム%sは受取人の優先指定に入っていません\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "注意: 秘密鍵%sは%sで期限切れとなります\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "注意: 鍵は失効済みです"
@@ -6699,7 +6779,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "*警告*: 署名のダイジェストが、メッセージと衝突します\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "鍵%sを署名のために%sモードで使うことはできません\n"
@@ -6756,27 +6836,27 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "注意: 鍵 %s は失効済みです\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "鍵%sによる不正な鍵への署名: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "鍵%sによる不正なデータへの署名: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "不明のクリティカル・ビットのため、鍵%sによる署名を不正とみなします\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "鍵%s: 副鍵失効署名に対する副鍵がありません\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "鍵%s: 副鍵対応への署名に対する副鍵がありません\n"
@@ -6799,12 +6879,12 @@
 "unexpanded.\n"
 msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s署名。署名者:\"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6812,12 +6892,12 @@
 "*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
 "ます\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "署名:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s暗号化を使用します\n"
@@ -6843,7 +6923,7 @@
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信用レコード%lu, 型%d: 書き込みに失敗しました: %s\n"
@@ -6888,12 +6968,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "'%s'で読み込みエラー: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信用データベース: 同期に失敗しました: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "'%s'のロックを作成できません\n"
@@ -6903,12 +6983,12 @@
 msgid "can't lock '%s'\n"
 msgstr "'%s'がロックできません\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信用データベース レコード%lu: シークに失敗しました: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信用データベース レコード%lu: 書き込みに失敗しました (n=%d): %s\n"
@@ -6923,103 +7003,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ディレクトリがありません!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "'%s'にアクセスできません: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 無効な信用データベースを作成\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 信用データベースができました\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "注意: 信用データベースが、書き込み不能です\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無効な信用データベース\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: ハッシュ表の作成に失敗しました: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: バージョン・レコードの更新エラー: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: バージョン・レコードの読み込みエラー: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: バージョン・レコードの書き込みエラー: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信用データベース: シークに失敗しました: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信用データベース: 読み込みに失敗しました (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 信用データベース・ファイルではありません\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: レコード番号%lu番のバージョン・レコード\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無効なファイル・バージョン%d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 空きレコードの読み込みエラー: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ディレクトリ・レコードの書き込みエラー: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: レコードの初期化に失敗しました: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: レコードの追加に失敗しました: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "エラー: 信用データベースが壊れています。\n"
@@ -7367,125 +7447,125 @@
 msgstr ""
 "*警告*: %s に暗号化します。失効していないユーザIDが一つもないものです\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s'は、有効な大型鍵IDでありません\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "鍵%s: 信用する鍵として受理しました\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "鍵%sが信用データベースに複数あります\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "鍵%s: 信用される鍵の公開鍵がありません - スキップします\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "鍵%sを究極的に信用するよう記録しました\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信用レコード%lu, リクエスト型%d: 読み込みに失敗しました: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信用レコード%luが要求された型%dではありません\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "trustdbを下記のコマンドで再生成することを試すことができます:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "もし、それがうまくいかなかったら、マニュアルをご覧ください\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを仮定\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s信用モデルを使用\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "信用データベースの検査は、不要です\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "次回の信用データベース検査は、%sです\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "信用モデル'%s'で信用データベースの検査は、不要です\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "信用モデル'%s'で信用データベースの更新は、不要です\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "公開鍵%sが見つかりません: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdbを実行してください\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "信用データベースの検査\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d個の鍵を処理"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (うち%d本の有効性数をクリア)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "究極的に信用する鍵が見つかりません\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深さ: %d  有効性: %3d  署名: %3d  信用: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7597,107 +7677,122 @@
 "形式:  kbxutil [オプション] [ファイル]\n"
 "Keyboxデータを一覧、エクスポート、インポート\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%s番号: %s%%0A保持者: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "残された試行回数: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||新しいPINを認定署名を生成する鍵のために入力してください。"
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||PINを標準の鍵のために入力してください。"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSAのモジュラスがないか、%dビットのものではありません\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA公開指数がないか %d ビットより大きすぎます\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PINコールバックがエラーを返しました: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPINが変更されていません\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|新しいPINを標準の鍵のために入力してください。"
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||PINを標準の鍵のために入力してください。"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|標準の鍵の新しいPIN Unblocking Code (PUK)を入力してください。"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|標準の鍵のPIN Unblocking Code (PUK)を入力してください。"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|新しいPINを認定署名を生成する鍵のために入力してください。"
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||新しいPINを認定署名を生成する鍵のために入力してください。"
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|NP|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|P|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "新しいPINの取得エラー: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "指紋の保管に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "生成日の保管に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "カードからCHVステイタスの取得でエラー\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "応答にRSAのモジュラスが含まれていません\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "応答にRSA公開指数が含まれていません\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "応答に楕円曲線の公開鍵が含まれていません\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "応答に公開鍵データが含まれていません\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "公開鍵の読み込みに失敗しました: %s\n"
@@ -7705,56 +7800,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s番号: %s%%0A保持者: %s%%0Aカウンタ: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%s番号: %s%%0A保持者: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "残された試行回数: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "デフォルトPINを%sとして使います\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "デフォルトのPIN %s を使うのに失敗しました: %s - これ以上デフォルトとしての使"
 "用を無効とします\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||カードをアンロックしてください"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%dの認証に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "カードが永久にロックされてます!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7763,24 +7846,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|管理者PINを入力してください"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管理コマンドへのアクセスが設定されていません\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||PINを入力してください"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||カードのリセット・コードを入力してください"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "リセット・コードが短すぎます。最短の長さは%dです。\n"
@@ -7788,119 +7871,119 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|新しいリセット・コード"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新しい管理者PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|新しいPIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||管理者PINと新しい管理者PINを入力してください"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||PINと新しいPINを入力してください"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "アプリケーション・データの読み込みエラー\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "フィンガープリントのデータ・オブジェクトの読み込みエラー\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "鍵はもうあります\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既存の鍵は置き換えられます\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "新しい鍵を生成\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "新しい鍵を書き込み\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "作成時刻スタンプがありません\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA素数 %s がありません、または%dビットのものではありません\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "鍵の保管に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "サポートされていない曲線\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "鍵生成の間、お待ちください ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "鍵の生成に失敗しました\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "鍵の生成が完了しました (%d秒)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGPカードに無効な構造 (データ・オブジェクト 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "カードのフィンガープリントが要求されたものと一致しません\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "これまでに作成された署名: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@ -7916,55 +7999,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|初期の新しいPIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|FILEにログを書き出します"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|ポートNのリーダに接続します"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|ct-APIドライバとしてNAMEを用います"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|PC/SCドライバとしてNAMEを用います"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "内蔵CCIDドライバを使いません"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|N秒アクティブでない場合、カードへの接続を切ります"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "リーダのピンパッドを使わない"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "管理カード・コマンドの使用を拒否"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "ピンパッドの可変長入力を使う"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "使い方: @SCDAEMON@ [オプション] (ヘルプは -h)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -7972,311 +8055,328 @@
 "形式: scdaemon [オプション] [コマンド [引数]]\n"
 "@GNUPG@のSmartcardデーモン\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
 "い\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %dのハンドラが開始されました\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %dのハンドラが終了しました\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "証明書から以下の検証モデルが要求されました: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "クリティカルな証明書の拡張%sはサポートされていません"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "発行者の証明書がCAとしてマークされていません"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "コンフィグされたポリシーなしにクリティカルにマークされたポリシー"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "'%s'が開けません: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "注意: クリティカルでない証明書ポリシーは認められません"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "証明書ポリシーは認められません"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "フィンガープリントの取得に失敗しました\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "発行者の外部ロケーションを調べています\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "マッチする発行者の数: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "authorityInfoAccessを取得できません: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngrキャッシュから発行者を調べています\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "マッチする証明書の数: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngrのキャッシュだけの鍵探索に失敗しました: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "keyDBハンドルの確保に失敗しました\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "証明書は失効済みです"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "証明書のステイタスは不明です"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\" が正しくインストールされていることを確認してください\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRLの検査に失敗しました: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "無効の妥当性の証明書: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "証明書はまだ有効ではありません"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "ルート証明書がまだ有効ではありません"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "中間証明書はまだ有効ではありません"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "証明書が有効期限を過ぎています"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "ルート証明書が有効期限を過ぎています"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "中間証明書が有効期限を過ぎています"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "必要な証明書の属性がありません: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "妥当性が無効な証明書"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "証明書のライフタイムの間に署名が作られていません"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "発行者のライフタイムの間に証明書が作られていません"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "発行者のライフタイムの間に中間証明書が作られていません"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  署名、作成"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "   (証明書、作成"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (     証明書、有効"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     発行者、有効"
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "フィンガープリント=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "ルート証明書は信用すると今、マークされました\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "インタラクティブに信用するとマークすることがgpg-agentで有効となっていません\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "インタラクティブに信用するとマークすることはこのセッションでは無効となってい"
 "ます\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "*警告*: 署名の作成時間が不明です - 現在時刻を仮定します"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "証明書の発行者がありません"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "自己署名証明書に*不正な*署名があります"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "ルート証明書が信用できるとマークされていません"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "信用リストの検査に失敗しました: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "証明書のチェインが長すぎます\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "発行者証明書が見つかりません"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "証明書に*不正な*署名があります"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "別の一致する可能性があるCA証明書が見つかりました - 再度試します"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "証明書のチェインがCAにより認められたもの(%d)より長くなっています"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "証明書は正しいです\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中間証明書は正しいです\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "ルート証明書は正しいです\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "チェイン・モデルに切り替えました"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用した検証モデル: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%uビットハッシュは%uビットの%s鍵には無効です\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "メモリがありません\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(これはMD2アルゴリズムです)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "none"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[エラー: 無効なエンコーディング]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[エラー - メモリがありません]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[エラー - 名前なし]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[エラー: 無効な DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8291,137 +8391,137 @@
 "S/N %s, ID 0x%08lX,\n"
 "作成 %s, 有効期限 %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "鍵の使い方が指定されていません - すべての使い道を仮定します\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "鍵使用情報の取得エラー: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "証明書は証明のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "証明書はOCSP応答の署名のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "証明書は暗号化のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "証明書は署名のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "証明書は暗号化のために使えません\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "証明書は署名のために使えません\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "行 %d: 無効なアルゴリズムです\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "行 %d: 無効な鍵長 %u (%d から %dが有効)です\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "行 %d: サブジェクト名がありません\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "行 %d: 無効なサブジェクト名ラベル'%.*s'です\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "行 %d: 無効なサブジェクト名'%s'(位置: %d)です\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "行 %d: 有効な電子メール・アドレスではありません\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "行 %d: 無効なシリアル番号です\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "行 %d: 無効なサブジェクト名ラベル'%.*s'です\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "行 %d: 無効なサブジェクト名'%s'(位置: %d)です\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "行 %d: 無効な日付が与えられました\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "行 %d: keygrip'%s'から鍵の取得エラー: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "行 %d: 無効なハッシュ・アルゴリズムです\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "行 %d: 無効なauthority-key-idです\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "行 %d: 無効なsubject-key-idです\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "行 %d: 無効な拡張構文です\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "行 %d: カードから鍵'%s'の読み込みエラー: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "行 %d: keygrip'%s'から鍵の取得エラー: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "行 %d: 鍵の生成に失敗しました: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8554,7 +8654,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "証明書'%s'が見つかりません: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "keyboxのロックのエラー: %s\n"
@@ -8579,123 +8679,123 @@
 msgid "no valid recipients given\n"
 msgstr "有効な受け取り手が指定されていません\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "外部鍵を一覧する"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "証明書のチェインを表示する"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "証明書をインポートする"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "証明書をエクスポートする"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "スマートカードを登録する"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "dirmngrにコマンドを渡す"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-toolを起動する"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "base-64形式の出力を作成"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "PEMフォーマットの入力を仮定する"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "base-64フォーマットの入力を仮定する"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "バイナリ・フォーマットの入力を仮定する"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "決してCRLを調べない"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "OCSPを用いて有効性を確認する"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|インクルードする証明書の数"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|ポリシー情報をFILEから取得する"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "証明書ポリシーをチェックしない"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "紛失している発行者証明書を取得する"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "端末をまったく使わない"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|サーバ・モードのログをFILEに書き出す"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|監査ログをFILEに書き出す"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "バッチ・モード: なにもユーザに問い合わせない"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "ほとんどの設問にyesを仮定する"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "ほとんどの設問にnoを仮定する"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|鍵リングを鍵リングのリストに追加"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|このキーサーバを鍵の検索に使う"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "使い方: @GPGSM@ [オプション] [ファイル] (ヘルプは -h)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8705,47 +8805,47 @@
 "S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
 "デフォルトの操作は、入力データに依存します\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注意:'%s'に対して暗号化できません: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "不明の検証モデル '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: ホスト名が指定されていません\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: この行はスキップ\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "鍵サーバのURLを解析不能\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "共通証明書のインポート・エラー: %s\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "'%s'を用いて署名できません: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
@@ -8765,7 +8865,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本証明書チェックが失敗しました - インポートされませんでした\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "保存されたフラグの取得エラー: %s\n"
@@ -8775,42 +8875,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "証明書のインポート・エラー: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "入力読み込みエラー: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "フィンガープリントの取得に失敗しました\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "既存の証明書の検索の問題: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "書き込み可能keyDBの判定エラー: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "証明書保存エラー: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "証明書の再検索の問題: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "フラグの保存エラー: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "エラー - "
 
@@ -8846,7 +8941,7 @@
 "\n"
 "%s%s本当にこれを望みますか?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8883,39 +8978,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "適正な認定証明書の検査に失敗しました: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "施された署名 "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[日時指定なし]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " 証明書 ID 0x%08lXを用います\n"
+msgid "algorithm:"
+msgstr "アルゴリズム:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "無効な署名: メッセージ・ダイジェストの属性が計算されたものと一致しません\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "正しい署名"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "      別名"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "これは認定署名です\n"
@@ -8983,274 +9078,273 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "証明書'%s'の読み込みエラー: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "永続的にロードされる証明書: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "実行時キャッシュ証明書の数: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           信用された証明書の数: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "   すでにキャッシュされた証明書\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "キャッシュされた証明書\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "証明書のキャッシュのエラー: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "無効なSHA1フィンガープリント文字列'%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "S/Nでの証明書取得エラー : %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "サブジェクトでの証明書取得エラー: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "証明書に発行者がみつかりません\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "authorityKeyIdentifierの取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "ディレクトリ'%s'の作成\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "ディレクトリ'%s'の作成エラー: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "データベース・ディレクトリ'%s'を無視します\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "ディレクトリ'%s'の読み込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "キャッシュ・ファイル' %s'の削除\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "ファイル'%s'を削除しません\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "キャッシュ・ファイルでクローズのエラー: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "キャッシュ・ディレクトリ・ファイル'%s'が開けません: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'の作成エラー: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'の書き込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'でクローズのエラー: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'ができました\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "キャッシュ・ディレクトリ・ファイル'%s'が再オープンできません: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "最初のレコード'%s'はそのバージョンではありません。\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "古いバージョンのキャッシュ・ディレクトリ - きれいにします\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "古いバージョンのキャッシュ・ディレクトリ - あきらめます\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "crlレコードの'%s'に行 %u で余分なフィールドが検出されました\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "'%s' (行 %u)で無効な行\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "'%s' (行 %u)で重複したエントリ\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "サポートしていないレコード型 '%s' を行 %u でスキップしました\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "'%s'の無効な発行者ハッシュ(行 %u)\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "'%s'で発行者DNがありません(行 %u)\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "'%s'の無効なタイムスタンプ(行 %u)\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "*警告*: '%s'で無効なキャッシュ・ファイル・ハッシュ(行 %u)\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "キャッシュ・ディレクトリ・ファイルの検出エラー\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "理由を確認し、手動でそのファイルを削除してください\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "一時キャッシュ・ディレクトリ・ファイル'%s'が作成できません: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "'%s'でクローズのエラー: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "'%s'から'%s'へ名前変更のエラー: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "'%s'をハッシュできません: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "MD5ハッシュ・コンテクストの設定エラー: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "'%s'でハッシュのエラー: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "'%s'に対する無効な形式のチェックサム\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 "キャッシュ・ファイルを多くオープンしすぎです。これ以上オープンできません\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "キャッシュ・ファイル'%s'を開く\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "キャッシュ・ファイル'%s'を開く際、エラー: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "キャッシュ・ファイル '%s' の初期化エラー、読み込み: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "unlock_db_file のクローズしたファイルへの呼び出し\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "unlock_db_fileのロックしてないファイルへの呼び出し\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "新しいキャッシュ・オブジェクトを作成するのに失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "発行者ID%sに対してCRLはありません\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "キャッシュされたCRLの発行者ID %s が古すぎます。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9258,195 +9352,197 @@
 msgstr ""
 "force-crl-refreshが有効で%d分が発行者ID%sに経過しました。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refreshが発行者ID%sに対し有効です。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "発行者ID%sに対する利用可能なCRLが使用できません\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "発行者ID%sに対するキャッシュされたCRLが変更されています。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "**警告**: S/Nに対する無効なキャッシュ・レコード長"
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "S/N %sに対するキャッシュ・レコードを読み込む際の問題: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s は無効です。理由=%02X 日付=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %sは有効です。CRLに載っていません\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "キャッシュ・ファイルからデータの取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "不明なハッシュ・アルゴリズム'%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "アルゴリズム%dのgcry_md_openが失敗: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "libksbaから無効なS-式を取得しました\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "S式の変換に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "不明なハッシュ・アルゴリズム'%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "アルゴリズム%dのgcry_md_openが失敗: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "S式の作成に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "CRLの更新時刻の取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "このCRLの更新時刻: これ=%s 次=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdateが与えられていません。一日の有効期間を仮定します\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "CRL項目の取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "一時キャッシュ・ファイルに項目の挿入エラー: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRLに発行者がありません: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "CRL発行証明書をauthorityKeyIdentifierで見つけます\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL署名の検証に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "CRL発行者証明書の検証検査エラ−: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new が失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader が失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "古い一時キャッシュ・ファイル'%s'を削除しました\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "古い一時キャッシュ・ファイル'%s'が削除の問題: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'の作成エラー: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert が失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'の終了エラー: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'のクローズ・エラー: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "**警告**: 新しいCRLはまだ古すぎます。%sに期限がきています - それでも読み込み"
 "ます\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新しいCRLはまだ古すぎます。%sに期限がきています\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "不明のクリティカルCRLの拡張 %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "CRL拡張の読み込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "キャッシュ・ファイル'%s'の作成\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "'%s'から'%s'へ名前変更の問題: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9455,65 +9551,65 @@
 "DIRファイルの更新の失敗 - キャッシュ・エントリは次のプログラムの開始で失われ"
 "ます\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "CRLダンプの開始 (%s から取得)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr "*エラー*: CRLは使用されません。更新後でも、古すぎるからです!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr "*エラー*: CRLは不明なクリティカル拡張のため使用されません!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr "*エラー*: CRLは使用されません\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr "*エラー*: このキャッシュされたCRLは変更されているかもしれません!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "*警告*: 無効なキャッシュ・レコード長\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "キャッシュ・レコードの読み込みの問題: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "キャッシュ鍵の再読み込みの問題: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "dbからキャッシュ・エントリの読み込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "CRLダンプの終了\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "DPからcrl_fetchが失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "DPからcrl_cache_insertが失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "発行者からcrl_cache_insertが失敗しました: %s\n"
@@ -9551,56 +9647,56 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "禁止されているため、証明書の探索ができません: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "OCSPをCRLの代わりに使います"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "dirmngrが動いているかどうか確認します"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "証明書をキャッシュに追加します"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "証明書を検証する"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "証明書を探索する"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "ローカルに保持された証明書だけを探索します"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "--lookupにはURLがきます"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "dirmngrにCRLをロードする"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "Squidのための特別なモード"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "証明書はPEM形式を期待します"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "デフォルトOCSP応答の使用を強制します"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "使い方: dirmngr-client [オプション] [証明書ファイル|パターン] (ヘルプは -h)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9612,82 +9708,82 @@
 "プロセスは証明書が有効の場合、0を返し、有効でない場合、1 を返す。\n"
 "一般の失敗の場合、そのほかのエラーコードを返す\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "stdinから証明書読み込みエラー: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "'%s'から証明書の読み込みエラー: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "証明書は意味のあるものとしては大きすぎます\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "dirmngrへ接続できません: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "検索に失敗しました: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "CRL'%s'の読み込みが失敗しました: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "dirmngr daemonが起動され動いています\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "証明書の検証に失敗しました: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "証明書は正しいです\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "証明書は失効済みです\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "証明書の検査に失敗しました: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "ステイタス'%s'を取得しました\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "base64エンコーディングの書き込みエラー: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "サポートされていない問い合わせ: '%s'\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "絶対ファイル名がきます\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "'%s'を検索します\n"
@@ -9712,92 +9808,92 @@
 msgid "flush the cache"
 msgstr "キャッシュをフラッシュします"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "ユーザに問い合わせせずに実行"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "期日の過ぎたCRLのロードを強制する"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "OCSP要求の送信を認める"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "オンラインのソフトウェア・バージョン・チェックを許す"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "HTTPの使用を禁止する"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "LDAPの使用を禁止する"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "HTTP CRL配布ポイントを無視する"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "LDAP CRL配布ポイントを無視する"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "OCSPサービスURLに入っている証明書を無視する"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "--ldap-proxy にフォールバック・ホストを使わない"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|LDAPのタイムアウトをN秒とする"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|OCSP応答としてURLを使用"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|FPRで署名されたOCSPレスポンス"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "ネットワーク・トラフィックをすべてTor経由にする"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9806,11 +9902,11 @@
 "@\n"
 "(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9818,132 +9914,132 @@
 "形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有効なdebugレベルは: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "使い方: %s [オプション] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "コロンはソケット名に許されません\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s'からCRLの取得の失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s'からCRLの処理に失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行が長すぎます - スキップされました\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 読み込みエラー: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 行末のゴミを無視\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERMを受け取り - シャットダウン...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "強制的にシャットダウンする\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "シグナル%dを受け取り - アクションは定義されない\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "レコード形式ですべての値を返す"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|host部分を無視してNAMEをとおして接続する"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|ホストNAMEに接続する"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|ポートNに接続します"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|ユーザNAMEを認証に使う"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|パスワードPASSを認証に使う"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "パスワードを$DIRMNGR_LDAP_PASSから取ってくる"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|DN STRINGをクエリする"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|STRINGをフィルタ式に使う"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|STRINGの属性を返す"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "使い方: dirmngr_ldap [オプション] [URL] (ヘルプは -h)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -9953,144 +10049,138 @@
 "Dirmngrの内部LDAPヘルパー\n"
 "インタフェースとオプションは事前の通知なく変更されることがあります\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "無効なポート番号 %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "属性'%s'のスキャン結果\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "stdoutへの書き込みエラー: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          利用可能な属性'%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "属性'%s'が見つかりません\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "属性'%s'が見つかりました\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "url'%s'を処理\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "        ユーザ '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "                パスワード '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "        ホスト '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "        ポート %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "                DN '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        フィルタ '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "         属性 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "'%s'にホスト名がありません\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "クエリ '%s' に属性が指定されていません\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "*警告*: 最初の属性だけを使っています\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "'%s:%d'のLDAP初期化に失敗: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "'%s:%d'のバインドに失敗: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "'%s'の探索に失敗しました: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s'は、LDAP URLではありません\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' は無効なLDAP URLです\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "'%s'へアクセスのエラー: httpステイタス %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL'%s' は '%s' (%u) へリダイレクトされました\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "リダイレクトが多すぎます\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "リダイレクトが'%s'に変更されました\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "メモリの確保のエラー: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10141,7 +10231,7 @@
 msgid "malloc failed: %s\n"
 msgstr "mallocが失敗しました: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: 無効なパターン '%s'\n"
@@ -10271,11 +10361,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "OCSPコンテクストの確保に失敗しました: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "authorityInfoAccessを取得できません: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10344,7 +10429,7 @@
 msgstr "serialnoがcert IDにありません"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquireに失敗しました: %s\n"
@@ -10374,32 +10459,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d を越えました\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "制御構造を確保できません: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "assuanコンテクストの確保に失敗しました: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "サーバの初期化に失敗しました: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Assuanで登録コマンドに失敗しました: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept の問題: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuanの処理が失敗しました: %s\n"
@@ -10437,56 +10522,56 @@
 msgid "certificate chain is good\n"
 msgstr "証明書チェインは正しいです\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "おとなしく"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "16進でエンコードしてデータ出力を表示する"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "受信したデータ行をデコードする"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "dirmngrへ接続"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Assuanのソケット名NAMEに接続する"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|ADDRのAssuanサーバに接続する"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "コマンド・ラインで与えられたAssuanサーバを実行する"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "拡張接続モードを使わない"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|起動時にFILEからコマンドを実行する"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "起動時に /subst を実行する"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "使い方: @GPG@-connect-agent [オプション] (ヘルプは -h)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10494,43 +10579,43 @@
 "形式: @GPG@-connect-agent [オプション]\n"
 "実行中のagentに接続し、コマンドを送る\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "オプション\"%s\"はプログラムとオプショナルの引数を要します\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "オプション\"%s\"は\"%s\"のため無視されました\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "行の受信に失敗しました: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "行が長すぎます - スキップされました\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "組込みのNulキャラクタのため行は短くされました\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "不明のコマンド'%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "行の送信に失敗しました: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "標準オプションを送信エラー: %s\n"
@@ -10717,94 +10802,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "注意: \"%s%s\"コマンドを使って詳細を得てください。\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "コンポーネント%sの外部の検証が失敗しました"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "グループ仕様は無視されていることに注意してください\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "'%s'でクローズのエラー\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "'%s'でパーズのエラー\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "すべてのコンポーネントをリストする"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "すべてのプログラムをチェックする"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|オプションをリストする"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|オプションを変更する"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|オプションをチェックする"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "グローバル・デフォルト値を適用する"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|FILEを使ってコンフィグレーション・ファイルを更新する"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "@GPGCONF@のためにコンフィグレーション・ディレクトリを取得する"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "グローバルのコンフィグレーション・ファイルをリストする"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "グローバルのコンフィグレーション・ファイルをチェックする"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "ソフトウェア・バージョン・データベースに問い合わせる"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "指定されたコンポーネントを起動する"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "指定されたコンポーネントをkillする"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "出力ファイルとして使用"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "可能な場合、実行時に変更を有効とする"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "使い方: @GPGCONF@ [オプション] (ヘルプは -h)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10812,202 +10897,150 @@
 "形式: @GPGCONF@ [オプション]\n"
 "@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "一つコンポーネント引数が必要です"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "コンポーネントが見つかりません"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "引数は許可されていません"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "使い方: gpg-check-pattern [オプション] patternfile (ヘルプは -h)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"@コマンド:\n"
-" "
+"形式: gpg-check-pattern [オプション] パターンファイル\n"
+"パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "復号方式"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr ""
+#~ "注意: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "暗号方式"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "@コマンド:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "ツール・クラス (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "復号方式"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "program [ファイル名]"
+#~ msgid "encryption modus"
+#~ msgstr "暗号方式"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "秘密鍵ファイル (必須)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "ツール・クラス (confucius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "入力ファイル名 (デフォルト stdin)"
+#~ msgid "program filename"
+#~ msgstr "program [ファイル名]"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "使い方: symcryption [オプション] (ヘルプは -h)"
+#~ msgid "secret key file (required)"
+#~ msgstr "秘密鍵ファイル (必須)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"形式: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [オプショ"
-"ン...] COMMAND [入力ファイル]\n"
-"シンプルな共通鍵暗号ツールを呼び出す\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "入力ファイル名 (デフォルト stdin)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s (%s の)がステイタス%iで中止されました\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "使い方: symcryption [オプション] (ヘルプは -h)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s (%s の)がステイタス%iで失敗しました\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "形式: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [オプ"
+#~ "ション...] COMMAND [入力ファイル]\n"
+#~ "シンプルな共通鍵暗号ツールを呼び出す\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "一時ディレクトリ'%s'が作成できません: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s (%s の)がステイタス%iで中止されました\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%sを書き込みでオープンできませんでした: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s (%s の)がステイタス%iで失敗しました\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "'%s'の書き込みエラー: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "一時ディレクトリ'%s'が作成できません: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "'%s'の読み込みエラー: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%sを書き込みでオープンできませんでした: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "'%s'でクローズのエラー: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "'%s'の書き込みエラー: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "--programオプションが指定されていません\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "'%s'の読み込みエラー: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "--decryptと--encryptだけがサポートされています\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "'%s'でクローズのエラー: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "--keyfileオプションが与えられていません\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "--programオプションが指定されていません\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "引数ベクタが確保できません\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "--decryptと--encryptだけがサポートされています\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "パイプが作成できませんでした: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "--keyfileオプションが与えられていません\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "ptyが作成できませんでした: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "引数ベクタが確保できません\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "fork できませんでした: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "パイプが作成できませんでした: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv が失敗しました: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "ptyが作成できませんでした: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select が失敗しました: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "fork できませんでした: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read が失敗しました: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv が失敗しました: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty read が失敗しました: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select が失敗しました: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid が失敗しました: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "read が失敗しました: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "子プロセスがステイタス %i で中止されました\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty read が失敗しました: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "infileの文字列が確保できません: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid が失敗しました: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "outfileの文字列を確保できません: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "子プロセスがステイタス %i で中止されました\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "%s か %s のどちらかが与えられる必要があります\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "infileの文字列が確保できません: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "クラスが与えられていません\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "outfileの文字列を確保できません: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "クラス%sはサポートされていません\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "%s か %s のどちらかが与えられる必要があります\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "使い方: gpg-check-pattern [オプション] patternfile (ヘルプは -h)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "クラスが与えられていません\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"形式: gpg-check-pattern [オプション] パターンファイル\n"
-"パターンファイルに対して標準入力のパスフレーズを確認する\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "クラス%sはサポートされていません\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " 証明書 ID 0x%08lXを用います\n"
 
 #~ msgid "male"
 #~ msgstr "男"
@@ -11110,38 +11143,6 @@
 #~ msgid "Error: Private DO too long (limit is %d characters).\n"
 #~ msgstr "エラー: プライベート DOが長すぎます (上限%d文字)。\n"
 
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr ""
-#~ "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
-
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr ""
-#~ "サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: "
-#~ "%s.\n"
-
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "(順番を変えた署名が続きます)"
-
-#~ msgid "key %s:\n"
-#~ msgstr "鍵  %s:\n"
-
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "%d個の重複した署名が除去されました\n"
-
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "%d個の正しい署名\n"
-
-#~ msgid ""
-#~ "Warning: errors found and only checked self-signatures, run '%s' to check "
-#~ "all signatures.\n"
-#~ msgstr ""
-#~ "警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を"
-#~ "確認ください。\n"
-
 #~ msgid ", "
 #~ msgstr ", "
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/nb.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/nb.gmo sont différents
diff -Nru gnupg2-2.2.20/po/nb.po gnupg2-2.2.27/po/nb.po
--- gnupg2-2.2.20/po/nb.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/nb.po	2021-01-11 18:47:18.000000000 +0100
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: Åka Sikrom <a4@hush.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -23,7 +23,7 @@
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@ -34,45 +34,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Avbryt"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ja"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nei"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Lagre i passordbehandler"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Er du sikker på at du vil gjøre passordfrasen synlig på skjermen?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Gjør passordfrase synlig"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skjul passordfrase"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -82,20 +82,20 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
 "hvordan kvaliteten vurderes."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Skriv inn PIN-kode slik at hemmelig nøkkel kan låses opp for denne økta"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -103,17 +103,17 @@
 "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
 "gjeldende økt"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "feil. Prøv igjen"
 
@@ -121,36 +121,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøk %d av %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Gjenta:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "For lang PIN"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "For lang passordfrase"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "Koden er for kort"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Ugyldig passordfrase"
 
@@ -159,31 +163,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "klarte ikke å lage «%s»: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -244,7 +248,7 @@
 "Skriv inn passordfrase som skal brukes til å beskytte mottatt hemmelig nøkkel"
 "%%0A   %s%%0A   %s%%0Ai nøkkellageret for gpg-agent"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke å lage strøm av sokkel: %s\n"
@@ -372,17 +376,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Advarsel: du har skrevet inn en svak passordfrase."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -390,132 +394,132 @@
 "@Valg:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "kjør som bakgrunnsprosess («daemon»)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "kjør i «supervised» modus"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "detaljert utskrift"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|les valg fra valgt FIL"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "ikke løsne fra konsoll"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "bruk loggfil for tjeneren"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "ikke bruk SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|godta enkelte kommandoer via «NAME»"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørsler om å bytte TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørsler om å bytte X-skjerm"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "ikke bruk PIN-hurtiglager under signering"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ikke la klienter tillitsmarkere nøkler"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "tillat valg av passordfrase på forhånd"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "ikke la kaller overstyre PIN-inntasting"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "la brukeren skrive inn passordfrase via Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "slå på ssh-støtte"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "slå på støtte for putty"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter programfeil til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -523,147 +527,135 @@
 "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
 "Håndtering av hemmelige nøkler for @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "valgfil «%s»: %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Merk: «%s» regnes ikke som et valg\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet «%s» er for langt\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent kjører allerede. Lar være å starte en ny\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "feil under henting av sokkel-anledning\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "feil under knytning av sokkel til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel «%s»\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "klarte ikke å lage mappa «%s»: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "mappa «%s» er opprettet\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislyktes for «%s»: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "«%s» kan ikke brukes som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "feil under lesing av anledning på fd %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "startet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "startet ssh-behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet ssh-behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect mislyktes: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kjører i gjeldende økt\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Bruk: gpg-preset-passphrase [valg] NØKKELGREP («-h» for hjelp)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -671,8 +663,8 @@
 "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
 "Vedlikehold av hurtiglager for passord\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -680,9 +672,9 @@
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -692,11 +684,11 @@
 "Valg:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Bruk: gpg-protect-tool [valg] («-h» for hjelp)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -704,22 +696,22 @@
 "Syntaks: gpg-protect-tool [valg] [arg]\n"
 "Håndteringsverktøy for hemmelige nøkler\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Skriv inn passordfrase for å låse opp PKCS#12-objekt."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Skriv inn passordfrase for å låse nytt PKCS#12-objekt."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -727,18 +719,18 @@
 "Skriv inn passordfrase eller PIN-kode som\n"
 "kreves for å fullføre gjeldende handling."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "avbrutt\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil under spørring etter passordfrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "feil under åpning av «%s»: %s\n"
@@ -748,32 +740,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fil «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrykk «%s» ignorert i «%s», linje %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system-tillitsliste «%s» er ikke tilgjengelig\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldig fingeravtrykk i «%s», linje %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldig nøkkelvalg i «%s», linje %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "feil under lesing av «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
@@ -786,7 +778,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -795,11 +787,11 @@
 "Stoler du fullstendig på at%%0A  «%s»%%0Asertifiserer brukersertifikater "
 "korrekt?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Nei"
@@ -812,7 +804,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -822,21 +814,21 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Riktig"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Feil"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Merk: denne passordfrasen har aldri blitt endret.%0AEndre den umiddelbart."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -845,15 +837,15 @@
 "Denne passordfrasen har ikke blitt endret%%0Asiden %.4s-%.2s-%.2s. Endre den "
 "umiddelbart."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Endre passordfrase"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Jeg endrer senere"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -861,11 +853,11 @@
 msgstr ""
 "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Slett nøkkel"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -874,12 +866,12 @@
 "Hvis du sletter nøkkelen, kan du miste tilgang til én eller flere eksterne "
 "maskiner."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA krever at kontrollsummen er multipliserbar med 8 bit\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s nøkkel bruker utrygg kontrollsum (%u bit)\n"
@@ -889,7 +881,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av opprettet signatur mislyktes: %s\n"
@@ -899,7 +891,7 @@
 msgid "secret key parts are not available\n"
 msgstr "hemmelige nøkkeldeler er ikke tilgjenglig\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
@@ -928,7 +920,7 @@
 msgstr "feil under opprettelse av strøm for datarør: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "feil under kopiering av prosess: %s\n"
@@ -975,27 +967,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "klarte ikke å sette opp valg for gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "klarte ikke å slå av kjernedump: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter på at fila «%s» skal bli tilgjengelig …\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
@@ -1055,7 +1047,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "kjernen ble full under tildeling av %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "feil under tildeling av minne: %s\n"
@@ -1170,7 +1162,7 @@
 msgstr "algoritme: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ustøttet algoritme: %s"
@@ -1245,39 +1237,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Rotsertifikat regnes som troverdig"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "fant ingen sertifikat-CRL"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "tilgjengelig CRL er for gammel"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL-/OCSP-sertifikatkontroll"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Inkluderte sertifikater"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Ingen elementer i revisjonslogg."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Ukjent handling"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent kan brukes"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr kan brukes"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Ingen hjelp tilgjengelig for «%s»"
@@ -1286,7 +1278,7 @@
 msgid "ignoring garbage line"
 msgstr "ignorerer ubrukelig linje"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[ingen]"
 
@@ -1295,82 +1287,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "uforventet argument"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "lesefeil"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "nøkkelord er for langt"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "argument mangler"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "ugydig argument"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "ugyldig kommando"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "ugyldig aliasdefinisjon"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "kjernen er full"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "ugyldig kommando"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "«%s» er en ukjent kommando\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "uforventet armering: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "ugyldig valg"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "valget «%.50s» mangler et argument\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "ugyldig argument for valget «%.50s»\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "valget «%.50s» skal ikke brukes med argumenter\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "kommandoen «%.50s» er ugyldig\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "valget «%.50s» er flertydig\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandoen «%.50s» er flertydig\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "kjernen er full\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "valget «%.50s» er ugyldig\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "valgfil «%s»: %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1386,42 +1410,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra «%s» til «%s» mislyktes: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "klarte ikke å lage midlertidig fil «%s»: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "feil under skriving til «%s»: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "fjerner ødelagt låsfil (laget av %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "venter på lås (holdt igjen av %d%s) %s …\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(vranglås?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lås «%s» ikke opprettet: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s …\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (krever %s, har %s)\n"
@@ -1602,13 +1625,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Merk: Bruk kommandoen «%s» for å starte dem på nytt.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s kan ikke brukes i %s-modus\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
@@ -1653,24 +1676,24 @@
 msgid "server uses an invalid certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Oppdaget OpenPGP-kortnummer %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "du kan ikke gjøres dette i buntmodus\n"
@@ -1680,136 +1703,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[ikke valgt]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: tegnet «<» kan ikke brukes.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa går ved %d tegn).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "Adresse for henting av offentlig nøkkel: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "feil under lesing av «%s»: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "feil under skriving av «%s»: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Språkoppsett: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig svar.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: feilformatert fingeravtrykk.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil under henting av nøkkelinfo: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende nøkkel? (j/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1819,107 +1842,107 @@
 "      Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
 "      det tillater hvis nøkkelgenerering mislykkes.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvor stor skal nøkkelen være? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bit\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Velg hvilken type nøkkel du vil ha:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 #| msgid "   (%d) ECC and ECC\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC og ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "feil under endring av størrelse på nøkkel %d til %u bit: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "feil under henting av nøkkelinfo: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Denne kommandoen støttes ikke av dette kortet\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "MERK: det ligger allerede nøkler på kortet.\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende nøkler? (j/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1930,172 +1953,172 @@
 "   PIN = «%s»     Admin-PIN = «%s»\n"
 "Du bør endre disse med kommandoen «--change-pin»\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Velg hvilken type nøkkel du vil lage:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "velg hvor nøkkelen skal lagres:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD mislyktes: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Merk: denne kommandoen ødelegger alle nøkler på kortet.\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 #| msgid "error looking up: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "feil under oppslag av %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "gå ut av denne menyen"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "vis admin-kommandoer"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "vis denne hjelpeteksten"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "endre adresse for å hente nøkkel"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøkkel som ligger i kortets adresse"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "endre brukernavn"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "endre språkoppsett"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "endre kortholders kjønn"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "endre CA-fingeravtrykk"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "slå av på tvungen bruk av signatur-PIN"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "lag nye nøkler"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "meny for å endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern PIN-blokkering med en tilbakestillingskode"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "ødelegg alle nøkler og data"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (prøv «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "«--output» virker ikke med denne kommandoen\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "klarte ikke å åpne «%s»\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "fant ikke nøkkelen «%s»: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2155,8 +2178,8 @@
 msgstr "undernøkkel"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
@@ -2181,37 +2204,49 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget «--delete-secret-keys» for å slette den først.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil under opprettelse av passordfrase: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "klarte ikke å bruke symmetrisk ESK-pakke på grunn av S2K-modus\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "bruker krypteringsmetode %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» er allerede komprimert\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ADVARSEL: «%s» er en tom fil\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "leser fra «%s»\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2219,18 +2254,12 @@
 "ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: nøkkel %s egner seg ikke for kryptering i %s-modus\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2239,32 +2268,32 @@
 "ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "tvungen bruk av krypt.metode %s (%d) bryter med mottakers oppsett\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: «%s»\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2272,7 +2301,7 @@
 "ADVARSEL: meldinga ble kryptert med svak nøkkel for symmetrisk "
 "krypteringsmetode.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved håndtering av kryptert pakke\n"
@@ -2365,7 +2394,7 @@
 msgstr ". Hoppet over"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "skriver til «%s»\n"
@@ -2400,262 +2429,268 @@
 msgid "[User ID not found]"
 msgstr "[Fant ikke bruker-ID]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hentet «%s» via %s automatisk\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "feil under henting av «%s» via %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Ingen fingeravtrykk"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(kontroller argument for valget «%s»)\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "alle verdier som sendes til «%s» blir ignorert\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "følgende verdier er gyldige for «%s»:\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "lag signatur"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "lag klartekst-signatur"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "lag adskilt signatur"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "krypter data (symmetrisk)"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "dekrypter data (forvalgt)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "bekreft signatur"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "vis nøkler"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "vis nøkler og signaturer"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "vis nøkler og fingeravtrykk"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "vis hemmelige nøkler"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "lag nytt nøkkelpar"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "lag nytt nøkkelpar raskt"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "legg til en ny bruker-ID raskt"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "endre utløpsdato raskt"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "fullverdig generering av nøkkelpar"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "fjern nøkler fra offentlig nøkkelknippe"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøkler fra hemmelig nøkkelknippe"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "hurtigsigner nøkkel"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "hurtigsigner nøkkel lokalt"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "opphev bruker-ID raskt"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "signer nøkkel"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "signer nøkkel lokalt"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "signer eller rediger nøkkel"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "endre passordfrase"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "eksporter nøkler"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "eksporter nøkler til nøkkeltjener"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "søk etter nøkler på nøkkeltjener"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "oppdater alle nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importer/slå sammen nøkler"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "vis kortstatus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "endre data på kort"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "endre PIN på kort"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "oppdater tillitsdatabase"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "skriv ut kontrollsum av melding"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "kjør i tjenermodus"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VERDI|endre TOFU-regler for nøkkel"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "lag ASCII-beskyttet utdata"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv utdata til valgt FIL"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "ikke utfør valgte endringer"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "spør før overskriving"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppførsel"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2663,7 +2698,7 @@
 "@\n"
 "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2683,11 +2718,11 @@
 " --list-keys [navn]         vis nøkler\n"
 " --fingerprint [navn]       vis fingeravtrykk\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2697,7 +2732,7 @@
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2705,572 +2740,561 @@
 "\n"
 "Støttede algoritmer:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Off. nøkkel: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Kryptering: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "bruk: %s [valg] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrgt eierskap til foreldermapper av hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrgt eierskap til foreldermapper av oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrgt eierskap til foreldermapper av utvidelse «%s»\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "oppsettselementet «%s» er ukjent\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "vis foto-id-er i nøkkelvisning"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "vis regeladresser i signaturvisning"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "vis alle notater i signaturvisning"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotater under signaturvisning"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brukervalgte notater under signaturvisning"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "vis opphevede og utgåtte bruker-id-er i nøkkelvisning"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "«%s» er et ukjent TOFU-regelverk\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» er en ugyldig signatur-utløpstid\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» er en ugyldig e-postadresse\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 #| msgid "invalid value for option '%s'\n"
 msgid "invalid request origin '%s'\n"
 msgstr "ugyldig verdi for valg «%s»\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "filtervalget %s er ugyldig\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "vis bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "vis adresser til retningslinjer under signaturbekreftelse"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "vis alle merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotater under signaturbekreftelse"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "vis selvvalgte merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "kontroller signaturer som har PKA-data"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "klarte ikke å endre «exec»-sti til %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "du kan ikke bruke %s med %s.\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s gir ikke mening med %s.\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kjører med falsk systemtid: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "lar være å kjøre med usikret minne på grunn av %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» må være større enn 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» må være større enn 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "«max-cert-depth» må være mellom 1 og 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig «default-cert-level» (må være 0, 1, 2 eller 3)\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig «min-cert-level» (må være 0, 1, 2 eller 3)\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus (må være 0, 1 eller 3)\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldig standardoppsett\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enda med %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i %s-modus\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruke «--symmetric --encrypt» og «--s2k-mode 0» samtidig\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "du kan ikke velge --symmetric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "du kan ikke bruke «--symmetric --sign --encrypt» og «--s2k-mode 0» samtidig\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "du kan ikke velge --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "«%s» ser hverken ut til å være en gyldig nøkkel-ID, fingeravtrykk eller "
 "nøkkelgrep\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "ADVARSEL: ingen kommando valgt. Prøver å gjette hva du mener …\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv inn melding …\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "valgt adresse for signaturregler er ugyldig\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FIL|hent nøkler fra valgt nøkkelknippe-FIL"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare være en advarsel"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|avvis signaturer som er laget med valgt ALGOritme"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruk: gpgv [valg] [filer] (-h for hjelp)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3467,7 +3491,7 @@
 msgstr ""
 "oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøkkel %s: ingen bruker-ID\n"
@@ -3477,7 +3501,7 @@
 msgid "key %s: %s\n"
 msgstr "nøkkel %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "avvist av importeringskontrollør"
 
@@ -3501,7 +3525,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes manglende selvsignatur\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
@@ -3516,7 +3540,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
@@ -3586,17 +3610,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nøkkel %s: «%s» ikke endret\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nøkkel %s: hemmelig nøkkel importert\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "nøkkel %s: feil under sending til agent: %s\n"
@@ -3609,232 +3633,299 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "hemmelig nøkkel %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nøkkel %s: hemmelig nøkkel med ugyldig krypteringsmetode %d - hoppet over\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Ingen grunn oppgitt"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Nøkkelen er overgått"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Nøkkelen har blitt kompromittert"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Nøkkelen er ikke lengre i bruk"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Bruker-ID er ikke lenger gyldig"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "grunnen for opphevelse: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "kommentar til opphevelse: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
 "opphevelsessertifikat\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøkkel %s: hoppet over undernøkkel\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "feil under minnetildeling: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
+"offentlig nøkkel (%d): %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
+"meldingssum (%d): %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (omsorterte signaturer følger)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "nøkkel %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplikatsignatur fjernet\n"
+msgstr[1] "%d duplikatsignaturer fjernet\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
+msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d ubrukelig signatur\n"
+msgstr[1] "%d ubrukelige signaturer\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signatur omsortert\n"
+msgstr[1] "%d signaturer omsortert\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
+"kontrollere alle signaturer.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "feil under opprettelse av nøkkelskrin «%s»: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "feil under opprettelse av nøkkelknippe «%s»: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "nøkkelskrin «%s» er opprettet\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "nøkkelknippe «%s» er opprettet\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "nøkkelblokkressurs «%s»: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "feil under åpning av nøkkeldatabase: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt: %s\n"
@@ -4073,8 +4164,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Er du sikker på at du vil signere? (j/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -4274,7 +4365,7 @@
 "  (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
 "osv.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Nøkkelen er opphevet."
 
@@ -4327,7 +4418,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Er du sikker på at du vil flytte primærnøkkelen? (j/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Du må velge minst én nøkkel.\n"
 
@@ -4403,7 +4494,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Vil du avslutte uten å lagre? (j/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
@@ -4446,104 +4537,119 @@
 msgid "Nothing to sign.\n"
 msgstr "Ingenting å signere.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Ikke signert av deg.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "kontroll av opprettet signatur mislyktes: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» er en ugyldig utløpstid\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "fant ikke undernøkkel «%s»\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Kontrollsum: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Funksjoner: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Nøkkeltjener no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-brukere har ingen oppsettsmuligheter.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Følgende nøkkel ble opphevet %s av %s med nøkkelen %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "utgår: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "bruk: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Denne nøkkelen er ikke i bruk"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4551,17 +4657,17 @@
 "Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
 "som vises her er riktig.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "utgått"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4570,17 +4676,17 @@
 "ADVARSEL: ingen bruker-ID er merket som primær. Denne kommandoen kan\n"
 "              føre til at en annen bruker-ID blir brukt som primærbruker.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4590,72 +4696,72 @@
 "føre til at\n"
 "         enkelte PGP-versjoner avviser nøkkelen.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Slettet %d signatur.\n"
 msgstr[1] "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruker-ID «%s» pakket sammen: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Bruker-ID «%s»: %d signatur fjernet\n"
 msgstr[1] "Bruker-ID «%s»: %d signaturer fjernet\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruker-ID «%s»: allerede minimert\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruker-ID «%s»: allerede renset\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4665,281 +4771,277 @@
 "         kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
 "nøkkelen.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du kan ikke knytte opphevere til PGP 2.x-nøkler.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Skriv inn oppheverens bruker-ID: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "du kan ikke bruke PGP 2.x-nøkler som opphevere\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan ikke bruke en nøkkel som opphevelsesnøkkel for seg selv\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "denne nøkkelen er allerede i bruk som opphevelsesnøkkel\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ADVARSEL: du kan ikke angre tildeling av opphevelsesrolle til en nøkkel.\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker på at du vil gjøre denne nøkkelen til en opphever? (j/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Er du sikker på at du vil endre utløpstid for flere undernøkler? (j/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan ikke endre utløpsdato for v3-nøkler\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "undernøkkel %s signerer ikke, og behøver derfor ikke å bli kryssertifisert\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Velg én bruker-ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker på at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker på at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Skriv inn notat: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruker-ID med indeks %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruker-ID med kontrollsum %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøkkel med ID «%s».\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøkkel med indeks %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signert med nøkkelen %s %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker på at du vil oppheve den? (j/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Ikke signert av deg.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signert disse bruker-id-ene med nøkkelen %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (kan ikke oppheves)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "opphevet med nøkkelen %s %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøkkel\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "prøvde å oppheve ID som ikke tilhørte en bruker: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruker-ID «%s» er allerede opphevet\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en bruker-id-signatur er datert %d sekunder i framtiden\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøkkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøkkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Viser %s foto-ID av størrelsen %ld for nøkkel %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "ugyldig verdi for valg «%s»\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "innstilling «%s» er duplisert\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "for mange krypteringsinnstillinger\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "for mange kontrollsum-innstillinger\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "for mange komprimeringsinnstillinger\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "«%s» er et ugyldig oppsettsvalg\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver nøkkelbindende signatur\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøkkelstørrelse rundet opp til %u bit\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -4947,19 +5049,19 @@
 "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
 "denne kontrollsum-størrelsen\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -4977,162 +5079,162 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mulige handlinger med en %s-nøkkel: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Tillatte handlinger: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Slå av/på signeringsfunksjon\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Slå av/på krypteringsfunksjon\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Slå av/på autentiseringsfunksjon\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Ferdig\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA og RSA (standard)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC og ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (kun signering)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (velg funksjoner selv)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (kun kryptering)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Nøkkel\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Nøkkel fra kort\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Skriv inn nøkkelgrep: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "feil under lesing av kort: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Kortets serienummer: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Tilgjengelige nøkler:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rundet av til %u bit\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Forespurt nøkkelstørrelse er %u bit\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Velg elliptisk kurve:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5148,7 +5250,7 @@
 "      <n>m = nøkkelen utgår om n months\n"
 "      <n>y = nøkkelen utgår om n years\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5164,38 +5266,38 @@
 "      <n>m = signaturen utgår om n months\n"
 "      <n>y = signaturen utgår om n years\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Nøkkelen er gyldig for? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Nøkkel utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøkkel utgår %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utgår %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5203,11 +5305,11 @@
 "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
 "Likevel håndteres det korrekt fram til 2106.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5221,7 +5323,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5237,49 +5339,49 @@
 "    «Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>»\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Navn kan ikke begynne med siffer\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet må bestå av minst 5 tegn\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-postadresse: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Ugyldig e-postadresse\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Du bruker tegnsettet «%s».\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5290,7 +5392,7 @@
 "    «%s»\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
 
@@ -5305,31 +5407,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Rett opp feilen først\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5341,13 +5443,13 @@
 "diskene jobbe) mens dette pågår. Da får\n"
 "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøkkelgenerering mislyktes: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5358,65 +5460,65 @@
 "    «%s»\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Vil du fortsette? (J/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Det finnes allerede en nøkkel for «%s»\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Vil du lage nøkkel likevel? (j/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "lager likevel\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøkkelgenerering ble avbrutt.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "skriver offentlig nøkkel til «%s»\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5425,7 +5527,7 @@
 "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
 "undernøkkel til dette formålet.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5433,7 +5535,7 @@
 "nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5441,23 +5543,23 @@
 "nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Merk: det strider med OpenPGP-standarden å lage undernøkler for v3-nøkler\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Er du sikker på at du vil fortsette? (j/N) "
 
@@ -5492,20 +5594,6 @@
 msgstr[0] "%d gyldig signatur\n"
 msgstr[1] "%d gyldige signaturer\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d ubrukelig signatur\n"
-msgstr[1] "%d ubrukelige signaturer\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
-msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5524,29 +5612,29 @@
 msgid "Keyring"
 msgstr "Nøkkelknippe"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for primærnøkkel:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Fingeravtrykk for undernøkkel:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for primærnøkkel:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Fingeravstrykk for undernøkkel:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Nøkkelfingeravtrykk ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
@@ -5576,7 +5664,7 @@
 msgstr[0] " (%lu signatur)\n"
 msgstr[1] " (%lu signaturer)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: laget nøkkelknippe\n"
@@ -5627,447 +5715,447 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» er ikke en nøkkel-ID, og blir hoppet over\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "oppdaterer %d nøkkel fra %s\n"
 msgstr[1] "oppdaterer %d nøkler fra %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å oppdatere nøkkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "fant ikke nøkkelen «%s» på nøkkeltjener\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "fant ikke nøkkelen på nøkkeltjener\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om nøkkelen %s fra %s tjener %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om nøkkelen %s fra %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ingen kjent nøkkeltjener\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over «%s»: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøkkelen %s til %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "ber om nøkkel fra «%s»\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig størrelse for en kryptert sesjonsnøkkel (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kryptert øktnøkkel\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passordfrase generert med ukjent summeringsalgoritme %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøkkel er %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig nøkkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-nøkkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-nøkkel, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kryptert med %lu passordfraser\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "kryptert med 1 passordfrase\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar %s kryptert data\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-kryptering er utilgjengelig. Prøver å bruke %s i stedet\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekryptering ok\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=«%.*s»\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "selvstendig opphevelse - bruk «gpg --import» for å ta i bruk\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "fant ikke signatur\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG signatur fra «%s»"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgått signatur fra «%s»"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra «%s»"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturbekreftelse ble hindret\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "disse flertydige signaturdataene kan ikke behandles\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s nøkkel %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                utsteder «%s»\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Nøkkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka «%s»"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "ADVARSEL: Denne nøkkelen egner seg ikke for signering i %s-modus\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utgått %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utgår %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", nøkkelalgoritme"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "ADVARSEL: ikke en separat signatur. Fila «%s» er IKKE bekreftet.\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Klarte ikke å kontrollere signatur: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en separat signatur\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ADVARSEL: fant flere signaturer. Kontrollerer bare den første.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat på «%s» mislyktes i %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig nøkkel-algoritme %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "ADVARSEL: «Elgamal»-nøkler er utgått\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell krypteringsalgoritme %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell kontrollsum-algoritme %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: kontrollsum-algoritmen «%s» er utgått\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Merk: signaturer som bruker algoritmen %s blir avvist\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "Note: signatures using the %s algorithm are rejected\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Merk: signaturer som bruker algoritmen %s blir avvist\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(rapportert feil: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(rapportert feil: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(mer info: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: valget «%s» er utgått\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: valget «%s» er utgått\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "bruk heller «%s%s»\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: «%s» er en utgått kommando. Ikke bruk den\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: «%s» er utgått i denne fila, og påvirker bare %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "ADVARSEL: valget «%s%s» er utgått, og påvirker bare %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Ukomprimert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "ukomprimert|ingen"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "denne meldinga kan kanskje ikke brukes av %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "«%s» er et flertydig valg\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "«%s» er et ukjent valg\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Offentlig ECDSA-nøkler forventes i SEC-koding som kan ganges med 8 bit\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "«%s» er en ukjent svak summeringsmetode\n"
@@ -6100,72 +6188,72 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "antar signert data i «%s»\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "klarte ikke å håndtere offentlig nøkkelalgoritme %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "ADVARSEL: det er usikkert å kryptere øktnøkkel symmetrisk\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritisk signaturnotat: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke %d er merket som kritisk\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agent: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Skriv inn passordfrase\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "avbrutt av bruker\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovednøkkelid %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Skriv inn passordfrase for å låse opp hemmelig OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Skriv inn passordfrase for å importere hemmelig OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-undernøkkel:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Er du sikker på at du vil slette følgende hemmelige OpenPGP-undernøkkel:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Er du sikker på at du vil slette følgende hemmelige OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6221,7 +6309,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette bildet riktig (j/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "klarte ikke å vise foto-ID.\n"
@@ -6527,12 +6615,12 @@
 msgid "no valid addressees\n"
 msgstr "ingen gyldige mottakere\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@ -6585,27 +6673,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, det er du som er den anonyme mottakeren.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammel DEK-koding støttes ikke\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritme %d%s er ukjent eller slått av\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "ADVARSEL: fant ikke krypteringsalgoritme %s i mottakers oppsett\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Merk: hemmelig nøkkel %s utgått %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Merk: nøkkelen er opphevet"
@@ -6801,7 +6889,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ADVARSEL: konflikt med signatur-kontrollsum i melding\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "du kan ikke bruke nøkkel %s til signering i %s-modus\n"
@@ -6872,29 +6960,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Merk: signaturnøkkel %s er opphevet\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "antatt ugyldig signatur fra nøkkel %s pga. ukjent «kritisk»-bit\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nøkkel %s: ingen undernøkkel for undernøkkelopphevingssignatur\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n"
@@ -6919,23 +7007,23 @@
 "ADVARSEL: klarte ikke å %%-utvide foretrukket nøkkeltjener-adresse (for "
 "lang).\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: «%s»\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "ADVARSEL: tvungen bruk av %s (%d) bryter med mottakerens oppsett\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bruker %s-kryptering\n"
@@ -6960,7 +7048,7 @@
 msgstr ""
 "dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitsoppføring %lu, type %d: skriving mislyktes: %s\n"
@@ -7005,12 +7093,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "lesefeil i «%s»: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synk mislyktes: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "klarte ikke å lage lås for «%s»\n"
@@ -7020,12 +7108,12 @@
 msgid "can't lock '%s'\n"
 msgstr "klarte ikke å låse «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb-oppf. %lu: lseek mislyktes: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d): %s\n"
@@ -7040,103 +7128,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappa finnes ikke.\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "fikk ikke tilgang til «%s»: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: klarte ikke å lage versjonsoppføring: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: laget ugyldig trustdb\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb opprettet\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Merk: trustdb er ikke skrivbar\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ugyldig trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: klarte ikke å lage kontrollsum-tabell: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: feil under oppdatering av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: feil under lesing av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: feil under skriving av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek mislyktes: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lesing mislyktes (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ikke en trustdb-fil\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versjonsoppføring nr. %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: %d er en ugyldig filversjon\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: feil under lesing av «free»-oppføring: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: feil under skriving av «dir»-oppføring: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: klarte ikke å nullstille oppføring: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: klarte ikke å legge til oppføring: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: trustdb er skadet.\n"
@@ -7513,130 +7601,130 @@
 "ADVARSEL: krypterer til %s. Denne har ingen bruker-id-er som ikke er "
 "opphevet\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» er en ugyldig lang nøkkel-ID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nøkkel %s: godtatt som betrodd nøkkel\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nøkkel %s forekommer flere enn én gang i trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nøkkel %s: ingen offentlig nøkkel for betrodd nøkkel - hoppet over\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nøkkel %s markert som endelig betrodd.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitsoppføring %lu, foresp.type %d: lesing mislyktes: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsoppføring %lu er ikke av forespurt type (%d)\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Du kan prøve å gjenskape trustdb ved å skrive inn følgende kommandoer:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "Klarte ikke å bruke ukjent tillitsmodell (%d). Prøver tillitsmodell %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "bruker tillitsmodell %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "kontroll av trustdb er ikke nødvendig\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "neste kontroll av trustdb planlagt %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "trustdb behøver ikke kontroll ved bruk av tillitsmodell «%s»\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb behøver ikke oppdatering ved bruk av tillitsmodell «%s»\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig nøkkel %s: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "kjør «--check-trustdb»\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d nøkkel behandlet"
 msgstr[1] "%d nøkler behandlet"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "(%d gyldighetsantall klarert)\n"
 msgstr[1] "(%d gyldighetsantall klarert)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "fant ikke offentlig nøkkel for absolutt pålitelig nøkkel %s\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "dybde: %d  gyldig: %3d  signert: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7747,106 +7835,121 @@
 "Syntaks: kbxutil [valg] [filer]\n"
 "Vis, eksporter eller importer Keybox-data\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Gjenstående forsøk: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Skriv inn PIN for å la nøkkelen lage kvalifiserte signaturer."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Skriv inn PIN-kode for standardnøkler."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller er av annen størrelse enn %d bit\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er større enn %d bit\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN er ikke blitt endret enda\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Skriv inn ny PIN-kode for standardnøkler."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Skriv inn PIN-kode for standardnøkler."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Skriv inn ny PIN-opplåsingskode (PUK) for standardnøkler."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Skriv inn PIN-opplåsingskode (PUK) for standardnøkler."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Skriv inn ny PIN for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||Skriv inn PIN for å la nøkkelen lage kvalifiserte signaturer."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|NP|Skriv inn ny PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil under henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "feil under henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "svar inneholder ikke offentlig EC-nøkkel\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar inneholder ikke offentlig nøkkeldata\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
@@ -7854,56 +7957,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%%0ATeller\\x1f: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Gjenstående forsøk: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruker forvalgt PIN som %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "klarte ikke å bruke forvalgt PIN som %s: %s. Lar være å bruke forvalgt PIN "
 "senere\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Lås opp kort"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet er låst for godt.\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7913,24 +8004,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Skriv inn admin-PIN"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Skriv inn PIN-kode"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Skriv inn tilbakestillingskode for kortet"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@ -7938,120 +8029,120 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny tilbakestillingskode"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Skriv inn admin-PIN og ny admin-PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Skriv inn PIN-kode og ny PIN-kode"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "feil under lesing av programdata\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "feil under lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "nøkkelen finnes allerede\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "gjeldende nøkkel blir erstattet\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "lager ny nøkkel\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøkkel\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke å lagre nøkkel: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "ustøttet kurve\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vent mens nøkkel blir generert …\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "nøkkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "nøkkelgenerering fullført (%d sekund)\n"
 msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet så langt: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 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:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@ -8067,55 +8158,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "kjør i multi-tjenermodus (forgrunn)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FIL|skriv logg til valgt FIL"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|koble til leser via port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAVN|bruk valgt NAVN som ct-API-driver"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|bruk valgt NAVN som PC-/SC-driver"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "ikke bruk intern CCID-driver"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|koble fra kort etter N antall sekunder uten aktivitet"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "ikke bruk kodetastatur"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "avvis bruk av admin-kortkommandoer"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "bruk inndata av vairabel lengde for kodetastatur"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8123,307 +8214,324 @@
 "Syntaks: scdaemon [valg] [kommando [arg]]\n"
 "Smartcard-bakgrunnsprogram for @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "startet håndteringsprogram for fd %d\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "avsluttet håndteringsprogram for fd %d\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "kontrollmodell forespurt av sertifikat: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "kjede"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "skall"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritisk sertifikatutvidelse %s støttes ikke"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "utsteders sertifikat er ikke merket som CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "regelsett merket som kritisk uten oppsatte regler"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Merk: ukritisk sertifikat-regelsett er ikke tillatt"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "sertifikatregelverk tillates ikke"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "klarte ikke å hente fingeravtrykk\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår opp utsteder på ekstern plassering\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antall ustedere funnet: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår opp utsteder fra Dirmngr-hurtiglager\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antall treff på sertifikater: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "sertifikatet er opphevet"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "sertifikatet har ukjent status"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "kontroller at «dirmngr» er installert skikkelig\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll av CRL mislyktes: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifikatet er ikke gyldig enda"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "rotsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "mellomsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifikatet er utgått"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "rotsertifikat er utgått"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "mellomsertifikat er utgått"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "påkrevde sertifikategenskaper mangler: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "sertifikat med ugyldig gyldighetsverdi"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "signatur ikke laget innenfor sertifikatets levetid"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "sertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signatur opprettet "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (sertifikat opprettet "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (sertifikat gyldig fra "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     utsteder gyldig fra "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtrykk=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotsertifikat er nå merket som troverdig\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv tillitsmerking er ikke slått på i gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv tillitsmarkering er slått av for gjeldende økt\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "ADVARSEL: opprettelsestid for signatur er ukjent. Antar gjeldende tidspunkt"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "fant ingen utsteder i sertifikat"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "selvsignert sertifikat har ugyldig signatur"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotsertifikat er ikke merket som troverdig"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll av tillitsliste mislyktes: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifikatkjede er for langt\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "fant ikke utstedersertifikat"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifikatet har ugyldig signatur"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifikatet er gyldig\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellomsertifikat er ok\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotsertifikat er gyldig\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "bytter til kjedemodell"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "gyldighetsmodell: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "kjernen er full\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er algortime MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "ingen"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Feil - utgyldig koding]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[feil - kjernen er full]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[feil - ingen navn]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[feil - ugyldig DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8438,138 +8546,138 @@
 "S/N %s, ID 0x%08lX,\n"
 "opprettet %s, utgår %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifikatet skulle ikke vært brukt til sertifisering\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifikatet skulle ikke vært brukt til OCSP-responssignering\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifikatet skulle ikke vært brukt til kryptering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifikatet skulle ikke vært brukt til signering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifikatet egner seg ikke til kryptering\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifikatet egner seg ikke til signering\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "linje %d: nøkkellengden %u er ugyldig (skal være mellom %d og %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "linje %d: emnenavn mangler\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "linje %d: emne-etikett«%.*s» er ugyldig\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "linje %d: emnenavn «%s» ved posisjon %d er ugyldig\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "linje %d: ugyldig e-postadresse\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "linje %d: ugyldig serienummer\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "linje %d: utsteder-etikett «%.*s» er ugyldig\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "linje %d: utstedernavn «%s» ved posisjon %d er ugyldig\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "linje %d: ugyldig dato\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr ""
 "linje %d: feil under henting av signeringsnøkkel ved nøkkelgrep «%s»: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "linje %d: ugyldig summeringsalgoritme\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "linje %d: ugyldig «authority-key-id»\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "linje %d: ugyldig «subject-key-id»\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "linje %d: ugyldig utvidelsessyntaks\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "linje %d: fiel under lesing av nøkkel «%s» fra kort: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "linje %d: feil under henting av nøkkel av nøkkelgrep «%s»: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "linje %d: nøkkelgenerering mislyktes: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8704,7 +8812,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "fant ikke sertifikatet «%s»: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "feil under låsing av nøkkelskrin: %s\n"
@@ -8729,123 +8837,123 @@
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige mottakere valgt\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "vis eksterne nøkler"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "vis sertifikatkjede "
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "importer sertifikater"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "eksporter sertifikater"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "registrer smartkort"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "kall gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "lag base64-kodet utdata"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "forvent inndata i «PEM»-format"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "forvent inndata i «base-64»-format"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "forvent inndata i binærformat"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "aldri spør CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "kontroller gyldighet med OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|antall sertifikater som skal være med"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hent regler fra valgt FIL"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "ikke kontroller sertifikatregler"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende utstedersertifikat"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "ikke bruk terminal i det hele tatt"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "buntmodus: aldri spør"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "svar automatisk ja på de fleste spørsmål"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "svar automatisk nei på de fleste spørsmål"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8855,47 +8963,47 @@
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Merk: det er ikke mulig å kryptere til «%s»: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "«%s» er en ukjent kontrollmodell\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: vertsnavn mangler\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hopper over denne linja\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "klarte ikke å tolke nøkkeltjener\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importerer sertifikat «%s»\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "klarte ikke å signere med «%s»: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@ -8915,7 +9023,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "feil under henting av lagrede valg: %s\n"
@@ -8925,42 +9033,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "feil under importering av sertifikat: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "feil under lesing av inndata: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "klarte ikke å hente fingeravtrykk\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "klarte ikke å søke etter sertifikat: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "feil under søk etter skrivbar nøkkeldatabase: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "feil under lagring av sertifikat: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "feil under lagring av valg: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Feil - "
 
@@ -8996,7 +9099,7 @@
 "\n"
 "%s%sEr du sikker på at du vil gjøre dette?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9032,22 +9135,23 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "søk etter godkjent sertifikat mislyktes: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Signatur fullført"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[dato ikke oppgitt]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " ved bruk av sertifikat-ID 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "algoritme: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9055,17 +9159,17 @@
 "ugyldig signatur. Kontrollsum-attributt for melding samsvarer ikke med "
 "attributt for utregnet sum\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Gyldig signatur fra"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                også kjent som"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dette er en godkjent signatur\n"
@@ -9133,273 +9237,272 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "feil under innlasting av sertifikat «%s»: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanent innlastede sertifikater: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    hurtiglagrede sertifikater: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           pålitelige sertifikater: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "sertifikat allerede hurtiglagret\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "sertifikat hurtiglagret\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "feil under hurtiglagring av sertifikat: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "«%s» er et ugyldig SHA1-fingeravtrykk\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "feil under henting av sertifikat etter S/N: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "feil under henting av sertifikat etter emne: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "fant ingen utsteder av sertifikat\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "feil under henting av «authorityKeyIdentifier»: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "lager mappe «%s»\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "feil under oppretting av mappa «%s»: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorerer databasemappe «%s»\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "feil under lesing av mappa «%s»: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "fjerner hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "lar være å fjerne «%s»\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "feil under lukking av hurtiglager-fil: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "klarte ikke å åpne hurtiglagermappe-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "feil under oppretting av ny hurtiglagermappe-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "feil under skriving av ny hurtiglagermappe-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "feil under lukking av ny hurtiglagermappe-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "ny hurtiglagermappe-fil «%s» opprettet\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "klarte ikke å åpne hurtiglagermappe-fil «%s» på nytt: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "første forekomst av «%s» står ikke i versjonspesifikasjon\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "hurtiglager-mappe er av gammel versjon. Rydder opp\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "hurtiglager-mappe er av gammel versjon. Gir opp\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "fant ekstrafelt i crl-oppføring i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "fant ugyldig linje i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "fant duplikat i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "hoppet over ugyldig elementtype i «%s», linje %u\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "ugyldig utsteder-kontrollsum i «%s», linje %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "ingen utsteder-DN i «%s», linje %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "ugyldig tidsstempel i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "ADVARSEL: ugyldig kontrollsum av hurtiglager-fil i %s», linje %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "fant feil i oppsettsfil for hurtiglager-mappe\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "kontroller årsaken og slett fila manuelt\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "klarte ikke å lage midlertidig hurtiglagermappe-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "feil under lukking av «%s»: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "klarte ikke å summere «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "feil under oppsett av MD5-summeringskontekst: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "feil under summering av «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "feilformatert kontrollsum av «%s»\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "for mange åpne hurtiglager-filer\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "åpner hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "feil under åpning av hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "feil under åpning av hurtiglager-fil «%s» for lesing: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "utfører «unlock_db_file» på en lukket fil\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "utfører «unlock_db_file» på en fil som ikke er låst\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "klarte ikke å lage nytt huritglager-objekt: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "ingen CRL tilgjengelig for utsteder-ID %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "hurtiglagret CRL for utsteder-ID %s er for gammel, og må oppdateres\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9408,195 +9511,197 @@
 "«force-crl-refresh» er slått på og %d minutter er gått for utsteder-ID %s. "
 "Oppdater hurtiglager.\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "«force-crl-refresh» er slått på for utsteder-ID %s. Oppdater hurtiglager.\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "tilgjengelig CRL for utsteder-ID %s kan ikke brukes\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "hurtiglagret CRL for utsteder-ID %s er endret. Hurtiglager må oppdateres\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "ADVARSEL: ugyldig S/N-lengde på oppføring i hurtiglager"
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "feil under lesing av hurtiglager-oppføring for S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s er ugyldig. grunn=%02X  dato=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s er gyldig, men står ikke i CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "feil under henting av data fra hurtiglager-fil: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "«%s» er en ugyldig summeringsalgoritme\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "«gcry_md_open» for algoritme %d mislyktes: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "fikk ugyldig S-uttrykk fra libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "konvertering av S-uttrykk mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "«%s» er en ugyldig summeringsalgoritme\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "«gcry_md_open» for algoritme %d mislyktes: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "oppretting av S-uttrykk mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "feil under henting av CRL-oppdateringstid: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "oppdateringstider for gjeldende CRL: denne=%s neste=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "«nextUpdate» ikke oppgitt. Antar én dags gyldighet\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "feil under henting av CRL-element: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "feil under innsetting av element i midlertidig hurtiglager-fil: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "fant ingen CRL-utsteder i CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "finner CRL-utstedersertifikat med «authorityKeyIdentifier»\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL-signaturbekreftelse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "feil under kontroll av gyldighet for CRL-utstedersertifikat: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "fjernet ødelagt midlertidig hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "feil under fjerning av ødelagt midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "feil under opprettelse av midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "feil under ferdigstillelse av midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "feil under lukking av midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "ADVARSEL: ny CRL er fremdeles for gammel (utgått %s). Laster inn likevel\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "ny CRL er fremdeles for gammel (utgått %s)\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "%s er en ukjent kritisk CRL-utvidelse\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "feil under lesing av CRL-utvidelser: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "lager hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "klarte ikke å endre navn på «%s» til «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9605,12 +9710,12 @@
 "oppdatering av DIR-fil mislyktes. Hurtiglager-oppføring går tapt neste gang "
 "programmet starter\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Start CRL-utskrift (hentet via %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9618,54 +9723,54 @@
 " FEIL: CRL blir ikke brukt fordi den fremdeles var for gammel etter "
 "oppdatering.\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " FEIL: CRL blir ikke brukt fordi en kritisk utvidelse er ukjent.\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEIL: CRL blir ikke brukt\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " FEIL: Huriglagret CRL kan ha blitt endret av uvedkommende.\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " ADVARSEL: ugyldig lengde på oppføring i hurtiglager\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "klarte ikke å lese hurtiglager-oppføring: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "klarte ikke å lese hurtiglager-nøkkel: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "feil under lesing av hurtiglager-oppføring fra db: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Avslutt CRL-utskrift\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via utsteder mislyktes: %s\n"
@@ -9703,55 +9808,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "sertifikatsøk ikke tilgjengelig fordi %s er slått av\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "bruk OCSP i stedet for CRL"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "kontroller om en dirmngr kjører"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "kontroller sertifikat"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "slå opp sertifikat"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "bare slå opp lokalt lagrede sertifikater"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "forvent nettadresse for «--lookup»"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "last inn CRL i dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "spesialmodus til bruk med Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "forvent sertifikater i PEM-format"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "tving bruk av forvalgt OCSP-svartjeneste"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Bruk: dirmngr-client [valg] [sert-fil|mønster] (-h for hjelp)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9763,82 +9868,82 @@
 "Avslutningskode er 0 hvis sertifikatet er gyldig, 1 hvis\n"
 "ugyldig og annet for generelle programfeil\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "feil under lesing av sertifikat fra stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "feil under lesing av sertifikat fra «%s»: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "sertifikatet er for stort til at det gir mening\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "klarte ikke å koble til dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "oppslag mislyktes: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "innlasting av CRL «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "dirmngr kjører i bakgrunnen\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "kontroll av sertifikat mislyktes: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "sertifikatet er gyldig\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "sertifikatet er opphevet\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "sertifikatkontroll mislyktes: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "fikk status: «%s»\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "feil under skriving av base64-koding: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "spørringa «%s» støttes ikke\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "forventet fullstendig filsti\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "slår opp «%s»\n"
@@ -9863,93 +9968,93 @@
 msgid "flush the cache"
 msgstr "tøm hurtiglager"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "kjør uten å spørre bruker"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "tving innlasting av utdatert CRL"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "tillat sending av OCSP-forespørsler"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "tillat kontroll av programvare-versjon over nett"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "hindre bruk av HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "hindre bruk av LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorer HTTP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorer LDAP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "legg til tjenere i tjenerliste som blir oppdaget via CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP-svartjeneste signert av FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|ikke vis flere enn N antall elementer per spørring"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FIL|bruk CA-sertifikater i valgt FIL til HKP via TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "kjør all nettverkstrafikk gjennom Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9958,11 +10063,11 @@
 "@\n"
 "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9970,132 +10075,132 @@
 "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
 "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "bruk: %s [valg] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "kolon tillates ikke i sokkelnavn\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "henting av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: for lang linje. Hoppet over\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: lesefeil: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP mottatt. Leser inn oppsett på nytt og tømmer hurtiglagre\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM mottatt. Slår av …\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "slår av under tvang\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT mottatt. Slår av umiddelbart\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "vis alle verdier i oppføringsorientert format"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAVN|ignorer vertsdel og koble til med NAVN"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAVN|koble til valgt vertsNAVN"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|koble til port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|bruk valgt PASSord til autentisering "
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "hent passord fra $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRENG|utfør spørring med valgt DN-STRENG"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRENG|bruk valgt STRENG som filteruttrykk"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRENG|vis attributt valgt med STRENG"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Bruk: dirmngr_ldap [valg] [ADR] (-h for hjelp)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10105,145 +10210,139 @@
 "Internt LDAP-hjelpeverktøy for Dirmngr\n"
 "Grensesnitt og valgmuligheter kan endres uten varsel\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "portnummer %d er ugyldig\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "ser gjennom treff for attributt «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "feil under skriving til std.utkanal: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          tilgjengelig attributt «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "fant ikke attributt «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "fant attributt «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "behandler adresse «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          bruker «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          passord «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          vert «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        filter «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          attr «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "ingen vertsnavn i «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "ingen attributt oppgitt for spørring «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "ADVARSEL: bruker bare første attributt\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "tilknytning til «%s:%d» mislyktes: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "søk etter «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "«%s» er ikke en LDAP-adresse\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "«%s» er en ugyldig LDAP-adresse\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "for mange videresendinger\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "skriver til «%s»\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "feil under minnetildeling: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10294,7 +10393,7 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc mislyktes: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
@@ -10424,11 +10523,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10497,7 +10591,7 @@
 msgstr "serienummer mangler i sertifikat-ID"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "«assuan_inquire» mislyktes: %s\n"
@@ -10527,32 +10621,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d overskredet\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "klarte ikke å starte opp tjener: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan-godkjenningsproblem: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan-behandling mislyktes: %s\n"
@@ -10590,56 +10684,56 @@
 msgid "certificate chain is good\n"
 msgstr "sertifikatkjede er funnet i orden\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "stille"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "kod utdata i heksadesimaler"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "dekod mottatte datalinjer"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "koble til dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAVN|koble til valgt Assuan-sokkelNAVN"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADR|koble til Assuan-tjener på valgt nettADResse"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "kjør valgt Assuan-tjener"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "ikke bruk utvidet tilkoblingsmodus"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kjør kommandoer fra valgt FIL ved oppstart"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "kjør /subst ved oppstart"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Bruk: @GPG@-connect-agent [vlag] (-h for hjelp)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10647,43 +10741,43 @@
 "Syntaks: @GPG@-connect-agent [valg]\n"
 "Koble til kjørende agent og send kommandoer\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "valget «%s» krever et program som argument\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "ignorerer valget «%s» pga. «%s»\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "linjemottak mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "hoppet over for lang linje\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linje forkortet pga. innebygget Nul-tegn\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "«%s» er en ukjent kommando\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending av linje mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil under sending av standardvalg: %s\n"
@@ -10876,94 +10970,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Merk: Bruk kommandoen «%s» for å starte dem på nytt.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Ekstern bekreftelse av komponent %s mislyktes"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "feil under lukking av «%s»\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "feil under tolkning av «%s»\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "kontroller alle programmer"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|vis valg"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|endre valg"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|kontroller valg"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "bruk globale standardverdier"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FIL|oppdater oppsettsfiler ved bruk av valgt FIL"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "hent oppsettsmapper for @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "vis global oppsettsfil"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "kontroller global oppsettsfil"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "søk i versjonsdatabase"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "last inn én eller alle komponenter på nytt"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "last inn valgt komponent"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "drep valgt komponent"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "bruk som utdatafil"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "ta i bruk endringer under kjøring, hvis mulig"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10971,202 +11065,149 @@
 "Syntaks: @GPGCONF@ [valg]\n"
 "Behandle oppsettsvalg for verktøy i @GNUPG@-systemet\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Komponent-argument mangler"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Fant ikke komponent"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Ingen argumenter tillatt"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Bruk: gpg-check-pattern [valg] mønsterfil (-h for hjelp)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Kommandoer:\n"
-" "
+"Syntaks: gpg-check-pattern [valg] mønsterfil\n"
+"Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "dekrypteringsmodus"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "krypteringsmodus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Kommandoer:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "verktøyklasse (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "dekrypteringsmodus"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "programfil-navn"
+#~ msgid "encryption modus"
+#~ msgstr "krypteringsmodus"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "hemmelig nøkkelfil (påkrevet)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "verktøyklasse (confucius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "inndata-filnavn (forvalgt: standard innkanal)"
+#~ msgid "program filename"
+#~ msgstr "programfil-navn"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Bruk: symcryptrun [valg] (-h for hjelp)"
+#~ msgid "secret key file (required)"
+#~ msgstr "hemmelig nøkkelfil (påkrevet)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntaks: symcryptrun --class KLASSE --program PROGRAM --keyfile NØKKELFIL "
-"[valg …] KOMMANDO [inndatafil]\n"
-"Bruk et enkelt symmetrisk krypteringsverktøy\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "inndata-filnavn (forvalgt: standard innkanal)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s på %s avbrøt med status %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Bruk: symcryptrun [valg] (-h for hjelp)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s på %s mislyktes med status %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntaks: symcryptrun --class KLASSE --program PROGRAM --keyfile NØKKELFIL "
+#~ "[valg …] KOMMANDO [inndatafil]\n"
+#~ "Bruk et enkelt symmetrisk krypteringsverktøy\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "klarte ikke å lage midlertidig mappe «%s»: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s på %s avbrøt med status %i\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "klarte ikke å åpne %s for skriving: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s på %s mislyktes med status %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "feil under skriving til %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "klarte ikke å lage midlertidig mappe «%s»: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "feil under lesing fra %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "klarte ikke å åpne %s for skriving: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "feil under lukking av %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "feil under skriving til %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "valget «--program» er ikke brukt\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "feil under lesing fra %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "programmet støtter bare «--decrypt» og «--encrypt»\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "feil under lukking av %s: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "valget «--keyfile» mangler\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "valget «--program» er ikke brukt\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "klarte ikke å tildele argumentvektor\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "programmet støtter bare «--decrypt» og «--encrypt»\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "klarte ikke å lage datarør: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "valget «--keyfile» mangler\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "klarte ikke å lage pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "klarte ikke å tildele argumentvektor\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "klarte ikke å lage underprosess: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "klarte ikke å lage datarør: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "«execv» mislyktes: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "klarte ikke å lage pty: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "«select» mislyktes: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "klarte ikke å lage underprosess: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "«read» mislyktes: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "«execv» mislyktes: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "«pty»-lesing mislyktes: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "«select» mislyktes: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "«waitpid» mislyktes: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "«read» mislyktes: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "underprosess ble avbrutt med status %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "«pty»-lesing mislyktes: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "klarte ikke å tildele inndatafil-streng: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "«waitpid» mislyktes: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "klarte ikke å tildele utdatafil-streng: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "underprosess ble avbrutt med status %i\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "du må velge enten %s eller %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "klarte ikke å tildele inndatafil-streng: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "ingen klasse valgt\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "klarte ikke å tildele utdatafil-streng: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klassen %s støttes ikke\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "du må velge enten %s eller %s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Bruk: gpg-check-pattern [valg] mønsterfil (-h for hjelp)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "ingen klasse valgt\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaks: gpg-check-pattern [valg] mønsterfil\n"
-"Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klassen %s støttes ikke\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " ved bruk av sertifikat-ID 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "option '%s' may not be used in %s mode\n"
@@ -11294,41 +11335,6 @@
 #~ msgstr ""
 #~ "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-modus\n"
 
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr ""
-#~ "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
-#~ "offentlig nøkkel (%d): %s.\n"
-
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr ""
-#~ "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
-#~ "meldingssum (%d): %s.\n"
-
-#~ msgid " (reordered signatures follow)"
-#~ msgstr " (omsorterte signaturer følger)"
-
-#~ msgid "key %s:\n"
-#~ msgstr "nøkkel %s:\n"
-
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "%d duplikatsignatur fjernet\n"
-#~ msgstr[1] "%d duplikatsignaturer fjernet\n"
-
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "%d signatur omsortert\n"
-#~ msgstr[1] "%d signaturer omsortert\n"
-
-#~ msgid ""
-#~ "Warning: errors found and only checked self-signatures, run '%s' to check "
-#~ "all signatures.\n"
-#~ msgstr ""
-#~ "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
-#~ "kontrollere alle signaturer.\n"
-
 #~ msgid "User ID revocation failed: %s\n"
 #~ msgstr "oppheving av bruker-ID mislyktes: %s\n"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/pl.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/pl.gmo sont différents
diff -Nru gnupg2-2.2.20/po/pl.po gnupg2-2.2.27/po/pl.po
--- gnupg2-2.2.20/po/pl.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/pl.po	2021-01-11 18:47:18.000000000 +0100
@@ -2,14 +2,14 @@
 # Copyright (C) 1998, 1999, 2000, 2001, 2002,
 #               2007 Free Software Foundation, Inc.
 # Janusz A. Urbanowicz <alex@bofh.net.pl>, 1999, 2000, 2001, 2002, 2003-2004
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2019.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-2.2.16\n"
+"Project-Id-Version: gnupg-2.2.24\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2019-05-29 17:45+0200\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-11-18 17:35+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie udało się uzyskać blokady pinentry: %s\n"
@@ -30,45 +30,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Anuluj"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Tak"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nie"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Zapisz w zarządcy haseł"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Czy na pewno pokazać hasło na ekranie?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Pokazanie hasła"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Ukrycie hasła"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Jakość:"
 
@@ -78,36 +78,36 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Jakość wpisanego wyżej tekstu.\n"
 "Kryteria jakości można uzyskać od administratora."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Proszę wprowadzić swój PIN, żeby odblokować klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Proszę wprowadzić swoje hasło, żeby odblokować klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Hasło:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "nie pasują - proszę spróbować jeszcze raz"
 
@@ -115,36 +115,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (próba %d z %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Powtórzenie:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN zbyt długi"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Hasło zbyt długie"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Niewłaściwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN zbyt krótki"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Niepoprawne hasło"
 
@@ -153,31 +157,31 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "nie można utworzyć ,,%s'': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nie można otworzyć ,,%s'': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -237,7 +241,7 @@
 "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A   %s"
 "%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
@@ -366,17 +370,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Ostrzeżenie: Wprowadzono hasło, które nie jest bezpieczne."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Proszę wprowadzić hasło do%0Azabezpieczenia swojego nowego klucza"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Proszę wprowadzić nowe hasło"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -384,132 +388,132 @@
 "@Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "uruchomienie w trybie dozorowanym"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "więcej komunikatów"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatów"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "wyjście poleceń w stylu sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "wyjście poleceń w stylu csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "bez odłączania od konsoli"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "użycie pliku loga dla serwera"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "nieużywanie SCdaemona"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAZWA|przyjęcie poleceń poprzez NAZWĘ"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie żądań zmiany TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie żądań zmiany ekranu X"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "nieużywanie pamięci PIN-ów przy podpisywaniu"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "niezezwalanie na użycie zewnętrznej pamięci podręcznej haseł"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "niezezwalanie klientom na oznaczanie kluczy jako ,,zaufanych''"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane hasło"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "niezezwalanie wywołującym na nadpisywanie pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "zezwolenie na pytanie o hasło poprzez Emacsa"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "włączenie obsługi ssh"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "włączenie obsługi putty"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Błędy prosimy zgłaszać na adres <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Składnia: @GPG_AGENT@ [opcje] (-h wyświetla pomoc)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -517,148 +521,136 @@
 "Składnia: @GPG_AGENT@ [opcje] [polecenie [argumenty]]\n"
 "Zarządzanie kluczem tajnym dla @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "podano błędny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Uwaga: brak domyślnego pliku opcji ,,%s''\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "plik opcji ,,%s'': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Uwaga: ,,%s'' nie jest uznane za opcję\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "nazwa gniazda ,,%s'' zbyt długa\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent już działa - nieuruchamianie nowego\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "błąd podczas pobierania nonce z gniazda\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "nie można ustawić praw dostępu do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "nie można użyć ,,%s'' jako katalogu domowego\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "błąd odczytu nonce z fd %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obsługa 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obsługa 0x%lx dla fd %d zakończona\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "obsługa ssh 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "obsługa ssh 0x%lx dla fd %d zakończona\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect nie powiodło się: %s - czekanie 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "brak działającego gpg-agenta w tej sesji\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA (-h wyświetla pomoc)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -666,8 +658,8 @@
 "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pamięci haseł\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -675,9 +667,9 @@
 "@Polecenia:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -687,11 +679,11 @@
 "Opcje:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Składnia: gpg-protect-tool [opcje] (-h wyświetla pomoc)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -699,22 +691,22 @@
 "Składnia: gpg-protect-tool [opcje] [argumenty]\n"
 "Narzędzie do utrzymywania kluczy tajnych\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Proszę wprowadzić hasło do odbezpieczenia obiektu PKCS#12."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -722,18 +714,18 @@
 "Proszę wprowadzić hasło lub PIN\n"
 "Potrzebny do zakończenia tej operacji."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "anulowano\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "błąd podczas pytania o hasło: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "błąd podczas otwierania ,,%s'': %s\n"
@@ -743,32 +735,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "plik ,,%s'', linia %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "instrukcja \"%s\" zignorowana w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systemowa lista zaufania ,,%s'' niedostępna\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "błędny odcisk w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "błąd odczytu ,,%s'', w linii %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
@@ -781,7 +773,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -790,11 +782,11 @@
 "Czy absolutnie ufasz, że%%0A  ,,%s''%%0Apoprawnie poświadcza certyfikaty "
 "użytkowników?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Nie"
@@ -807,7 +799,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -819,20 +811,20 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Akceptuj"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Odrzuć"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Uwaga: To hasło nie było nigdy zmieniane.%0AProszę zmienić je teraz."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -840,15 +832,15 @@
 msgstr ""
 "To hasło nie zostało zmienione%%0Aod %.4s-%.2s-%.2s. Proszę zmienić je teraz."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Zmiana hasła"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Zmienię je później"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -856,11 +848,11 @@
 msgstr ""
 "Czy na pewno usunąć klucz identyfikowany przez uchwyt%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Usuń klucz"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -868,12 +860,12 @@
 "Ostrzeżenie: ten klucz jest wymieniony także do użycia z SSH!\n"
 "Usunięcie klucza może uniemożliwić dostęp do zdalnych maszyn."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA wymaga długości skrótu będącego wielokrotnością 8 bitów\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "Klucz %s używa niebezpiecznego (%u-bitowego) skrótu\n"
@@ -883,7 +875,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "skrót %zu-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
@@ -893,7 +885,7 @@
 msgid "secret key parts are not available\n"
 msgstr "tajne części klucza są niedostępne\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algorytm klucza publicznego %d (%s) nie jest obsługiwany\n"
@@ -922,7 +914,7 @@
 msgstr "błąd tworzenia strumienia dla potoku: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "błąd podczas tworzenia procesu: %s\n"
@@ -968,27 +960,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem z ustawieniem opcji gpg-agenta\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie można wyłączyć zrzutów pamięci: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Ostrzeżenie: niebezpieczne prawa własności do %s ,,%s''\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "oczekiwanie aż plik ,,%s'' stanie się dostępny...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
@@ -1048,7 +1040,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajtów"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
@@ -1161,7 +1153,7 @@
 msgstr "algorytm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nieobsługiwany algorytm: %s"
@@ -1236,39 +1228,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certyfikat główny jest zaufany"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "nie znaleziono CRL dla certyfikatu"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "dostępny CRL jest zbyt stary"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "weryfikacja CRL/OCSP certyfikatów"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Dołączone certyfikaty"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Brak wpisów w logu."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Nieznana operacja"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent sprawny"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr sprawny"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Brak pomocy dla ,,%s''."
@@ -1277,7 +1269,7 @@
 msgid "ignoring garbage line"
 msgstr "zignorowano błędną linię"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[brak]"
 
@@ -1286,82 +1278,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niewłaściwy znak formatu radix64 %02x został pominięty\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "nieoczekiwany argument"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "błąd odczytu"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "słowo kluczowe zbyt długie"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "brak argumentu"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "niepoprawny argument"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "błędne polecenie"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "błędna definicja aliasu"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "brak pamięci"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "błędne polecenie"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "nieznane polecenie ,,%s''\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "nieoczekiwane opakowanie: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "błędna opcja"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "brak argumentu dla opcji ,,%.50s''\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "błędny argument dla opcji ,,%.50s''\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "opcja ,,%.50s'' nie może mieć argumentów\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "błędne polecenie ,,%.50s''\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "brak pamięci\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "błędna opcja ,,%.50s''\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Uwaga: brak domyślnego pliku opcji ,,%s''\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "plik opcji ,,%s'': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1377,42 +1401,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "błąd zapisu do ,,%s'': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "usuwanie nieaktualnego pliku blokady (utworzonego przez %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "oczekiwanie na blokadę (trzymaną przez %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(zakleszczenie?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "blokada ,,%s'' nie założona: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "oczekiwanie na blokadę %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (wymagana %s, zainstalowana %s)\n"
@@ -1594,75 +1617,67 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Uwaga: do restartu ich należy użyć polecenia ,,%s''.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s nie jest zgodny z trybem %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
 
 #: g10/call-dirmngr.c:243
-#, fuzzy, c-format
-#| msgid "option '%s' may not be used in %s mode\n"
+#, c-format
 msgid "keyserver option \"%s\" may not be used in %s mode\n"
-msgstr "opcja ,,%s'' nie może być używana w trybie %s\n"
+msgstr "opcja serwera kluczy ,,%s'' nie może być używana w trybie %s\n"
 
 #: g10/call-dirmngr.c:417
 msgid "WKD uses a cached result"
-msgstr ""
+msgstr "WKD używa zapamiętanego wyniku"
 
 #: g10/call-dirmngr.c:420
 msgid "Tor is not running"
-msgstr ""
+msgstr "Tor nie działa"
 
 #: g10/call-dirmngr.c:422
-#, fuzzy
-#| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
-msgstr ",,%s'' nie jest właściwym odciskiem\n"
+msgstr "Tor nie jest właściwie skonfigurowany"
 
 #: g10/call-dirmngr.c:424
-#, fuzzy
-#| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
-msgstr ",,%s'' nie jest właściwym odciskiem\n"
+msgstr "DNS nie jest właściwie skonfigurowany"
 
 #: g10/call-dirmngr.c:426
 msgid "unacceptable HTTP redirect from server"
-msgstr ""
+msgstr "niedopuszczalne przekierowanie HTTP z serwera"
 
 #: g10/call-dirmngr.c:428
 msgid "unacceptable HTTP redirect from server was cleaned up"
-msgstr ""
+msgstr "niedopuszczalne przekierowanie HTTP z serwera zostało wyczyszczone"
 
 #: g10/call-dirmngr.c:430
-#, fuzzy
-#| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
-msgstr "tworzenie certyfikatu unieważnienia klucza"
+msgstr "serwer używa błędnego certyfikatu"
 
-#: g10/call-dirmngr.c:437
-#, fuzzy, c-format
-#| msgid "armor: %s\n"
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
+#, c-format
 msgid "Note: %s\n"
-msgstr "opakowanie: %s\n"
+msgstr "Uwaga: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Karta OpenPGP niedostępna: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kartę OpenPGP nr %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nie działa w trybie wsadowym\n"
@@ -1672,136 +1687,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Kod resetujący nie jest (już lub w ogóle) dostępny\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[nie ustawiono]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
-msgstr ""
+msgstr "Pan"
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
-msgstr ""
+msgstr "Pani"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Błąd: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Błąd: znak ,,<'' nie może być użyty.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Błąd: podwójne spacje nie są dopuszczalne.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Imię posiadacza karty: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Błąd: pełne personalia zbyt długie (limit to %d znaków).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "błąd odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "błąd zapisu ,,%s'': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Preferowane języki: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
-msgstr ""
+msgstr "Tutuł (M = Pan, F = Pani lub spacja): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Błąd: niewłaściwa odpowiedź.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Błąd: niewłaściwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Zastąpić istniejący klucz? (t/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1811,97 +1826,97 @@
 "       Jeśli tworzenie klucza nie powiedzie się, proszę sprawdzić\n"
 "       dokumentację karty, aby poznać dozwolone rozmiary.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej długości klucz wygenerować? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Rozmiary kluczy %s muszą być z przedziału %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Zmiana atrybutu klucza karty dla: "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Klucz do podpisów\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszę wybrać rodzaj klucza:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Niewłaściwy wybór.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Karta zostanie przekonfigurowana do tworzenia klucza typu: %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "błąd podczas zmiany atrybutu klucza %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "błąd podczas pobierania informacji o karcie: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "To polecenie nie jest obsługiwane przez tę kartę\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Stworzyć poza kartą kopię zapasową klucza szyfrującego? (T/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Uwaga: klucze są już zapisane na karcie!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Zastąpić istniejące klucze? (t/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1912,167 +1927,165 @@
 "   PIN = ,,%s''   PIN administracyjny = ,,%s''\n"
 "Należy je zmienić przy użyciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Proszę wybrać rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Klucz do podpisów\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Proszę wybrać gdzie zapisać klucz:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD nie powiodło się: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Uwaga: to polecenie niszczy wszystkie klucze zapisane na karcie!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Naprawdę przywrócić stan fabryczny? (proszę wpisać ,,yes'') "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "błąd przy ustawianiu KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "wyjście z tego menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "pokazanie poleceń administratora"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "wypisanie wszystkich dostępnych danych"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza określonego w URL-u karty"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "zmiana preferowanych języków"
 
-#: g10/card-util.c:2178
-#, fuzzy
-#| msgid "change card holder's sex"
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
-msgstr "zmiana płci posiadacza karty"
+msgstr "zmiana tytułu posiadacza karty"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokowanie PIN-u przy użyciu kodu resetującego"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "zniszczenie wszystkich kluczy i danych"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "zmiana atrybutu klucza"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora są dozwolone\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie są dozwolone\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie działa z tym poleceniem\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "nie można otworzyć ,,%s''\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2133,8 +2146,8 @@
 msgstr "podklucza"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powiódł się: %s\n"
@@ -2159,38 +2172,50 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usunąć należy najpierw użyć opcji \"--delete-secret-key\".\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "błąd podczas tworzenia hasła: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala użyć pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ",,%s'' już jest skompresowany\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "OSTRZEŻENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "algorytm skrótu ,,%s'' nie może być używany w trybie %s\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "odczyt z ,,%s''\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2198,18 +2223,12 @@
 "OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "OSTRZEŻENIE: klucz %s nie nadaje się do szyfrowania w trybie %s\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2218,39 +2237,39 @@
 "OSTRZEŻENIE: wymuszone użycie kompresji %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami adresata\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "opcja ,,%s'' nie może być używana w trybie %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomocą %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZEŻENIE: wiadomość była szyfrowana kluczem słabym szyfru symetrycznego.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obróbki pakietu szyfrowego\n"
@@ -2343,7 +2362,7 @@
 msgstr " - pominięty"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "zapis do ,,%s''\n"
@@ -2378,266 +2397,270 @@
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora użytkownika]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatycznie pobrano ,,%s'' poprzez %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "błąd pobierania ,,%s'' poprzez %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Brak odcisku"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "szukanie świeżej kopii wygasłego klucza poprzez %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(sprawdzić argument opcji ,,%s'')\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Ostrzeżenie: ,,%s'' nie jest użyty jako domyślny klucz: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "użycie ,,%s'' jako domyślnego klucza tajnego do podpisywania\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "wszystkie wartości przekazane do ,,%s'' zostały zignorowane\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusiła uznanie za poprawny niepoprawnego "
 "klucza %s.\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "poprawne argimenty dla opcji ,,%s'':\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "złożenie podpisu"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "złożenie podpisu pod dokumentem"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "złożenie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domyślne)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpisów kluczy"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "szybkie wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "szybkie dodanie nowego identyfikatora użytkownika"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "szybkie unieważnienie identyfikatora użytkownika"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "szybkie ustawienie nowej daty wygaśnięcia"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "wygenerowanie pary kluczy z pełną funkcjonalnością"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu unieważnienia klucza"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "usunięcie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "szybkie złożenie podpisu na kluczu"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "szybkie złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+msgid "quickly revoke a key signature"
+msgstr "szybkie unieważnienie podpisu klucza"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "zmiana hasła"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "odświeżenie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "import/dołączenie kluczy"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "wyświetlenie stanu karty"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "wypisanie skrótów wiadomości"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WARTOŚĆ|ustawienie polityki TOFU dla klucza"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
 "odszyfrowania"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|zapis wyjścia do PLIKU"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plików"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "ścisłe zachowanie OpenPGP"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2645,7 +2668,7 @@
 "@\n"
 "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2667,11 +2690,11 @@
 " --list-keys [nazwy]        pokazanie kluczy\n"
 " --fingerprint [nazwy]      pokazanie odcisków kluczy\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPG@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2681,7 +2704,7 @@
 "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2689,78 +2712,78 @@
 "\n"
 "Obsługiwane algorytmy:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Skrótów: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "składnia: %s [opcje] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa własności do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2768,21 +2791,21 @@
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2790,490 +2813,479 @@
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "pokazywanie informacji o zastosowaniu klucza przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "pokazywanie unieważnionych i wygasłych ID użytkownika na listach kluczy"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nieznana polityka TOFU ,,%s''\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(,,help'' wyświetli listę wyborów)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Uwaga: stary domyślny plik opcji ,,%s'' został zignorowany\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Uwaga: %s nie jest do normalnego użytku!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia podpisu\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ",,%s'' nie jest niepoprawnym adresem e-mail\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "błędny tryb pinentry ,,%s''\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "błędne źródło żądania ,,%s''\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumiały URL serwera kluczy\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "niepoprawne opcje filtrowania: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie unieważnionych i wygasłych ID użytkownika przy sprawdzaniu "
 "podpisów"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpisów z danymi PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie można ustawić ścieżki programów wykonywalnych na %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno używać %s z %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w połączeniu z %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadziała z niebezpieczną pamięcią z powodu %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "wartość completes-needed musi być większa od 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "wartość marginals-needed musi być większa od 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "wartość max-cert-depth musi mieścić się w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niewłaściwy domyślny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niewłaściwy minimalny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Uwaga: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieć wartość 0, 1 lub 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "niewłaściwe domyślne ustawienia\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "niewłaściwe ustawienia skrótów\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie działa z %s!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "algorytm skrótu ,,%s'' nie może być używany w trybie %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "algorytm kompresji ,,%s'' nie może być używany w trybie %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZEŻENIE: podano adresatów (-r) w działaniu które ich nie dotyczy\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie można użyć --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "nie można użyć --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie można użyć --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "nie można użyć --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksport do klucza ssh powiódł się: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "błąd analizy specyfikacji klucza ,,%s'': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 ",,%s'' nie wygląda na prawidłowy identyfikator, odcisk ani uchwyt klucza\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "OSTRZEŻENIE: nie podano polecenia. Próba odgadnięcia zamiaru...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoją wiadomość ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|PLIK|pobieranie kluczy ze zbioru PLIK"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktować konfliktu datowników jako błędu"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|odrzucanie podpisów wykonanych podanym ALGOrytmem"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Składnia: gpgv [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3324,7 +3336,7 @@
 
 #: g10/import.c:193
 msgid "ignore key-signatures which are not self-signatures"
-msgstr ""
+msgstr "ignorowanie podpisów kluczy nie będących podpisami własnymi"
 
 #: g10/import.c:196
 msgid "run import filters and export key immediately"
@@ -3468,7 +3480,7 @@
 msgstr ""
 "można uaktualnić swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %s: brak identyfikatora użytkownika\n"
@@ -3478,7 +3490,7 @@
 msgid "key %s: %s\n"
 msgstr "klucz %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "odrzucony przez filtr importu"
 
@@ -3502,7 +3514,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to może być spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %s: brak klucza publicznego: %s\n"
@@ -3517,7 +3529,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "błąd zapisu zbioru kluczy ,,%s'': %s\n"
@@ -3587,17 +3599,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %s: ,,%s'' bez zmian\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "klucz %s: klucz prywatny już istnieje\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klucz %s: błąd wysyłania do agenta: %s\n"
@@ -3610,236 +3622,306 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Aby zmigrować ,,%s'', dla każdej karty procesorowej należy uruchomić: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "klucz prywatny %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %s: klucz tajny z błędnym szyfrem %d - pominięty\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "klucz został zastąpiony"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "klucz został skompromitowany"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "klucz nie jest już używany"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "identyfikator użytkownika przestał być poprawny"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "powód unieważnienia: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "komentarz do unieważnienia: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %s: brak klucza publicznego, którego dotyczy wczytany certyfikat\n"
 "              unieważnienia\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %s: ,,%s'' certyfikat unieważnienia został już wczytany\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %s: brak identyfikatora użytkownika do podpisu\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obsługiwany\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "klucz %s: nieprawidłowy bezpośredni podpis\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %s: brak podklucza do dowiązania\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %s: niepoprawne dowiązanie podklucza\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %s: usunięto wielokrotne dowiązanie podklucza\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %s: brak podklucza, którego dotyczy unieważnienie\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %s: usunięto wielokrotne unieważnienie podklucza\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %s: pominięto identyfikator użytkownika ,,%s''\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %s: podklucz pominięty\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pominięty\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %s: pominięto certyfikat unieważnienia umieszczony\n"
 "              w niewłaściwym miejscu\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %s: pominięto -  niepoprawny certyfikat unieważnienia: %s\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %s: pominięto - podpis na podkluczu w niewłaściwym miejscu\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %s: pominięto - nieoczekiwana klasa podpisu (0x%02X)\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
 "             zapytanie o unieważniający klucz %s w serwerze kluczy\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
 "             brak unieważniającego klucza %s.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %s: ,,%s'' dodany certyfikat unieważnienia\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %s: dodano bezpośredni podpis\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "błąd przydzielania pamięci: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"nie można sprawdzić podpisu z nieobsługiwanym algorytmem klucza publicznego "
+"(%d): %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"nie można sprawdzić podpisu z nieobsługiwanym algorytmem skrótu %d: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (poniżej uporządkowane podpisy)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "klucz %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d powtórzony podpis usunięty\n"
+msgstr[1] "%d powtórzone podpisy usunięte\n"
+msgstr[2] "%d powtórzonych podpisów usuniętych\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d podpis nie został sprawdzony z powodu braku klucza\n"
+msgstr[1] "%d podpisy nie zostały sprawdzone z powodu braku klucza\n"
+msgstr[2] "%d podpisów nie zostało sprawdzonych z powodu braku klucza\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d niepoprawny podpis\n"
+msgstr[1] "%d niepoprawne podpisy\n"
+msgstr[2] "%d niepoprawnych podpisów\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d podpis uporządkowany\n"
+msgstr[1] "%d podpisy uporządkowane\n"
+msgstr[2] "%d podpisów uporządkowanych\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Uwaga: znaleziono błędy, a sprawdzono tylko podpisy własne; uruchomienie "
+"'%s' sprawdzi wszystkie podpisy.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "błąd tworzenia keyboksa ,,%s'': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "błąd tworzenia zbioru kluczy ,,%s'': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ,,%s'' utworzony\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "zbiór kluczy ,,%s'' został utworzony\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "zasób bloku klucza ,,%s'': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "błąd podczas otwierania bazy kluczy: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiodła się odbudowa bufora bazy: %s\n"
@@ -4083,8 +4165,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisać? (t/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "złożenie podpisu nie powiodło się: %s\n"
@@ -4288,7 +4370,7 @@
 "(ltsign,\n"
 "  tnrsign itd.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Klucz unieważniony."
 
@@ -4343,7 +4425,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno przenieść główny klucz (t/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybrać dokładnie jeden klucz.\n"
 
@@ -4421,7 +4503,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Wyjść bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie został zmieniony więc zapis zmian nie jest konieczny.\n"
@@ -4464,104 +4546,118 @@
 msgid "Nothing to sign.\n"
 msgstr "Nie ma nic do podpisania.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Nie podpisane przez ciebie.\n"
+
+#: g10/keyedit.c:2995
+#, c-format
+msgid "revoking the key signature failed: %s\n"
+msgstr "unieważnienie podpisu klucza nie powiodło się: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ",,%s'' nie jest właściwym odciskiem\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklucz ,,%s'' nie został odnaleziony\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Skrót: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawierają opisu ustawień.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz został unieważniony %s przez klucz użytkownika %s %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz może zostać unieważniony przez klucz %s użytkownika %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "unieważniono: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "wygasł: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "użycie: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "poprawność: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Ten klucz został wyłączony z użytku"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4569,17 +4665,17 @@
 "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
 "dopóki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "unieważniony"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "wygasł"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4589,17 +4685,17 @@
 "             jako główny. Wykonanie tego polecenie może więc spowodować\n"
 "             wyświetlanie innego identyfikatora jako domyślnego głównego.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Może warto także zmienić jego datę ważności.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4608,35 +4704,35 @@
 "OSTRZEŻENIE: To jest klucz PGP wersji 2. Dodanie zdjęcia spowoduje, że\n"
 "             niektóre wersje przestaną go rozumieć.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodać? (t/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie można dodać zdjęcia.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usunąć ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usunąć ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4644,20 +4740,20 @@
 msgstr[1] "%d podpisy usunięte.\n"
 msgstr[2] "%d podpisów usuniętych.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zostało usunięte.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4665,17 +4761,17 @@
 msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpisy usunięte\n"
 msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpisów usuniętych\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4685,282 +4781,278 @@
 "             unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
 "             go rozumieć.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie można wyznaczyć klucza unieważniającego.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza unieważniającego: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie można wyznaczyć jako unieważniającego\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie można wyznaczyć klucza do unieważniania jego samego\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz został już uznany kluczem unieważniającym\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZEŻENIE: nie można cofnąć wyznaczenia klucza jako unieważniającego!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Czy na pewno zmienić datę ważności dla wielu podkluczy? (t/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty ważności podklucza.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty ważności głównego klucza.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Zmiana zastosowań podklucza.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Zmiana zastosowań klucza głównego.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisujący %s jest już skrośnie podpisany\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisujący, więc nie musi być skrośnie podpisany\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usunąć? (t/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Brak podklucza o identyfikatorze ,,%s''.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ważność tego klucza wygasła %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go unieważnić? (t/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Nie podpisane przez ciebie.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory na kluczu %s są podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (podpis nieunieważnialny) "
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "unieważniony przez twój klucz %s w %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 "próba unieważnienia identyfikatora nie odnoszącego się do użytkownika: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZEŻENIE: identyfikator użytkownika podpisany za %d sekund (w "
 "przyszłości)\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 "Nie można unieważnić ostatniego poprawnego identyfikatora użytkownika.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Wyświetlanie zdjęcia w formacie %s o rozmiarze %ld bajtów dla klucza %s (id "
 "%d).\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "błędna wartość dla opcji ,,%s''\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "ustawienie ,,%s'' powtarza się\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele ustawień szyfru\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele ustawień funkcji skrótu\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele ustawień kompresji\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "niewłaściwy element ,,%s'' w tekście ustawień\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpośredniego\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wiążącego klucz\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmiar klucza zaokrąglony w górę do %u bitów\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -4968,19 +5060,19 @@
 "OSTRZEŻENIE: niektóre programy OpenPGP nie potrafią obsłużyć klucza RSA o "
 "tej długości skrótu\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Podpisywanie"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certyfikowanie"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Uwierzytelnianie"
 
@@ -4994,162 +5086,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "PpSsUuZz"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Możliwe akcje dla klucza %s: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Aktualnie dopuszczalne akcje: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Przełączenie możliwości podpisywania\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Przełączenie możliwości szyfrowania\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Przełączenie możliwości uwierzytelniania\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Zakończenie\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA i RSA (domyślne)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA i Elgamala\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC i ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) ECC (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) ECC (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) ECC (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Istniejący klucz\n"
 
-#: g10/keygen.c:1974
-#, fuzzy, c-format
-#| msgid "   (%d) Existing key from card\n"
+#: g10/keygen.c:1973
+#, c-format
 msgid "  (%d) Existing key from card\n"
-msgstr "   (%d) Istniejący klucz z karty\n"
+msgstr "  (%d) Istniejący klucz z karty\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Uchwyt klucza: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Brak klucza o tym uchwycie\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "błąd odczytu karty: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numer seryjny karty: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Dostępne klucze:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Klucze %s będą miały od %u do %u bitów długości.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Jakiej długości podklucz wygenerować? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Żądana długość klucza to %u bitów.\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Proszę wybrać rodzaj krzywej eliptycznej:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5165,7 +5256,7 @@
 "      <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:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5181,38 +5272,38 @@
 "      <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:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Okres ważności klucza? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres ważności podpisu? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "niepoprawna wartość\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci ważność %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ważność podpisu wygasa %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5220,11 +5311,11 @@
 "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:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko się zgadza (t/N)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5238,7 +5329,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5254,49 +5345,49 @@
 "    \"Tadeusz Żeleński (Boy) <tzb@ziemianska.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Imię i nazwisko: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Znaki ,,%s'' i ,,%s'' nie mogą występować w inieniu ani nazwisku\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 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:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Niewłaściwy znak w komentarzu\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Używany zestaw znaków: ,,%s''.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5307,7 +5398,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
@@ -5324,35 +5415,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Zmienić (I)mię/nazwisko, adres (E)mail, czy (W)yjść? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 "Zmienić (I)mię/nazwisko, adres (E)mail, przejść (D)alej,\n"
 "czy (W)yjść z programu? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawić ten błąd\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5368,13 +5459,13 @@
 "ilości\n"
 "entropii.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiodła się: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5385,66 +5476,66 @@
 "    ,,%s''\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Kontynuować? (T/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "klucz dla ,,%s'' już istnieje\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Utworzyć klucz mimo to? (t/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "tworzenie mimo to\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Uwaga: pełną funkcjonalność generowania klucza można uzyskać przez ,,%s "
 "%s''.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza została anulowana.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, 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:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Uwaga: kopia zapasowa klucza karty zapisana do ,,%s''\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "zapis klucza publicznego w ,,%s''\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5452,7 +5543,7 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5460,7 +5551,7 @@
 "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5468,23 +5559,23 @@
 "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Część tajna głównego klucza jest niedostępna.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Część tajna głównego klucza jest zapisana na karcie.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzyć? (t/N) "
 
@@ -5520,22 +5611,6 @@
 msgstr[1] "%d poprawne podpisy\n"
 msgstr[2] "%d poprawnych podpisów\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d niepoprawny podpis\n"
-msgstr[1] "%d niepoprawne podpisy\n"
-msgstr[2] "%d niepoprawnych podpisów\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d podpis nie został sprawdzony z powodu braku klucza\n"
-msgstr[1] "%d podpisy nie zostały sprawdzone z powodu braku klucza\n"
-msgstr[2] "%d podpisów nie zostało sprawdzonych z powodu braku klucza\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5556,29 +5631,29 @@
 msgid "Keyring"
 msgstr "Zbiór kluczy"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza głównego:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza głównego:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "       Odcisk klucza ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "    Nr seryjny karty ="
 
@@ -5611,7 +5686,7 @@
 msgstr[1] " (%lu podpisy)\n"
 msgstr[2] " (%lu podpisów)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
@@ -5662,7 +5737,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pominięto\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5670,133 +5745,133 @@
 msgstr[1] "odświeżanie %d kluczy z %s\n"
 msgstr[2] "odświeżanie %d kluczy z %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZEŻENIE: nie można odświeżyć klucza %s przez %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klucz nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %s z serwera %s %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s z %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "brak znanego serwera kluczy\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pominięty ,,%s'': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysyłanie klucza %s na %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "zapytanie o klucz z ,,%s''\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZEŻENIE: nie można pobrać URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dziwny rozmiar jak na zaszyfrowany klucz sesyjny (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "hasło wygenerowane nieznanym algorytmem skrótu %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny to %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ,,%s''\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomocą %lu haseł\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym hasłem\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmując że dane zostały zaszyfrowane za pomocą %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dostępny, próba użycia %s zamiast niego\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5806,277 +5881,278 @@
 "prawdopodobne, że jest ona prawdziwa. Jest tak dlatego, że w tamtych\n"
 "czasach ochrona integralności nie była szeroko stosowana.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Użycie mimo to opcji ,,%s'' do odszyfrowania.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "wymuszono błąd odszyfrowywania!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "błąd odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Uwaga: nadawca zaznaczył, że wiadomość nie powinna być zapisywana\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat unieważnienia - użyj ,,gpg --import'' aby go wczytać\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "nie znaleziono podpisu\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie można obsłużyć tych wieloznacznych danych podpisu\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpisano w %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               przy użyciu klucza %s %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %s kluczem %s o numerze %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                        wystawca ,,%s''\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Klucz dostępny w: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
-msgstr ""
+msgstr "Uwaga: aby wykorzystać tę informację, należy użyć ,,%s''\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias ,,%s''"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "OSTRZEŻENIE: ten klucz nie nadaje się do podpisywania w trybie %s\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ważność podpisu wygasła %s.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Ważność podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, algorytm skrótu %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", algorytm klucza "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "OSTRZEŻENIE: to nie jest oddzielony podpis; plik ,,%s'' NIE został "
 "zweryfikowany!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie można sprawdzić podpisu: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZEŻENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat na ,,%s'' nie powiodło się w %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) nie powiodło się w %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "OSTRZEŻENIE: użycie eksperymentalnego algorytmu klucza publicznego %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "OSTRZEŻENIE: klucze do podpisywania i szyfrowania Elgamala są odradzane\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "OSTRZEŻENIE: użycie eksperymentalnego szyfru %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "OSTRZEŻENIE: użycie eksperymentalnego algorytmu skrótu %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "OSTRZEŻENIE: algorytm skrótu %s jest odradzany\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Uwaga: podpisy wykorzystujące algorytm %s są odrzucane\n"
 
-#: g10/misc.c:370
-#, fuzzy, c-format
-#| msgid "Note: signatures using the %s algorithm are rejected\n"
+#: g10/misc.c:376
+#, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
-msgstr "Uwaga: podpisy wykorzystujące algorytm %s są odrzucane\n"
+msgstr ""
+"Uwaga: podpisy kluczami osób trzecich wykorzystujące algorytm %s są "
+"odrzucane\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(zgłoszony błąd: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(zgłoszony błąd: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(dalsze informacje: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: przestarzała opcja ,,%s''\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce należy użyć ,,%s%s''\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "OSTRZEŻENIE: ,,%s'' jest przestarzałym poleceniem - nie należy go używać\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: ,,%s'' jest przestarzałe w tym pliku - ma znaczenie tylko w %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6084,37 +6160,37 @@
 "OSTRZEŻENIE: ,,%s%s'' jest przestarzałą opcją - nie ma efektu z wyjątkiem "
 "%s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "nieskompresowany|brak"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomość może nie dać się odczytać za pomocą %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "klucz publiczny ECDSA powinien być w kodowaniu SEC wielokrotnością 8 bitów\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nieznany słaby skrót ,,%s''\n"
@@ -6147,73 +6223,73 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "przyjęto obecność podpisanych danych w '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie można obsłużyć tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZEŻENIE: symetrycznie zaszyfrowany klucz sesyjny może nie być "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Nieznane krytyczne adnotacje podpisu: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem z agentem: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Hasło\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "anulowano przez użytkownika\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID głównego klucza %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Proszę wprowadzić hasło do odbezpieczenia klucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Proszę wprowadzić hasło do zaimportowania klucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Proszę wprowadzić hasło do wyeksportowania podklucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Proszę wprowadzić hasło do wyeksportowania klucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Czy na pewno trwale usunąć podklucz prywatny OpenPGP:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Czy na pewno trwale usunąć klucz prywatny OpenPGP:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6269,7 +6345,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdjęcie jest w porządku? (t/N/w) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nie można wyświetlić zdjęcia!\n"
@@ -6573,12 +6649,12 @@
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresatów\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Uwaga: klucz %s nie ma cechy %s\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@ -6632,27 +6708,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jesteśmy adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nieobsługiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfrujący %d%s jest nieznany lub został wyłączony\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "OSTRZEŻENIE: brak algorytmu szyfrującego %s w ustawieniach odbiorcy\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Uwaga: ważność klucza tajnego %s wygasła %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Uwaga: klucz został unieważniony"
@@ -6850,7 +6926,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "OSTRZEŻENIE: konflikt skrótów podpisów w wiadomości\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "klucz %s nie może być używany do podpisów w trybie %s\n"
@@ -6928,29 +7004,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Uwaga: klucz podpisujący %s został unieważniony\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "błędny podpis klucza wykonany kluczem %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "błędny podpis danych wykonany kluczem %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "uznano za zły podpis utworzony kluczem %s z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klucz %s: brak podklucza dla podpisu unieważnienia podklucza\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %s: brak podklucza dowiązywanego podpisem\n"
@@ -6979,12 +7055,12 @@
 "OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL-u preferowanego\n"
 "           serwera kluczy (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "podpis %s/%s złożony przez: ,,%s''\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6992,12 +7068,12 @@
 "OSTRZEŻENIE: wymuszone użycie skrótu %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie użyty szyfr %s\n"
@@ -7025,7 +7101,7 @@
 "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniający "
 "bezpiecznych podpisów!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiódł się: %s\n"
@@ -7070,12 +7146,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "błąd odczytu w ,,%s'': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "nie można utworzyć blokady dla ,,%s''\n"
@@ -7085,12 +7161,12 @@
 msgid "can't lock '%s'\n"
 msgstr "nie można zablokować ,,%s''\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, 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"
@@ -7105,103 +7181,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "nie można dostać się do ,,%s'': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiodło się: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Uwaga: nie można zapisywać bazy zaufania\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, 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:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: błąd przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: błąd odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: błąd zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiodła: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiodła: %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niewłaściwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: błąd odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiodło się: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiodło się: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Błąd: uszkodzona baza zaufania.\n"
@@ -7611,98 +7687,98 @@
 "OSTRZEŻENIE: szyfrowanie kluczem %s, który nie ma unieważnionych "
 "identyfikatorów użytkownika\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr ",,%s'' nie jest poprawnym długim identyfikatorem klucza\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %s: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %s jest wpisany więcej niż raz w bazie zaufania\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "klucz %s: brak klucza publicznego dla zaufanego klucza - pominięty\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klucz %s został oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powiódł się: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego niż poszukiwany %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Można próbować odtworzyć bazę zaufania przy użyciu poleceń:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Jeśli to nie działa, należy poradzić się instrukcji\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nie można użyć nieznanego modelu zaufania (%d) - przyjęto model zaufania %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "użycie modelu zaufania %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "następne sprawdzanie bazy odbędzie się %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "nie ma potrzeby sprawdzania trustdb przy modelu zaufania ,,%s''\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nie ma potrzeby uaktualniania trustdb przy modelu zaufania ,,%s''\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %s nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7710,7 +7786,7 @@
 msgstr[1] "przetworzono %d klucze"
 msgstr[2] "przetworzono %d kluczy"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7718,17 +7794,17 @@
 msgstr[1] " (skasowano %d liczniki zaufania)\n"
 msgstr[2] " (skasowano %d liczników zaufania)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7736,7 +7812,7 @@
 "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
 "%du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7848,57 +7924,72 @@
 "Składnia: kbxutil [opcje] [pliki]\n"
 "Wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sNumer: %s%%0AWłaściciel: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Pozostało prób: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Proszę wprowadzić PIN PIN dla klucza do tworzenia podpisów kwalifikowanych."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Proszę wprowadzić PIN dla zwykłych kluczy."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwróciło błąd: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN nie został jeszcze zmieniony\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Proszę wprowadzić nowy PIN dla zwykłych kluczy."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Proszę wprowadzić PIN dla zwykłych kluczy."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Proszę wprowadzić nowy kod oblokowujący PIN (PUK) dla zwykłych kluczy."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla zwykłych kluczy."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Proszę wprowadzić nowy PIN dla klucza do tworzenia podpisów "
 "kwalifikowanych."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-"||Proszę wprowadzić PIN PIN dla klucza do tworzenia podpisów kwalifikowanych."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7906,7 +7997,7 @@
 "|NP|Proszę wprowadzić nowy kod odblokowujący PIN (PUK) dla klucza do "
 "tworzenia podpisów kwalifikowanych."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7914,47 +8005,47 @@
 "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
 "podpisów kwalifikowanych."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powiódł się zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "błąd podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowiedź nie zawiera współczynnika RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "odpowiedź nie zawiera klucza publicznego EC\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
@@ -7962,56 +8053,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumer: %s%%0AWłaściciel: %s%%0ALicznik: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sNumer: %s%%0AWłaściciel: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Pozostało prób: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "użycie domyślnego PIN-u jako %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "nie udało się użyć domyślnego PIN-u jako %s: %s - wyłączenie dalszego "
 "domyślnego użycia\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Proszę odblokować kartę"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta została trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8025,24 +8104,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Proszę wprowadzić PIN administracyjny"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "dostęp do poleceń administratora nie został skonfigurowany\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Proszę wpisać PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Proszę wprowadzić kod resetujący dla karty"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Kod resetujący zbyt krótki; minimalna długość to %d\n"
@@ -8050,87 +8129,87 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nowy kod resetujący"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Proszę wprowadzić PIN i nowy PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "błąd podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "błąd podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "klucz już istnieje\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "istniejący klucz zostanie zastąpiony\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "zapisywanie nowego klucza\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powiódł się zapis klucza: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nieobsługiwana krzywa\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "proszę czekać na wygenerowanie klucza...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiodło się\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8138,27 +8217,27 @@
 msgstr[1] "generowanie klucza zakończone (%d sekundy)\n"
 msgstr[2] "generowanie klucza zakończone (%d sekund)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza się z żądanym\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, 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:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpisów: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8166,7 +8245,7 @@
 "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
 "zabroniona\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@ -8182,55 +8261,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Początkowy nowy PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|PLIK|zapisanie logów do PLIKu"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|połączenie z czytnikiem na porcie N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|użycie NAZWY jako sterownika ct-API"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|użycie NAZWY jako sterownika PC/SC"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "nieużywanie wewnętrznego sterownika CCID"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|odłączenie karty po N sekundach nieaktywności"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "nieużywanie klawiatury czytnika"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "zabronienie używania poleceń karty administratora"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "użycie wejścia z klawiatury czytnika o zmiennej długości"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Składnia: @SCDAEMON@ [opcje] (-h wyświetla pomoc)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8238,308 +8317,325 @@
 "Składnia: scdaemon [opcje] [polecenie [argumenty]]\n"
 "Demon kart procesorowych dla @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsługa fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsługa fd %d zakończona\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "model poprawności żądany przez certyfikat: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "łańcuchowy"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "powłokowy"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "krytyczne rozszerzenie certyfikatu %s nie jest obsługiwane"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "certyfikat wystawcy nie jest oznaczony jako CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "polityka oznaczona jako krytyczna bez skonfigurowanych polityk"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "nie udało się otworzyć ,,%s'': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Uwaga: niekrytyczna polityka certyfikatu niedozwolona"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "polityka certyfikatu niedozwolona"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "nie udało się pobrać odcisku\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "poszukiwanie wystawcy na zewnątrz\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "liczba pasujących wystawców: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "nie można uzyskać authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "poszukiwanie wystawcy w pamięci podręcznej Dirmngr\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "liczba pasujących certyfikatów: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr ""
 "wyszukiwanie klucza tylko w pamięci podręcznej dirmngr nie powiodło się: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "nie udało się przydzielić uchwytu keyDB\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "certyfikat został unieważniony"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "status certyfikatu jest nieznany"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "proszę upewnić się, że ,,dirmngr'' jest poprawnie zainstalowany\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie CRL nie powiodło się: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certyfikat z błędną ważnością: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certyfikat jeszcze nie jest ważny"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "certyfikat główny jeszcze nie jest ważny"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "certyfikat pośredni jeszcze nie jest ważny"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certyfikat wygasł"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "certyfikat główny wygasł"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "certyfikat pośredni wygasł"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "brak wymaganych atrybutów certyfikatu: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certyfikat o nieważnej ważności"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nie utworzony w czasie życia certyfikatu"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "pośredni certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  podpis utworzony "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certyfikat utworzony "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certyfikat ważny od "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     wystawca ważny od "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "odcisk=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "główny certyfikat nie został oznaczony jako zaufany\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktywne oznaczanie zaufania nie włączone w gpg-agencie\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktywne oznaczanie zaufania wyłączone dla tej sesji\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "OSTRZEŻENIE: czas utworzenia podpisu nie jest znany - przyjęto czas bieżący"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "nie znaleziono wystawcy w certyfikacie"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "główny certyfikat nie jest oznaczony jako zaufany"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "łańcuch certyfikatów zbyt długi\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "nie znaleziono certyfikatu wystawcy"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certyfikat ma ZŁY podpis"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "znaleziono inny być może pasujący certyfikat CA - ponawianie próby"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "łańcuch certyfikatów dłuższy niż dozwolony przez CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certyfikat jest dobry\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certyfikat pośredni jest dobry\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certyfikat główny jest dobry\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "przełączanie do modelu łańcuchowego"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "użyty model poprawności: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "brak pamięci\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "brak"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Błąd - niewłaściwe kodowanie]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Błąd - brak pamięci]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Błąd - Brak nazwy]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Błąd - niewłaściwe DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8553,137 +8649,137 @@
 "S/N %s, ID 0x%08lX,\n"
 "stworzony %s, wygasa %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "nie podano zastosowania klucza - przyjęto wszystkie zastosowania\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "błąd pobierania informacji o zastosowaniu klucza: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certyfikat nie powinien być używany do poświadczania\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certyfikat nie powinien być używany do szyfrowania\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certyfikat nie nadaje się do szyfrowania\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certyfikat nie nadaje się do podpisywania\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "linia %d: niewłaściwy algorytm\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "linia %d: niewłaściwa długość klucza %u (poprawne są od %d do %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "linia %d: nie podano nazwy przedmiotu\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "linia %d: niewłaściwa etykieta nazwy przedmiotu ,,%.*s''\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "linia %d: niewłaściwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "linia %d: niepoprawny adres e-mail\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "linia %d: niewłaściwy numer seryjny\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "linia %d: niewłaściwa etykieta nazwy wystawcy ,,%.*s''\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "linia %d: niewłaściwa nazwa wystawcy ,,%s'' na pozycji %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "linia %d: podano niewłaściwą datę\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "linia %d: błąd pobierania klucza podpisującego z uchwytu ,,%s'': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "linia %d: podano niewłaściwy algorytm skrótu\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "linia %d: niewłaściwy authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "linia %d: niewłaściwy subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "linia %d: niewłaściwa składnia rozszerzenia\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "linia %d: błąd odczytu klucza ,,%s'' z karty: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "linia %d: błąd pobierania klucza z uchwytu ,,%s'': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "linia %d: generowanie klucza nie powiodło się: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8817,7 +8913,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "błąd blokowania keyboksa: %s\n"
@@ -8842,123 +8938,123 @@
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresatów\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "wypisanie kluczy zewnętrznych"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "wypisanie łańcucha certyfikatów"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "import certyfikatów"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "eksport certyfikatów"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "zarejestrowanie karty procesorowej"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "przekazanie polecenia do dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "wywołanie gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "tworzenie wyjścia zakodowanego base-64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "przyjęcie wejścia w formacie PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "przyjęcie wejścia w formacie base-64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "przyjęcie wejścia w formacie binarnym"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "pominięcie CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawności przy użyciu OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|liczba certyfikatów do dołączenia"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "niesprawdzanie polityk certyfikatów"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "pobranie brakujących certyfikatów wystawców"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "nieużywanie w ogóle terminala"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKU"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez żadnych pytań"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPGSM@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8969,47 +9065,47 @@
 "S/MIME\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Uwaga: nie można zaszyfrować do ,,%s'': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nieznany model poprawności ,,%s''\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: nie podano nazwy hosta\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: podano hasło bez użytkownika\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: linia pominięta\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "niezrozumiały adres serwera kluczy\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "import wspólnych certyfikatów ,,%s''\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@ -9030,7 +9126,7 @@
 msgstr ""
 "podstawowe sprawdzenia certyikatu nie powiodły się - nie zaimportowany\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "błąd pobierania zapisanych flag: %s\n"
@@ -9040,42 +9136,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "błąd importu certyfikatu: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "błąd odczytu wejścia: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "nie udało się pobrać odcisku\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem odszukaniem istniejącego certyfikatu: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "błąd podczas szukania zapisywalnego keyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "błąd zapisywania certyfikatu: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "błąd zapisywania flag: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Błąd - "
 
@@ -9111,7 +9202,7 @@
 "\n"
 "%s%sNa pewno chcesz to zrobić?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9148,38 +9239,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Podpisano w "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[nie podano daty]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " przy użyciu certyfikatu o ID 0x%08lX\n"
+msgid "algorithm:"
+msgstr "algorytm:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "błędny podpis: atrybut skrótu wiadomości nie zgadza się z obliczonym\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Poprawny podpis złożony przez"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                        alias"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "To jest podpis kwalifikowany\n"
@@ -9249,281 +9340,280 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "błąd ładowania certyfikatu ,,%s'': %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " trwale załadowanych certyfikatów: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "certyfikatów w pamięci podręcznej: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           certyfikatów zaufanych: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certyfikat już istnieje w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "certyfikat zapisany w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "błąd zapisu certyfikatu w pamięci podręcznej: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "niewłaściwy łańcuch odcisku SHA1 ,,%s''\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "błąd pobierania certyfikatu wg S/N: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "błąd pobierania certyfikatu wg przedmiotu: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "nie znaleziono wystawcy w certyfikacie\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "błąd pobierania authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "tworzenie katalogu ,,%s''\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "błąd tworzenia katalogu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "zignorowano katalog bazy danych ,,%s''\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "błąd odczytu katalogu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "usuwanie pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "bez usuwania pliku ,,%s''\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "błąd zamykania pliku pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "nie udało się otworzyć pliku katalogu pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "błąd tworzenia nowego pliku katalogu pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr ""
 "błąd podczas zapisu nowego pliku katalogu pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "błąd zamykania nowego pliku katalogu pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "nowy plik katalogu pamięci podręcznej ,,%s'' został utworzony\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr ""
 "nie udało ponownie otworzyć pliku katalogu pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "pierwszy rekord ,,%s'' nie jest wersją\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "stara wersja katalogu pamięci podręcznej - czyszczenie\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "stara wersja katalogu pamięci podręcznej - poddaję się\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "wykryto nadmiarowe pole w rekordzie CRL ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "wykryto niewłaściwą linię w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "wykryto powtórzony wpis w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "pominięto nieobsługiwany typ rekordu w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "nieprawidłowy skrót wystawcy w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "brak DN wystawcy w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "nieprawidłowy znacznik czasu w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 "UWAGA: nieprawidłowy skrót pliku pamięci podręcznej w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "wykryto błędy w pliku katalogu pamięci podręcznej\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "proszę sprawdzić przyczynę i ręcznie usunąć ten plik\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr ""
 "nie udało się utworzyć pliku tymczasowego katalogu pamięci podręcznej ,,"
 "%s'': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "błąd zamykania ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "błąd zmiany nazwy ,,%s'' na ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nie można policzyć skrótu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "błąd ustawiania kontekstu skrótu MD5: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "błąd liczenia skrótu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "niewłaściwie sformatowana suma kontrolna ,,%s''\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 "zbyt dużo otwartych plików pamięci podręcznej; nie można otworzyć więcej\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "otwieranie pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "błąd otwierania pliku pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "błąd inicjowania pliku pamięci podręcznej ,,%s'' do odczytu: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "wywołanie unlock_db_file na zamkniętym pliku\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "wywołanie unlock_db_file na nie zablokowanym pliku\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "nie udało się utworzyć nowego obiektu pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "brak dostępnego CRL dla id wystawcy %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "CRL w pamięci podręcznej dla id wystawcy %s zbyt stare; wymagana "
 "aktualizacja\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9532,198 +9622,200 @@
 "force-crl-refresh aktywne i minęło %d minut dla id wystawcy %s; wymagana "
 "aktualizacja\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refresh aktywne dla id wystawcy %s; wymagana aktualizacja\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "dostępne CRL dla ID wystawcy %s nie może być użyte\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "CRL w pamięci podręcznej dla id wystawcy %s naruszone; konieczna "
 "aktualizacja\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "OSTRZEŻENIE: błędna długość rekordu pamięci podręcznej dla S/N "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "problem z odczytem rekordu pamięci podręcznej dla S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s nie jest prawidłowy; powód=%02X  data=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s jest prawidłowy, nie jest wymieniony w CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "błąd pobierania danych z pliku pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "gcry_md_open dla algorytmu %d nie powiodło się: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "odebrano błędne S-wyrażenie z libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "konwersja S-wyrażenia nie powiodła się: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open dla algorytmu %d nie powiodło się: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "tworzenie S-wyrażenia nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "błąd pobierania czasów aktualizacji CRL: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "czasy uaktualnienia tego CRL: obecne=%s następne=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nie podano nextUpdate; przyjęto okreś ważności jednego dnia\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "błąd pobierania elementu CRL: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "błąd wstawiania elementu do pliku tymczasowego pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "nie znaleziono wystawcy CRL w CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "wyszukiwanie certyfikatu wystawcy CRL po authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "weryfikacja podpisu CRL nie powiodła się: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "błąd sprawdzania poprawności certyfikatu wystawcy CRL: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "usunięto zleżały plik tymczasowy pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "problem z usunięciem zleżałego pliku tymczasowego pamięci podręcznej ,,%s'': "
 "%s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "błąd tworzenia pliku tymczasowego pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "błąd finalizacji pliku tymczasowego pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "błąd zamykania pliku tymczasowego pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "OSTRZEŻENIE: nowe CRL jest nadal zbyt stare; wygasło %s - ładowanie mimo to\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "nowe CRL jest nadal zbyt stare; wygasło %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "nieznane rozszerzenie krytyczne CRL %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "błąd odczytu rozszerzeń CRL: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "błąd tworzenia pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem ze zmianą nazwy ,,%s'' na ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9732,12 +9824,12 @@
 "uaktualnianie pliku DIR nie powiodło się - wpis pamięci podręcznej zostanie "
 "utracony przy następnym starcie programu\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Rozpoczęcie zrzutu cRL (uzyskanego poprzez %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9745,55 +9837,55 @@
 " BŁĄD: CRL nie będzie użyte, ponieważ po uaktualnieniu jest nadal zbyt "
 "stare!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " BŁĄD: CRL nie będzie użyte ze względu na nieznane rozszerzenie krytyczne!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " BŁĄD: CRL nie będzie użyte\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " BŁĄD: to zapamiętane CRL mogło zostać naruszone!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " OSTRZEŻENIE: błędna długość rekordu pamięci podręcznej\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem z odczytem rekordu pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem z odczytem klucza pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "błąd odczytu wpisu pamięci podręcznej z db: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Koniec zrzutu CRL\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch po DP nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert po DP nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert po wystawcy nie powiodło się: %s\n"
@@ -9831,57 +9923,57 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "wyszukanie certyfikatu niemożliwe z powodu wyłączonego %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "użycie OCSP zamiast CRL"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "sprawdzenie, czy dirmngr działa"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "sprawdzenie poprawności certyfikatu"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "wyszukanie certyfikatu"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "szukanie tylko lokalnie zapisanych certyfikatów"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "oczekiwano URL-a dla --lookup"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "załadowanie CRL do dirmnge"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "specjalny tryb do wykorzystania przez Squida"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "eksport certyfikatów w formacie PEM"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "wymuszenie użycia domyślnego respondera OCSP"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "Składnia: dirmngr-client [opcje] [plik_certyfikatu|wzorzec] (-h wyświetla "
 "pomoc)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9893,82 +9985,82 @@
 "Proces zwraca 0, jeśli certyfikat jest poprawny, 1 jeśli niepoprawny,\n"
 "a inne kody w przypadku błędów ogólnych\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "błąd odczytu certyfikatu ze standardowego wejścia: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "błąd odczytu certyfikatu z ,,%s'': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "certyfikat zbyt duży, żeby miał sens\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "nie można połączyć się z dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "wyszukanie nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "załadowanie CRL ,,%s'' nie powiodła się: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "demon dirmngr jest włączony i działa\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "sprawdzenie poprawności certyfikatu nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "certyfikat jest poprawny\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "certyfikat został anulowany\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "sprawdzenie certyfikatu nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "otrzymano status: ,,%s''\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "błąd zapisu kodowania base64: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "nieobsługiwane zapytanie ,,%s''\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "oczekiwano bezwzględnej nazwy pliku\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "wyszukiwanie ,,%s''\n"
@@ -9993,94 +10085,94 @@
 msgid "flush the cache"
 msgstr "zapis pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "działanie bez pytania użytkownika"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "wymuszenie ładowania nieaktualnych CRL"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "zezwolenie na wysyłanie żądań OCSP"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "zezwolenie na sprawdzenie wersji oprogramowania online"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "powstrzymanie od użycia HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "powstrzymanie od użycia LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez HTTP"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez LDAP"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorowanie URL-i usług OCSP zawartych w certyfikatach"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|przekierowanie wszystkich żądań HTTP na URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|użycie HOSTA do zapytań LDAP"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "bez użycia hostów zapasowych z --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|PLIK|odczyt listy serwerów LDAP z PLIKU"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "dodanie nowych serwerów wykrytych w pinktach dystrybucji CRL do listy "
 "serwerów"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|użycie respondera OCSP spod URL-a"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|odpowiedź OCSP podpisana przez FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|bez zwracania więcej niż N elementów w jednym zapytaniu"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|PLIK|użycie certyfikatów CA w PLIKU dla HKP po TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "trasowanie całego ruchu sieciowego przez Tora"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10089,11 +10181,11 @@
 "@\n"
 "(pełną listę poleceń i opcji można znaleźć w podręczniku ,,info'')\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Składnia: @DIRMNGR@ [opcje] (-h wyświetla pomoc)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10101,133 +10193,133 @@
 "Składnia: @DIRMNGR@ [opcje] [polecenie [argumenty]]\n"
 "Dostęp do serwera kluczy, CRL i OCSP dla @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "poprawne poziomy diagnostyki to: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "składnia: %s [opcje]"
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dwukropki nie są dozwolone w nazwie gniazda\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pobranie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "przetworzenie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: linia zbyt długa - pominięto\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: wykryto błędny odcisk\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: błąd odczytu: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: zignorowano śmieci na końcu linii\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "otrzymano SIGHUP - ponowny odczyt konfiguracji i zapis pamięci podręcznej\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "otrzymano SIGUSR2 - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "otrzymano SIGTERM - zamykanie...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "otrzymano SIGTERM - nadal są aktywne połączenia: %d\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "wymuszono zamknięcie\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "otrzymano SIGINT - natychmiastowe zamknięcie\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "otrzymano sygnał %d - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "zwrócenie wszystkich wartości w formacie rekordu"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAZWA|zignorowanie części z hostem i połączenie poprzez NAZWĘ"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAZWA|połączenie z hostem NAZWA"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|połączenie z portem N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAZWA|użycie NAZWY użytkownika do uwierzytelnienia"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|HASŁO|użycie HASŁA do uwierzytelnienia"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "pobranie hasła z $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|ŁAŃCUCH|ŁAŃCUCH zapytania DN"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|ŁAŃCUCH|użycie ŁAŃCUCHA jako wyrażenia filtra"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|ŁAŃCUCH|zwrócenie atrybutu ŁAŃCUCH"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Składnia: dirmngr_ldap [opcje] [URL] (-h wyświetla pomoc)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10237,144 +10329,138 @@
 "Wewnętrzny program pomocniczy LDAP dla Dirmngr\n"
 "Interfejs i opcje mogą się zmienić bez uprzedzenia\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "błędny numer portu %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "przeszukiwanie wyniku pod kątem atrybutu ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "błąd zapisu na standardowe wyjście: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          dostępny atrybut ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "nie znaleziono atrybutu ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "znaleziono atrybut ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "przetwarzanie URL-a ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          użytkownik ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          hasło ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          host ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          port %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        filtr ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          atrybut ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "brak nazwy hosta w ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "nie podano atrybutu dla zapytania ,,%s''\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "OSTRZEŻENIE: użyto tylko pierwszego atrybutu\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "dowiązanie do ,,%s:%d'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "szukanie ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr ",,%s'' nie jest URL-em LDAP\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ",,%s'' jest nieprawidłowym URL-em LDAP\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "błąd dostępu do ,,%s'': status http %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ,,%s'' przekierowany na ,,%s'' (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "za dużo przekierowań\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "przekierowanie zmienione na ,,%s''\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "błąd przydzielania pamięci: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10425,7 +10511,7 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc nie powiodło się: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: błędny wzorzec ,,%s''\n"
@@ -10556,11 +10642,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "nie udało się przydzielić kontekstu OCSP: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "nie można uzyskać authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10629,7 +10710,7 @@
 msgstr "brak pola serialno w ID certyfikatu"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire nie powiodło się: %s\n"
@@ -10659,32 +10740,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "przekroczono max_replies %d\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nie można przydzielić struktury sterującej: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "nie udało się przydzielić kontekstu assuan: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "nie udało się zainicjować serwera: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "nie udało się zarejestrować poleceń przez Assuana: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problem z accept u Assuana: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Przetwarzanie u Assuana nie powiodło się: %s\n"
@@ -10722,56 +10803,56 @@
 msgid "certificate chain is good\n"
 msgstr "łańcuch certyfikatów jest dobry\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania CRL\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "cicho"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "wypisanie danych zakodowanych szesnastkowo"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "dekodowanie otrzymanych linii danych"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "połączenie z dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADRES|połączenie z serwerem Assuan pod ADRESEM"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "uruchomienie serwera Assuan podanego z linii poleceń"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "nieużywanie rozszerzonego trybu połączenia"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "uruchomienie /subst przy starcie"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Składnia: @GPG@-connect-agent [opcje] (-h wyświetla pomoc)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10779,43 +10860,43 @@
 "Składnia: @GPG@-connect-agent [opcje]\n"
 "Połączenie z działającym agentem i wysyłanie poleceń\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "opcja ,,%s'' wymaga programu i opcjonalnych argumentów\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "opcja ,,%s'' zignorowana z powodu ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "odbieranie linii nie powiodło się: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linia zbyt długa - pominięta\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linia skrócona z powodu osadzonego znaku Nul\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "nieznane polecenie ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "wysyłanie linii nie powiodło się: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "błąd wysyłania standardowych opcji: %s\n"
@@ -10915,16 +10996,12 @@
 "adresów e-mail"
 
 #: tools/gpgconf-comp.c:760
-#, fuzzy
-#| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
-msgstr "import kluczy z serwera kluczy"
+msgstr "import brakującego klucza z podpisu"
 
 #: tools/gpgconf-comp.c:763
-#, fuzzy
-#| msgid "list and check key signatures"
 msgid "include the public key in signatures"
-msgstr "wypisanie i sprawdzenie podpisów kluczy"
+msgstr "włączanie klucza publicznego do podpisów"
 
 #: tools/gpgconf-comp.c:770 tools/gpgconf-comp.c:831
 msgid "disable all access to the dirmngr"
@@ -11008,94 +11085,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Podpowiedź: można użyć polecenia ,,%s%s'', aby uzyskać szczegóły.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, określenia grup są ignorowane\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "błąd zamykania ,,%s''\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "błąd analizy ,,%s''\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "lista wszystkich komponentów"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "sprawdzenie wszystkich programów"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|wypisanie opcji"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|zmiana opcji"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|zaznaczenie opcji"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "zastosowanie globalnych wartości domyślnych"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|PLIK|uaktualnienie plików konfiguracyjnych przy użyciu PLIKU"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "pobranie katalogów konfiguracyjnych dla @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "wyświetl globalny plik konfiguracyjny"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "odpytanie bazy danych wersji oprogramowania"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "ponowne załadowanie wszystkich lub podanych komponentów"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "uruchomienie podanego komponentu"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "zabicie podanego komponentu"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "plik wyjściowy"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "uaktywnienie zmian w czasie działania o ile to możliwe"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Składnia: @GPGCONF@ [opcje] (-h wyświetla pomoc)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11103,218 +11180,144 @@
 "Składnia: @GPGCONF@ [opcje]\n"
 "Zarządzanie opcjami konfiguracji dla narzędzi z systemu @GNUPG@\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Wymagany jest jeden argument komponentu"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Nie znaleziono komponentu"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
-#: tools/symcryptrun.c:166
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@\n"
-"Polecenia:\n"
-" "
-
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "tryb rozszyfrowywania"
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "tryb szyfrowania"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "klasa narzędzia (confucius)"
-
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "nazwa programu"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "plik klucza tajnego (wymagany)"
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "nazwa pliku wejściowego (domyślnie standardowe wejście)"
-
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Składnia: symcryptrun [opcje] (-h wyświetla pomoc)"
+"Składnia: gpg-check-pattern [opcje] plik-wzorców (-h wyświetla pomoc)\n"
 
-#: tools/symcryptrun.c:224
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"Składnia: symcryptrun --class KLASA --program PROGRAM --keyfile PLIK_KLUCZA "
-"[opcje...] POLECENIE [plik-weściowy]\n"
-"Wywołanie prostego narzędzia do szyfrowania symetrycznego\n"
+"Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
+"Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s na %s przerwany ze stanem %i\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "Uwaga: stary domyślny plik opcji ,,%s'' został zignorowany\n"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s na %s nie powiódł się ze stanem %i\n"
-
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nie można utworzyć katalogu tymczasowego ,,%s'': %s\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Polecenia:\n"
+#~ " "
+
+#~ msgid "decryption modus"
+#~ msgstr "tryb rozszyfrowywania"
+
+#~ msgid "encryption modus"
+#~ msgstr "tryb szyfrowania"
+
+#~ msgid "tool class (confucius)"
+#~ msgstr "klasa narzędzia (confucius)"
+
+#~ msgid "program filename"
+#~ msgstr "nazwa programu"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "nie udało się otworzyć %s do zapisu: %s\n"
+#~ msgid "secret key file (required)"
+#~ msgstr "plik klucza tajnego (wymagany)"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "błąd zapisu do %s: %s\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nazwa pliku wejściowego (domyślnie standardowe wejście)"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "błąd odczytu z %s: %s\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Składnia: symcryptrun [opcje] (-h wyświetla pomoc)"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "błąd zamykania %s: %s\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Składnia: symcryptrun --class KLASA --program PROGRAM --keyfile "
+#~ "PLIK_KLUCZA [opcje...] POLECENIE [plik-weściowy]\n"
+#~ "Wywołanie prostego narzędzia do szyfrowania symetrycznego\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "nie podano opcji --program\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s na %s przerwany ze stanem %i\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "obsługiwane są tylko --decrypt i --encrypt\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s na %s nie powiódł się ze stanem %i\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "nie podano opcji --keyfile\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nie można utworzyć katalogu tymczasowego ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "nie można przydzielić wektora args\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "nie udało się otworzyć %s do zapisu: %s\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "nie udało się utworzyć potoku: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "błąd zapisu do %s: %s\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "nie udało się utworzyć pty: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "błąd odczytu z %s: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "nie udało się wykonać fork: %s\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "błąd zamykania %s: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv nie powiodło się: %s\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "nie podano opcji --program\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select nie powiodło się: %s\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "obsługiwane są tylko --decrypt i --encrypt\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "odczyt nie powiódł się: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "nie podano opcji --keyfile\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "odczyt pty nie powiódł się: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "nie można przydzielić wektora args\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid nie powiodło się: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "nie udało się utworzyć potoku: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "potomek został przerwany ze stanem %i\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "nie udało się utworzyć pty: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nie można przydzielić łańcucha pliku wejściowego: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "nie udało się wykonać fork: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv nie powiodło się: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "musi być podane %s lub %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select nie powiodło się: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "nie podano klasy\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "odczyt nie powiódł się: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klasa %s nie jest obsługiwana\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "odczyt pty nie powiódł się: %s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Składnia: gpg-check-pattern [opcje] plik-wzorców (-h wyświetla pomoc)\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid nie powiodło się: %s\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
-"Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "potomek został przerwany ze stanem %i\n"
 
-#, fuzzy
-#~| msgid "option '%s' may not be used in %s mode\n"
-#~ msgid ""
-#~ "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
-#~ msgstr "opcja ,,%s'' nie może być używana w trybie %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nie można przydzielić łańcucha pliku wejściowego: %s\n"
 
-#~ msgid "male"
-#~ msgstr "mężczyzna"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
 
-#~ msgid "female"
-#~ msgstr "kobieta"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "musi być podane %s lub %s\n"
 
-#~ msgid "unspecified"
-#~ msgstr "nie podano"
+#~ msgid "no class provided\n"
+#~ msgstr "nie podano klasy\n"
 
-#~ msgid "Sex ((M)ale, (F)emale or space): "
-#~ msgstr "Płeć (M - mężczyzna, F - kobieta lub spacja): "
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klasa %s nie jest obsługiwana\n"
diff -Nru gnupg2-2.2.20/po/POTFILES.in gnupg2-2.2.27/po/POTFILES.in
--- gnupg2-2.2.20/po/POTFILES.in	2019-12-07 11:43:24.000000000 +0100
+++ gnupg2-2.2.27/po/POTFILES.in	2020-12-21 17:38:05.000000000 +0100
@@ -30,6 +30,7 @@
 common/utf8conv.c
 common/dotlock.c
 common/init.c
+common/homedir.c
 
 g10/armor.c
 g10/build-packet.c
@@ -48,6 +49,7 @@
 g10/gpgv.c
 g10/helptext.c
 g10/import.c
+g10/key-check.c
 g10/keydb.c
 g10/keyedit.c
 g10/keygen.c
@@ -79,6 +81,7 @@
 
 kbx/kbxutil.c
 
+scd/app-p15.c
 scd/app-nks.c
 scd/app-openpgp.c
 scd/app-dinsig.c
@@ -125,5 +128,4 @@
 tools/gpgconf-comp.c
 tools/gpgconf.c
 tools/no-libgcrypt.c
-tools/symcryptrun.c
 tools/gpg-check-pattern.c
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/pt.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/pt.gmo sont différents
diff -Nru gnupg2-2.2.20/po/pt.po gnupg2-2.2.27/po/pt.po
--- gnupg2-2.2.20/po/pt.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/pt.po	2021-01-11 18:47:18.000000000 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2015-02-11 19:17+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -18,7 +18,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@ -29,40 +29,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -70,7 +70,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -80,35 +80,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -116,40 +116,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inválido no nome\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
@@ -159,33 +163,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -243,7 +247,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
@@ -375,20 +379,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -398,70 +402,70 @@
 "Opções:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A chave foi substituída"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confiança"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
@@ -469,55 +473,55 @@
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -526,179 +530,165 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "ficheiro de opções `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -706,9 +696,9 @@
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -718,52 +708,52 @@
 "Opções:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -773,32 +763,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -811,19 +801,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -836,7 +826,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -846,59 +836,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "activa uma chave"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -908,7 +898,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
@@ -918,7 +908,7 @@
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -950,7 +940,7 @@
 msgstr "erro na criação da frase secreta: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -997,27 +987,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
@@ -1079,7 +1069,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
@@ -1202,7 +1192,7 @@
 msgstr "armadura: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1286,44 +1276,44 @@
 msgid "Root certificate trustworthy"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda disponível"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versão desconhecida"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nenhuma ajuda disponível para `%s'"
@@ -1333,7 +1323,7 @@
 msgid "ignoring garbage line"
 msgstr "erro na última linha\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "versão desconhecida"
@@ -1343,92 +1333,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "erro de leitura"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "argumento inválido"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "armadura inválida"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos em conflito\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opções de importação inválidas\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "não processado"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "comandos em conflito\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "destinatário por omissão desconhecido `%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "dados inesperados"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "opções de importação inválidas\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "não processado"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "ficheiro de opções `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1444,42 +1466,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "chave pública %08lX não encontrada: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1669,13 +1690,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
@@ -1718,24 +1739,24 @@
 msgid "server uses an invalid certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta não disponível"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
@@ -1745,246 +1766,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "não processado"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferências actualizadas"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1992,184 +2013,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revocação: "
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output não funciona para este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "impossível abrir `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2232,8 +2253,8 @@
 msgstr "Chave pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
@@ -2258,58 +2279,64 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a opção \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "não é possível utilizar o pacote ESK simétrico devido ao modo S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVISO: `%s' é um ficheiro vazio\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2318,41 +2345,41 @@
 "ao forçar o algoritmo de compressão %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem simétrica.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
@@ -2448,7 +2475,7 @@
 msgstr "%s: ignorado: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2486,290 +2513,296 @@
 msgid "[User ID not found]"
 msgstr "[Utilizador não encontrado]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra simétrica"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "decifrar dados (acção por omissão)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "gerar um novo par de chaves"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrepôr"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2777,7 +2810,7 @@
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2807,13 +2840,13 @@
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2828,7 +2861,7 @@
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2836,587 +2869,575 @@
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Chave pública: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Dispersão: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compressão: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opções] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "não foi possível alterar o exec-path para %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de política de certificação dada é inválida\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3613,7 +3634,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -3623,7 +3644,7 @@
 msgid "key %s: %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3647,7 +3668,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave pública não encontrada: %s\n"
@@ -3662,7 +3683,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3733,18 +3754,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" não modificada\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -3757,236 +3778,300 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "A chave foi substituída"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "A chave já não é utilizada"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador já não é válido"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo da revocação: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "comentário da revocação: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogação\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revogação importado\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada ligação múltipla de subchave \n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revocação de chave\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocação de subchave inválida\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revogação múltiplace de subchaves\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação "
 "%08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
 "presente.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Assinatura correcta de \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "ignorado `%s': %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Utilizador \"%s\" está revocado."
+msgstr[1] "Utilizador \"%s\" está revocado."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 assinatura não verificada por falta de chave\n"
+msgstr[1] "1 assinatura não verificada por falta de chave\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d assinaturas incorrectas\n"
+msgstr[1] "%d assinaturas incorrectas\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Assinatura correcta de \""
+msgstr[1] "Assinatura correcta de \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
@@ -4251,8 +4336,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -4465,7 +4550,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "A chave está revogada."
 
@@ -4523,7 +4608,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
@@ -4611,7 +4696,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
@@ -4659,106 +4744,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   assinado por %08lX em %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "verificação da assinatura criada falhou: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notação: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4766,37 +4866,37 @@
 "Não se esqueça que a validade de chave mostrada não é necessáriamente a\n"
 "correcta a não ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 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"
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4805,36 +4905,36 @@
 "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n"
 "       algumas versão do PGP podem rejeitá-la.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4842,38 +4942,38 @@
 msgstr[0] "%d assinatura removida.\n"
 msgstr[1] "%d assinatura removida.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inválida"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Utilizador \"%s\" está revocado."
 msgstr[1] "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4882,310 +4982,305 @@
 "AVISO: Esta chave é do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas versão do PGP podem rejeitá-la.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   assinado por %08lX em %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5199,169 +5294,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notação de assinatura: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva uma chave"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5377,7 +5472,7 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5393,40 +5488,40 @@
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura é valida por? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5434,12 +5529,12 @@
 "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:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5450,7 +5545,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5468,50 +5563,50 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 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:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5522,7 +5617,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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 "
@@ -5539,35 +5634,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (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:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5579,13 +5674,13 @@
 "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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5593,69 +5688,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, 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:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5664,7 +5759,7 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5672,7 +5767,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5680,23 +5775,23 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
@@ -5733,22 +5828,6 @@
 msgstr[0] "%d assinaturas incorrectas\n"
 msgstr[1] "%d assinaturas incorrectas\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d assinaturas incorrectas\n"
-msgstr[1] "%d assinaturas incorrectas\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 assinatura não verificada por falta de chave\n"
-msgstr[1] "1 assinatura não verificada por falta de chave\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5768,30 +5847,30 @@
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Impressão da chave primária:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "      Impressão da subchave:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Impressão da chave primária:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Impressão da subchave:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impressão da chave ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5822,7 +5901,7 @@
 msgstr[0] "1 assinatura incorrecta\n"
 msgstr[1] "1 assinatura incorrecta\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
@@ -5875,458 +5954,458 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "a pedir a chave %08lX de %s\n"
 msgstr[1] "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO não disponível, a tentar utilizar %s em substituição\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem não tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "não consigo tratar estas assinaturas múltiplas\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública desconhecido"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: várias assinaturas detectadas.  Apenas a primeira será verificada.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia não implementado"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "armadura: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "armadura: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opção depreciada \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 #, fuzzy
 msgid "Uncompressed"
 msgstr "não processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "não processado"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poderá não ser utilizável pelo %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "classe de assinatura desconhecida"
@@ -6362,77 +6441,77 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notação de assinatura crítica: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6480,7 +6559,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "não foi possível alterar o exec-path para %s\n"
@@ -6794,12 +6873,12 @@
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -6853,27 +6932,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anónimo.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifra %d%s é desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7058,7 +7137,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7128,31 +7207,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: a chave foi revogada"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "assumindo assinatura incorrecta na chave %08lX devido a um bit crítico "
 "desconhecido\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revocação de subchave\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
@@ -7181,12 +7260,12 @@
 "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
 "A utilizar não expandida.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7194,12 +7273,12 @@
 "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "será utilizada a cifragem %s\n"
@@ -7227,7 +7306,7 @@
 "ignorado `%s': esta é uma chave ElGamal gerada pelo PGP que não é segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
@@ -7273,12 +7352,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confiança: sincronização falhou: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossível criar `%s': %s\n"
@@ -7288,12 +7367,12 @@
 msgid "can't lock '%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, 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"
@@ -7308,104 +7387,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de versão: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confiança inválida criada\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confiança criada\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: não é possível escrever na trustdb\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confiança inválida\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de versão: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de versão: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de versão: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confiança: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: não é um base de dados de confiança\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de versão com recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diretório: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: base de dados de confiança criada\n"
@@ -7774,132 +7853,132 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' não é um identificador longo de chave válido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confiança\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confiança\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave pública para chave de confiança - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada como de confiança absoluta\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confiança %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confiança %lu não é do tipo pedido %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verificação da base de dados de confiança a %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave pública %08lX não encontrada: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confiança\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu chaves processadas até agora\n"
 msgstr[1] "%lu chaves processadas até agora\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, fuzzy, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave pública da chave absolutamente de confiança %08lX não encontrada\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave pública da chave absolutamente de confiança %08lX não encontrada\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
@@ -8012,110 +8091,125 @@
 "List, export, import Keybox data\n"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muda a frase secreta"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "muda a frase secreta"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, 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:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "remover chaves do porta-chaves público"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -8123,55 +8217,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8181,27 +8263,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revocação: "
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8209,123 +8291,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, 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:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI não suportado"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "A geração de chaves falhou: %s\n"
 msgstr[1] "A geração de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@ -8342,376 +8424,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a versão %d do protocolo gpg-agent não é suportada\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "falha ao inicializar a base de dados de confiança: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: impossível aceder: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        novas assinaturas: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impressão digital"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revogação"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "não processado"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "não"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8726,137 +8826,137 @@
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8997,7 +9097,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -9022,136 +9122,136 @@
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inválida\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar saída com armadura ascii"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9162,47 +9262,47 @@
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "impossível ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = saltar esta chave\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9222,7 +9322,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
@@ -9232,42 +9332,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "falha ao inicializar a base de dados de confiança: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9297,7 +9392,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9327,38 +9422,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "erro na criação da frase secreta: %s\n"
+msgid "algorithm:"
+msgstr "armadura: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                   ou \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9429,542 +9524,543 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificado incorrecto"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 msgid "creating directory '%s'\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "erro na última linha\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
+#, c-format
+msgid "got an invalid S-expression from libksba\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#, fuzzy, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "impossível abrir %s: %s\n"
+
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "unknown hash algorithm '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: dirmngr/crlcache.c:1554
+#: dirmngr/crlcache.c:1637
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
-#, c-format
-msgid "got an invalid S-expression from libksba\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
-#, fuzzy, c-format
-msgid "converting S-expression failed: %s\n"
-msgstr "impossível abrir %s: %s\n"
-
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -10003,64 +10099,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "certificado incorrecto"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "certificado incorrecto"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "certificado incorrecto"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "certificado incorrecto"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10068,88 +10164,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "impossível ligar a `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "NOTA: a chave foi revogada"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "impossível 'stat' a `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10175,95 +10271,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Sair sem gravar? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10276,108 +10372,108 @@
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opções] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "não processado"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
@@ -10385,194 +10481,188 @@
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "opções de importação inválidas\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "                   ou \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "                   ou \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "        não importadas: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "                   ou \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "                   ou \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "AVISO: a utilizar memória insegura!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "%s: não é um base de dados de confiança\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "erro ao criar porta-chaves `%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10623,7 +10713,7 @@
 msgid "malloc failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10755,12 +10845,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: impossível aceder: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10830,7 +10914,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -10860,33 +10944,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10927,101 +11011,101 @@
 msgid "certificate chain is good\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -11222,302 +11306,230 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualizar a base de dados de confiança"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "chave pública não encontrada"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Comandos:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "decifragem correcta\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "decifragem correcta\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comandos:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [nome_do_ficheiro]"
+#~ msgid "decryption modus"
+#~ msgstr "decifragem correcta\n"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
-
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
+#~ msgid "encryption modus"
+#~ msgstr "decifragem correcta\n"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s não é permitido com %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "impossível abrir %s: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "%s: impossível criar directoria: %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "impossível abrir %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [nome_do_ficheiro]"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s não é permitido com %s!\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "impossível abrir %s: %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "impossível criar %s: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "%s: impossível criar directoria: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "impossível criar %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "impossível abrir %s: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "remoção do bloco de chave falhou: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "impossível criar %s: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "impossível criar %s: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "impossível criar `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "impossível criar `%s': %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "impossível criar `%s': %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "algoritmo de protecção %d%s não é suportado\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "impossível criar `%s': %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "algoritmo de protecção %d%s não é suportado\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "erro na criação da frase secreta: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11608,36 +11620,6 @@
 #~ msgstr "actualização falhou: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "assinatura %s de: \"%s\"\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Assinatura correcta de \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "ignorado `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Utilizador \"%s\" está revocado."
-#~ msgstr[1] "Utilizador \"%s\" está revocado."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Assinatura correcta de \""
-#~ msgstr[1] "Assinatura correcta de \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "criado um novo ficheiro de configuração `%s'\n"
@@ -12717,9 +12699,6 @@
 #~ msgid "file delete error"
 #~ msgstr "erro na remoção do ficheiro"
 
-#~ msgid "unexpected data"
-#~ msgstr "dados inesperados"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflito de \"timestamp\""
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/ro.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/ro.gmo sont différents
diff -Nru gnupg2-2.2.20/po/ro.po gnupg2-2.2.27/po/ro.po
--- gnupg2-2.2.20/po/ro.po	2020-03-20 15:40:34.000000000 +0100
+++ gnupg2-2.2.27/po/ro.po	2021-01-11 18:47:18.000000000 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2017-12-19 12:30+0100\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
@@ -30,41 +30,41 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -72,7 +72,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 #, fuzzy
 msgid "Quality:"
 msgstr "validitate: %s"
@@ -83,17 +83,17 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -101,18 +101,18 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frază-parolă incorectă"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -120,40 +120,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lungă"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frază-parolă prea lungă\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid în nume\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frază-parolă incorectă"
@@ -163,33 +167,33 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -249,7 +253,7 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
@@ -387,20 +391,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Aveţi nevoie de o frază-parolă pentru a vă proteja cheia secretă.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -410,124 +414,124 @@
 "Opţiuni:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Cheia este înlocuită"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai tăcut"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caută pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizează baza de date de încredere"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -536,181 +540,167 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Raportaţi bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTĂ: nici un fişier opţiuni implicit `%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "fişier opţiuni `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "citesc opţiuni din `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a eşuat: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: sărită: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -718,9 +708,9 @@
 "@Comenzi:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -730,36 +720,36 @@
 "Opţiuni:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -767,18 +757,18 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "anulată"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
@@ -788,32 +778,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fişier opţiuni `%s': %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -826,19 +816,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -851,7 +841,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -861,36 +851,36 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -898,24 +888,24 @@
 "%%0A?"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "activează cheia"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -925,7 +915,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
@@ -935,7 +925,7 @@
 msgid "secret key parts are not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -967,7 +957,7 @@
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1014,27 +1004,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fişierelor core: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1095,7 +1085,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@ -1220,7 +1210,7 @@
 msgstr "validitate: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1305,44 +1295,44 @@
 msgid "Root certificate trustworthy"
 msgstr "certificat incorect"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibilă la: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificat incorect"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificat incorect"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versiune necunoscută"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nici un disponibil disponibil pentru `%s'"
@@ -1352,7 +1342,7 @@
 msgid "ignoring garbage line"
 msgstr "eroare linia de trailer\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "[nesetat(ă)]"
@@ -1362,92 +1352,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X sărit\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "eroare citire fişier"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "linie prea lungă"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "argument invalid"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "armură invalidă"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "Comandă numai-administrare\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "opţiuni enumerare invalide\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "neforţat(ă)"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "Comandă numai-administrare\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "opţiune necunoscută `%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "date neaşteptate"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "opţiuni enumerare invalide\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "neforţat(ă)"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTĂ: nici un fişier opţiuni implicit `%s'\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "fişier opţiuni `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1463,42 +1485,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "cheia publică %s nu a fost găsită: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1690,14 +1711,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Vă rugăm folosiţi mai întâi comanda \"toggle\".\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@ -1742,24 +1763,24 @@
 msgid "server uses an invalid certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armură: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru în modul batch\n"
@@ -1769,242 +1790,242 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Selecţia d-voastră? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[nesetat(ă)]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "neforţat(ă)"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "forţat(ă)"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdată sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spaţiile duble nu sunt permise.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia publică: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Preferinţe limbă: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide în şir preferinţe.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operaţia pe cheie nu e posibilă: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Înlocuiesc cheia existentă? (d/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie să fie în intervalul %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Selectaţi ce fel de cheie doriţi:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Selecţie invalidă.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezervă a cheii de cifrare în afara cardului? (d/N) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Înlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2019,174 +2040,174 @@
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui să le schimbaţi folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Vă rugăm selectaţi tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Vă rugăm selectaţi unde să fie stocată cheia:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Doriţi să-l semnaţi? (d/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "ieşi din acest meniu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "arată comenzi administrare"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "afişează acest mesaj"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "afişează toate datele disponibile"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "schimbă numele purtătorului cardului"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "schimbă URL-ul de unde să fie adusă cheia"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificată de URL-ul de pe card"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "schimbă numele de login"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "schimbă preferinţele de limbă"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "schimbă sexul purtătorului cardului"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "schimbă o amprentă CA"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "comută fanionul PIN de forţare a semnăturii"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "generează noi chei"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "verifică PIN-ul şi listează toate datele"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NUME|foloseşte NUME ca destinatar implicit"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Comandă numai-administrare\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru această comandă\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2248,8 +2269,8 @@
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
@@ -2276,40 +2297,54 @@
 "folosiţi opţiunea \"--delete-secret-keys\" pentru a o şterge pe aceasta mai "
 "întâi.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "nu pot crea un pachet ESK simetric datorită modului S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fişier gol\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "nu puteţi folosi algorimul de rezumat `%s' câtă vreme în modul %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2317,19 +2352,12 @@
 "AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2338,40 +2366,40 @@
 "AVERTISMENT: forţând algoritmul de compresie %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forţând cifrul simetric %s (%d) violaţi preferinţele destinatarului\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTISMENT: mesajul a fost cifrat cu o cheie slabă din cifrul simetric.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problemă cu mânuirea pachetului cifrat\n"
@@ -2474,7 +2502,7 @@
 msgstr "%s: sărită: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2511,285 +2539,291 @@
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost găsit]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Amprenta CA: "
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalidă %s făcută validă de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s în loc de cheia primară %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fişier]|crează o semnătură"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fişier]|crează o semnătură text în clar"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "crează o semnătură detaşată"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "cifrează datele"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "cifrează numai cu cifru simetric"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "decriptează datele (implicit)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifică o semnătură"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "enumeră chei"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "enumeră chei şi semnături"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "enumeră chei şi amprente"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "şterge chei de pe inelul de chei public"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "şterge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "generează o nouă perechi de chei"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "semnează sau editează o cheie"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exportă chei"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exportă chei pentru un server de chei"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "caută pentru chei pe un server de chei"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "actualizează toate cheile de la un server de chei"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importă/combină chei"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "afişează starea cardului"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "schimbă data de pe card"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "schimbă PIN-ul unui card"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "crează ieşire în armură ascii"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "foloseşte acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|setează nivel de compresie N (0 deactivează)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "foloseşte modul text canonic"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "întreabă înainte de a suprascrie"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "foloseşte comportament strict OpenPGP"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2797,7 +2831,7 @@
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2827,13 +2861,13 @@
 " --list-keys [nume]         arată chei\n"
 " --fingerprint [nume]       arată amprente\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2848,7 +2882,7 @@
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2856,79 +2890,79 @@
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "folosire: gpg [opţiuni] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nu am găsit nici un semn = în definiţia grupului `%s'\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigură (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigură (unsafe) pentru fişier configurare `%s'\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fişier configurare `%s'\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@ -2936,7 +2970,7 @@
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2946,7 +2980,7 @@
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fişier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@ -2954,7 +2988,7 @@
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@ -2962,7 +2996,7 @@
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -2973,7 +3007,7 @@
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fişier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@ -2981,503 +3015,490 @@
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arată căruia dintre inelele de chei îi aparţine o cheie enumerată"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "NOTĂ: fisier opţiuni implicite vechi `%s' ignorat\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTĂ: %s nu este pentru o folosire normală!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opţiuni import invalide\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "opţiuni import invalide\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opţiuni export invalide\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "opţiuni export invalide\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuţie ca %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fişier core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieşte %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejată (insecure) pentru că %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie să fie mai mare decât 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie să fie în intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTĂ: modul S2K simplu (0) este contraindicat cu insistenţă\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie să fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferinţe implicite invalide\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferinţe rezumat personale invalide\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferinţe compresie personale invalide\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "nu puteţi folosi algorimul de rezumat `%s' câtă vreme în modul %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi algoritmul de compresie `%s' câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furnizaţi fără a folosi cifrare cu cheie "
 "publică\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "cifrarea simetrică a lui `%s' a eşuat: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu puteţi folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "nu puteţi folosi --symmetric --encrypt câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu puteţi folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "nu puteţi folosi --symmetric --sign --encrypt câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepţie server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eşuat: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "export cheie eşuat: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "căutare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eşuat: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eşuat: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semnături furnizat este invalid\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "dă numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informaţii de stare în acest FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3682,7 +3703,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "vă puteţi actualiza preferinţele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
@@ -3693,7 +3714,7 @@
 msgid "key %s: %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3717,7 +3738,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzată de o auto-semnătură ce lipseşte\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia publică nu a fost găsită: %s\n"
@@ -3732,7 +3753,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "n-am găsit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3803,18 +3824,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbată\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secretă importată\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "sărită: cheia secretă deja prezentă\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -3827,236 +3848,303 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secretă cu cifru invalid %d - sărită\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Cheia este înlocuită"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromisă"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosită"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie publică - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semnătură\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie publică nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semnătură invalidă pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalidă\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am şters multiple legături de subchei\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalidă\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am şters multiple revocări de subcheie\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am sărit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am sărit subcheia\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semnătura nu poate fi exportată (clasa 0x%02X) - sărită\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare într-un loc greşit - sărit\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - sărit\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clasă de semnătură neaşteptată (0x%02X) - sărită\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocată: aduc revocarea cheii %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocată: cheia de revocare %s nu este "
 "prezentă.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am adăugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "semnătură %s, algoritm rezumat %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "revoke signatures"
+msgid " (reordered signatures follow)"
+msgstr "revocă semnături"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "sărită \"%s\": %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "ID utilizator \"%s\" a fost revocat."
+msgstr[1] "ID utilizator \"%s\" a fost revocat."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
+msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d semnături incorecte\n"
+msgstr[1] "%d semnături incorecte\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Semnătură bună din \"%s\""
+msgstr[1] "Semnătură bună din \"%s\""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "resursă keyblock `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am eşuat să reconstruiesc cache-ul inelului de chei: %s\n"
@@ -4300,8 +4388,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Doriţi cu adevărat să semnaţi? (d/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
@@ -4510,7 +4598,7 @@
 "  pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Cheia este revocată."
 
@@ -4566,7 +4654,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie să selectaţi exact o cheie.\n"
 
@@ -4647,7 +4735,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Terminaţi fără a salva?  (d/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbată aşa că nici o actualizare a fost necesară.\n"
@@ -4697,108 +4785,123 @@
 msgid "Nothing to sign.\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr ""
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "verificarea semnăturii create a eşuat: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Capabilităţi: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaţie:"
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu există nici o preferinţă pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Această cheie a fost revocată pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Această cheie poate fi revocată de %s cheia %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "creată: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "revocată: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "expirată: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "expiră: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "încredere: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Această cheie a fost deactivată"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4807,17 +4910,17 @@
 "corectă dacă nu reporniţi programul.\n"
 
 #
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "revocată"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "expirată"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4827,18 +4930,18 @@
 "              Această comandă poate cauza ca un alt ID utilizator\n"
 "              să devină ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4847,35 +4950,35 @@
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Adăugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP să respingă această cheie.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu puteţi adăuga o poză ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură bună? (d/N/t)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4883,37 +4986,37 @@
 msgstr[0] "Am şters %d semnături.\n"
 msgstr[1] "Am şters %d semnături.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nu am şters nimic.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "invalid(ă)"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID utilizator \"%s\" a fost revocat."
 msgstr[1] "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4923,43 +5026,43 @@
 "             desemnat poate face ca unele versiuni de PGP să respingă "
 "cheia.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu puteţi adăuga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu puteţi desemna o cheie ca propriul său revocator desemnat\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "această cheie a fost deja desemnată ca un revocator\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulată!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4970,268 +5073,264 @@
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semnătură v3 sărită pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnată de cheia d-voastră %s la %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (non-exportabilă)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Această semnătură a expirat pe %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunteţi încă sigur(ă) că doriţi să o revocaţi? (d/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creaţi un certificat de revocare pentru această semnătură? (d/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr ""
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Aţi semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (non-revocabilă)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocată de cheia d-voastră %s pe %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Doriţi într-adevăr să creaţi certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "nici o cheie secretă\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, fuzzy, c-format
 #| msgid "revoke a user ID"
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "revocă un ID utilizator"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semnătură ID utilizator este datată %d secunde în viitor\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afişez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "prea multe preferinţe de rezumat\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "prea multe preferinţe de compresie\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "articol invalid `%s' în şirul de preferinţe\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scriu semnătură directă\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "scriu auto semnătură\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scriu semnătură legată de cheie\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalidă; folosesc %u biţi\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjită la %u biţi\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Semnează"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Cifrează"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Autentifică"
 
@@ -5245,170 +5344,170 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Acţiuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Acţiuni permise curent: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comută capabilitatea de semnare\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comută capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comută capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) DSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notare semnătură: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deactivează cheia"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea între %u şi %u biţi.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesară este %u biţi\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Selectaţi ce fel de cheie doriţi:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5424,7 +5523,7 @@
 "      <n>m = cheia expiră în n luni\n"
 "      <n>y = cheia expiră în n ani\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5440,38 +5539,38 @@
 "      <n>m = semnătura expiră în n luni\n"
 "      <n>y = semnătura expiră în n ani\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Cheia este validă pentru? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semnătura este validă pentru? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expiră deloc\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Semnătura nu expiră deloc\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expiră pe %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semnătura expiră pe %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5479,11 +5578,11 @@
 "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:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5494,7 +5593,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5511,50 +5610,50 @@
 "    \"Popa Ioan (popică) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid în nume\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate începe cu o cifră\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 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:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Adresă de email: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid în comentariu\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Folosiţi setul de caractere `%s'\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5565,7 +5664,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5580,35 +5679,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5620,13 +5719,13 @@
 "î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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a eşuat: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5634,72 +5733,72 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "cheia există deja\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulată.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "nu pot crea fişier de rezervă `%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTĂ: copia de siguranţa a cheii cardului salvată la `%s'\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "scriu cheia publică în `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, 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:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secretă şi publică au fost create şi semnate.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5709,7 +5808,7 @@
 "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5717,7 +5816,7 @@
 "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5725,23 +5824,23 @@
 "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Părţile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Creaţi într-adevăr? (d/N) "
 
@@ -5777,22 +5876,6 @@
 msgstr[0] "%d semnături incorecte\n"
 msgstr[1] "%d semnături incorecte\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d semnături incorecte\n"
-msgstr[1] "%d semnături incorecte\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
-msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5812,29 +5895,29 @@
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Amprentă cheie primară:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Amprentă subcheie:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Amprentă cheie primară:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Amprentă subcheie:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Amprentă cheie ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
@@ -5867,7 +5950,7 @@
 msgstr[0] "1 semnătură incorectă\n"
 msgstr[1] "1 semnătură incorectă\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
@@ -5919,7 +6002,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: sărit\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -5927,454 +6010,454 @@
 msgstr[0] "reactualizez %d chei de la %s\n"
 msgstr[1] "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost găsită pe serverul de chei\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost găsită pe serverul de chei\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "nici o acţiune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudată pentru o cheie de sesiune cifrată (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrată\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parolă generată cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia publică este %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie publică: DEK bun\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creată %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie publică a eşuat: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrată cu %lu fraze-parolă\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrată cu 1 frază-parolă\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom încerca să folosim %s în loc\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decriptarea a eşuat: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a eşuat: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTĂ: expeditorul a cerut \"doar-pentru-ochii-d-voastră\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fişier original='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosiţi \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură INCORECTĂ din \"%s\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semnătură expirată din \"%s\""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot mânui aceste semnături multiple\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semnătură făcută %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semnătură făcută %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Cheie disponibilă la: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "AVERTISMENT: Această cheie nu este certificată de o semnătură de încredere!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semnătură expirată %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semnătura expiră %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritm pubkey necunoscut"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semnătura: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nu o semnătură detaşată\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semnături.  Numai prima va fi verificată.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semnătură de sine stătătoare (standalone) de clasă 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semnătură de stil vechi (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 #| msgid "fstat of `%s' failed in %s: %s\n"
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie publică experimental %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s)\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opţiune învechită \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "vă rugăm folosiţi \"%s%s\" în loc\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comandă învechită - nu o folosiţi\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea să nu poată fi folosit de %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "opţiune ambiguă `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6410,85 +6493,85 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "presupun date semnate în `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot mânui algoritmul cu cheie publică %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrată simetric potenţial nesigură "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notare semnătură critică: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Introduceţi fraza-parolă\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "anulată de utilizator\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principală %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6544,7 +6627,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este această poză corectă (d/N/t)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afişa poza ID!\n"
@@ -6859,12 +6942,12 @@
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -6919,30 +7002,30 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, noi suntem destinatarul anonim.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vechea encodare a lui DEK nu este suportată\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISMENT: algoritm cifrare %s nu a fost găsit în preferinţele "
 "destinatarului\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 #| msgid "NOTE: secret key %s expired at %s\n"
 msgid "Note: secret key %s expired at %s\n"
 msgstr "NOTĂ: cheia secretă %s a expirat la %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7127,7 +7210,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semnătură în mesaj\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7208,31 +7291,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "semnătură de sine stătătoare (standalone) de clasă 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "semnătură de sine stătătoare (standalone) de clasă 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupun semnătură incorectă din cheia %s datorită unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semnătura de revocare a subcheii\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semnătura legată de subcheie\n"
@@ -7260,12 +7343,12 @@
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  Îl "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semnătură de la: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7273,12 +7356,12 @@
 "AVERTISMENT: forţarea algoritmului rezumat %s (%d) violează preferinţele "
 "destinatarului\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosită cifrarea %s\n"
@@ -7304,7 +7387,7 @@
 "aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
 "semnături!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "înregistrare încredere %lu, tip %d: scrierea a eşuat: %s\n"
@@ -7352,12 +7435,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a eşuat: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
@@ -7369,12 +7452,12 @@
 msgid "can't lock '%s'\n"
 msgstr "nu pot încuia (lock) `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a eşuat: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a eşuat (n=%d): %s\n"
@@ -7389,105 +7472,105 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu există!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am eşuat să creez înregistrare versiune: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTĂ: nu poate fi scris în trustdb\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a eşuat: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a eşuat (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fişier trustdb\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: înregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fişier invalidă %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, 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:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: a fost creat trustdb\n"
@@ -7859,101 +7942,101 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime validă\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cheia %s: acceptată ca cheie de încredere\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "cheia %s apare de mai multe ori în trustdb\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cheia %s: nici o cheie publică pentru cheia de încredere - sărită\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cheia %s marcată ca având încredere supremă\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "înregistrare încredere %lu, tip req %d: citirea a eşuat: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "înregistrare încredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de încredere (%d) - presupun model de încredere %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de încredere %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "următoarea verificare trustdb programată pe %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de încredere `%s'\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de încredere `%s'\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia publică %s nu a fost găsită: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "vă rugăm faceţi un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -7961,7 +8044,7 @@
 msgstr[0] "%lu chei procesate până acum\n"
 msgstr[1] "%lu chei procesate până acum\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7969,24 +8052,24 @@
 msgstr[0] "%d chei procesate (%d numărători valide anulate)\n"
 msgstr[1] "%d chei procesate (%d numărători valide anulate)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am găsit nici o cheie cu încredere supremă\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia publică a cheii cu încredere supremă %s nu a fost găsită\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "adânc: %d  valid: %3d  semnat: %3d  încredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8101,110 +8184,125 @@
 "List, export, import Keybox data\n"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea stării CHV de pe card\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "răspunsul nu conţine modulul RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "răspunsul nu conţine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "răspunsul nu conţine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "răspunsul nu conţine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
@@ -8212,55 +8310,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a eşuat: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "cardul este încuiat permanent!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8273,27 +8359,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurată\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
@@ -8301,90 +8387,90 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplicaţiei\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "cheia există deja\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "cheia existentă va fi înlocuită\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipseşte\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI nesuportat"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 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:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "generarea cheii a eşuat\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8392,34 +8478,34 @@
 msgstr[0] "generarea cheii este completă (%d secunde)\n"
 msgstr[1] "generarea cheii este completă (%d secunde)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 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:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -8437,376 +8523,394 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|foloseşte NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|foloseşte NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "arată comenzi administrare"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "ajutor"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "am eşuat să stochez amprenta: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: nu pot accesa: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "semnături create până acum: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, fuzzy, c-format
 msgid "  (     issuer valid from "
 msgstr "      Card nr. serie ="
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generează un certificat de revocare"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifică o semnătură"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "neforţat(ă)"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "nu"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8820,138 +8924,138 @@
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creată %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 #| msgid "key %s: invalid subkey binding\n"
 msgid "line %d: invalid subject-key-id\n"
 msgstr "cheia %s: legare subcheie invalidă\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Generarea cheii a eşuat: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9094,7 +9198,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -9119,135 +9223,135 @@
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "enumeră chei secrete"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaugă o cheie la un smartcard"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crează ieşire în armură ascii"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "modul batch: nu întreba niciodată"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe întrebări"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe întrebări"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "adaugă acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|foloseşte algoritm cifrare NUME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|foloseşte algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9258,48 +9362,48 @@
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "nu mă pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = sări peste cheia asta\n"
 
 #
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9319,7 +9423,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
@@ -9329,42 +9433,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "am eşuat să stochez amprenta: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleme la verificare revocării: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9394,7 +9493,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9424,38 +9523,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Semnătură făcută %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "eroare la obţinerea numărului serial: %s\n"
+msgid "algorithm:"
+msgstr "validitate: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Semnătură bună din \"%s\""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                aka \"%s\""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semnătură.\n"
@@ -9524,183 +9623,182 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificat incorect"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "eroare linia de trailer\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "punerea armurii a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "fişier de configurare nou `%s' creat\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
@@ -9708,332 +9806,334 @@
 "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
 "folosită\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "Eroare citind cheia de rezervă de pe `%s': %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "algoritm hash invalid `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "răspuns invalid de la agent\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "nu pot deschide fişierul: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "algoritm hash invalid `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "actualizarea secretului a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10041,36 +10141,36 @@
 "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
 "folosită\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? probleme la verificare revocării: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
@@ -10109,64 +10209,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "certificat incorect"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "certificat incorect"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "certificat incorect"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "certificat incorect"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10174,89 +10274,89 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "nu mă pot conecta la `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "nu pot obţine statistici `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10282,97 +10382,97 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 #| msgid "Quit without saving? (y/N) "
 msgid "run without asking a user"
 msgstr "Terminaţi fără a salva?  (d/N) "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
 #
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10385,313 +10485,307 @@
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "folosire: gpg [opţiuni] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "neforţat(ă)"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NUME|foloseşte NUME ca destinatar implicit"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "opţiuni import invalide\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "  fără ID-uri utilizator: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          pass '%s'\n"
 msgstr "                aka \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          host '%s'\n"
 msgstr "  fără ID-uri utilizator: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "            ne importate: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "            DN '%s'\n"
 msgstr "                aka \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          attr '%s'\n"
 msgstr "                aka \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "AVERTISMENT: este folosită memorie neprotejată (insecure)!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "eliminarea armurii a eşuat: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not an LDAP URL\n"
 msgstr "`%s' nu este un fişier JPEG\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "scriu în `%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "eroare la crearea inelului de chei `%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10743,7 +10837,7 @@
 msgid "malloc failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10877,12 +10971,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: nu pot accesa: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10953,7 +11041,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
@@ -10983,34 +11071,34 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nu pot crea fişier de rezervă `%s': %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "am eşuat să stochez data creării: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11051,101 +11139,101 @@
 msgid "certificate chain is good\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "termină"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -11346,303 +11434,235 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Vă rugăm folosiţi mai întâi comanda \"toggle\".\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualizează baza de date de încredere"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "foloseşte ca fişier ieşire"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia publică nu a fost găsită"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Comenzi:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "decriptare OK\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "NOTĂ: fisier opţiuni implicite vechi `%s' ignorat\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "decriptare OK\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comenzi:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [nume_fişier]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "decriptare OK\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
+#~ msgid "encryption modus"
+#~ msgstr "decriptare OK\n"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s nu este permis cu %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nu pot crea directorul `%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "nu pot deschide %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "eroare la citire `%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "eroare în `%s': %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [nume_fişier]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "nu este suportată execuţia nici unui program la distanţă\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s nu este permis cu %s!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nu pot crea directorul `%s': %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "nu pot crea `%s': %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "nu pot deschide %s: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "nu pot crea `%s': %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "eroare la citire `%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "eroare în `%s': %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "stergere keyblock a eşuat: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "nu este suportată execuţia nici unui program la distanţă\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "stergere keyblock a eşuat: %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nu pot deschide fişierul: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nu pot crea fişier de rezervă `%s': %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nu pot deschide fişierul: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "algoritm rezumat %d nu este suportat\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nu pot crea fişier de rezervă `%s': %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "eroare la obţinerea numărului serial: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11746,39 +11766,6 @@
 #~ msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
 #, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "semnătură %s, algoritm rezumat %s\n"
-
-#, fuzzy
-#~| msgid "revoke signatures"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "revocă semnături"
-
-#, fuzzy
-#~| msgid "skipped \"%s\": %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "sărită \"%s\": %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "ID utilizator \"%s\" a fost revocat."
-#~ msgstr[1] "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Semnătură bună din \"%s\""
-#~ msgstr[1] "Semnătură bună din \"%s\""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "fişier de configurare nou `%s' creat\n"
@@ -12936,9 +12923,6 @@
 #~ msgid "file delete error"
 #~ msgstr "eroare ştergere fişier"
 
-#~ msgid "unexpected data"
-#~ msgstr "date neaşteptate"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflict timestamp"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/ru.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/ru.gmo sont différents
diff -Nru gnupg2-2.2.20/po/ru.po gnupg2-2.2.27/po/ru.po
--- gnupg2-2.2.20/po/ru.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/ru.po	2021-01-11 18:47:18.000000000 +0100
@@ -1,18 +1,18 @@
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# Copyright (C) 2020 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GnuPG package.
 # Maxim Britov <maxim.britov@gmail.com>, 2006.
 #              !-- no such user (2011-01-11)
 # Thanks Pawel I. Shajdo <pshajdo@gmail.com>.
 # Thanks Cmecb for the inspiration.
-# Ineiev <ineiev@gnu.org>, 2014, 2015, 2016, 2017, 2018, 2019
+# Ineiev <ineiev@gnu.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020
 #
 # Designated-Translator: none
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.2.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2019-05-29 17:41+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-07-20 17:41+0100\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
 "Language: ru\n"
@@ -22,7 +22,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "сбой при блокировке для ввода пароля: %s\n"
@@ -33,45 +33,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|Отмена (_C)"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|Да (_Y)"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|Нет (_N)"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Вы действительно хотите, чтобы фраза-пароль была видна на экране?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Показывать фразу-пароль"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Скрывать фразу-пароль"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Стойкость:"
 
@@ -81,36 +81,36 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойкость введенного выше текста. Проконсультируйтесь у администратора о "
 "критериях оценки стойкости."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN, чтобы сделать секретный ключ доступным в этом сеансе"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Введите фразу-пароль, чтобы сделать секретный ключ доступным в этом сеансе"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "не подходит - попробуйте еще раз"
 
@@ -118,36 +118,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Повторите:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "Слишком длинный PIN"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Слишком длинная фраза-пароль"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Недопустимые символы в PIN"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "Слишком короткий PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Неверный PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
@@ -156,31 +160,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не могу создать '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -241,7 +245,7 @@
 "Введите фразу-пароль для защиты полученного секретного ключа%%0A   %s%%0A   "
 "%s%%0Aвнутри хранилища ключей агента gpg"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "сбой создания потока из сокета: %s\n"
@@ -376,17 +380,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Внимание: Вы ввели небезопасную фразу-пароль."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -394,133 +398,133 @@
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (фоновый режим)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (нефоновый режим)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "запуск в подконтрольном режиме"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "сократить подробности"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "вывод команд в стиле sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "вывод команд в стиле csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из файла FILE"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать программу PGM для ввода паролей"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|использовать программу PGM как демон криптографических карт"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "не использовать демон криптографических карт"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|принимать некоторые команды по NAME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены терминала"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены дисплея XWindow"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|сбрасывать запомненный PIN через N секунд"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать запомненный PIN при подписывании"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "не позволять пользоваться внешней памятью паролей"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позволять клиентам помечать ключи как \"доверенные\""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "разрешить предустанавливать фразу-пароль"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 "не позволять вызывающей программе замещать собой программу ввода пароля"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "разрешить ввод фразы-пароля через Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "включить поддержку ssh"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|использовать для отображения отпечатков алгоритм ALGO"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "включить поддержку putty"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Вызов: @GPG_AGENT@ [параметры] (-h - подсказка)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -528,147 +532,135 @@
 "Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
 "Управление секретными ключами для @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "запрошен недопустимый уровень отладки '%s'\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопустимая хеш-функция\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "файл параметров '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Замечание: '%s' не считается параметром\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "слишком длинное имя сокета '%s'\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка получения разового кода для сокета\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка связывания сокета с '%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не удалось задать права доступа для '%s': %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "слушаем сокет '%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не могу создать каталог '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "создан каталог '%s'\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "сбой stat() для '%s': %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "невозможно использовать '%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s остановлен\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "в этом сеансе агент gpg не работает\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Вызов: gpg-preset-passphrase [параметры] КОД_КЛЮЧА (-h - подсказка)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -676,8 +668,8 @@
 "Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
 "Работа с буфером паролей\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -685,9 +677,9 @@
 "@Команды:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -697,11 +689,11 @@
 "Параметры:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Вызов: gpg-protect-tool [параметры] (-h - подсказка)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -709,22 +701,22 @@
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Средство работы с секретными ключами\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для снятия защиты с объекта PKCS#12."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового объекта PKCS#12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Введите фразу-пароль для защиты импортированных объектов в системе GnuPG."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -732,18 +724,18 @@
 "Введите фразу-пароль или PIN,\n"
 "необходимые для выполнения данной операции."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "ошибка открытия '%s': %s\n"
@@ -753,32 +745,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "файл '%s', строка %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "выражение \"%s\" в '%s' игнорируется, строка %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "системный список доверия '%s' не доступен\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "недопустимый отпечаток в '%s', строка %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "недопустимый признак ключа в '%s', строка %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "ошибка чтения '%s', строка %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверенных корневых сертификатов\n"
@@ -791,7 +783,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -800,11 +792,11 @@
 "Действительно абсолютно верить, что%%0A  \"%s\"%%0Aправильно заверяет "
 "сертификаты пользователя?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Нет"
@@ -817,7 +809,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -828,21 +820,21 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Подтверждаю"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Неверно"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Замечание: Фразу-пароль никогда не меняли.%0AПожалуйста, смените ее сейчас."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -850,26 +842,26 @@
 msgstr ""
 "Фраза-пароль не менялась%%0Aс %.4s-%.2s-%.2s. Пожалуйста, смените ее сейчас."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Сменить фразу-пароль"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Сменю позже"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Вы действительно хотите удалить ключ с кодом%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Удалить ключ"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -877,12 +869,12 @@
 "Внимание: этот ключ также находится в списке для применения с SSH!\n"
 "Удаление его может лишить Вас возможности доступа к удаленным машинам."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA требует длины хеша, кратной 8 битам\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s ключ использует небезопасный (%u-битный) хеш\n"
@@ -892,7 +884,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu-битный хеш недопустим для %u-битного ключа %s\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
@@ -902,7 +894,7 @@
 msgid "secret key parts are not available\n"
 msgstr "секретная часть ключа недоступна\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "алгоритм шифрования с открытым ключом %d (%s) не поддерживается\n"
@@ -931,7 +923,7 @@
 msgstr "ошибка при создании потока для канала конвейера: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "ошибка при дублировании процесса: %s\n"
@@ -977,27 +969,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема задания параметров агента gpg\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла образа памяти: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Внимание: небезопасный владелец объекта %s \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Внимание: небезопасные права доступа объекта %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ожидаю доступа к файлу '%s'\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "сбой при переименовании '%s' в '%s': %s\n"
@@ -1057,7 +1049,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при размещении %lu байтов"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка выделения достаточной памяти: %s\n"
@@ -1170,7 +1162,7 @@
 msgstr "алгоритм: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "алгоритм (не поддерживается): %s"
@@ -1245,39 +1237,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Корневой сертификат достоверен"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "для сертификата не найден список отозванных сертификатов"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "доступный список отозванных сертификатов слишком стар"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "проверка списка отозванных сертификатов/OCSP для сертификата"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Задействованные сертификаты"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Записи журнала аудита отсутствуют."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Неизвестная операция"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Агент Gpg годен"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmgr годен"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Нет справки для '%s'."
@@ -1286,7 +1278,7 @@
 msgid "ignoring garbage line"
 msgstr "игнорируем дефектную строку"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[отсутствует]"
 
@@ -1295,82 +1287,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопустимый символ radix64 %02x пропущен\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "неожиданный параметр"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "ошибка чтения"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "слишком длинное ключевое слово"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "пропущен аргумент"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "недопустимый аргумент"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "недопустимая команда"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "недопустимое определение синонима"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "нехватка выделенной памяти"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "недопустимая команда"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "неизвестная команда '%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "неожиданный текстовый формат: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "недопустимый параметр"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "не хватает аргумента для параметра \"%.50s\"\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "недопустимый аргумент для параметра \"%.50s\"\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "у параметра \"%.50s\" не должно быть аргумента\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "недопустимая команда \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "параметр \"%.50s\" неоднозначен\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "команда \"%.50s\" неоднозначна\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "нехватка выделенной памяти\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "недопустимый параметр \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "файл параметров '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1386,42 +1410,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "сбой преобразования '%s' в '%s': %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "сбой при создании временного файла '%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "ошибка записи в '%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "удаляю залипшую блокировку (созданную процессом %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "жду снятия блокировки (заблокировано процессом %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(мертвая точка?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "блокировка '%s' не выполнена: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "ожидаю снятия блокировки %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
@@ -1604,75 +1627,67 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Замечание: Для их перезагрузки воспользуйтесь командой \"%s\".\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s не совместим с режимом %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "в этом сеансе dirmngr не работает\n"
 
 #: g10/call-dirmngr.c:243
-#, fuzzy, c-format
-#| msgid "option '%s' may not be used in %s mode\n"
+#, c-format
 msgid "keyserver option \"%s\" may not be used in %s mode\n"
-msgstr "параметр '%s' нельзя использовать в режиме %s\n"
+msgstr "параметр сервера ключей \"%s\" нельзя использовать в режиме %s\n"
 
 #: g10/call-dirmngr.c:417
 msgid "WKD uses a cached result"
-msgstr ""
+msgstr "WKD пользуется сохраненным результатом"
 
 #: g10/call-dirmngr.c:420
 msgid "Tor is not running"
-msgstr ""
+msgstr "Tor не работает"
 
 #: g10/call-dirmngr.c:422
-#, fuzzy
-#| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
-msgstr "\"%s\" - не правильный отпечаток\n"
+msgstr "Tor не настроен должным образом"
 
 #: g10/call-dirmngr.c:424
-#, fuzzy
-#| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
-msgstr "\"%s\" - не правильный отпечаток\n"
+msgstr "DNS не настроен должным образом"
 
 #: g10/call-dirmngr.c:426
 msgid "unacceptable HTTP redirect from server"
-msgstr ""
+msgstr "недопустимое перенаправление HTTP с сервера"
 
 #: g10/call-dirmngr.c:428
 msgid "unacceptable HTTP redirect from server was cleaned up"
-msgstr ""
+msgstr "недопустимое перенаправление HTTP с сервера сброшено"
 
 #: g10/call-dirmngr.c:430
-#, fuzzy
-#| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
-msgstr "создать сертификат отзыва"
+msgstr "на сервере применяется непригодный сертификат"
 
-#: g10/call-dirmngr.c:437
-#, fuzzy, c-format
-#| msgid "armor: %s\n"
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
+#, c-format
 msgid "Note: %s\n"
-msgstr "текстовый формат: %s\n"
+msgstr "Замечание: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "в пакетном режиме это действие невозможно\n"
@@ -1682,136 +1697,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Эта команда доступна только для карт версии 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Код сброса (больше) не доступен\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Ваш выбор? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
-msgstr ""
+msgstr "Уважаемый"
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
-msgstr ""
+msgstr "Уважаемая"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "не требуется"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "требуется"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только простой текст ASCII.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\".\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Фамилия держателя карты: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Имя держателя карты: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Слишком длинное полное имя (предел - %d символов).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "ошибка чтения '%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "ошибка записи '%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Секретные данные DO:"
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Предпочтительный язык: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
-msgstr ""
+msgstr "Приветствие (M = Уважаемый, F = Уважаемая, пробел - не задано): "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "отпечаток удостоверяющего центра: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: недопустимый формат отпечатка.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "это не карта OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1821,97 +1836,97 @@
 "           Если создать ключ не удастся, сверьтесь с документацией\n"
 "           на карту и выясните, какие размеры допустимы.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "Изменение атрибутов ключа на карте:"
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "Ключа для подписи\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "Ключа для шифрования\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "Ключа для удостоверения личности\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Теперь карта будет перенастроена на генерацию ключа типа %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "ошибка изменения атрибута ключа %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "ошибка при считывании информации карты: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Данная команда этой картой не поддерживается\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать вне карты архивную копию ключа шифрования? (Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хранятся на карте!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1922,167 +1937,165 @@
 "   PIN = '%s'    Админ. PIN = '%s'\n"
 "Вам следует изменить их командой --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ удостоверения личности\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где хранить ключ:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "сбой записи ключа на карту: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Замечание: эта команда сотрет с карты все ключи!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "ошибка при настройке KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "показать административные команды"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "изменить имя держателя карты"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ по заданному картой URL"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "изменить имя учетной записи"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:2178
-#, fuzzy
-#| msgid "change card holder's sex"
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
-msgstr "изменить пол держателя карты"
+msgstr "изменить приветствие для держателя карты"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток удостоверяющего центра"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "переключить признак 'подпись требует PIN'"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "создать новые ключи"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN с помощью кода сброса"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "уничтожить все ключи и данные"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "настроить KDF для проверки по PIN"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "изменить атрибут ключа"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Команды администрирования\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда (список команд: \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output для данной команды не работает\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не могу открыть '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2144,8 +2157,8 @@
 msgstr "подключа"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
@@ -2170,37 +2183,49 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании фразы-пароля: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK из-за режима S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "используется симметричный шифр %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' уже сжат\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Внимание: файл '%s' пуст\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "хеш-функцию '%s' нельзя использовать в режиме %s\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "чтение из '%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2208,59 +2233,53 @@
 "Внимание: принудительное использование симметричного шифра %s (%d)\n"
 "          нарушает предпочтения получателя\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Внимание: ключ %s не подходит для шифрования в режиме %s\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "Внимание: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "принудительное использование симметричного шифра %s (%d) нарушает "
 "предпочтения получателя\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для пользователя \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр '%s' нельзя использовать в режиме %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "данные зашифрованы алгоритмом %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Внимание: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
@@ -2355,7 +2374,7 @@
 msgstr " - пропущено"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "сохраняю в '%s'\n"
@@ -2390,265 +2409,271 @@
 msgid "[User ID not found]"
 msgstr "[Идентификатор пользователя не найден]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "автоматически получили '%s' через %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "ошибка получения '%s' через %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Нет отпечатка"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "поиск обновленной копии просроченного ключа по %s\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(проверьте аргумент параметра '%s')\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr ""
 "\"%s\" используется в качестве основного секретного ключа для подписи\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "все значения, переданные в '%s', игнорируются\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
 "достоверным\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подключ %s вместо первичного ключа %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "недопустимые значения для параметра \"%s\"\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "создать подпись"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "создать текстовую подпись"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "шифрование только симметричным шифром"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "быстро создать новую пару ключей"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "быстро добавить новый идентификатор пользователя"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "быстро отозвать идентификатор пользователя"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "быстро установить новый срок действия"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "создание полноценной пары ключей"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы секретных ключей"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "быстро подписать ключ"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "быстро подписать ключ локально"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "быстро отозвать идентификатор пользователя"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "обновить таблицу доверия"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "вывести хеши сообщений"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|установить правила TOFU для ключа"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "вывод в текстовом формате"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифровать для пользователя USER-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|выводить данные в файл FILE"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2656,7 +2681,7 @@
 "@\n"
 "(Полный список команд и параметров см. на странице man)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2676,11 +2701,11 @@
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPG@ [параметры] [файлы] (-h - подсказка)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2690,7 +2715,7 @@
 "Подписи и их проверка, шифрование и расшифровка\n"
 "Действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2698,95 +2723,95 @@
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Хеш-функции: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "вызов: %s [параметры] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "в определении группы '%s' отсутствует знак =\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Внимание: небезопасный владелец каталога,\n"
 "          содержащего модуль расширения '%s'\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопасные права доступа к каталогу,\n"
 "          содержащему домашний каталог '%s'\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2794,492 +2819,481 @@
 "ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
 "          содержащему файл настроек '%s'\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Внимание: небезопасные права доступа к каталогу,\n"
 "          содержащему файл модуля расширения '%s'\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "неизвестный элемент в файле настроек '%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "показывать в списке ключей фотоидентификаторы"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "показывать в списке ключей сведения о назначении ключа"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "показывать в списке подписей URL правил"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "показывать в списке подписей все замечания"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать в списке подписей замечания стандарта IETF"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "показывать в списке подписей пользовательские замечания"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать в списке подписей URL предпочтительных серверов ключей"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 "показывать в списке ключей действительность идентификаторов пользователей"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показывать в списке ключей отозванные и просроченные идентификаторы "
 "пользователей"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать в списке ключей отозванные и просроченные подключи"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "показывать в списке ключей название таблицы ключей"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "показывать в списке подписей сроки действия"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "неизвестные правила TOFU '%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" выведет список вариантов)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Замечание: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' - не допустимый срок действия подписи\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" не является адресом электронной почты\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "недопустимый режим ввода пароля '%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "недопустимый источник запроса '%s'\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' - не допустимая таблица символов\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не могу интерпретировать URL сервера ключей\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры сервера ключей\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры сервера ключей\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "недопустимый параметр фильтра: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимые параметры списка\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "недопустимые параметры списка\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "показать при проверке подписи фотоидентификаторы"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "показать при проверке подписи URL правил"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "показать при проверке подписей все замечания"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "показать при проверке подписей замечания стандарта IETF"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "показать при проверке подписей пользовательские замечания"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показать при проверке подписей действительность идентификаторов пользователей"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показать при проверке подписей отозванные и просроченные идентификаторы "
 "пользователя"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показать при проверке подписей только первичный идентификатор пользователя"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "проверить подписи по данным PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "поднять доверие подписей по действительным данным PKA"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Внимание: возможно создание файла образа памяти!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Внимание: %s отменяет %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s с %s недопустимо!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s с %s не имеет смысла!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Внимание: работаем с фальшивым системным временем: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "отказываюсь работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопустимый алгоритм шифрования\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран недопустимый алгоритм сжатия\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана недопустимая хеш-функция для сертификации\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые личные предпочтения шифра\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые личные предпочтения хеш-функции\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "хеш-функцию '%s' нельзя использовать в режиме %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм сжатия '%s' нельзя использовать в режиме %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверия: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "сбой симметричного шифрования '%s': %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "сбой при экспорте в виде ключа ssh: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из текстового формата: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в текстовый формат: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопустимая хеш-функция '%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "Внимание: команда не отдана. Пытаюсь угадать, что имелось в виду ...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Пишите сообщение ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочтительного сервера ключей неверен\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|взять ключи из файла таблицы ключей FILE"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии метки времени - только предупреждение"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|отвергать подписи, сделанные по данному алгоритму"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Вызов: gpgv [параметры] [файлы] (-h - подсказка)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3330,7 +3344,7 @@
 
 #: g10/import.c:193
 msgid "ignore key-signatures which are not self-signatures"
-msgstr ""
+msgstr "игнорировать подписи ключей, кроме самоподписей"
 
 #: g10/import.c:196
 msgid "run import filters and export key immediately"
@@ -3475,7 +3489,7 @@
 msgstr ""
 "свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: нет идентификатора пользователя\n"
@@ -3485,7 +3499,7 @@
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "исключен фильтром импорта"
 
@@ -3510,7 +3524,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "может быть, из-за отсутствия самоподписи\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
@@ -3525,7 +3539,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "ошибка записи таблицы ключей '%s': %s\n"
@@ -3595,17 +3609,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: импортирован секретный ключ\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: секретный ключ уже имеется\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: ошибка отправки в агент: %s\n"
@@ -3618,231 +3632,300 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "секретный ключ %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "импорт секретного ключа не допускается\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Ключ заменен другим"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Ключ был раскрыт"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Идентификатор пользователя больше не действителен"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "пояснение к отзыву: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет идентификатора пользователя для подписи\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: алгоритм с открытым ключом у идентификатора пользователя \"%s\" не "
 "поддерживается\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неправильная самоподпись на идентификаторе пользователя \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: недействительная прямая подпись ключа\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания ключей\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: недопустимая связь подключей\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалена многократная связь подключей\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзыва ключа\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неверный отзыв подключа\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удален многократный отзыв подключей\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен идентификатор пользователя \"%s\"\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "ключ %s: обнаружено дублирование идентификатора пользователя - объединены\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: добавлена прямая подпись ключа\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "ошибка выделения памяти: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"не удалось проверить подпись: алгоритм с открытым ключом %d не "
+"поддерживается: %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr "(порядок подписей изменен)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "ключ %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d повторная подпись удалена\n"
+msgstr[1] "%d повторные подписи удалены\n"
+msgstr[2] "%d повторных подписей удалено\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d подпись не проверена за отсутствием ключа\n"
+msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
+msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d плохая подпись\n"
+msgstr[1] "%d плохих подписи\n"
+msgstr[2] "%d плохих подписей\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Порядок %d подписи изменен\n"
+msgstr[1] "Порядок %d подписей изменен\n"
+msgstr[2] "Порядок %d подписей изменен\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
+"всех подписей выполните '%s'.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "ошибка создания щита с ключами '%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "ошибка создания таблицы ключей '%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "создан щит с ключами '%s'\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "создана таблица ключей '%s'\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "источник блока ключей '%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "ошибка открытия базы данных ключей: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
@@ -4082,8 +4165,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "подписать не удалось: %s\n"
@@ -4281,7 +4364,7 @@
 "  't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
 "  nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
@@ -4337,7 +4420,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно переместить первичный ключ? (y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
@@ -4416,7 +4499,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
@@ -4459,76 +4542,91 @@
 msgid "Nothing to sign.\n"
 msgstr "Подписывать нечего.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Вами не подписано.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "сбой проверки созданной подписи: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' - не допустимый срок действия\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" - не правильный отпечаток\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "подключ \"%s\" не найден\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Хеш: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Характеристики: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Не изменять на сервере"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Предпочтительный сервер ключей: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Замечания: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "В идентификаторе пользователя типа PGP 2.x не может быть предпочтений.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(особо важный)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "     создан: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "    отозван: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
@@ -4537,30 +4635,30 @@
 # perhaps this should be somewhere in help/man
 # (S - подпись, C - сертификация, E - шифрование, A - удостоверение личности)
 # too long for repeating messages.
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "назначение: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "номер карты: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4568,18 +4666,18 @@
 "Учтите, что показанная достоверность ключа может быть неверной,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "просрочен"
 
 # check it
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4589,17 +4687,17 @@
 "          Эта команда может привести к тому, что первичным станет считаться\n"
 "          другой идентификатор пользователя.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Возможно, надо поменять также срок действия.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4608,35 +4706,35 @@
 "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
 "          в некоторых версиях PGP вызвать отбраковку ключа.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4644,20 +4742,20 @@
 msgstr[1] "Удалены %d подписи.\n"
 msgstr[2] "Удалено %d подписей.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "недопустим"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Идентификатор пользователя \"%s\" сжат: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4665,17 +4763,17 @@
 msgstr[1] "Идентификатор пользователя \"%s\": %d подписи удалены\n"
 msgstr[2] "Идентификатор пользователя \"%s\": %d подписей удалено\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Идентификатор пользователя \"%s\" уже минимизирован\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Идентификатор пользователя \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4684,39 +4782,39 @@
 "Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите идентификатор пользователя ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим самого себя\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4724,240 +4822,236 @@
 "Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
 "N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действия подключа.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия первичного ключа.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменить срок действия ключа v3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "Смена режимов использования подключа.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "Смена режимов использования первичного ключа.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписывающий подключ %s уже перекрестно заверен\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите ровно один идентификатор пользователя.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск самоподписи v3 на идентификаторе пользователя \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтительного сервера ключей: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Введите замечание: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет идентификатора пользователя с индексом %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет идентификатора пользователя с хешем %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Нет подключа с идентификатором ключа '%s'.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Идентификатор пользователя: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (неэкспортируемая)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действия подписи истек %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Вами не подписано.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали эти идентификаторы пользователей на ключе %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (неотзываемая)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отозвано Вашим ключом %s %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "попытка отзыва непользовательского идентификатора: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Идентификатор пользователя \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Внимание: подпись идентификатора пользователя датирована %d секундами в "
 "будущем\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Нельзя удалять последний действительный идентификатор пользователя.\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Показ фотоидентификатора %s размера %ld для ключа %s (идентификатор "
 "пользователя %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "недопустимое значения параметра \"%s\"\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "предпочтение '%s' дублируется\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений шифров\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений хеш-функций\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений методов сжатия\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "недопустимый элемент '%s' в строке предпочтений\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "запись прямой подписи\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "запись самоподписи\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "запись связующей подписи\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; использую %u бит\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа округлен вверх до %u бит\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -4965,19 +5059,19 @@
 "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
 "такой длиной хеша\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Подписать"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Заверить"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Удостоверить личность"
 
@@ -4991,162 +5085,161 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "11223300"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Допустимы действия: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность подписи\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность шифрования\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность удостоверения личности\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA и RSA (по умолчанию)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA и Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (только для шифрования)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (задать возможности)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (задать возможности)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC и ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (только для подписи)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (задать возможности)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (только для шифрования)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Имеющийся ключ\n"
 
-#: g10/keygen.c:1974
-#, fuzzy, c-format
-#| msgid "   (%d) Existing key from card\n"
+#: g10/keygen.c:1973
+#, c-format
 msgid "  (%d) Existing key from card\n"
-msgstr "   (%d) Имеющийся на карте ключ\n"
+msgstr "  (%d) Имеющийся на карте ключ\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Введите код ключа:"
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Нет ключа с таким кодом\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "ошибка чтения карты: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серийный номер карты: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Доступные ключи:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "длина ключей %s может быть от %u до %u.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Какой размер подключа необходим? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрошенный размер ключа - %u бит\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Выберите эллиптическую кривую:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5162,7 +5255,7 @@
 "      <n>m = срок действия ключа - n месяцев\n"
 "      <n>y = срок действия ключа - n лет\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5178,38 +5271,38 @@
 "      <n>m = срок действия подписи - n месяцев\n"
 "      <n>y = срок действия подписи - n лет\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Срок действия ключа? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Срок действия подписи? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Срок действия ключа не ограничен\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Срок действия подписи не ограничен\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5217,11 +5310,11 @@
 "Ваша система не может отображать даты после 2038 года.\n"
 "Однако даты до 2106 года будут обрабатываться верно.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5235,7 +5328,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5251,49 +5344,49 @@
 "    \"Вася Пушкин (персонаж) <vp@test.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Ваше полное имя: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в имени\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Адрес электронной почты: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Неправильный адрес электронной почты\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Примечание: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в примечании\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Используется таблица символов '%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5304,7 +5397,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
@@ -5320,31 +5413,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес; (Q)Выход? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес; (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Сменить (N)Имя, (E)Адрес; (Q)Выход? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Имя, (E)Адрес; (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5357,13 +5450,13 @@
 "случайных чисел больше возможностей получить достаточное количество "
 "энтропии.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5374,65 +5467,65 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Продолжить? (Y/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ пользователя \"%s\" уже существует\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Все равно создать новый? (y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "принудительное создание\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не могу создать архивную копию, файл '%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "сохранение открытого ключа в '%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и секретный ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5440,7 +5533,7 @@
 "Учтите, что данный ключ не может использоваться для шифрования. Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5448,7 +5541,7 @@
 "ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
 "часами)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5456,22 +5549,22 @@
 "ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
 "часами)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретные части первичного ключа отсутствуют.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретные части первичного ключа хранятся на карте.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N) "
 
@@ -5507,22 +5600,6 @@
 msgstr[1] "%d хороших подписи\n"
 msgstr[2] "%d хороших подписей\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d плохая подпись\n"
-msgstr[1] "%d плохих подписи\n"
-msgstr[2] "%d плохих подписей\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d подпись не проверена за отсутствием ключа\n"
-msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
-msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5543,29 +5620,29 @@
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Отпечаток первичного ключа:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "      Отпечаток подключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток первичного ключа:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "       Отпечаток подключа:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Отпечаток ключа ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr " серийный номер карты ="
 
@@ -5598,7 +5675,7 @@
 msgstr[1] "(%lu подписи)\n"
 msgstr[2] "(%lu подписей)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
@@ -5649,7 +5726,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" - не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5657,132 +5734,132 @@
 msgstr[1] "обновление %d ключей из %s\n"
 msgstr[2] "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Внимание: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" на сервере ключей не найден\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с сервера %s %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "не известно ни одного сервера ключей\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "запрос ключа из '%s'\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Внимание: невозможно получить URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован по %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль создана с незнакомой хеш-функцией %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ - %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s с идентификатором %s, созданным %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с идентификатором %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифровки с открытым ключом: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Внимание: наблюдается несколько текстов\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано %lu фразами-паролями\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано одной фразой-паролем\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "предполагаются данные, зашифрованные по %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробую вместо него %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Внимание: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5792,310 +5869,309 @@
 "оно правомерно, поскольку в те времена защита целостности широко\n"
 "не применялась.\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Воспользуйтесь параметром '%s', чтобы тем не менее расшифровать.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "принудительный сбой расшифровки!\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "расшифровано нормально\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Внимание: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифровки: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Замечание: отправитель запросил \"только между нами\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "первоначальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "подпись не найдена\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись пользователя \"%s\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись пользователя \"%s\""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись пользователя \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти неоднозначные данные подписи\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с идентификатором %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись сделана %s ключом %s с идентификатором %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                издатель \"%s\"\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ доступен на: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
-msgstr ""
+msgstr "Замечание: Параметр '%s' включает использование этой информации\n"
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                или \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "Внимание: Данный ключ не подходит для подписи в режиме %s\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "отдельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "подпись старого типа (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "сбой fstat '%s' в функции %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "сбой fstat(%d) в функции %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "Внимание: используется экспериментальный алгоритм шифрования с открытым "
 "ключом %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "Внимание: Ключи для подписи+шифрования Elgamal не рекомендуются\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "Внимание: используется экспериментальный алгоритм симметричного шифрования "
 "%s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Внимание: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "Внимание: хеш-функция %s не рекомендуется\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "Замечание: подписи с хеш-функцией %s игнорируются\n"
+msgstr "Замечание: подписи с алгоритмом %s игнорируются\n"
 
-#: g10/misc.c:370
-#, fuzzy, c-format
-#| msgid "Note: signatures using the %s algorithm are rejected\n"
+#: g10/misc.c:376
+#, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
-msgstr "Замечание: подписи с хеш-функцией %s игнорируются\n"
+msgstr "Замечание: подписи третьих сторон с алгоритмом %s игнорируются\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(сообщенная ошибка: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(сообщенная ошибка: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(дальнейшие сведения: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: параметр \"%s\" не рекомендуется\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте вместо этого \"%s%s\"\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "Внимание: команда \"%s\" не рекомендуется к употреблению - не применяйте ее\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: \"%s\" в этом файле устарело - оно действует только в %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "Внимание: параметр \"%s%s\" устарел - он действует только для %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "без сжатия|без|none"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть непригодно для %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначный параметр '%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "неизвестный параметр '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "неизвестный слабый хеш '%s'\n"
@@ -6128,72 +6204,72 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "предполагается, что подписанные данные находятся в '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "Внимание: потенциально небезопасный сеансовый ключ,\n"
 "          зашифрованный симметричным шифром\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Неизвестное критическое замечание к подписи: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "в подпакете типа %d установлен критический бит\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Введите фразу-пароль\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (идентификатор главного ключа %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Введите фразу-пароль для разблокировки секретного ключа OpenPGP:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Введите фразу-пароль для импорта секретного ключа OpenPGP:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Введите фразу-пароль для экспорта секретного подключа OpenPGP:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Введите фразу-пароль для экспорта секретного ключа OpenPGP:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Вы действительно хотите навсегда удалить секретный подключ OpenPGP:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Вы действительно хотите навсегда удалить секретный ключ OpenPGP:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6249,7 +6325,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Это правильная фотография? (y/N/q) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить фотоидентификатор!\n"
@@ -6550,12 +6626,12 @@
 msgid "no valid addressees\n"
 msgstr "нет пригодных адресов\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Замечание: у ключа %s нет функции %s\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@ -6608,28 +6684,28 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "отлично, мы - анонимный получатель.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "старая кодировка DEK не поддерживается\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "Внимание: в списке предпочтений получателя алгоритм шифрования %s не найден\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "Замечание: секретный ключ %s просрочен с %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "Замечание: ключ был отозван"
@@ -6818,7 +6894,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Внимание: конфликт хешей подписей в сообщении\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "ключ %s нельзя использовать для подписи в режиме %s\n"
@@ -6895,28 +6971,28 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Замечание: ключ для подписей %s отозван\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "плохая подпись ключа ключом %s: %s (0x%02x 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "плохая подпись данных ключом %s: %s (0x%02x 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "подпись ключа %s считается плохой из-за неизвестного критического бита\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для отзывающей подписи подключа\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
@@ -6945,12 +7021,12 @@
 "Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
 "(слишком длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "подпись %s/%s пользователя \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6958,12 +7034,12 @@
 "Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано шифрование по %s\n"
@@ -6990,7 +7066,7 @@
 msgstr ""
 "это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@ -7035,12 +7111,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "ошибка чтения в '%s': %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "таблица доверия: сбой синхронизации: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "не удается создать блокировку для '%s'\n"
@@ -7050,12 +7126,12 @@
 msgid "can't lock '%s'\n"
 msgstr "не удается заблокировать '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "таблица доверия, запись %lu: сбой lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "таблица доверия, запись %lu: сбой записи (n=%d): %s\n"
@@ -7070,103 +7146,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "нет доступа к '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: создана недопустимая таблица доверия\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверия\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Замечание: таблица доверия недоступна для записи\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недопустимая таблица доверия\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хешей: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "таблица доверия: сбой lseek: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "таблица доверия: сбой чтения (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверия\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка сохранения записи каталога: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Ошибка: таблица доверия повреждена.\n"
@@ -7576,98 +7652,98 @@
 "ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
 "идентификаторов пользователя\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' не является допустимым длинным идентификатором ключа\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: принят как доверенный ключ\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s встречается в таблице доверия более одного раза\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: нет открытого ключа для доверенного ключа - пропущен\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s помечен как абсолютно доверенный\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "тип записи о доверии %lu отличается от запрошенного (%d)\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Можно попытаться пересоздать таблицу доверия командами:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Если это не выйдет, обратитесь к руководству пользователя\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу использовать неизвестную модель (%d) - использую модель доверия %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую модель доверия %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "проверка таблицы доверия не нужна\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверия %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "проверять таблицу доверия при модели доверия '%s' не нужно\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверия\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7675,7 +7751,7 @@
 msgstr[1] "обработаны %d ключа"
 msgstr[2] "обработано %d ключей"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7683,17 +7759,17 @@
 msgstr[1] " (сброшены %d счетчика достоверности)\n"
 msgstr[2] " (сброшено %d счетчиков достоверности)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "абсолютно доверенных ключей не найдено\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7701,7 +7777,7 @@
 "глубина: %d  достоверных: %3d  подписанных: %3d  доверие: %d-, %dq, %dn, "
 "%dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7812,53 +7888,68 @@
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "Просмотр, экспорт, импорт данных щита с ключами\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%sНомер: %s%%0AДержатель: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Осталось попыток: %d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Введите PIN ключа для создания квалифицированных подписей."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|Введите PIN для стандартных ключей."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA, или ее размер превышает %d бит\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Функция обработки PIN возвратила ошибку: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "пустой PIN до сих пор не изменен\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|A|Введите новый PIN для стандартных ключей."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "|A|Введите PIN для стандартных ключей."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Введите новый код разблокировки PIN (PUK) для стандартных ключей."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Введите код разблокировки PIN (PUK) для стандартных ключей."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Введите новый PIN ключа для создания квалифицированных подписей."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||Введите PIN ключа для создания квалифицированных подписей."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7866,7 +7957,7 @@
 "|NP|Введите новый код разблокировки PIN (PUK) ключа для создания "
 "квалифицированных подписей."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7874,47 +7965,47 @@
 "|P|Введите код разблокировки PIN (PUK) ключа для создания квалифицированных "
 "подписей."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой при сохранении отпечатка: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой при сохранении даты создания: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "в ответе отсутствует открытый ключ эллиптической кривой\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой при чтении открытого ключа: %s\n"
@@ -7922,56 +8013,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sНомер: %s%%0AДержатель: %s%%0AСчетчик: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%sНомер: %s%%0AДержатель: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "Осталось попыток: %d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "основной PIN применяется как %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "не удалось применить основной PIN как %s: %s - далее применяться\n"
 "как основной не будет\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||Разблокируйте карту"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "сбой при проверке CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "карта окончательно заблокирована!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7985,24 +8064,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Введите административный PIN"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите код сброса для карты"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Код сброса слишком короток; минимальная длина %d\n"
@@ -8010,87 +8089,87 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Новый код сброса"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Введите административный PIN и новый административный PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Введите PIN и новый PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "запись нового ключа\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "пропущена метка времени создания\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или его размер не равен %d\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "кривая не поддерживается\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8098,34 +8177,34 @@
 msgstr[1] "создание ключа завершено (%d секунды)\n"
 msgstr[2] "создание ключа завершено (%d секунд)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "отпечаток на карте не совпадает с запрошенным\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает хеш-функцию %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "создано подписей: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@ -8141,55 +8220,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Первоначальный новый PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "работать в многосерверном режиме (нефоновый режим)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|сохранять журнал в файл FILE"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|подключаться к считывателю на порту N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|использовать NAME как драйвер ct-API"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|использовать NAME как драйвер PC/SC"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "не использовать внутренний драйвер CCID"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|отключить карту после N секунд неактивности"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "не использовать клавиатуру считывателя"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "не позволять использовать административные команды карты"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "использовать входные данные переменой длины для клавиатуры считывателя"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Вызов: @SCDAEMON@ [параметры] (-h - подсказка)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8197,311 +8276,328 @@
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон криптографических карт для @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "схема проверки, запрошенная сертификатом: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "цепь"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "оболочка"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "критичное расширение сертификата %s не поддерживается"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "издатель сертификата не помечен как удостоверяющий центр"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "незаданные правила помечены как критичные"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Замечание: некритичные правила сертификата недопустимы"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "правила сертификата недопустимы"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "сбой получения отпечатка\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "внешний поиск издателя\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "число соответствующих издателей: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "не могу получить authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "поиск издателя в буфере Dirmngr\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "число соответствующих сертификатов: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "ключ в буфере dirmngr не найден: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "сбой при выделении памяти под указатель на базу данных\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "сертификат был отозван"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "статус сертификата неизвестен"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" установлен корректно\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "сбой проверки списка отозванных сертификатов: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертификат с недействительной достоверностью: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "сертификат еще не достоверен"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "корневой сертификат еще не достоверен"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "промежуточный сертификат еще не достоверен"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "сертификат просрочен"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "корневой сертификат просрочен"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "промежуточный сертификат просрочен"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "сертификат не имеет требуемых атрибутов: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "сертификат с недействительной достоверностью"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "подпись создана вне времени действия сертификата"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "сертификат создан вне времени действия издателя"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "промежуточный сертификат создан вне времени действия издателя"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (          подпись создана "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (        сертификат создан "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (сертификат действителен с "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (  издатель действителен с "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой сертификат теперь помечен как доверенный\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в агенте gpg нельзя интерактивно сделать сертификат доверенным\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "для данного сеанса запрещено интерактивно делать сертификат доверенным\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "Внимание: время создания подписи неизвестно - предполагается текущий момент"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "в сертификате не найден издатель"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "корневой сертификат не помечен как доверенный"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверия: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "слишком длинная цепочка сертификатов\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не найден издатель сертификата"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "сертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "найден еще один возможный сертификат удостоверяющего центра - повторная "
 "попытка"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификатов длиннее допускаемой удостоверяющим центром (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "хороший сертификат\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "хороший промежуточный сертификат\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "хороший корневой сертификат\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "переключение на цепную схему"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "используется схема проверки: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-битный хеш недопустим для %u-битного ключа %s\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "нехватка выделенной памяти\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это алгоритм MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "нет"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Ошибка - недопустимая кодировка]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Ошибка - нехватка выделенной памяти]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Ошибка - Нет имени]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Ошибка - недопустимый DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8515,137 +8611,137 @@
 "S/N %s, идентификатор 0x%08lX,\n"
 "создан %s, истекает %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимость ключа - подразумеваем все\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "ошибка получения информации применимости ключа: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "сертификат не следовало использовать для заверения\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "сертификат не следовало использовать для подписывания ответа OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "сертификат не следовало использовать для шифрования\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "сертификат не следовало использовать для подписей\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "сертификат не пригоден для шифрования\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "сертификат не пригоден для подписи\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "строка %d: недопустимый алгоритм\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "строка %d: недопустимая длина ключа %u (допустимы от %d до %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "строка %d: не задано имя субъекта\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "строка %d: недопустимая метка имени субъекта '%.*s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "строка %d: недопустимое имя субъекта '%s' в позиции %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "строка %d: нет допустимого адреса электронной почты\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "строка %d: недопустимый серийный номер\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "строка %d: недопустимая метка имени издателя '%.*s'\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "строка %d: недопустимое имя издателя '%s' в позиции %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "строка %d: задана недопустимая дата\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "строка %d: ошибка получения кода подписывающего ключа '%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "строка %d: задана недопустимая хеш-функция\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "строка %d: недопустимый authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "строка %d: недопустимый subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "строка %d: недопустимый синтаксис расширения\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "строка %d: ошибка чтения ключа '%s' из карты: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "строка %d: ошибка получения кода ключа '%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "строка %d: сбой создания ключа: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8779,7 +8875,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "сертификат '%s' не найден: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "ошибка блокировки щита с ключами: %s\n"
@@ -8804,123 +8900,123 @@
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "вывести список цепочек сертификатов"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "зарегистрировать криптографическую карту"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "вывод в кодировке base64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "предполагаю, что входные данные в формате PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "предполагаю, что входные данные в формате base64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "предполагаю, что входные данные в двоичном формате"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "не сверять со списком отозванных сертификатов"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "проверка достоверности с помощью OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о правилах из файла FILE"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "не проверять правила сертификата"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "запросить недостающих издателей сертификатов"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|сохранять журнал аудита в файле FILE"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не спрашивать"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "принять 'да' как ответ на большинство вопросов"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "принять 'нет' как ответ на большинство вопросов"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|искать ключи на данном сервере ключей"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h - подсказка)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8930,47 +9026,47 @@
 "Подписать, проверить, зашифровать или расшифровать по протоколу S/MIME\n"
 "Операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Замечание: не могу зашифровать для '%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "неизвестная схема проверки '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: не задано имя хоста\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: задан пароль, но не задан пользователь\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: пропускаю эту строку\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "не удалось определить сервер ключей\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "импорт общих сертификатов '%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "невозможно подписать с помощью '%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "недопустимая команда (неявной команды нет)\n"
@@ -8990,7 +9086,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "ошибка базовой проверки сертификата - не импортирован\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "ошибка получения сохраненных признаков: %s\n"
@@ -9000,42 +9096,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импорта сертификата: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "сбой получения отпечатка\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "проблема поиска существующего сертификата: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "ошибка при поиске базы данных ключей для записи: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "ошибка сохранения сертификата: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "проблема повторного поиска сертификата: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "ошибка сохранения признаков: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Ошибка - "
 
@@ -9073,7 +9164,7 @@
 "\n"
 "%s%sВы уверены, что хотите этого?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9109,22 +9200,22 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "сбой при проверке квалифицированной подписи: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Подпись сделана "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[дата не указана]"
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " с помощью сертификата с идентификатором 0x%08lX\n"
+msgid "algorithm:"
+msgstr "алгоритм:"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9132,17 +9223,17 @@
 "недопустимая подпись: атрибут хеш-функции сообщения не соответствует "
 "вычисленному\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Хорошая подпись пользователя"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                         или"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Это квалифицированная подпись\n"
@@ -9210,277 +9301,276 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "ошибка загрузки сертификата '%s': %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "      постоянно загруженных сертификатов: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "сертификатов в буфере времени исполнения: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "                достоверных сертификатов: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "сертификат уже в буфере\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "сертификат в буфере\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "ошибка помещения сертификата в буфер: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "неверная строка отпечатока SHA1 '%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "ошибка получения сертификата по серийному номеру: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "ошибка получения сертификата по субъекту: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "в сертификате не найден издатель\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "ошибка получения authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "создание каталога '%s'\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "ошибка создания каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "игнорируем каталог базы данных '%s'\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "ошибка чтения из каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "удаление файла буфера '%s'\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "не удаляю файл '%s'\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "ошибка закрытия файла буфера: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "не могу открыть файл буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "ошибка создания нового файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "ошибка записи нового файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "ошибка закрытия нового файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "создан новый файл буферного каталога '%s'\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "сбой при повторном открытии файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "первая запись '%s' - не версия\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "старая версия каталога буфера - очищаю\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "старая версия каталога буфера - не продолжаю\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "лишнее поле в записи списка отозванных сертификатов '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "недопустимая строка в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "удвоенный элемент в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "запись неподдерживаемого типа в '%s', строка %u (игнорируется)\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "неправильный хеш издателя в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "нет DN издателя в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "недопустимая метка времени в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "Внимание: недопустимый хеш файла буфера в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "в файле каталога буфера обнаружены ошибки\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "выясните причину и удалите этот файл вручную\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "невозможно создание временного файла '%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "ошибка закрытия '%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "ошибка переименования '%s' в '%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "невозможно получить хеш '%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "ошибка установки контекста хеша MD5: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "ошибка при получении хеша '%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "недопустимая отформатированная контрольная сумма для '%s'\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "слишком много открытых файлов буферов; не могу открыть еще один\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "открываю файл буфера '%s'\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "ошибка при открытии файла буфера '%s': '%s'\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "ошибка инициализации файла буфера '%s' на чтение: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "вызов unlock_db_file для закрытого файла\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "вызов unlock_db_file для неразблокированного файла\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "сбой создания нового объекта буфера: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr ""
 "списка отозванных сертификатов для издателя с идентификатором %s нет в "
 "наличии\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "список отозванных сертификатов для издателя с идентификатором %s в буфере "
 "слишком стар; требуется обновление\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9489,211 +9579,213 @@
 "действует force-crl-refresh и прошло %d минут для издателя с идентификатором "
 "%s; требуется обновление\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "для издателя с идентификатором %s действует force-crl-refresh; требуется "
 "обновление\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 "доступный список отозванных сертификатов для издателя с идентификатором %s "
 "нельзя использовать\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "список отозванных сертификатов для издателя с идентификатором %s в буфере "
 "поврежден; его нужно обновить\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "Внимание: недопустимая для серийного номера длина буферной записи "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "проблема чтения буферной записи для серийного номера %s: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "Серийный номер %s недопустим; причина=%02X, дата=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 "Серийный номер %s допустим, он не перечислен в списке отозванных "
 "сертификатов\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "ошибка получения данных из файла буфера: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "недопустимая хеш-функция '%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "сбой gcry_md_open для алгоритма %d: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "из libksba получено недопустимое S-выражение\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "сбой преобразования S-выражения: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "недопустимая хеш-функция '%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "сбой gcry_md_open для алгоритма %d: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "сбой создания S-выражения: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "сбой ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 "ошибка получения времен обновления списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 "времена обновления этого списка отозванных сертификатов: текущее=%s, "
 "следующее=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не задано nextUpdate; предполагаю срок действия в один день\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "ошибка получения элемента списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "ошибка вставки элемента во временный файл буфера: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "в списке отозванных сертификатов не найден издатель списка: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "поиск сертификата издателя списка отозванных сертификатов по "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "сбой проверки подписи списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "ошибка проверки достоверности сертификата издателя списка отозванных "
 "сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "сбой ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "сбой ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "удален залипший временный файл буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "проблема удаления залипшего временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "ошибка создания временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "сбой crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "ошибка завершения временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "ошибка закрытия временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "Внимание: новый список отозванных сертификатов тоже слишком стар; срок "
 "действия истек %s - тем не менее загружаю\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 "новый список отозванных сертификатов тоже слишком стар; срок действия истек "
 "%s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "неизвестное критическое расширение списка отозванных сертификатов %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "ошибка чтения расширений списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "создание файла буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема при переименовании '%s' в '%s': %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9702,12 +9794,12 @@
 "сбой обновления файла каталога - запись буфера будет утеряна при следующем "
 "запуске программы\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Начало вывода списка отозванных сертификатов (полученного через %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9715,57 +9807,57 @@
 " Ошибка: Список отозванных сертификатов использован не будет, потому что "
 "после обновления он все равно слишком стар!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " Ошибка: Список отозванных сертификатов не будет использован из-за "
 "неизвестного критического расширения!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " Ошибка: Список отозванных сертификатов использован не будет\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " Ошибка: Этот список отозванных сертификатов в буфере, возможно, подменен!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "Внимание: найдена недопустимая длина буферной записи\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема при чтении буферной записи: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема при чтении ключа буфера: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "ошибка чтения записи буфера из базы данных: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Конец вывода списка отозванных сертификатов\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "сбой crl_fetch через DP: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "сбой crl_cache_insert через DP: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "сбой crl_cache_insert через издателя: %s\n"
@@ -9807,57 +9899,57 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "поиск сертификата невозможен из-за того, что не задействуется %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "использовать OCSP вместо списков отозванных сертификатов"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "проверять, работает ли dirmngr"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "добавить сертификат в буфер"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "проверить сертификат"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "искать сертификат"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "искать только сертификаты, хранящиеся локально"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "--lookup задает URL"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "загрузить список отозванных сертификатов в dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "особый режим для применения со Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "рассматривать сертификаты в формате PEM"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "принудительно использовать основной ответчик OCSP"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "Вызов: dirmngr-client [параметры] [файл_сертификата|шаблон] (-h - "
 "подсказка)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9869,82 +9961,82 @@
 "Процесс возвращает 0, если сертификат достоверен, 1, если недостоверен,\n"
 "и другие коды ошибок при общих отказах.\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "ошибка чтения сертификата из stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "ошибка чтения сертификата из %s: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "сертификат слишком велик, чтобы иметь какой-то смысл\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "не могу подключиться к dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "сбой при поиске: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "сбой при загрузке списка отозванных сертификатов '%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "демон dirmngr работает\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "сбой при проверке сертификата: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "сертификат достоверен\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "сертификат был отозван\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "сбой при проверке сертификата: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "получен статус: '%s'\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "ошибка записи в кодировке base64: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "запрос '%s' не поддерживается\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "нужно абсолютное имя файла\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "поиск '%s'\n"
@@ -9969,98 +10061,98 @@
 msgid "flush the cache"
 msgstr "записать буфер на диск"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "работать, не спрашивая пользователя"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "разрешить посылку запросов OCSP"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "разрешить проверку версий программ по сети"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "запретить использование HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "запретить использование LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "игнорировать точки распространения списков отозванных сертификатов по HTTP"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "игнорировать точки распространения списков отозванных сертификатов по LDAP"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "игнорировать URL служб OCSP из сертификата"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|перенаправлять все запросы HTTP на URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|использовать хост HOST для поиска LDAP"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не пользоваться запасными хостами с --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|взять список серверов LDAP из файла FILE"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "добавлять новые серверы, обнаруженные в точках распространения списков "
 "отозванных сертификатов, в список серверов"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|установить время ожидания LDAP N секунд"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|использовать ответчик OCSP по URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|не возвращать более чем N результатов одного поиска"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 "|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
 "по TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "проводить весь сетевой обмен через Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10069,11 +10161,11 @@
 "@\n"
 "(Полный список команд и параметров см. в руководстве \"info\")\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Вызов: @DIRMNGR@ [параметры] (-h - подсказка)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10081,132 +10173,132 @@
 "Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
 "Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "допустимые уровни отладки: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "вызов: %s [параметры] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "двоеточия в имени сокета недопустимы\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: слишком длинная строка - пропущена\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: обнаружен неверный отпечаток\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: ошибка чтения: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: мусор в конце строки игнорируется\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "получен SIGUSR2 - действие не определено\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "получен SIGTERM - завершение работы ...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "получен SIGTERM - осталось %d активных соединений\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "принудительное выключение\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "получен SIGINT - немедленное завершение работы\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "получен сигнал %d - действие не определено\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "возвращать все значения в формате, ориентированном на записи"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|игнорировать хост и подключаться через NAME"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|подключиться к хосту NAME"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|подключиться к порту N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|использовать имя пользователя NAME для удостоверения личности"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|использовать для удостоверения личности пароль PASS"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "взять пароль из $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|искать строку DN STRING"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|использовать строку STRING как выражение для фильтра"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|вернуть атрибут STRING"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Вызов: dirmngr_ldap [параметры] [URL] (-h - подсказка)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10216,144 +10308,138 @@
 "Внутренний помощник LDAP для Dirmngr\n"
 "Протокол и параметры могут изменяться без предупреждения\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "недопустимый номер порта %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "поиск атрибута '%s' в результатах\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "ошибка записи в stdout: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "           доступный атрибут '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "атрибут '%s' не найден\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "найден атрибут '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "обработка URL '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr " пользователь '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "       проход '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "         хост '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "         порт %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "           DN '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "       фильтр '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "      атрибут '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "в '%s' нет имени хоста\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "для запроса '%s' не задано атрибута\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "Внимание: Используется только первый атрибут\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "сбой при инициализации LDAP в '%s:%d': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "сбой при привязке к '%s:%d': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "ошибка поиска '%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' - не URL LDAP\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' - недопустимый URL LDAP\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "ошибка чтения '%s': статус HTTP %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "слишком много перенаправлений\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "перенаправление изменилось на '%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "ошибка выделения памяти: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10404,7 +10490,7 @@
 msgid "malloc failed: %s\n"
 msgstr "сбой malloc: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: недопустимый шаблон '%s'\n"
@@ -10534,11 +10620,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "сбой при выделении памяти под контекст OCSP: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "не могу получить authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10607,7 +10688,7 @@
 msgstr "в идентификаторе сертификата нет серийного номера"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "сбой assuan_inquire: %s\n"
@@ -10637,32 +10718,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "превышено max_replies %d\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "сбой размещения контекста Assuan: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "сбой инициализации сервера: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "сбой регистрации команд с помощью Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема с приемом Assuan: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "сбой обработки Assuan: %s\n"
@@ -10701,58 +10782,58 @@
 msgid "certificate chain is good\n"
 msgstr "хорошая цепочка сертификатов\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 "сертификат не следовало использовать для подписывания списка отозванных "
 "сертификатов\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "менее подробно"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "выводить данные в шестнадцатеричном виде"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "декодировать полученные строки данных"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "подключиться к dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|подключиться к сокету Assuan NAME"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|подключиться к серверу Assuan по адресу ADDR"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "запустить сервер Assuan, заданный в командной строке"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "не пользоваться расширенным режимом подключения"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|выполнить при запуске команды из файла FILE"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "выполнить при запуске подстановку subst"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Вызов: @GPG@-connect-agent [параметры] (-h - подсказка)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10760,43 +10841,43 @@
 "Синтаксис: @GPG@-connect-agent: [параметры]\n"
 "Связывается с запущенным агентом и посылает команды\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и необязательных аргументов\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорируется; причина - \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "сбой получения строки: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "слишком длинная строка - пропущена\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "строка сокращена из-за содержащегося в ней нулевого символа\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "неизвестная команда '%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
@@ -10895,16 +10976,12 @@
 "электронной почты"
 
 #: tools/gpgconf-comp.c:760
-#, fuzzy
-#| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
-msgstr "импортировать ключи с сервера ключей"
+msgstr "импортировать недостающий ключ из подписи"
 
 #: tools/gpgconf-comp.c:763
-#, fuzzy
-#| msgid "list and check key signatures"
 msgid "include the public key in signatures"
-msgstr "вывести и проверить подписи ключей"
+msgstr "вносить открытый ключ в подписи"
 
 #: tools/gpgconf-comp.c:770 tools/gpgconf-comp.c:831
 msgid "disable all access to the dirmngr"
@@ -10988,94 +11065,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Замечание: Подробности можно вывести командой \"%s%s\".\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Внешняя проверка компонента %s не прошла"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Обратите внимание, что спецификации групп игнорируются\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "ошибка закрытия '%s'\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "ошибка при интерпретации '%s'\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "вывод списка всех компонентов"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "проверить все программы"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|вывод списка параметров"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|изменить параметры"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|проверить параметры"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "применить глобальные значения по умолчанию"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|обновить файлы конфигурации из файла FILE"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "получить каталоги настроек для @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "указать глобальный файл настроек"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "проверить глобальный файл настроек"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "запросить базу данных версий программ"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "перезагрузить все или заданный компонент"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "запустить заданный компонент"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "выключить заданный компонент"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "задействовать изменения во время исполнения, если возможно"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Вызов: @GPGCONF@ [параметры] (-h - подсказка)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11083,208 +11160,149 @@
 "Синтаксис: @GPGCONF@ [параметры]\n"
 "Управляет параметрами настроек инструментария @GNUPG@\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Требуется однокомпонентный аргумент"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Аргументы не разрешены"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Вызов: gpg-check-pattern [параметры] файл_образцов (-h - подсказка)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Команды:\n"
-" "
+"Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
+"Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "режим расшифровки"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "режим зашифровывания"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Команды:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "класс средства (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "режим расшифровки"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "имя файла программы"
+#~ msgid "encryption modus"
+#~ msgstr "режим зашифровывания"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "файл секретного ключа (обязателен)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "класс средства (confucius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "имя входного файла (по умолчанию stdin)"
+#~ msgid "program filename"
+#~ msgstr "имя файла программы"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Вызов: symcryptrun [параметры] (-h - подсказка)"
+#~ msgid "secret key file (required)"
+#~ msgstr "файл секретного ключа (обязателен)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Синтаксис: symcryptrun --class КЛАСС --program ПРОГРАММА --keyfile "
-"ФАЙЛ_КЛЮЧА [параметры...] КОМАНДА [входной файл]\n"
-"Вызывает простое средство шифрования\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "имя входного файла (по умолчанию stdin)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s над %s прервано, статус %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Вызов: symcryptrun [параметры] (-h - подсказка)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "сбой %s над %s, статус %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Синтаксис: symcryptrun --class КЛАСС --program ПРОГРАММА --keyfile "
+#~ "ФАЙЛ_КЛЮЧА [параметры...] КОМАНДА [входной файл]\n"
+#~ "Вызывает простое средство шифрования\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "не могу создать временный каталог '%s': %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s над %s прервано, статус %i\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "невозможно открыть %s на запись: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "сбой %s над %s, статус %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "ошибка записи в %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "не могу создать временный каталог '%s': %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "ошибка чтения из %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "невозможно открыть %s на запись: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "ошибка закрытия %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "ошибка записи в %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "не задан параметр --program\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "ошибка чтения из %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "ошибка закрытия %s: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "не задан параметр --keyfile\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "не задан параметр --program\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "невозможно выделить память под вектор аргументов\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "сбой при создании канала конвейера: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "не задан параметр --keyfile\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "сбой при создании псевдотерминала: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "невозможно выделить память под вектор аргументов\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "сбой при дублировании процесса: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "сбой при создании канала конвейера: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "сбой execv: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "сбой при создании псевдотерминала: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "сбой select: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "сбой при дублировании процесса: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "сбой чтения: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "сбой execv: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "сбой чтения из псевдотерминала: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "сбой select: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "сбой waitpid: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "сбой чтения: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "потомок завершился, статус %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "сбой чтения из псевдотерминала: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "сбой при выделении памяти под имя входного файла: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "сбой waitpid: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "сбой при выделении памяти под имя выходного файла: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "потомок завершился, статус %i\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "следует задать %s либо %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "сбой при выделении памяти под имя входного файла: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "не задан класс\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "сбой при выделении памяти под имя выходного файла: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "класс %s не поддерживается\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "следует задать %s либо %s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Вызов: gpg-check-pattern [параметры] файл_образцов (-h - подсказка)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "не задан класс\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
-"Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "класс %s не поддерживается\n"
 
-#, fuzzy
-#~| msgid "option '%s' may not be used in %s mode\n"
-#~ msgid ""
-#~ "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
-#~ msgstr "параметр '%s' нельзя использовать в режиме %s\n"
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " с помощью сертификата с идентификатором 0x%08lX\n"
 
 #~ msgid "male"
 #~ msgstr "мужской"
@@ -11377,42 +11395,6 @@
 #~ msgid "Error: Private DO too long (limit is %d characters).\n"
 #~ msgstr "Ошибка: Слишком много секретных данных DO (предел - %d символов).\n"
 
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr ""
-#~ "не удалось проверить подпись: алгоритм с открытым ключом %d не "
-#~ "поддерживается: %s.\n"
-
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr ""
-#~ "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
-
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "(порядок подписей изменен)"
-
-#~ msgid "key %s:\n"
-#~ msgstr "ключ %s:\n"
-
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "%d повторная подпись удалена\n"
-#~ msgstr[1] "%d повторные подписи удалены\n"
-#~ msgstr[2] "%d повторных подписей удалено\n"
-
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Порядок %d подписи изменен\n"
-#~ msgstr[1] "Порядок %d подписей изменен\n"
-#~ msgstr[2] "Порядок %d подписей изменен\n"
-
-#~ msgid ""
-#~ "Warning: errors found and only checked self-signatures, run '%s' to check "
-#~ "all signatures.\n"
-#~ msgstr ""
-#~ "Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
-#~ "всех подписей выполните '%s'.\n"
-
 #~ msgid ", "
 #~ msgstr ", "
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/sk.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/sk.gmo sont différents
diff -Nru gnupg2-2.2.20/po/sk.po gnupg2-2.2.27/po/sk.po
--- gnupg2-2.2.20/po/sk.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/sk.po	2021-01-11 18:47:18.000000000 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,7 +18,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@ -29,40 +29,40 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Skutočne chcete zmazať vybrané kľúče? "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -70,7 +70,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr ""
 
@@ -80,35 +80,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr ""
 
@@ -116,40 +116,44 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je príliš dlhý\n"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je príliš dlhé\n"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak ve mene\n"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nesprávne MPI"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nesprávne heslo"
@@ -159,33 +163,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
@@ -243,7 +247,7 @@
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
@@ -375,20 +379,20 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Na ochranu Vášho tajného kľúča musíte zadať heslo.\n"
 "\n"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -398,124 +402,124 @@
 "Možnosti:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Kľúč je nahradený"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "s dodatočnými informáciami"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "byť o trochu tichší"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhľadať kľúče na serveri kľúčov"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovať databázu dôvery"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
@@ -524,182 +528,168 @@
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Chyby oznámte, prosím, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "POZNÁMKA: neexistuje implicitný súbor s možnosťami `%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "súbor s možnosťami `%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "čítam možnosti z `%s'\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: adresár vytvorený\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nemôžem vytvoriť adresár: %s\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: preskočené: %s\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -707,9 +697,9 @@
 "@Príkazy:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -719,52 +709,52 @@
 "Možnosti:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Zrušiť"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
@@ -774,32 +764,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "tajné časti kľúča nie sú dostupné\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -812,19 +802,19 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -837,7 +827,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -847,59 +837,59 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 #, fuzzy
 msgid "Change passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Skutočne chcete zmazať vybrané kľúče? "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 msgid "Delete key"
 msgstr "nastaviť kľúč ako platný (enable)"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -909,7 +899,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
@@ -919,7 +909,7 @@
 msgid "secret key parts are not available\n"
 msgstr "tajné časti kľúča nie sú dostupné\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -951,7 +941,7 @@
 msgstr "chyba pri vytváraní hesla: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
@@ -998,27 +988,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "problém s agentom: agent vracia 0x%lx\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemôžem vypnúť vytváranie core súborov: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@ -1079,7 +1069,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
@@ -1202,7 +1192,7 @@
 msgstr "ASCII kódovanie: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1286,44 +1276,44 @@
 msgid "Root certificate trustworthy"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kľúč k dispozícii na: "
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 #, fuzzy
 msgid "Included certificates"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 #, fuzzy
 msgid "Unknown operation"
 msgstr "neznáma verzia"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Pomoc nie je dostupná pre '%s'"
@@ -1333,7 +1323,7 @@
 msgid "ignoring garbage line"
 msgstr "chyba v pätičke\n"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 #, fuzzy
 msgid "[none]"
 msgstr "neznáme"
@@ -1343,92 +1333,124 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 #, fuzzy
 msgid "argument not expected"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 #, fuzzy
 msgid "read error"
 msgstr "chyba pri čítaní súboru"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 #, fuzzy
 msgid "keyword too long"
 msgstr "riadok je príliš dlhý\n"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 #, fuzzy
 msgid "missing argument"
 msgstr "neplatný argument"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid armor"
 msgid "invalid argument"
 msgstr "neplatný spôsob reprezentácie v ASCII"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 #, fuzzy
 msgid "invalid command"
 msgstr "konfliktné príkazy\n"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "neplatný parameter pre import\n"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 #, fuzzy
 msgid "out of core"
 msgstr "nespracované"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+msgid "invalid meta command"
+msgstr "konfliktné príkazy\n"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+msgid "unknown meta command"
+msgstr "neznámy implicitný adresát `%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "neočakávané dáta"
+
+#: common/argparse.c:546
 #, fuzzy
 msgid "invalid option"
 msgstr "neplatný parameter pre import\n"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "nespracované"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "POZNÁMKA: neexistuje implicitný súbor s možnosťami `%s'\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "súbor s možnosťami `%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1444,42 +1466,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1669,14 +1690,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Prosím, najskôr použite príkaz \"toggle\" (prepnúť).\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@ -1721,24 +1742,24 @@
 msgid "server uses an invalid certificate"
 msgstr "vytvoriť revokačný certifikát"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "ASCII kódovanie: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajný kľúč nie je dostupný"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nemožno previesť v dávkovom móde\n"
@@ -1748,246 +1769,246 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajné časti kľúča nie sú dostupné\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Váš výber? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 #, fuzzy
 msgid "not forced"
 msgstr "nespracované"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "žiadny zodpovedajúci verejný kľúč: %s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizovať predvoľby"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Akú veľkosť kľúča si prajete? (1024) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Neplatný výber.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "preskočené: tajný kľúč je už v databáze\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1995,184 +2016,184 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "preskočené: tajný kľúč je už v databáze\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Skutočne podpísať? "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "ukončiť toto menu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "ukázať túto pomoc"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 #, fuzzy
 msgid "list all available data"
 msgstr "Kľúč k dispozícii na: "
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeniť dobu platnosti"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento príkaz nefunguje\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "nemožno otvoriť `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2235,8 +2256,8 @@
 msgstr "Verejné kľúče: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
@@ -2261,57 +2282,63 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, použite najprv prepínač \"--delete-secret-key\".\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v móde S2K nemožno použiť symetrický ESK paket\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "použitá šifra %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VAROVANIE: súbor `%s' je prázdny\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "čítam z `%s'\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2319,17 +2346,17 @@
 msgstr ""
 "vyžiadaný kompresný algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zašifrovaný pre: %s\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
@@ -2337,24 +2364,24 @@
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zašifrované dáta\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROVANIE: správa bola zašifrovaná slabým kľúčom v symetrickej šifre.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problém so zašifrovaným paketom\n"
@@ -2456,7 +2483,7 @@
 msgstr "%s: preskočené: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2494,292 +2521,298 @@
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 #, fuzzy
 msgid "No fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatný kľúč %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používam sekundárny kľúč %08lX namiesto primárneho kľúča %08lX\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[súbor]|vytvoriť podpis v čitateľnom dokumente"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "šifrovať dáta"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "šifrovanie len so symetrickou šifrou"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "verifikovať podpis"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "vypísať zoznam kľúčov"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "vypísať zoznam kľúčov a podpisov"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolovať podpisy kľúčov"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "vypísať zoznam kľúčov a fingerprintov"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "vypísať zoznam tajných kľúčov"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "vytvoriť revokačný certifikát"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "odstrániť kľúč zo súboru verejných kľúčov"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "odstrániť kľúč zo súboru tajných kľúčov"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "podpísať kľúč"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "podpísať kľúč lokálne"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "vytvoriť nový pár kľúčov"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "podpísať kľúč"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "podpísať kľúč lokálne"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "podpísať alebo modifikovať kľúč"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exportovať kľúče"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exportovať kľúče na server kľúčov"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importovať kľúče zo servera kľúčov"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "vyhľadať kľúče na serveri kľúčov"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "aktualizovať všetky kľúče zo servera kľúčov"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importovať/zlúčiť kľúče"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [súbory]|vypíš hash"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "použiť toto id užívateľa na podpísanie\n"
 " alebo dešifrovanie"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|nastaviť úroveň komprimácie N (0 - žiadna\n"
 " komprimácia)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "použiť kánonický textový mód"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "nevykonať žiadne zmeny"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "vyžiadať potvrdenie pred prepísaním"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2788,7 +2821,7 @@
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2818,13 +2851,13 @@
 " --list-keys [mená]        vypísať kľúče\n"
 " --fingerprint [mená]      vypísať fingerprinty\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2839,7 +2872,7 @@
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2847,591 +2880,579 @@
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Verejné kľúče: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Šifry: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použitie: gpg [možnosti] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "POZNÁMKA: starý implicitný súbor s možnosťami `%s ignorovaný'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s nie je pre normálne použitie!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí byť väčšia ako 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí byť väčšia ako 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí byť v rozmedzí od 1 do 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatná implicitná úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatná minimálna úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dôrazne nedoporučovaný\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí byť 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoľby\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "nemôžete použiť kompresný algoritmus \"%s\" v móde %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: daný adresát (-r) bez použitia šifrovania s verejným kľúčom\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo poslať kľúč na server: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kľúča: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "nepodaril sa export kľúča: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájsť server: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Začnite písať svoju správu ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "Zmazať tento kľúč zo súboru kľúčov? "
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt časového razítka"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapísať informácie o stave do tohto FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Použitie: gpgv [možnosti] [súbory] (-h pre pomoc)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3631,7 +3652,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
@@ -3641,7 +3662,7 @@
 msgid "key %s: %s\n"
 msgstr "preskočený `%s': %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3667,7 +3688,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "môže to byť spôsobené chýbajúcim podpisom kľúča ním samým\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kľúč %08lX: verejný kľúč nenájdený: %s\n"
@@ -3682,7 +3703,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "nenájdený zapisovateľný súbor kľúčov (keyring): %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3753,18 +3774,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kľúč %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kľúč %08lX: tajný kľúč importovaný\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "preskočené: tajný kľúč je už v databáze\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -3777,236 +3798,300 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kľúč %08lX: tajný kľúč bez verejného kľúča %d - preskočené\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Dôvod nebol špecifikovaný"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Kľúč je nahradený"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Kľúč bol skompromitovaný"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Kľúč sa už nepoužíva"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Identifikátor užívateľa už neplatí"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "dôvod na revokáciu: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "revokačná poznámka: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kľúč %08lX: chýba verejný kľúč - nemôžem aplikovať revokačný certifikát\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kľúč %08lX: nemôžem nájsť originálny blok kľúča: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kľúč %08lX: nemôžem čítať originálny blok kľúča: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - zamietnuté\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kľúč %08lX: \"%s\" revokačný certifikát importovaný\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kľúč %08lX: neexistuje id užívateľa pre podpis\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kľúč %08lX: nepodporovaný algoritmus verejného kľúča u užívateľského id \"%s"
 "\"\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "kľúč %08lX: neplatný podpis kľúča ním samým u užívateľského id \"%s\"\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie kľúčov\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kľúč %08lX: zmazaná viacnásobná väzba podkľúča\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kľúč %08lX: neexistuje podkľúč na revokáciu kľúča\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kľúč %08lX: neplatný revokačný podkľúč\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kľúč %08lX: zmazaná viacnásobná revokácia podkľúča\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kľúč %08lX: identifikátor užívateľa preskočený '"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kľúč %08lX: podkľúč preskočený\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kľúč %08lX: podpis nie je exportovateľný (trieda %02x) - preskočené\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kľúč %08lX: revokačný certifikát na zlom mieste - preskočené \n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - preskočené\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kľúč %08lX: neočakávaná podpisová trieda (0x%02X) - preskočené\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kľúč %08lX: zistený duplikovaný identifikátor užívateľa - zlúčený\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: kľúč %08lX môže byť revokovaný: skúšam získať revokačný kľúč "
 "%08lX\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: kľúč %08lX môže byť revokovaný: revokačný kľúč %08lX nenájdený.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kľúč %08lX: pridaný revokačný certifikát \"%s\"\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s podpis, hashovací algoritmus %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Dobrý podpis od \""
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "preskočený `%s': %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Užívateľské ID \"%s\" je revokované."
+msgstr[1] "Užívateľské ID \"%s\" je revokované."
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 podpis neoverený, pretože chýba kľúč\n"
+msgstr[1] "1 podpis neoverený, pretože chýba kľúč\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d zlých podpisov\n"
+msgstr[1] "%d zlých podpisov\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Dobrý podpis od \""
+msgstr[1] "Dobrý podpis od \""
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "súbor kľúčov (keyring) `%s' vytvorený\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "súbor kľúčov (keyring) `%s' vytvorený\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
@@ -4272,8 +4357,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Skutočne podpísať? "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -4483,7 +4568,7 @@
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Kľúč revokovaný."
 
@@ -4541,7 +4626,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Skutočne odstrániť toto id užívateľa? "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľúč.\n"
@@ -4628,7 +4713,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Ukončiť bez uloženia? "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "kľúč nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
@@ -4676,106 +4761,121 @@
 msgid "Nothing to sign.\n"
 msgstr "Nič na podpísanie kľúčom %08lX\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   podpísané %08lX v %s%s\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notácie: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Užívateľské ID vo formáte PGP 2.x nemá žiadne predvoľby\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Tento kľúč môže byť revokovaný kľúčom %s "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kľúč môže byť revokovaný kľúčom %s "
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnosť skončí: %s]"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnosť skončí: %s]"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Tento kľúč bol označený za neplatný (disabled)"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4783,19 +4883,19 @@
 "Prosím nezabúdajte, že zobrazované údaje o platnosti kľúčov nemusia\n"
 "byť správne, pokiaľ znovu nespustíte program.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 #, fuzzy
 msgid "revoked"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4804,18 +4904,18 @@
 "VAROVANIE: žiadne ID užívateľa nebolo označené ako primárne. Tento príkaz\n"
 "spôsobí, že iné ID užívateľa sa bude považovať primárne.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4824,35 +4924,35 @@
 "VAROVANIE: Toto je PGP2 kľúč. Pridanie fotografického ID môže v niektorých\n"
 "           verziách PGP viesť k odmietnutiu tohto kľúča.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmazať tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmazať tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmazať tento neznámy podpis? (a/N/u)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skutočne zmazať tento podpis podpísaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4860,38 +4960,38 @@
 msgstr[0] "Zmazaný %d podpis.\n"
 msgstr[1] "Zmazaný %d podpis.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Nič nebolo zmaznané.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 #, fuzzy
 msgid "invalid"
 msgstr "neplatný spôsob reprezentácie v ASCII"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Užívateľské ID \"%s\" je revokované."
 msgstr[1] "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4900,308 +5000,303 @@
 "VAROVANIE: Toto je PGP2 kľúč. Pridanie fotografického ID môže v niektorých\n"
 "           verziách PGP viesť k odmietnutiu tohoto kľúča.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kľúč vo formáte PGP 2.x nemožno poveriť revokáciou\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kľúč nemožno poveriť revokáciou ním samým\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho určeným revokátorom/!\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: označenie kľúča ako revokovací už nemôže byť zrušené!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si istý, že chcete označiť tento kľúč ako revokovací? (a/N): "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Ste si istý, že chcete označiť tento kľúč ako revokovací? (a/N): "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľúča.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľúča.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovací podkľúč %08lX nie je krížovo certifikovaný\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "preskočený v3 podpis kľúča ním samým u užívateľského id \"%s\"\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si istý, že ho chcete použiť? (a/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si istý, že ho chcete použiť? (a/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prepísať (a/N)? "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podpísané %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnosť podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si istý, že ho chcete stále revokovať? (a/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoriť pre tento podpis revokačný certifikát? (a/N)"
 
-#: g10/keyedit.c:5759
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   podpísané %08lX v %s%s\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podpísali ste nasledujúce identifikátory užívateľa:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokované %08lX v %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokovať tieto podpisy:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skutočne vytvoriť revokačné certifikáty? (a/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný kľúč\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis použivateľkého ID vznikol %d sekund v budúcnosti\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Nemôžete zmazať posledné id užívateľa!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazujem %s fotografické ID s veľkosťou %ld pre kľúč 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis kľúča ním samým (direct signature)\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisujem podpis kľúča sebou samým\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dĺžka kľúča zaokrúhlená na %u bitov\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 #, fuzzy
 msgid "Encrypt"
 msgstr "šifrovať dáta"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr ""
 
@@ -5215,169 +5310,169 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na šifrovanie)\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na šifrovanie)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Podpisová notácia: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "nastaviť kľúč ako neplatný (disable)"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Akú veľkosť kľúča si prajete? (1024) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná dĺžka kľúča je %u bitov.\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5393,7 +5488,7 @@
 "      <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:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5409,40 +5504,40 @@
 "      <n>m = doba platnosti podpisu skončí za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skončí za n rokov\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Kľúč je platný na? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný na? (0) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnosť %s neskončí\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnosť %s neskončí\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnosť %s skončí %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5450,12 +5545,12 @@
 "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:2691
+#: g10/keygen.c:2694
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to správne (a/n)? "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5466,7 +5561,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 #, fuzzy
 msgid ""
 "\n"
@@ -5483,50 +5578,50 @@
 "    \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve mene\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Meno nemôže začínať číslicou\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno musí byť dlhé aspoň 5 znakov\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Komentár: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentári\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Používate znakovú sadu `%s'.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5537,7 +5632,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5552,35 +5647,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (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:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Najskôr, prosím, opravte chybu\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5592,13 +5687,13 @@
 "používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5606,67 +5701,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Použiť napriek tomu tento kľúč? "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváranie kľúča bolo zrušené.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, 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"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "zapisujem verejný kľúč do `%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, 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:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 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:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5675,7 +5770,7 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5683,7 +5778,7 @@
 "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:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5691,23 +5786,23 @@
 "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:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skutočne vytvoriť? "
@@ -5744,22 +5839,6 @@
 msgstr[0] "%d zlých podpisov\n"
 msgstr[1] "%d zlých podpisov\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d zlých podpisov\n"
-msgstr[1] "%d zlých podpisov\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 podpis neoverený, pretože chýba kľúč\n"
-msgstr[1] "1 podpis neoverený, pretože chýba kľúč\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5779,30 +5858,30 @@
 msgid "Keyring"
 msgstr "súbor kľúčov (keyring)"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Primárny fingerprint kľúča:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkľúča:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " Primárny fingerprint kľúča:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkľúča:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint kľúča ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5833,7 +5912,7 @@
 msgstr[0] "1 zlý podpis\n"
 msgstr[1] "1 zlý podpis\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: súbor kľúčov (keyring) vytvorený\n"
@@ -5886,462 +5965,462 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "požadujem kľúč %08lX z %s\n"
 msgstr[1] "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "preskočený `%s': %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpísané Vaším kľúčom %08lX v %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvláštna veľkosť šifrovacieho kľúča pre sedenie (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kľúč šifrovaného sedenia\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejný kľúč je %08lX\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dáta zašifrované verejným kľúčom: správny DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zašifrované %u-bitovým %s kľúčom, ID %08lX, vytvoreným %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrovaná %s kľúčom, ID %08lX\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrovanie verejným kľúčom zlyhalo: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrované s %lu heslami\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrované jedným heslom\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpokladám %s šifrovaných dát\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupný; optimisticky sa ho pokúsime nahradiť "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: správa nemá ochranu integrity\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrovanie o.k.\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZNÁMKA: odosielateľ požadoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pôvodné meno súboru='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatný revokačný certifikát -  použite \"gpg --import\", ak ho chcete "
 "využiť\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZLÝ podpis od \""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršanou platnosťou od \""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikácia podpisu potlačená\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracovať s týmito násobnými podpismi\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvorený %.*s pomocou %s kľúča ID %08lX\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Kľúč k dispozícii na: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[neistý]  "
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "VAROVANIE: Tento kľúč nie certifikovaný dôveryhodným podpisom!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binárne"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "neznáme"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "neznámy algoritmus verejného kľúča"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemôžem overiť podpis: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelený od dokumentu\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: Nájdené viacnásobne podpisy. Skontrolovaný bude len prvý.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "nemožno otvoriť súbor: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nemôžem pracovať s algoritmom verejného kľúča %d\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "šifrovací algoritmus nie je implementovaný"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 msgid "(reported error: %s)\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použitie parametra \"%s\" sa neodporúča\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "použite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Nekomprimované"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimované"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "táto správa nemusí použiteľná s %s\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "čítam možnosti z `%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznáma trieda podpisu"
@@ -6377,78 +6456,78 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "predpokladám podpísané dáta v `%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemôžem pracovať s algoritmom verejného kľúča %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpečný symetricky šifrovaný kľúč sedenia\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritická podpisová notácia: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problém s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Vložiť heslo\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "zrušené užívateľom\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavné ID kľúča %08lX)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Skutočne chcete zmazať vybrané kľúče? "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Skutočne chcete zmazať vybrané kľúče? "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6501,7 +6580,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je táto fotografia správna (a/N/u)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
@@ -6815,12 +6894,12 @@
 msgid "no valid addressees\n"
 msgstr "žiadne platné adresy\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
@@ -6874,27 +6953,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my sme anonymný adresát.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "staré kódovanie DEK nie je podporováné\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "šifrovací algoritmus %d%s je neznamý alebo je zakázaný\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "POZNÁMKA: v predvoľbách nenájdený šifrovací algoritmus %d\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7082,7 +7161,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVANIE: konflikt hashu podpisu v správe\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7155,31 +7234,31 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "POZNÁMKA: kľúč bol revokovaný"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "predpokladám neplatný podpis kľúčom %08lX, pretože je nastavený neznámy "
 "kritický bit\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kľúč %08lX: neexistuje podkľúč pre revokáciu kľúča\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie podkľúčov\n"
@@ -7208,24 +7287,24 @@
 "VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
 "neexpandované.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude použité šifrovanie %s\n"
@@ -7254,7 +7333,7 @@
 "preskočený `%s': toto je vygenerovaný PGP kľúč podľa algoritmu ElGamal,\n"
 "podpisy vytvorené týmto kľúčom nie sú bezpečné!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
@@ -7304,12 +7383,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
@@ -7319,12 +7398,12 @@
 msgid "can't lock '%s'\n"
 msgstr "nemožno otvoriť `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, 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"
@@ -7339,104 +7418,104 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresár neexistuje!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvoriť záznam verzie: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvorená neplatná databáza dôvery\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: databáza dôvery vytvorená\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "POZNÁMKA: do trustdb nemožno zapisovať\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatná databáze dôvery\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualizácii záznamu verzie: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri čítaní záznamu verzie: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri zápise záznamu verzie: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "databáze dôvery: procedúra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je súbor databázy dôvery\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: záznam verzie s číslom %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatná verzia súboru %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, 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:1822
+#: g10/tdbio.c:1824
 #, 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:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie záznamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie záznamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: databáza dôvery vytvorená\n"
@@ -7807,106 +7886,106 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' nie je platné dlhé keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kľúč %08lX: akceptovaný ako dôveryhodný kľúč\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kľúč %08lX sa v databáze dôvery vyskytuje viac ako raz\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "kľúč %08lX: nenájdený verejný kľúč k dôveryhodnému kľúču - preskočené\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kľúč označený ako absolútne dôveryhodný.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "záznam dôvery %lu, typ pož. %d: čítanie zlyhalo: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "záznam dôvery %lu nie je požadovaného typu %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dalšia kontrola databázy dôvery %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "prosím vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrolujem databázu dôvery\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu kľúče boli doteraz spracované\n"
 msgstr[1] "%lu kľúče boli doteraz spracované\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7914,23 +7993,23 @@
 msgstr[0] "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
 msgstr[1] "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli nájdené žiadne absolútne dôveryhodné kľúče\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejný kľúč k absolútne dôveryhodnému kľúču  %08lX nebol nájdený\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
@@ -8045,110 +8124,125 @@
 "List, export, import Keybox data\n"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "zmeniť heslo"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "zmeniť heslo"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, 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:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "odstrániť kľúč zo súboru verejných kľúčov"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
@@ -8156,55 +8250,43 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo poslať kľúč na server: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8214,27 +8296,27 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8242,123 +8324,123 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "chyba pri čítaní bloku kľúča: %s\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, 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:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "toto URI nie je podporované"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Vytvorenie kľúča sa nepodarilo: %s\n"
 msgstr[1] "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@ -8375,376 +8457,394 @@
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "vôbec nepoužívať terminál"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "konfliktné príkazy\n"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "nemôžem inicializovať databázu dôvery: %s\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: nemôžem pristupovať k: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZNÁMKA: kľúč bol revokovaný"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "               nové podpisy: %lu\n"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vypísať fingerprint"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvoriť revokačný certifikát"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikovať podpis"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "nespracované"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "none"
 msgstr "nie"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8757,137 +8857,137 @@
 "\"%.*s\"\n"
 "kľúč s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 msgid "line %d: invalid date given\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9028,7 +9128,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba pri čítaní bloku kľúča: %s\n"
@@ -9053,138 +9153,138 @@
 msgid "no valid recipients given\n"
 msgstr "(Žiadny popis)\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "list external keys"
 msgstr "vypísať zoznam tajných kľúčov"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 #, fuzzy
 msgid "import certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 #, fuzzy
 msgid "export certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "vôbec nepoužívať terminál"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy sa na nič nepýtať"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "automaticky odpovedať áno na väčšinu otázok"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "automaticky odpovedať NIE na väčšinu otázok"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 "pridať tento súbor kľúčov do zoznamu\n"
 " používaných súborov kľúčov"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 "|POČÍTAČ|použi tento server kľúčov na vyhľadávanie\n"
 " kľúčov"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|použiť šifrovací algoritmus ALG"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|použiť hashovací algoritmus ALG"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9195,47 +9295,47 @@
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "nemôžem sa pripojiť k `%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Žiadny popis)\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = preskočiť tento kľúč\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, fuzzy, c-format
 msgid "could not parse keyserver\n"
 msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9255,7 +9355,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
@@ -9265,42 +9365,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, fuzzy, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "nemôžem inicializovať databázu dôvery: %s\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problém overenia revokácie: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr ""
 
@@ -9330,7 +9425,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9360,38 +9455,38 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:491
+#: sm/verify.c:479
 #, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "chyba pri vytváraní hesla: %s\n"
+msgid "algorithm:"
+msgstr "ASCII kódovanie: %s\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Dobrý podpis od \""
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                alias \""
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9462,543 +9557,544 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "vytvoriť revokačný certifikát"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "chyba v pätičke\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "vytvorený nový konfiguračný súbor `%s'\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "varovanie: neplatná veľkosť random_seed - súbor nepoužitý\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 msgid "error closing '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Pomoc nie je dostupná pre '%s'"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "neplatný hashovací algoritmus `%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "neplatná reakcia od agenta\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "nemožno otvoriť súbor: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "neplatný hashovací algoritmus `%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "vytvoriť revokačný certifikát"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verifikácia podpisu potlačená\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "varovanie: neplatná veľkosť random_seed - súbor nepoužitý\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problém overenia revokácie: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
@@ -10037,64 +10133,64 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 msgid "add a certificate to the cache"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 msgid "validate a certificate"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 msgid "lookup a certificate"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 msgid "lookup only locally stored certificates"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 msgid "expect certificates in PEM format"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10102,88 +10198,88 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "nemôžem sa pripojiť k `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 msgid "certificate is valid\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 msgid "certificate has been revoked\n"
 msgstr "POZNÁMKA: kľúč bol revokovaný"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 msgid "certificate check failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, fuzzy, c-format
 #| msgid "can't stat `%s': %s\n"
 msgid "got status: '%s'\n"
 msgstr "nemôžem použiť príkaz stat na `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10209,95 +10305,95 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "run without asking a user"
 msgstr "Ukončiť bez uloženia? "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10311,301 +10407,295 @@
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "použitie: gpg [možnosti] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nespracované"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "neplatný parameter pre import\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 msgid "attribute '%s' not found\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "čítam z `%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "        bez identifikátorov: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 msgid "          pass '%s'\n"
 msgstr "                alias \""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 msgid "          host '%s'\n"
 msgstr "                alias \""
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "           neimportované: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 msgid "            DN '%s'\n"
 msgstr "                alias \""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 msgid "          attr '%s'\n"
 msgstr "                alias \""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 msgid "no host name in '%s'\n"
 msgstr "(Žiadny popis)\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: using insecure memory!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "VAROVANIE: Používaná pamäť nie je bezpečná!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" nie je súbor JPEG\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 msgid "error printing log line: %s\n"
@@ -10656,7 +10746,7 @@
 msgid "malloc failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -10788,12 +10878,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "%s: can't access: %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "%s: nemôžem pristupovať k: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10864,7 +10948,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -10894,33 +10978,33 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10961,101 +11045,101 @@
 msgid "certificate chain is good\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 #, fuzzy
 msgid "quiet"
 msgstr "ukončiť"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -11254,302 +11338,234 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Prosím, najskôr použite príkaz \"toggle\" (prepnúť).\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "list global configuration file"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "check global configuration file"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "aktualizovať databázu dôvery"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "použiť ako výstupný súbor"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 #, fuzzy
 msgid "Component not found"
 msgstr "verejný kľúč nenájdený"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Príkazy:\n"
-" "
 
-#: tools/symcryptrun.c:168
 #, fuzzy
-msgid "decryption modus"
-msgstr "dešifrovanie o.k.\n"
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "POZNÁMKA: starý implicitný súbor s možnosťami `%s ignorovaný'\n"
 
-#: tools/symcryptrun.c:169
 #, fuzzy
-msgid "encryption modus"
-msgstr "dešifrovanie o.k.\n"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Príkazy:\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
 #, fuzzy
-msgid "program filename"
-msgstr "--store [meno súboru]"
-
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr ""
-
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "dešifrovanie o.k.\n"
 
-#: tools/symcryptrun.c:221
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
+#~ msgid "encryption modus"
+#~ msgstr "dešifrovanie o.k.\n"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#: tools/symcryptrun.c:290
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "Nie je dovolené používať %s s %s!\n"
-
-#: tools/symcryptrun.c:297
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "nemožno otvoriť súbor: %s\n"
-
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nemôžem vytvoriť adresár `%s': %s\n"
-
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "nemožno otvoriť %s: %s\n"
-
-#: tools/symcryptrun.c:397
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
-
-#: tools/symcryptrun.c:404
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "chyba pri čítaní `%s': %s\n"
-
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "chyba pri čítaní `%s': %s\n"
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [meno súboru]"
 
-#: tools/symcryptrun.c:502
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "nemožno otvoriť súbor: %s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: tools/symcryptrun.c:543
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s: nemôžem vytvoriť: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "nemožno otvoriť %s: %s\n"
 
-#: tools/symcryptrun.c:550
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s: nemôžem vytvoriť: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "chyba pri čítaní `%s': %s\n"
 
-#: tools/symcryptrun.c:594
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "chyba pri čítaní `%s': %s\n"
 
-#: tools/symcryptrun.c:623
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
 
-#: tools/symcryptrun.c:640
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: tools/symcryptrun.c:692
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: tools/symcryptrun.c:744
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#: tools/symcryptrun.c:813
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nemôžem vytvoriť `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:826
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nemôžem vytvoriť `%s': %s\n"
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: tools/symcryptrun.c:1030
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "ochranný algoritmus %d%s nie je podporováný\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: tools/gpg-check-pattern.c:144
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "chyba pri vytváraní hesla: %s\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11642,36 +11658,6 @@
 #~ msgstr "aktualizácia zlyhala: %s\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "%s podpis, hashovací algoritmus %s\n"
-
-#, fuzzy
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Dobrý podpis od \""
-
-#, fuzzy
-#~ msgid "key %s:\n"
-#~ msgstr "preskočený `%s': %s\n"
-
-#, fuzzy
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Užívateľské ID \"%s\" je revokované."
-#~ msgstr[1] "Užívateľské ID \"%s\" je revokované."
-
-#, fuzzy
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Dobrý podpis od \""
-#~ msgstr[1] "Dobrý podpis od \""
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "vytvorený nový konfiguračný súbor `%s'\n"
@@ -12779,9 +12765,6 @@
 #~ msgid "file delete error"
 #~ msgstr "chyba pri mazaní súboru"
 
-#~ msgid "unexpected data"
-#~ msgstr "neočakávané dáta"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "konflikt časového razítka"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/sv.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/sv.gmo sont différents
diff -Nru gnupg2-2.2.20/po/sv.po gnupg2-2.2.27/po/sv.po
--- gnupg2-2.2.20/po/sv.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/sv.po	2021-01-11 18:47:18.000000000 +0100
@@ -24,7 +24,7 @@
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -34,7 +34,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@ -45,47 +45,47 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "PIN-kod:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -93,7 +93,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -103,7 +103,7 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -112,7 +112,7 @@
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -120,24 +120,24 @@
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 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:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -145,37 +145,41 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
@@ -186,33 +190,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -273,7 +277,7 @@
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
@@ -426,19 +430,19 @@
 "vara minst %u tecken lång."
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 #| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 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:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -446,147 +450,147 @@
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "kör i serverläge"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 #, fuzzy
 #| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Rapportera fel till <@EMAIL@>.\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -598,165 +602,151 @@
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "invalid debug-level '%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "inställningsfil \"%s\": %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, fuzzy, c-format
 #| msgid "socket name `%s' is too long\n"
 msgid "socket name '%s' is too long\n"
 msgstr "namnet på uttaget \"%s\" är för långt\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 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:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 #| msgid "error binding socket to `%s': %s\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
 # Extension är vad? FIXME
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 #| msgid "listening on socket `%s'\n"
 msgid "listening on socket '%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 #| msgid "can't use `%s' as home directory\n"
 msgid "can't use '%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, 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:2724
+#: agent/gpg-agent.c:2709
 #, 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:2729
+#: agent/gpg-agent.c:2714
 #, 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:2804
+#: agent/gpg-agent.c:2789
 #, 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:2809
+#: agent/gpg-agent.c:2794
 #, 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:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 #| msgid "pth_select failed: %s - waiting 1s\n"
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
 # KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 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"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -764,8 +754,8 @@
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -774,9 +764,9 @@
 " "
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -786,11 +776,11 @@
 "Flaggor:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 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:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -798,22 +788,22 @@
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 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:699
+#: agent/protect-tool.c:708
 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:705
+#: agent/protect-tool.c:714
 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:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -821,18 +811,18 @@
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
@@ -844,37 +834,37 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
@@ -887,7 +877,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -896,11 +886,11 @@
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -913,7 +903,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -925,22 +915,22 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Fel"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, 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."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -949,15 +939,15 @@
 "Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s.  Du bör ändra "
 "den nu."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "ändra lösenfras"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -965,24 +955,24 @@
 "%%0A?"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktivera nyckel"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 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"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
@@ -993,7 +983,7 @@
 msgid "a %zu 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"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
@@ -1003,7 +993,7 @@
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1036,7 +1026,7 @@
 msgstr "fel när ett rör skapades: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
@@ -1087,29 +1077,29 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, 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:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1170,7 +1160,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 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"
@@ -1289,7 +1279,7 @@
 msgstr "algoritm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmen stöds inte: %s"
@@ -1364,39 +1354,39 @@
 msgid "Root certificate trustworthy"
 msgstr "rotcertifikatet är pålitligt"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP-kontroll av certifikat"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Inkluderade certifikat"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Inga poster i granskningslogg."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Okänd åtgärd"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent användbar"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr användbar"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 #| msgid "No help available for `%s'."
 msgid "No help available for '%s'."
@@ -1406,7 +1396,7 @@
 msgid "ignoring garbage line"
 msgstr "ignorerar skräprad"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[ingen]"
 
@@ -1416,85 +1406,119 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "argument förväntades inte"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "läsfel"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "nyckelordet är för långt"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid value\n"
 msgid "invalid argument"
 msgstr "ogiltigt värde\n"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "ogiltigt kommando"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "ogiltig aliasdefinition"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "slut på minne"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "ogiltigt kommando"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command `%s'\n"
+msgid "unknown meta command"
+msgstr "okänt kommando \"%s\"\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "oväntat skal: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "ogiltig flagga"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "flaggan \"%.50s\" förväntar sig inte ett argument\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "ogiltigt kommando \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "flagga \"%.50s\" är tvetydig\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandot \"%.50s\" är tvetydigt\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "slut på minne\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ogiltig flagga \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "OBS: inställningsfilen \"%s\" saknas\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "inställningsfil \"%s\": %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
@@ -1512,45 +1536,44 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 #| msgid "error writing to `%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "tar bort gammal låsfil (skapad av %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, 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"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(dödläge?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 #| msgid "lock `%s' not made: %s\n"
 msgid "lock '%s' not made: %s\n"
 msgstr "låset \"%s\" gjordes inte: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "väntar på låset %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
@@ -1748,14 +1771,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1801,24 +1824,24 @@
 msgid "server uses an invalid certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
@@ -1828,138 +1851,138 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Återställningskoden är inte tillgänglig längre\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 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:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, 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:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
 msgid "error writing '%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1970,73 +1993,73 @@
 "      kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
 "      som tillåts.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, 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/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA och Elgamal\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
 "bitar\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
@@ -2044,39 +2067,39 @@
 "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
 "bitar\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "fel vid ändring av storlek för nyckel %d till %u bitar: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 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:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: keys are already stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2091,181 +2114,181 @@
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 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:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "lås upp PIN-koden med en nollställningskod"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 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:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2328,8 +2351,8 @@
 msgstr "Publik nyckel: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
@@ -2354,40 +2377,55 @@
 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/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 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/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använder %s-chiffer\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2395,20 +2433,13 @@
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2417,35 +2448,35 @@
 "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, 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/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2453,7 +2484,7 @@
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i det symmetriska chiffret.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
@@ -2552,7 +2583,7 @@
 msgstr "%s: hoppade över: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2589,284 +2620,290 @@
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 #| msgid "automatically retrieved `%s' via %s\n"
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Inget fingeravtryck"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, 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"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, 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:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "skapa en signatur"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "skapa en klartextsignatur"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 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:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "generera ett nytt nyckelpar"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "skriv ut kontrollsummor"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2874,7 +2911,7 @@
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2904,14 +2941,14 @@
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 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:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2926,7 +2963,7 @@
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2934,85 +2971,85 @@
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "användning: gpgsm [flaggor] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 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:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3022,21 +3059,21 @@
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3047,519 +3084,505 @@
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 #| msgid "show user ID validity during key listings"
 msgid "show key usage information during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 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:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "rad %d: inte en giltig e-postadress\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid pinentry mode '%s'\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, 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:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 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:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, 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:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, 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:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 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:3838
+#: g10/gpg.c:3780
 #, c-format
 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:3840
+#: g10/gpg.c:3782
 #, c-format
 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:3842
+#: g10/gpg.c:3784
 #, c-format
 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:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 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:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 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:3860
+#: g10/gpg.c:3802
 #, c-format
 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:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 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:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 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:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FIL|ta nycklarna från nyckelringen FIL "
 
 # 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:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3766,7 +3789,7 @@
 msgstr ""
 "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
@@ -3777,7 +3800,7 @@
 msgid "key %s: %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3803,7 +3826,7 @@
 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:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
@@ -3818,7 +3841,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3890,18 +3913,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -3915,242 +3938,313 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, 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"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 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/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Nyckeln är åsidosatt"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Nyckeln har blivit komprometterad"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, 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:3410
+#: g10/import.c:3411
 #, 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:3417
+#: g10/import.c:3418
 #, 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:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, 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:3575
+#: g10/import.c:3576
 #, 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"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, 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:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, 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:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, 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:3808
+#: g10/import.c:3809
 #, 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:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, 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:3848
+#: g10/import.c:3849
 #, 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:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, 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:4102
+#: g10/import.c:4103
 #, 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:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Korrekt signatur från"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "hoppade över \"%s\": %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
+msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
+msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d felaktiga signaturer\n"
+msgstr[1] "%d felaktiga signaturer\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Korrekt signatur från"
+msgstr[1] "Korrekt signatur från"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating keybox '%s': %s\n"
 msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
 msgstr "nyckelskåpet \"%s\" skapat\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
@@ -4392,8 +4486,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -4605,7 +4699,7 @@
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
@@ -4661,7 +4755,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
@@ -4741,7 +4835,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
@@ -4794,109 +4888,124 @@
 msgid "Nothing to sign.\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Inte signerad av dig.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 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"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Följande nyckel blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, 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:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4904,17 +5013,17 @@
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4924,18 +5033,18 @@
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4944,36 +5053,36 @@
 "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:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 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:3961
+#: g10/keyedit.c:4221
 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:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 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:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4981,20 +5090,20 @@
 msgstr[0] "Raderade %d signatur.\n"
 msgstr[1] "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5002,17 +5111,17 @@
 msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5022,42 +5131,42 @@
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 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:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 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"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 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:4331
+#: g10/keyedit.c:4591
 #, c-format
 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:4349
+#: g10/keyedit.c:4609
 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:4355
+#: g10/keyedit.c:4615
 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) "
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5067,251 +5176,247 @@
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 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:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, 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:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, 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:5003
+#: g10/keyedit.c:5263
 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:5082
+#: g10/keyedit.c:5342
 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:5083
+#: g10/keyedit.c:5343
 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:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, 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:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 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:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Inte signerad av dig.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, 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:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, 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"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, 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:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid value for option '%s'\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5319,19 +5424,19 @@
 "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
 "sammandragsstorleken\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Signera"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Certifiera"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -5349,171 +5454,171 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA och RSA (standard)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA och Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, 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:1956
+#: g10/keygen.c:1955
 #, 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:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) DSA och Elgamal\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Befintlig nyckel\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Befintlig nyckel från kort\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Ange nyckelhashen: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Ingen nyckel med denna nyckelhash\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "fel vid läsning av kortet: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serienummer för kortet: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Tillgängliga nycklar:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, 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:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Vilken nyckelstorlek vill du använda för undernyckeln? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5530,7 +5635,7 @@
 "      <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:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5546,38 +5651,38 @@
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5585,11 +5690,11 @@
 "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:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5604,7 +5709,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5622,50 +5727,50 @@
 "    \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5676,7 +5781,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
 
@@ -5692,35 +5797,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5732,13 +5837,13 @@
 "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:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5746,73 +5851,73 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "genererar ny nyckel\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 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:5225
+#: g10/keygen.c:5229
 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"
@@ -5822,7 +5927,7 @@
 "syfte.\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5830,7 +5935,7 @@
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5838,23 +5943,23 @@
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 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/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 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/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
@@ -5890,22 +5995,6 @@
 msgstr[0] "%d felaktiga signaturer\n"
 msgstr[1] "%d felaktiga signaturer\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d felaktiga signaturer\n"
-msgstr[1] "%d felaktiga signaturer\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
-msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5925,29 +6014,29 @@
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
@@ -5980,7 +6069,7 @@
 msgstr[0] "1 felaktig signatur\n"
 msgstr[1] "1 felaktig signatur\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
@@ -6031,7 +6120,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6039,126 +6128,126 @@
 msgstr[0] "uppdaterar %d nycklar från %s\n"
 msgstr[1] "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, 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:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, 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:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, 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:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, 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:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, 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:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
@@ -6166,191 +6255,191 @@
 "istället\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:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\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:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 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:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
 # 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:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritm: %s"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6358,147 +6447,147 @@
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 #| msgid "fstat of `%s' failed in %s: %s\n"
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, 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:287
+#: g10/misc.c:291
 #, c-format
 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:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s)\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, 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:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, 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:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, fuzzy, c-format
 #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6534,83 +6623,83 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, 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:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, 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:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6665,7 +6754,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
@@ -6985,12 +7074,12 @@
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, 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:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@ -7047,29 +7136,29 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den anonyma mottagaren.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, 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:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 #| msgid "NOTE: secret key %s expired at %s\n"
 msgid "Note: secret key %s expired at %s\n"
 msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7265,7 +7354,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7349,30 +7438,30 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, 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"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, 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:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
@@ -7401,12 +7490,12 @@
 "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
 "stor).  Använder oexpanderad.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7414,12 +7503,12 @@
 "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
@@ -7447,7 +7536,7 @@
 msgstr ""
 "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -7495,12 +7584,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
@@ -7513,12 +7602,12 @@
 msgid "can't lock '%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
@@ -7533,105 +7622,105 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, 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:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fel: Tillitsdatabasen är skadad.\n"
@@ -8013,108 +8102,108 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
 
 # trusted??
-#: g10/trustdb.c:255
+#: 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:293
+#: 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:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, 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:363
+#: g10/trustdb.c:360
 #, 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:369
+#: g10/trustdb.c:366
 #, 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:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Du kan försöka att skapa tillitsdatabasen igen med dessa kommandon:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Referera till handboken om detta inte fungerar för dig\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, 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:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 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:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8123,7 +8212,7 @@
 msgstr[1] "%lu nycklar behandlade än så länge\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8131,24 +8220,24 @@
 msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
 msgstr[1] "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, 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:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8277,54 +8366,69 @@
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Ange PIN-koden för nyckeln att skapa kvalificerade signaturer med."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Ange PIN-koden för standardnycklarna."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Ange en ny PIN-kod för standardnycklarna."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Ange PIN-koden för standardnycklarna."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Ange en ny upplåsningskod (PUK-kod) för standardnycklarna."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Ange upplåsningskoden (PUK-kod) för standardnycklarna."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Ange en ny PIN-kod för nyckeln att skapa kvalificerade signaturer med."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||Ange PIN-koden för nyckeln att skapa kvalificerade signaturer med."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8332,7 +8436,7 @@
 "|NP|Ange en ny upplåsningskod (PUK-kod) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8340,48 +8444,48 @@
 "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
@@ -8389,58 +8493,46 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, 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"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8453,24 +8545,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Ange nollställningskoden för kortet"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Nollställningskoden är för kort; minimumlängd är %d\n"
@@ -8478,92 +8570,92 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nollställningskod"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 #| msgid "|A|Please enter the Admin PIN"
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nyckel\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "algoritmen stöds inte: %s"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8571,27 +8663,27 @@
 msgstr[0] "nyckelgenereringen är färdig (%d sekunder)\n"
 msgstr[1] "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 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:4368
+#: scd/app-openpgp.c:4558
 #, 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:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8599,7 +8691,7 @@
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -8617,59 +8709,59 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial PIN-kod"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FIL|skriv en logg till FIL"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|koppla från kortet efter N sekunder inaktivitet"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 #, fuzzy
 #| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "neka användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8681,311 +8773,329 @@
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
 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:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "valideringsmodellen begärd av certifikat: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "kedja"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "skal"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritiska certifikattillägget %s stöds inte"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markerad policy utan konfigurerade policier"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 #| msgid "failed to open `%s': %s\n"
 msgid "failed to open '%s': %s\n"
 msgstr "misslyckades med att öppna \"%s\": %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 #| msgid "note: non-critical certificate policy not allowed"
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "misslyckades med att få fingeravtrycket\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "can't access `%s': %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "kan inte komma åt \"%s\": %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår upp utfärdare från Dirmngr-cachen\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "status för certifikatet är okänt"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "se till att \"dirmngr\" är korrekt installerat\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med felaktig giltighetstid: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "rotcertifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "tillfälligt certifikat är ännu inte giltigt"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "rotcertifikatet har gått ut"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "tillfälligt certifikat har gått ut"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "nödvändiga certifikattillägg saknas: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "certifikat med felaktig giltighetstid"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "signaturen inte skapad under certifikatets livstid"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikatet skapades inte under utfärdarens livstid"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "tillfälligt certifikat är inte skapat under utfärdarens livstid"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signatur skapad "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certifikat skapat "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certifikat giltigt från "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     utfärdare giltig från "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 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:1316
+#: sm/certchain.c:1472
 #, c-format
 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:1375
+#: sm/certchain.c:1531
 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"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 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:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, 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:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "tillfälligt certifikat är korrekt\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotcertifikatet är korrekt\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "växlar till kedjemodell"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, 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:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "slut på minne\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "ingen"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Fel - ogiltig kodning]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Fel - slut på kärna]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Fel - Inget namn]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Fel - ogiltigt DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9000,101 +9110,101 @@
 "S/N %s, ID 0x%08lX,\n"
 "skapad %s, går ut %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 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:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, 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:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "rad %d: inget ämnesnamn angivit\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name label `%.*s'\n"
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "rad %d: ogiltigt ämnesnamn \"%s\" på position %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "rad %d: inte en giltig e-postadress\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid serial number\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name label `%.*s'\n"
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "rad %d: ogiltigt ämnesnamn \"%s\" på position %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid date given\n"
@@ -9102,37 +9212,37 @@
 
 # keygrip (i.e. a hash over the public key
 # parameters) formatted as a hex string.
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 #| msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "rad %d: fel vid hämtning av nyckelhashen \"%s\": %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid authority-key-id\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid subject-key-id\n"
 msgstr "rad %d: ogiltigt ämnesnamn \"%s\" på position %d\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid extension syntax\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 #| msgid "line %d: error reading key `%s' from card: %s\n"
 msgid "line %d: error reading key '%s' from card: %s\n"
@@ -9140,18 +9250,18 @@
 
 # keygrip (i.e. a hash over the public key
 # parameters) formatted as a hex string.
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 #| msgid "line %d: error getting key by keygrip `%s': %s\n"
 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:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "rad %d: nyckelgenerering misslyckades: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9294,7 +9404,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fel vid låsning av nyckelskåp: %s\n"
@@ -9321,126 +9431,126 @@
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FIL|skriv en serverlägeslogg till FIL"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9455,51 +9565,51 @@
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 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:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: inget värdnamn angivet\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: lösenord angivet utan användare\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "kunde inte tolka nyckelserver\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 #| msgid "can't sign using `%s': %s\n"
 msgid "can't sign using '%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@ -9519,7 +9629,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
@@ -9529,42 +9639,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "misslyckades med att få fingeravtrycket\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Fel - "
 
@@ -9603,7 +9708,7 @@
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9639,39 +9744,40 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[datum inte angivet]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " använder certifikat-id 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "algoritm: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "ogiltig signatur: attribut för kontrollsumma matchar inte den beräknade\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "      även känd som"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
@@ -9748,601 +9854,602 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "Inkluderade certifikat"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "    runtime cached certificates: %u\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 #| msgid "  (certificate created at "
 msgid "certificate already cached\n"
 msgstr "  (certifikat skapat "
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "certifikatet är korrekt\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error caching certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no issuer found in certificate\n"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating directory '%s': %s\n"
 msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 #| msgid "ignoring garbage line"
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorerar skräprad"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 #| msgid "error reading from %s: %s\n"
 msgid "error reading directory '%s': %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "removing cache file '%s'\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 #| msgid "failed to open `%s': %s\n"
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "misslyckades med att öppna \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 #| msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "ogiltigt formaterat fingeravtryck i \"%s\", rad %d\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "opening cache file '%s'\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening cache file '%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to create a new cache object: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting data from cache file: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "iconv_open failed: %s\n"
 msgid "converting S-expression failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
 # Vad?
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 #| msgid "error getting serial number of card: %s\n"
 msgid "error getting update times of CRL: %s\n"
 msgstr "fel när serienumret hämtades från kortet: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 #| msgid "error reading input: %s\n"
 msgid "error reading CRL extensions: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "creating cache file '%s'\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid notation data found\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 #| msgid "error reading the card: %s\n"
 msgid "problem reading cache record: %s\n"
 msgstr "fel vid läsning av kortet: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 #| msgid "problem re-searching certificate: %s\n"
 msgid "problem reading cache key: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 #| msgid "error reading nonce on fd %d: %s\n"
 msgid "error reading cache entry from db: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10385,71 +10492,71 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "add a certificate to the cache"
 msgstr "  (certifikat skapat "
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 #| msgid "Included certificates"
 msgid "validate a certificate"
 msgstr "Inkluderade certifikat"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 #| msgid "Included certificates"
 msgid "lookup a certificate"
 msgstr "Inkluderade certifikat"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 #| msgid "Included certificates"
 msgid "lookup only locally stored certificates"
 msgstr "Inkluderade certifikat"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "load a CRL into the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 #| msgid "export certificates"
 msgid "expect certificates in PEM format"
 msgstr "exportera certifikat"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10457,93 +10564,93 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error reading certificate from stdin: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 #| msgid "error reading from %s: %s\n"
 msgid "error reading certificate from '%s': %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 #| msgid "deleting certificate \"%s\" failed: %s\n"
 msgid "validation of certificate failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate is valid\n"
 msgstr "certifikatet är korrekt\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked\n"
 msgstr "certifikatet har spärrats"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 #| msgid "deleting certificate \"%s\" failed: %s\n"
 msgid "certificate check failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
 msgstr "algoritmen stöds inte: %s"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10572,104 +10679,104 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 #| msgid "Quit without saving? (y/N) "
 msgid "run without asking a user"
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10682,13 +10789,13 @@
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -10700,313 +10807,306 @@
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "valid debug levels are: %s\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 #| msgid "line too long - skipped\n"
 msgid "%s:%u: line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "inte tvingad"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 #, fuzzy
 #| msgid "|N|connect to reader at port N"
 msgid "|N|connect to port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to stdout: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 #| msgid "certificate `%s' not found: %s\n"
 msgid "attribute '%s' not found\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          pass '%s'\n"
 msgstr "      även känd som \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          host '%s'\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "               inte importerade: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "            DN '%s'\n"
 msgstr "      även känd som \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          attr '%s'\n"
 msgstr "      även känd som \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 #| msgid "%s:%u: no hostname given\n"
 msgid "no host name in '%s'\n"
 msgstr "%s:%u: inget värdnamn angivet\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: Using untrusted key!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "för många chifferinställningar\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
@@ -11062,7 +11162,7 @@
 msgid "malloc failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -11211,12 +11311,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "kan inte komma åt \"%s\": %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -11291,7 +11385,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
@@ -11326,36 +11420,36 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 #| msgid "cannot allocate outfile string: %s\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to allocate assuan context: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11402,63 +11496,63 @@
 msgid "certificate chain is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "tyst"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "skriv ut data hexkodat"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "avkoda mottagna datarader"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "kör Assuan-servern som angivits på kommandoraden"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "använd inte utökat anslutningsläge"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kör kommandon från FIL vid uppstart"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "kör /subst vid uppstart"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
 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:208
+#: tools/gpg-connect-agent.c:211
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent [options]\n"
@@ -11470,44 +11564,44 @@
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, 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:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 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:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
@@ -11707,110 +11801,110 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Extern validering av komponenten %s misslyckades"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s'\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "kontrollera alla program"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|kontrollera flaggor"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "tillämpa globala standardvärden"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "hämta konfigurationskatalogerna för gpgconf"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "lista global konfigurationsfil"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "kontrollera global konfigurationsfil"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "list all components"
 msgid "launch a given component"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 #, fuzzy
 #| msgid "list all components"
 msgid "kill a given component"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgconf [options]\n"
@@ -11822,205 +11916,155 @@
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+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:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Kommandon:\n"
-" "
+"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
+"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "dekrypteringsmodus"
+#, fuzzy
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "krypteringsmodus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Kommandon:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "verktygsklass (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "dekrypteringsmodus"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "programfilnamn"
+#~ msgid "encryption modus"
+#~ msgstr "krypteringsmodus"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "hemlig nyckelfil (krävs)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "verktygsklass (confucius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "filnamn för inmatning (standardvärde är standard in)"
+#~ msgid "program filename"
+#~ msgstr "programfilnamn"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
+#~ msgid "secret key file (required)"
+#~ msgstr "hemlig nyckelfil (krävs)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"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"
-"Anropa ett enkelt symmetriskt krypteringsverktyg\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "filnamn för inmatning (standardvärde är standard in)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s på %s avbröts med status %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s på %s misslyckades med status %i\n"
+#~ msgid ""
+#~ "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"
+#~ "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-#| msgid "can't create temporary directory `%s': %s\n"
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s på %s avbröts med status %i\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "kunde inte öppna %s för skrivning: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s på %s misslyckades med status %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "fel vid skrivning till %s: %s\n"
+#, fuzzy
+#~| msgid "can't create temporary directory `%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "fel vid läsning från %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "fel vid stängning av %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "fel vid skrivning till %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "flaggan --program angavs inte\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "fel vid läsning från %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "endast --decrypt och --encrypt stöds\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "fel vid stängning av %s: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "flaggan --keyfile angavs inte\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "flaggan --program angavs inte\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "kan inte allokera argumentvektor\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "endast --decrypt och --encrypt stöds\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "kunde inte skapa rör: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "flaggan --keyfile angavs inte\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "kunde inte skapa pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "kan inte allokera argumentvektor\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "kunde inte grena process: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "kunde inte skapa rör: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv misslyckades: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "kunde inte skapa pty: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "val misslyckades: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "kunde inte grena process: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "läsning misslyckades: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv misslyckades: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty-läsning misslyckades: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "val misslyckades: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid misslyckades: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "barnprocess avbröts med status %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty-läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "kan inte allokera infilssträng: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid misslyckades: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "kan inte allokera utfilssträng: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "barnprocess avbröts med status %i\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "antingen %s eller %s måste anges\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "kan inte allokera infilssträng: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "ingen klass tillhandahölls\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "kan inte allokera utfilssträng: %s\n"
+
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "antingen %s eller %s måste anges\n"
+
+#~ msgid "no class provided\n"
+#~ msgstr "ingen klass tillhandahölls\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klassen %s stöds inte\n"
-
-#: tools/gpg-check-pattern.c:144
-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"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klassen %s stöds inte\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
-"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " använder certifikat-id 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -12138,42 +12182,6 @@
 #~ msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
 #, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
-
-#, fuzzy
-#~| msgid "card does not support digest algorithm %s\n"
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Korrekt signatur från"
-
-#, fuzzy
-#~| msgid "skipped \"%s\": %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "hoppade över \"%s\": %s\n"
-
-#, fuzzy
-#~| msgid "User ID \"%s\": %d signature removed\n"
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
-#~ msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Korrekt signatur från"
-#~ msgstr[1] "Korrekt signatur från"
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "ny konfigurationsfil \"%s\" skapad\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/tr.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/tr.gmo sont différents
diff -Nru gnupg2-2.2.20/po/tr.po gnupg2-2.2.27/po/tr.po
--- gnupg2-2.2.20/po/tr.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/tr.po	2021-01-11 18:47:18.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2015-02-11 19:18+0100\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
@@ -29,41 +29,41 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -71,7 +71,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -81,11 +81,11 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -93,7 +93,7 @@
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -101,17 +101,17 @@
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
@@ -119,36 +119,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
@@ -157,33 +161,33 @@
 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:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -244,7 +248,7 @@
 "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
 "için lütfen anahtar parolası giriniz"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
@@ -398,18 +402,18 @@
 "Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u "
 "karakterlik olmalı."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, fuzzy, c-format
 #| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı giriniz"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -417,145 +421,145 @@
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "sunucu kipinde çalışır"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 #, fuzzy
 #| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -567,162 +571,148 @@
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "invalid debug-level '%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "seçenek dosyası \"%s\": %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, fuzzy, c-format
 #| msgid "socket name `%s' is too long\n"
 msgid "socket name '%s' is too long\n"
 msgstr "soketin ismi `%s' çok uzun\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "çalışan bir gpg-agent zaten var - bir yenisi başlatılmayacak\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, fuzzy, c-format
 #| msgid "error binding socket to `%s': %s\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgid "can't set permissions of '%s': %s\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 #| msgid "listening on socket `%s'\n"
 msgid "listening on socket '%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, fuzzy, c-format
 #| msgid "can't use `%s' as home directory\n"
 msgid "can't use '%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, fuzzy, c-format
 #| msgid "pth_select failed: %s - waiting 1s\n"
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Kullanımı: gpg-preset-passphrase [seçenekler] ANHMAŞASI (yardım için -h)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -730,8 +720,8 @@
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -739,9 +729,9 @@
 "@Komutlar:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -751,11 +741,11 @@
 "Seçenekler:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Kullanımı: gpg-protect-tool [seçenekler] (yardım için -h)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -763,16 +753,16 @@
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -780,7 +770,7 @@
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -788,18 +778,18 @@
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
@@ -811,37 +801,37 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
@@ -854,7 +844,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -863,11 +853,11 @@
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Hayır"
@@ -880,7 +870,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -892,21 +882,21 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Doğru"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Bilginize: Bu anahtar parolası hiç değişmedi%0ALütfen şimdi değiştirin."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -915,15 +905,15 @@
 "Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
 "şimdi değiştirin."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Anahtar parolasını değiştir"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Sonra değiştireceğim"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -931,24 +921,24 @@
 "%%0A?"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "anahtarı kullanıma sokar"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s anahtarı, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
@@ -959,7 +949,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
@@ -969,7 +959,7 @@
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1002,7 +992,7 @@
 msgstr "boru oluşturulurken hata: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
@@ -1053,28 +1043,28 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1135,7 +1125,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "yeterli bellek ayrılırken hata: %s\n"
@@ -1260,7 +1250,7 @@
 msgstr "algoritma: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "desteklenmeyen algoritma: %s"
@@ -1337,39 +1327,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Kök sertifika güvenilir"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "sertifikalar için CRL/OCSP sınaması"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "İçerilen sertifikalar"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Hiç denetim günlük girdisi yok."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Bilinmeyen işlem"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent elverişli"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr elverişli"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, fuzzy, c-format
 #| msgid "No help available for `%s'."
 msgid "No help available for '%s'."
@@ -1379,7 +1369,7 @@
 msgid "ignoring garbage line"
 msgstr "bozuk satır yok sayılıyor"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[yok]"
 
@@ -1388,85 +1378,119 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "değiştirge beklenmiyordu"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "okuma hatası"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "anahtar sözcük çok uzun"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "eksik değiştirge"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 #, fuzzy
 #| msgid "invalid value\n"
 msgid "invalid argument"
 msgstr "değer hatalı\n"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "geçersiz komut"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "geçersiz rumuz tanımı"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "nüve dışı"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "geçersiz komut"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command `%s'\n"
+msgid "unknown meta command"
+msgstr "komut `%s' bilinmiyor\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "beklenmeyen zırh: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "geçersiz seçenek"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "\"%.50s\" seçeneğinin değiştirge ihtiyacı yok\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "geçersiz komut \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" seçeneği belirsiz\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" komutu belirsiz\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "nüve dışında\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "geçersiz seçenekler \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
+
+#: common/argparse.c:1832
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "seçenek dosyası \"%s\": %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
@@ -1484,45 +1508,44 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, fuzzy, c-format
 #| msgid "error writing to `%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "`%s' yazılırken hata: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "bayat kilit dosyası siliniyor (%d tarafından oluşturulmuş)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kilit için bekleniyor (%d%s tarafından tutulmuş) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(ölükilit?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 #| msgid "lock `%s' not made: %s\n"
 msgid "lock '%s' not made: %s\n"
 msgstr "kilit `%s' yapılmadı: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "%s kilidi için bekleniyor...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@ -1715,14 +1738,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1768,24 +1791,24 @@
 msgid "server uses an invalid certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
@@ -1795,242 +1818,242 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "`%s' yazılırken hata: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2045,174 +2068,174 @@
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "İmzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "`%s' açılamadı\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2275,8 +2298,8 @@
 msgstr "GenAnah: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
@@ -2301,40 +2324,54 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
+
+#: g10/encrypt.c:549
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2342,20 +2379,13 @@
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2364,40 +2394,40 @@
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
@@ -2497,7 +2527,7 @@
 msgstr "%s: atlandı: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -2534,283 +2564,289 @@
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, fuzzy, c-format
 #| msgid "automatically retrieved `%s' via %s\n"
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "`%s' %s üzerinden alınırken hata: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Parmak izi yok"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "bir imza yapar"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "yeni bir anahtar çifti üretir"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "ileti özetlerini gösterir"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|DOSYA|çıktı DOSYAya yazılır"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2818,7 +2854,7 @@
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2848,13 +2884,13 @@
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2869,7 +2905,7 @@
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2877,82 +2913,82 @@
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2960,19 +2996,19 @@
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -2981,512 +3017,499 @@
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 #, fuzzy
 #| msgid "show user ID validity during key listings"
 msgid "show key usage information during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "%d. satır: geçerli bir eposta adresi değil\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid pinentry mode '%s'\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
@@ -3696,7 +3719,7 @@
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
@@ -3707,7 +3730,7 @@
 msgid "key %s: %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr ""
 
@@ -3731,7 +3754,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
@@ -3746,7 +3769,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
@@ -3817,18 +3840,18 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -3842,244 +3865,315 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "yürürlükten kaldırma sebebi: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "yeterli bellek ayrılırken hata: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kart %s özet algoritmasını desteklemiyor\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Buradaki imzeler iyi:"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "\"%s\" atlandı: %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
+msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
+msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d kötü imza\n"
+msgstr[1] "%d kötü imza\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Buradaki imzeler iyi:"
+msgstr[1] "Buradaki imzeler iyi:"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating keybox '%s': %s\n"
 msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
 msgstr "`%s' anahtar bloğu oluşturuldu\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "`%s' anahtarlığı oluşturuldu\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "anahtar bloku özkaynağı `%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
@@ -4324,8 +4418,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -4538,7 +4632,7 @@
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
@@ -4595,7 +4689,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
@@ -4684,7 +4778,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
@@ -4737,110 +4831,125 @@
 msgid "Nothing to sign.\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr ""
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "parmakizi geçersiz"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Özet: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4848,17 +4957,17 @@
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4868,18 +4977,18 @@
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4888,35 +4997,35 @@
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4924,20 +5033,20 @@
 msgstr[0] "%d imza silindi.\n"
 msgstr[1] "%d imza silindi.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -4945,17 +5054,17 @@
 msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4965,50 +5074,50 @@
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5019,253 +5128,249 @@
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
 "y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr ""
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
 "veya y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid value for option '%s'\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "çok fazla özet tercihi\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5273,19 +5378,19 @@
 "UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
 "çalışamayabilir\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Onayla"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Şifrele"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Kimlik kanıtla"
 
@@ -5299,172 +5404,172 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "OoŞşKkçÇ"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Mevcut anahtar\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Karttaki mevcut anahtar\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "anahtarı iptal eder"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5480,7 +5585,7 @@
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5496,38 +5601,38 @@
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5535,11 +5640,11 @@
 "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:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5554,7 +5659,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5570,50 +5675,50 @@
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 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:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5624,7 +5729,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 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"
@@ -5640,37 +5745,37 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 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:2924
+#: g10/keygen.c:2927
 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:2929
+#: g10/keygen.c:2932
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (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:2930
+#: g10/keygen.c:2933
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (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:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5683,13 +5788,13 @@
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5697,72 +5802,72 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5770,14 +5875,14 @@
 "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:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, 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:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5785,24 +5890,24 @@
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 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:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
@@ -5838,22 +5943,6 @@
 msgstr[0] "%d kötü imza\n"
 msgstr[1] "%d kötü imza\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d kötü imza\n"
-msgstr[1] "%d kötü imza\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5873,29 +5962,29 @@
 msgid "Keyring"
 msgstr "Anahtar zinciri"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
@@ -5928,7 +6017,7 @@
 msgstr[0] "1 kötü imza\n"
 msgstr[1] "1 kötü imza\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
@@ -5980,7 +6069,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -5988,458 +6077,458 @@
 msgstr[0] "%d anahtar %s adresinden tazeleniyor\n"
 msgstr[1] "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "UYAR: çok sayıda salt metin görüldü\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s imzası, %s özet algoritması\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritma: %s"
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, fuzzy, c-format
 #| msgid "fstat of `%s' failed in %s: %s\n"
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) %s de başarısız: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "UYARI: Elgamal imza+şifre anahtarları artık önerilmiyor\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özet algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s imzası, %s özet algoritması\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "%s imzası, %s özet algoritması\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s)\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, fuzzy, c-format
 #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6475,84 +6564,84 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritik imza simgelemi: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 #, fuzzy
 #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6606,7 +6695,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu foto doğru mu? (e/H/ç veya y/N/ç) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
@@ -6925,12 +7014,12 @@
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Bilginize: anahtar %s %s özelliğine sahip değil\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Bilginize: anahtar %s %s için bir tercihe sahip değil\n"
@@ -6985,28 +7074,28 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, fuzzy, c-format
 #| msgid "NOTE: secret key %s expired at %s\n"
 msgid "Note: secret key %s expired at %s\n"
 msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: key has been revoked"
 msgid "Note: key has been revoked"
@@ -7202,7 +7291,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "UYARI: iletideki imza özeti çelişkili\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -7277,32 +7366,32 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -7332,12 +7421,12 @@
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7345,12 +7434,12 @@
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
 "isteniyor\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -7374,7 +7463,7 @@
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@ -7422,12 +7511,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
@@ -7439,12 +7528,12 @@
 msgid "can't lock '%s'\n"
 msgstr "`%s' kiltlenemedi\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, 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:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, 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"
@@ -7459,105 +7548,105 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, 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:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, 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:983
+#: g10/tdbio.c:985
 #, 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:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, 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:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, 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:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, 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:1867
+#: g10/tdbio.c:1869
 #, 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:1928
+#: g10/tdbio.c:1930
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
@@ -7939,102 +8028,102 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8042,7 +8131,7 @@
 msgstr[0] "şu ana kadar %lu anahtar işlendi\n"
 msgstr[1] "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8050,17 +8139,17 @@
 msgstr[0] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 msgstr[1] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8068,7 +8157,7 @@
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8187,110 +8276,125 @@
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, 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-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, 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-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "BoşPIN henüz değişmedi\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 
-#: scd/app-nks.c:1128
-#, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, 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:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
@@ -8298,58 +8402,46 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
 "ediliyor\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, 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:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8362,25 +8454,25 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 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:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
@@ -8388,91 +8480,91 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|YSK|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|YYP|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, 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:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "desteklenmeyen algoritma: %s"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8480,33 +8572,33 @@
 msgstr[0] "anahtar üretimi tamamlandı (%d saniye)\n"
 msgstr[1] "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 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:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 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:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -8524,60 +8616,60 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|İlk Yeni PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSYA|DOSYAya bir günce yazar"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 #, fuzzy
 #| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8589,7 +8681,7 @@
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -8598,304 +8690,322 @@
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "sertifika tarafından istenen geçerlilik modeli: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "zincir"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "kabuk"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritik sertifika eklentisi %s desteklenmiyor"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "sertifikacı onu bir CA gibi imlememiş"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, fuzzy, c-format
 #| msgid "failed to open `%s': %s\n"
 msgid "failed to open '%s': %s\n"
 msgstr "`%s' açılamadı: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, fuzzy, c-format
 #| msgid "note: non-critical certificate policy not allowed"
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "sertifika poliçesine izin verilmiyor"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "parmakizinin alınması başarısız oldu\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "harici bir sertifikacı arar\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, fuzzy, c-format
+#| msgid "can't access `%s': %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "'%s' erişilemiyor: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "sertifika durumu bilinmiyor"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\"'ın düzgün olarak kurulu olduğundan lütfen emin olunuz\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL sınaması başarısız: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "geçersiz doğrulukla sertifika: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "kök sertifika henüz geçersiz"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "ara sertifika henüz geçersiz"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "kök sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "ara sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "gerekli sertifika özellikleri eksik: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "geçersiz doğrulukla sertifika"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "sertifika yaşam süresi boyunca imza oluşturulmadı"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "sertifikacının yaşam süresi boyunca sertifika oluşturulmadı"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "sertifikacının yaşam süresi boyunca ara sertifika oluşturulmadı"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  imzanın oluşturuluşu: "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (sertifika geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (sertifikacı geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "parmakizi=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "güvenilir olarak etkileşimli imleme gpg-agent'ta etkin değil\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "güvenilir olarak etkileşimli imleme bu oturum için iptal edildi\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "UYARI: imzanın oluşturulma zamanı bilinmiyor - şimdiki zaman varsayılıyor"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "sertifikacı kim belli değil"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "sertifikacı belli değil"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifika iyi durumda\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ara sertifika iyi durumda\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kök sertifika iyi durumda\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "zincir modeline geçiş"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "kullanılan geçerlilik modeli: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "nüve dışında\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "yok"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Hata - kodlama geçersiz]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Hata - nüve dışında]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Hata - Adsız]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Hata - DN geçersiz]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8910,154 +9020,154 @@
 "S/N: %s, Kimlik: 0x%08lX,\n"
 "oluşturuluşu: %s, süre bitimi: %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifika onaylama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifika şifreleme için kullanılmamalıydı\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifika şifreleme için elverişli değil\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifika imzalama için elverişli değil\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "%d. satır: anahtar uzunluğu %u geçersiz (%d .. %d geçerli)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "%d. satır: konu ismi belirtilmemiş\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name label `%.*s'\n"
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "%1$d. satır: %3$d konumundaki konu ismi %2$s' geçersiz\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "%d. satır: geçerli bir eposta adresi değil\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid serial number\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name label `%.*s'\n"
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "%1$d. satır: %3$d konumundaki konu ismi %2$s' geçersiz\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid date given\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, fuzzy, c-format
 #| msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "%d. satır: `%s' anahtar maşası tarafından alınırken hata: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid authority-key-id\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, fuzzy, c-format
 #| msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgid "line %d: invalid subject-key-id\n"
 msgstr "%1$d. satır: %3$d konumundaki konu ismi %2$s' geçersiz\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "line %d: invalid extension syntax\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, fuzzy, c-format
 #| msgid "line %d: error reading key `%s' from card: %s\n"
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "%d. satır: `%s' anahtarı karttan okunurken hata: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, fuzzy, c-format
 #| msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "%d. satır: `%s' anahtar maşası tarafından alınırken hata: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "%d. satır: anahtar üretimi başarısızlığa uğradı: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -9201,7 +9311,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "sertifika \"%s\" yok: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "anahtar bloğu kilitlenirken hata: %s\n"
@@ -9228,127 +9338,127 @@
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9363,51 +9473,51 @@
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, fuzzy, c-format
 #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "BİLGİ:`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "`%s' geçerlilik modeli bilinmiyor\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: konak adı belirtilmemiş\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: kullanıcısız parola verilmiş\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: bu satır atlanıyor\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "anahtar sunucusu çözümlenemedi\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, fuzzy, c-format
 #| msgid "can't sign using `%s': %s\n"
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@ -9427,7 +9537,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
@@ -9437,42 +9547,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "parmakizinin alınması başarısız oldu\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Hata - "
 
@@ -9509,7 +9614,7 @@
 "\n"
 "%s%sBunu yapmak istediğinizden emin misiniz?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9545,38 +9650,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için sınama başarısız: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "İmza "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[belirtilmeyen tarihte]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " sertifika kimliği 0x%08lX kullanılarak yapıldı\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "algoritma: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "geçersiz imza: ileti özeti özelliği hesaplananla uyuşmuyor\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Buradaki imzeler iyi:"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "        nam-ı diğer"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Bu bir nitelikli imzadır.\n"
@@ -9653,599 +9759,600 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "İçerilen sertifikalar"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "    runtime cached certificates: %u\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, fuzzy, c-format
 #| msgid "  (certificate created at "
 msgid "certificate already cached\n"
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "sertifika iyi durumda\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error caching certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "parmakizi geçersiz"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no issuer found in certificate\n"
 msgstr "sertifikacı kim belli değil"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating directory '%s': %s\n"
 msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, fuzzy, c-format
 #| msgid "ignoring garbage line"
 msgid "ignoring database dir '%s'\n"
 msgstr "bozuk satır yok sayılıyor"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, fuzzy, c-format
 #| msgid "error reading from %s: %s\n"
 msgid "error reading directory '%s': %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "removing cache file '%s'\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, fuzzy, c-format
 #| msgid "failed to open `%s': %s\n"
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "`%s' açılamadı: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "'%s' de hata: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, fuzzy, c-format
 #| msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "`%s', %d. satırındaki biçimli parmakizi geçersiz\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "opening cache file '%s'\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening cache file '%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to create a new cache object: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting data from cache file: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
-msgid "unknown hash algorithm '%s'\n"
-msgstr "`%s' çittirim algoritması geçersiz\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "iconv_open failed: %s\n"
 msgid "converting S-expression failed: %s\n"
 msgstr "iconv_open başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "`%s' çittirim algoritması geçersiz\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, fuzzy, c-format
 #| msgid "error getting serial number of card: %s\n"
 msgid "error getting update times of CRL: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "sertifikacı kim belli değil"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 #| msgid "error reading input: %s\n"
 msgid "error reading CRL extensions: %s\n"
 msgstr "girdi okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "creating cache file '%s'\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, fuzzy, c-format
 #| msgid "WARNING: invalid notation data found\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, fuzzy, c-format
 #| msgid "problem re-searching certificate: %s\n"
 msgid "problem reading cache key: %s\n"
 msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, fuzzy, c-format
 #| msgid "error reading nonce on fd %d: %s\n"
 msgid "error reading cache entry from db: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10288,72 +10395,72 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "sertifika \"%s\" yok: %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "add a certificate to the cache"
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
 #| msgid "Included certificates"
 msgid "validate a certificate"
 msgstr "İçerilen sertifikalar"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
 #| msgid "Included certificates"
 msgid "lookup a certificate"
 msgstr "İçerilen sertifikalar"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 #, fuzzy
 #| msgid "Included certificates"
 msgid "lookup only locally stored certificates"
 msgstr "İçerilen sertifikalar"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "load a CRL into the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 #, fuzzy
 #| msgid "export certificates"
 msgid "expect certificates in PEM format"
 msgstr "sertifikaları ihraç eder"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 #, fuzzy
 #| msgid "Enter the user ID of the designated revoker: "
 msgid "force the use of the default OCSP responder"
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -10361,93 +10468,93 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error reading certificate from stdin: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, fuzzy, c-format
 #| msgid "error reading from %s: %s\n"
 msgid "error reading certificate from '%s': %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, fuzzy, c-format
 #| msgid "deleting certificate \"%s\" failed: %s\n"
 msgid "validation of certificate failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate is valid\n"
 msgstr "sertifika iyi durumda\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked\n"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, fuzzy, c-format
 #| msgid "deleting certificate \"%s\" failed: %s\n"
 msgid "certificate check failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, fuzzy, c-format
 #| msgid "error writing secret keyring `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
 msgstr "desteklenmeyen algoritma: %s"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr ""
@@ -10476,102 +10583,102 @@
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 #| msgid "Quit without saving? (y/N) "
 msgid "run without asking a user"
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10584,13 +10691,13 @@
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -10602,311 +10709,304 @@
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "valid debug levels are: %s\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, fuzzy, c-format
 #| msgid "line too long - skipped\n"
 msgid "%s:%u: line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "parmakizi geçersiz"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "zorlanmadı"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|connect to host NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 #, fuzzy
 #| msgid "|N|connect to reader at port N"
 msgid "|N|connect to port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
 "Interface and options may change without notice\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, fuzzy, c-format
 #| msgid "invalid import options\n"
 msgid "invalid port number %d\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to stdout: %s\n"
 msgstr "%s yazılırken hata: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, fuzzy, c-format
 #| msgid "certificate `%s' not found: %s\n"
 msgid "attribute '%s' not found\n"
 msgstr "sertifika \"%s\" yok: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "processing url '%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          user '%s'\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          pass '%s'\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, fuzzy, c-format
 #| msgid "          w/o user IDs: %lu\n"
 msgid "          host '%s'\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, fuzzy, c-format
 #| msgid "          not imported: %lu\n"
 msgid "          port %d\n"
 msgstr "             alınamadı: %lu\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "            DN '%s'\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "          attr '%s'\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, fuzzy, c-format
 #| msgid "%s:%u: no hostname given\n"
 msgid "no host name in '%s'\n"
 msgstr "%s:%u: konak adı belirtilmemiş\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, fuzzy, c-format
 #| msgid "WARNING: Using untrusted key!\n"
 msgid "WARNING: using first attribute only\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, fuzzy, c-format
 #| msgid "dearmoring failed: %s\n"
 msgid "searching '%s' failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "yeterli bellek ayrılırken hata: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
@@ -10962,7 +11062,7 @@
 msgid "malloc failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr ""
@@ -11111,12 +11211,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
 
-#: dirmngr/ocsp.c:682
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "'%s' erişilemiyor: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -11191,7 +11285,7 @@
 msgstr ""
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
@@ -11226,36 +11320,36 @@
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, fuzzy, c-format
 #| msgid "cannot allocate outfile string: %s\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to allocate assuan context: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11301,63 +11395,63 @@
 msgid "certificate chain is good\n"
 msgstr "sertifika iyi durumda\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "sessiz"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "veri çıktısını onaltılık kodlamayla basar"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "alınan veri satırlarının kodunu açar"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "komut satırında verilen Assuan sunucu çalıştırılır"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "ek bağlantı kipi kullanılmaz"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "/subst başlangıçta çalıştırılır"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 #, fuzzy
 #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg-connect-agent [seçenekler] (yardım için -h)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent [options]\n"
@@ -11369,44 +11463,44 @@
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik değiştirgeler gerektirir\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
@@ -11609,110 +11703,110 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s'\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "'%s' de hata: %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "tüm programları sınar"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|BİLEŞEN|seçenekleri listeler"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|BİLEŞEN|seçenekleri değiştirir"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|BİLEŞEN|seçenekleri sınar"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "öntanımlı küresel değerleri uygular"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "gpgconf için yapılandırma dizinlerini getirir"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "küresel yapılandırma dosyasını listeler"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "küresel yapılandırma dosayasını sınar"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "güvence veritabanını günceller"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "list all components"
 msgid "launch a given component"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 #, fuzzy
 #| msgid "list all components"
 msgid "kill a given component"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgconf [options]\n"
@@ -11724,205 +11818,155 @@
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Tek bileşenlik değiştirge gerekli"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Bileşen yok"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Değiştirgeye izin verilmez"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr ""
+"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası (yardım için -h)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Komutlar:\n"
-" "
+"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası\n"
+"Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
+"karşılaştırır\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "şifre çözme kipi"
+#, fuzzy
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "şifreleme kipi"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Komutlar:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "araç sınıfı (Konfüçyüs)"
+#~ msgid "decryption modus"
+#~ msgstr "şifre çözme kipi"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "program dosyaismi"
+#~ msgid "encryption modus"
+#~ msgstr "şifreleme kipi"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "gizli anahtar dosyası (gerekli)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "araç sınıfı (Konfüçyüs)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "girdi dosyası ismi (std girdi öntanımlı)"
+#~ msgid "program filename"
+#~ msgstr "program dosyaismi"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
+#~ msgid "secret key file (required)"
+#~ msgstr "gizli anahtar dosyası (gerekli)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Sözdizimi: symcryptrun --class SINIF --program PROGRAM --keyfile ANHDOSYA "
-"[seçenekler...] KOMUT [girdi-dosyası]\n"
-"Basit bir simetrik şifreleme aracı çalıştırır\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "girdi dosyası ismi (std girdi öntanımlı)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Sözdizimi: symcryptrun --class SINIF --program PROGRAM --keyfile ANHDOSYA "
+#~ "[seçenekler...] KOMUT [girdi-dosyası]\n"
+#~ "Basit bir simetrik şifreleme aracı çalıştırır\n"
 
-#: tools/symcryptrun.c:329
-#, fuzzy, c-format
-#| msgid "can't create temporary directory `%s': %s\n"
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s yazmak için açılamadı: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "%s yazılırken hata: %s\n"
+#, fuzzy
+#~| msgid "can't create temporary directory `%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "%s okunurken hata: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s yazmak için açılamadı: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "%s kapanırken hata: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "%s yazılırken hata: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "--program diye bir seçenek yok\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "%s okunurken hata: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "%s kapanırken hata: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "--keyfile diye bir seçenek yok\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "--program diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "boru oluşturulamadı: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "--keyfile diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "pty oluşturulamadı: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "çatallanamadı: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "boru oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv başarısız: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "pty oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select başarısız: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "çatallanamadı: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read başarısız: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv başarısız: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty okuması başarısız: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select başarısız: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid başarısız: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "read başarısız: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "alt süreç %i durumu ile çıktı\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty okuması başarısız: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "dosya içi dizge ayrılamıyor: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid başarısız: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "dosya dışı dizge ayrılamıyor: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "alt süreç %i durumu ile çıktı\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "ya %s verilmeli ya da %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "dosya içi dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "hiç sınıf sağlanmamış\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "%s sınıfı desteklenmiyor\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "ya %s verilmeli ya da %s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası (yardım için -h)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "hiç sınıf sağlanmamış\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası\n"
-"Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
-"karşılaştırır\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "%s sınıfı desteklenmiyor\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " sertifika kimliği 0x%08lX kullanılarak yapıldı\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -12038,42 +12082,6 @@
 #~ msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
 #, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
-
-#, fuzzy
-#~| msgid "card does not support digest algorithm %s\n"
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "kart %s özet algoritmasını desteklemiyor\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "Buradaki imzeler iyi:"
-
-#, fuzzy
-#~| msgid "skipped \"%s\": %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "\"%s\" atlandı: %s\n"
-
-#, fuzzy
-#~| msgid "User ID \"%s\": %d signature removed\n"
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
-#~ msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "Buradaki imzeler iyi:"
-#~ msgstr[1] "Buradaki imzeler iyi:"
-
-#, fuzzy
 #~| msgid "new configuration file `%s' created\n"
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/uk.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/uk.gmo sont différents
diff -Nru gnupg2-2.2.20/po/uk.po gnupg2-2.2.27/po/uk.po
--- gnupg2-2.2.20/po/uk.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/uk.po	2021-01-11 18:47:18.000000000 +0100
@@ -2,13 +2,13 @@
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GnuPG package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2014, 2015, 2016, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2014, 2015, 2016, 2017, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
-"PO-Revision-Date: 2017-11-02 17:41+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
+"PO-Revision-Date: 2020-08-31 11:54+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -17,9 +17,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 20.11.70\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "не вдалося встановити блокування запису пінкоду: %s\n"
@@ -30,45 +30,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "_Гаразд"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "_Скасувати"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "_Так"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "_Ні"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Зберегти у засобі керування паролями"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Справді хочете зробити пароль видимим на екрані?"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Зробити пароль видимим"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Приховати пароль"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "Якість:"
 
@@ -78,13 +78,13 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Якість введеного вище тексту.\n"
 "Дані щодо критеріїв якості можна отримати у вашого адміністратора."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -92,7 +92,7 @@
 "Будь ласка, вкажіть ваш пінкод, щоб ключ можна було розблокувати для цього "
 "сеансу"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -100,17 +100,17 @@
 "Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
 "сеансу"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "Пароль:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "паролі не збігаються, повторіть спробу"
 
@@ -118,36 +118,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (спроба %d з %d)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "Повторіть:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "Занадто довгий пінкод"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "Занадто довгий пароль"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "Некоректні символи у пінкоді"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "Занадто короткий пінкод"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "Помилковий пінкод"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "Помилковий пароль"
 
@@ -157,31 +161,31 @@
 msgstr ""
 "підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не вдалося створити «%s»: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не вдалося відкрити «%s»: %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -203,10 +207,9 @@
 msgstr "не виявлено відповідних ключів картки: %s\n"
 
 #: agent/command-ssh.c:2587
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
+#, c-format
 msgid "error getting list of cards: %s\n"
-msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
+msgstr "помилка під час спроби отримання списку карток: %s\n"
 
 #: agent/command-ssh.c:2765
 #, c-format
@@ -243,7 +246,7 @@
 "Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A   %s"
 "%%0A   %s%%0Aу сховищі ключів gpg-agent"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "не вдалося створити потік даних з сокета: %s\n"
@@ -374,17 +377,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Попередження: вами вказано нескладний пароль."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Вкажіть пароль до%0Aз метою захисту вашого нового ключа"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -392,132 +395,132 @@
 "@Параметри:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "запустити у режимі фонової служби (фоновий)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "запустити у режимі сервера (основному)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "запустити у режимі із наглядом"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "докладний режим"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "дещо зменшити кількість повідомлень"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "виведення команд у форматі sh"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "виведення команд у форматі csh"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|прочитати параметри з вказаного файла"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "не від’єднувати від консолі"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "використовувати файл журналу для сервера"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|використовувати вказану програму пінзаписів"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|використовувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "не використовувати SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|приймати певні команди через NAME"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ігнорувати запити щодо зміни TTY"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ігнорувати запити щодо зміни графічного дисплея"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "не використовувати кеш пін-кодів для підписування"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "заборонити використання зовнішнього кешу паролів"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "заборонити клієнтам позначати ключі як надійні"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє встановлення пароля"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "дозволити запит пароля з Emacs"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "увімкнути підтримку ssh"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr ""
+msgstr "|АЛГО|використати алгоритм АЛГО для показу відбитків ssh"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "увімкнути підтримку putty"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -525,150 +528,138 @@
 "Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
 "Керування закритими ключами у @GNUPG@\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "вказано некоректне значення рівня діагностики «%s»\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "файл параметрів «%s»: %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдалося створити сокет: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "назва сокета «%s» є надто довгою\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "помилка під час спроби отримання поточного стану сокета\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не вдалося встановити права доступу до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "очікування даних на сокеті «%s»\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не вдалося створити каталог «%s»: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "створено каталог «%s»\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "не можна використовувати як домашній каталог «%s»\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 "помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
 "%s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "помилка pth_select: %s — очікування у 1 с\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s зупинено\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "у цьому сеансі не запущено gpg-agent\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Використання: gpg-preset-passphrase [параметри] KEYGRIP (-h — довідка)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -676,8 +667,8 @@
 "Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
 "Керування кешем паролів\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -685,9 +676,9 @@
 "@Команди:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -697,11 +688,11 @@
 "Параметри:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Використання: gpg-protect-tool [параметри] (-h — довідка)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -709,22 +700,22 @@
 "Синтаксис: gpg-protect-tool [параметри] [аргументи]\n"
 "Інструмент керування закритими ключами\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Будь ласка, вкажіть пароль для зняття захисту з об’єкта PKCS#12."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Будь ласка, вкажіть пароль для захисту нового об’єкта PKCS#12."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Будь ласка, введіть пароль для захисту імпортованого об’єкта у системі GnuPG."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -732,18 +723,18 @@
 "Будь ласка, вкажіть пароль або пінкод,\n"
 "потрібні для завершення цієї дії."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "скасовано\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "помилка під час спроби запиту пароля: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "помилка під час відкриття «%s»: %s\n"
@@ -753,32 +744,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "файл «%s», рядок %d: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "проігноровано інструкцію «%s» у «%s», рядок %d\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "список довіри системи «%s» недоступний\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "помилковий відбиток у «%s», рядок %d\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "некоректна позначка ключа у «%s», рядок %d\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "помилка під час читання «%s», рядок %d: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "помилка під час читання списку надійних кореневих сертифікатів\n"
@@ -791,7 +782,7 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -800,11 +791,11 @@
 "Бажаєте встановити абсолютний рівень довіри до%%0A  «%s»%%0Aз метою належної "
 "сертифікації сертифікатів користувача?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Так"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "Ні"
@@ -817,7 +808,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -829,21 +820,21 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "Підтверджую"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "Не підтверджую"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Зауваження: цей пароль ще не змінювався.%0AБудь ласка, змініть його зараз."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -852,15 +843,15 @@
 "Цей пароль не змінювався%%0Aз %.4s-%.2s-%.2s.  Будь ласка, змініть його "
 "зараз."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "Змінити пароль"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "Я зміню його пізніше"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -868,11 +859,11 @@
 msgstr ""
 "Справді хочете вилучити ключ, що визначається keygrip%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "Вилучити ключ"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -881,12 +872,12 @@
 "Вилучення цього ключа може призвести до неможливості отримати доступ до "
 "віддалених комп’ютерів."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "Для DSA довжина хешу має бути кратною до 8 бітів\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "Ключ %s використовує недостатньо міцний (%u-бітовий) хеш\n"
@@ -896,7 +887,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu-бітовий хеш не є коректним для %u-бітового ключа %s\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "невдала спроба перевірити створений підпис: %s\n"
@@ -906,7 +897,7 @@
 msgid "secret key parts are not available\n"
 msgstr "закриті частини ключа недоступні\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -936,7 +927,7 @@
 msgstr "помилка під час спроби створення потоку для каналу: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "помилка під час спроби розгалужування процесу: %s\n"
@@ -983,27 +974,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема під час спроби встановлення параметрів gpg-agent\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Увага: визначення власника не є безпечним для %s — «%s»\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "очікуємо на отримання доступу до файла «%s»…\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
@@ -1064,7 +1055,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "вихід за межі області під час спроби отримання %lu байтів"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "помилка під час спроби розподілу пам’яті: %s\n"
@@ -1179,7 +1170,7 @@
 msgstr "алгоритм: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "непідтримуваний алгоритм: %s"
@@ -1254,39 +1245,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Кореневий сертифікат є гідним довіри"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "не знайдено списку відкликання для сертифіката"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "доступний список відкликання є занадто старим"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "перевірка сертифікатів за допомогою CRL/OCSP"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "Включені сертифікати"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "Немає записів журналу перевірки."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "Невідома дія"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent придатний до використання"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr придатна до використання"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Довідки щодо «%s» не виявлено."
@@ -1295,7 +1286,7 @@
 msgid "ignoring garbage line"
 msgstr "ігноруємо беззмістовний рядок"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[немає]"
 
@@ -1304,82 +1295,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "пропущено некоректний символ radix64 %02x\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "неочікуваний аргумент"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "помилка читання"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "занадто довге ключове слово"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "не вистачає аргументу"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "некоректний аргумент"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "некоректна команда"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "некоректне визначення замінника"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "вихід за межі області пам’яті"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "некоректна команда"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "невідома команда «%s»\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "неочікуваний формат ASCII: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "некоректний параметр"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "не вказано аргументу до параметра «%.50s»\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "некоректний аргумент параметра «%.50s»\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "для параметра «%.50s» аргументи не потрібно вказувати\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "некоректна команда «%.50s»\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "параметр «%.50s» є неоднозначним\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "команда «%.50s» є неоднозначною\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "вихід за межі області пам’яті\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "некоректний параметр «%.50s»\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "файл параметрів «%s»: %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1395,42 +1418,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "помилка перетворення з «%s» у «%s»: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "не вдалося створити тимчасовий файл «%s»: %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "помилка під час спроби запису до «%s»: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "вилучення застарілого файла блокування (створено %d)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "очікування на блокування (зайнято %d%s) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(застаріле блокування?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "блокування «%s» не виконано: %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "очікування на блокування %s…\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
@@ -1604,22 +1626,22 @@
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
+"Зауваження: на застарілих серверах може не бути важливих виправлено "
+"захисту.\n"
 
 #: g10/call-agent.c:216 g10/call-dirmngr.c:170 sm/call-agent.c:115
 #: sm/call-dirmngr.c:182
-#, fuzzy, c-format
-#| msgid "Please use the command \"toggle\" first.\n"
+#, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
-msgstr "Скористайтеся спочатку командою «toggle».\n"
+msgstr "Зауваження: скористайтеся командою «%s» для їхнього перезапуску.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
-#, fuzzy, c-format
-#| msgid "%s does not yet work with %s\n"
+#, c-format
 msgid "%s is not compliant with %s mode\n"
-msgstr "%s ще не може працювати разом з %s\n"
+msgstr "%s не є сумісним із режимом %s\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "у цьому сеансі не запущено dirmngr\n"
@@ -1664,24 +1686,24 @@
 msgid "server uses an invalid certificate"
 msgstr "створити сертифікат відкликання"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Виявлено картку OpenPGP з номером %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "це не можна робити у пакетному режимі\n"
@@ -1691,137 +1713,137 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "Цією командою можна користуватися лише для карток версії 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Немає коду скидання або код скидання вже недоступний\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "Ваш вибір? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[не встановлено]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "не увімкнено"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "увімкнено"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 "Помилка: у поточній версії можна використовувати лише звичайний ASCII.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Помилка: символ «<» не можна використовувати.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Помилка: не можна використовувати подвійні пробіли.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "Прізвище власника картки: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "Ім’я власника картки: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Помилка: складена назва є занадто довгою (максимум — %d символів).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "Адреса для отримання відкритого ключа: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "помилка під час спроби читання «%s»: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "помилка під час спроби читання «%s»: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "Дані користувача (назва запису): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "Особисті дані DO: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "Основна мова: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "Помилка: некоректна довжина рядка основної мови.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Помилка: некоректні символи у рядку основної мови.\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "Помилка: некоректна відповідь.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "Відбиток CA: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Помилка: некоректне форматування відбитка.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "дія над ключем неможлива: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "не є карткою OpenPGP"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "помилка під час отримання даних поточного ключа: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "Замінити вже створений ключ? (y/N або т/Н) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1832,108 +1854,98 @@
 "      ознайомтеся з документацією до вашої картки, щоб\n"
 "      визначити дозволені розміри.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Якою має бути довжина ключа? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
-msgstr ""
+msgstr "Зміна атрибута ключа картки для: "
 
-#: g10/card-util.c:1450
-#, fuzzy
-#| msgid "   (1) Signature key\n"
+#: g10/card-util.c:1413
 msgid "Signature key\n"
-msgstr "   (1) Ключ підписування\n"
+msgstr "Ключ підписування\n"
 
-#: g10/card-util.c:1452
-#, fuzzy
-#| msgid "   (2) Encryption key\n"
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
-msgstr "   (2) Ключ шифрування\n"
+msgstr "Ключ шифрування\n"
 
-#: g10/card-util.c:1454
-#, fuzzy
-#| msgid "   (3) Authentication key\n"
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
-msgstr "   (3) Ключ розпізнавання\n"
+msgstr "Ключ розпізнавання\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Вкажіть потрібний вам тип ключа:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Некоректний вибір.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
 
-#: g10/card-util.c:1548
-#, fuzzy, c-format
-#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+#: g10/card-util.c:1511
+#, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
-msgstr ""
-"Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
+msgstr "Зараз налаштування картки буде змінено для створення ключа типу %s\n"
 
-#: g10/card-util.c:1584
-#, fuzzy, c-format
-#| msgid "error changing size of key %d to %u bits: %s\n"
+#: g10/card-util.c:1547
+#, c-format
 msgid "error changing key attribute for key %d: %s\n"
-msgstr "помилка під час спроби зміни розміру ключа з %d на %u: %s\n"
+msgstr "помилка під час спроби змінити атрибут ключа %d: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
-#, fuzzy, c-format
-#| msgid "error getting current key info: %s\n"
+#: g10/card-util.c:1563 g10/card-util.c:2090
+#, c-format
 msgid "error getting card info: %s\n"
-msgstr "помилка під час отримання даних поточного ключа: %s\n"
+msgstr "помилка під час спроби отримання даних щодо картки: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "Замірити вже створені ключі? (y/N або т/Н) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1944,175 +1956,170 @@
 "   PIN = «%s»     Адміністративний PIN = «%s»\n"
 "Вам слід змінити параметри за допомогою команди --change-pin\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "Виберіть тип ключа, який слід створити:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ підписування\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрування\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ розпізнавання\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "Виберіть сховище для зберігання ключа:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Помилка KEYTOCARD: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Зауваження: у результаті виконання цієї команди усі ключі на картці буде "
 "знищено!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "Продовжити? (y (так)/N (ні)) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 "Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
 
-#: g10/card-util.c:2136
-#, fuzzy, c-format
-#| msgid "error looking up: %s\n"
+#: g10/card-util.c:2113
+#, c-format
 msgid "error for setup KDF: %s\n"
-msgstr "помилка під час пошуку: %s\n"
+msgstr "помилка налаштування KDF: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "вийти з цього меню"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "показати керівні команди"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "показати цю довідкову інформацію"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "показати всі доступні дані"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "змінити ім’я власника картки"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "змінити адресу для отримання ключа"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "отримати ключ, вказаний у полі адреси картки"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "змінити ім’я користувача"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "змінити основну мову"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "змінити поле статі власника картки"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "змінити відбиток CA"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "увімкнути або вимкнути позначку примусового пінкоду підпису"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "створити ключі"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "меню зміни або розблокування пінкоду"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "перевірити пінкод і показати список всіх даних"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "розблокувати під коду за допомогою коду скидання"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "знищити усі ключі і дані"
 
-#: g10/card-util.c:2187
-#, fuzzy
-#| msgid "|NAME|use user NAME for authentication"
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
-msgstr "|NAME|використовувати вказаного користувача для розпізнавання"
+msgstr "налаштування KDF для розпізнавання за PIN"
 
-#: g10/card-util.c:2188
-#, fuzzy
-#| msgid "change the ownertrust"
+#: g10/card-util.c:2165
 msgid "change the key attribute"
-msgstr "змінити рівень довіри до власника"
+msgstr "змінити атрибут ключа"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/картка> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "Команда адміністратора\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "Команди адміністрування дозволено\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "Команди адміністрування заборонено\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Некоректна команда  (скористайтеся командою «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не вдалося відкрити «%s»\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ «%s» не знайдено: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2171,8 +2178,8 @@
 msgstr "підключ"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "помилка оновлення: %s\n"
@@ -2198,37 +2205,51 @@
 msgstr ""
 "спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "помилка під час спроби створення пароля: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не можна використовувати симетричний пакет ESK через режим S2K\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "використано шифр %s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» вже стиснено\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "УВАГА: файл «%s» є порожнім\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr ""
+"алгоритм створення контрольних сум «%s» не можна використовувати у режимі "
+"%s\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "читання з «%s»\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -2236,20 +2257,12 @@
 "УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+#: g10/encrypt.c:640 sm/encrypt.c:490
+#, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
+msgstr "УВАГА: ключ %s не можна використовувати для шифрування у режимі %s\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2258,42 +2271,41 @@
 "УВАГА: примусове використання алгоритму стиснення %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "примусове використання симетричного шифру %s (%d) не відповідає параметрам "
 "отримувача\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для «%s»\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#, c-format
 msgid "option '%s' may not be used in %s mode\n"
-msgstr "не можна використовувати %s у режимі %s\n"
+msgstr "параметр «%s» не можна використовувати у режимі %s\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Дані, зашифровані за алгоритмом %s\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "УВАГА: повідомлення зашифровано слабким ключем з симетричним шифруванням.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "проблема з обробкою зашифрованого пакета\n"
@@ -2390,7 +2402,7 @@
 msgstr " - пропущено"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "записуємо до «%s»\n"
@@ -2425,266 +2437,272 @@
 msgid "[User ID not found]"
 msgstr "[Ідентифікатор не знайдено]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "автоматично отримано «%s» за допомогою %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "Без відбитка"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "закритий ключ «%s» не знайдено: %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(перевірте аргумент параметра «%s»)\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "усі значення, передані «%s», проігноровано\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
 "uid\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "використовуємо підключ %s замість основного ключа %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "коректні значення параметра «%s»:\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "створити підпис"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "створити текстовий підпис"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "створити від’єднаний підпис"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "зашифрувати дані"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "шифрувати лише за допомогою симетричного шифру"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "розшифрувати дані (типова дія)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "перевірити підпис"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "показати список ключів"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "показати список ключів і підписів"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "показати список і перевірити підписи ключів"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "показати список ключів і відбитків"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "показати список закритих ключів"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "створити пару ключів"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "швидке створення пари ключів"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "швидке додавання нового ідентифікатора користувача"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "швидке відкликання ідентифікатора користувача"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "швидке встановлення нової дати завершення строку дії"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "повноцінне створення пари ключів"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "створити сертифікат відкликання"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "вилучити ключі з відкритого сховища ключів"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "вилучити ключів з закритого сховища ключів"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "швидко підписати ключ"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "швидко підписати ключ локально"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "швидке відкликання ідентифікатора користувача"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "підписати ключ"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "підписати ключ локально"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "підписати або редагувати ключ"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "змінити пароль"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "експортувати ключі"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "експортувати ключі на сервер ключів"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "імпортувати ключі з сервера ключів"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "шукати ключі на сервері ключів"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "оновити всі ключів з сервера ключів"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "імпортувати/об’єднати ключі"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "показати дані про стан картки"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "змінити дані на картці"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "змінити пінкод картки"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "оновити базу даних довіри"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "показати контрольні суми повідомлень"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "запустити у режимі сервера"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|встановити вказане правило TOFU для ключа"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "створити дані у форматі ASCII"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|USER-ID|використовувати для створення підписів або розшифрування вказаний "
 "ідентифікатор"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "використовувати канонічний текстовий режим"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|записати дані до вказаного файла"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "не вносити змін"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "запитувати перед перезаписом"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "строго використовувати стандарт OpenPGP"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2693,7 +2711,7 @@
 "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
 "довідника (man))\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2714,11 +2732,11 @@
 " --list-keys [назви]        показати ключі\n"
 " --fingerprint [назви]      показати відбитки\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2728,7 +2746,7 @@
 "Підписування, перевірка підписів, шифрування або розшифрування\n"
 "Типова дія залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2736,77 +2754,77 @@
 "\n"
 "Підтримувані алгоритми:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "Відкритий ключ: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "Шифр: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "Хеш: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "Стиснення: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "користування: %s [параметри] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "несумісні команди\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2814,21 +2832,21 @@
 "УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2836,508 +2854,489 @@
 "УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у списках ключів"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "показувати дані щодо використання ключа у списках ключів"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "показувати адреси правил у списках підписів"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "показувати всі примітки у списках підписів"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати стандартні примітки IETF у списках підписів"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки користувача у списках підписів"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адреси основних серверів ключів у списках підписів"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та застарілі ідентифікатори користувачів у списках "
 "ключів"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та застарілі підключі у списках ключів"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "показувати назву сховища ключів у списках ключів"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "невідомі правила TOFU «%s»\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить список можливих варіантів)\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» не є коректною адресою електронної пошти\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "некоректний режим pinentry, «%s»\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
-#, fuzzy, c-format
-#| msgid "invalid value for option '%s'\n"
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
+#, c-format
 msgid "invalid request origin '%s'\n"
-msgstr "некоректне значення параметра «%s»\n"
+msgstr "некоректне походження запиту «%s»\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором символів\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не вдалося обробити адресу сервера ключів\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри сервера ключів\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри сервера ключів\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортування\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортування\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "некоректний параметр фільтрування: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри експортування\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "некоректні параметри експортування\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови списку\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови списку\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під час перевірки підписів"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "показувати адреси правил під час перевірки підписів"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "показувати всі примітки під час перевірки підписів"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати стандартні примітки IETF під час перевірки підписів"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані користувачем примітки під час перевірки підписів"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адреси основних серверів ключів у списках перевірки підписів"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинність ідентифікаторів користувача під час перевірки підписів"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та застарілі ідентифікатори користувачів у списках "
 "перевірки підписів"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише основний ідентифікатор користувача під час перевірки підписів"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "перевірити підписи за допомогою даних PKA"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "підняти рівень довіри до підписів з коректними даними PKA"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдалося встановити шлях для запуску у значення %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний список auto-key-locate\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний список auto-key-locate\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВАГА: %s перевизначає %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна використовувати разом з %s!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, якщо використано %s!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "УВАГА: запущено з фіктивним системним часом: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифрування є некоректним\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм стискання є некоректним\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "значення completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значення marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "некоректне значення default-cert-level; має бути 0, 1, 2 або 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні особисті параметри шифрування\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні особисті параметри контрольної суми\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні особисті параметри стискання\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
-"%s\n"
-
-#: g10/gpg.c:3971
-#, fuzzy, c-format
-#| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+#: g10/gpg.c:3913
+#, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
-msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
+msgstr "алгоритм стискання «%s» не можна використовувати у режимі %s\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
 "ключем\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:4230
-#, fuzzy, c-format
-#| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+#: g10/gpg.c:4173
+#, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
 "s2k-mode 0\n"
 
-#: g10/gpg.c:4291
-#, fuzzy, c-format
-#| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+#: g10/gpg.c:4234
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
-"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
-"%s\n"
+"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під час спроби експортування ключа: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на сервері ключів: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновлення з сервера ключів: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворення з формату ASCII: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворення у формат ASCII: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешування «%s»\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
-msgstr ""
+msgstr "УВАГА: команд не надано. Намагаємося вгадати, що вам потрібно...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомлення...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адреса правил сертифікації є некоректною\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адреса правил підписування є некоректною\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адреса основного сервера ключів є некоректною\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|визначити ключі з файла сховища ключів ФАЙЛ"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|записувати до дескриптора файла дані щодо стану"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|відкидати підписи, створені за допомогою алгоритму ALGO"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Використання: gpgv [параметри] [файли] (-h — довідка)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3399,10 +3398,8 @@
 msgstr "припускати формат резервних копій ключів GnuPG"
 
 #: g10/import.c:203
-#, fuzzy
-#| msgid "show key during import"
 msgid "repair keys on import"
-msgstr "показувати ключ під час імпортування"
+msgstr "відновлювати ключі при імпортуванні"
 
 #: g10/import.c:380 g10/import.c:699
 #, c-format
@@ -3536,7 +3533,7 @@
 "оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
 "save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: немає ідентифікатор користувача\n"
@@ -3546,7 +3543,7 @@
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "відкинуто екранувальником імпорту"
 
@@ -3570,7 +3567,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиною цього може бути те, що немає самопідпису\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
@@ -3585,7 +3582,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "не виявлено придатного до запису сховища ключів: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
@@ -3655,17 +3652,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: «%s» не змінено\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: імпортовано закритий ключ\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: закритий ключ вже існує\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
@@ -3678,233 +3675,304 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
 "%s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "закритий ключ %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "імпортування закритих ключів заборонено\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "Причину не вказано"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "Ключ замінено"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "Ключ скомпрометовано"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "Ключ більше не використовується"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "Ідентифікатор користувача втратив чинність"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина відкликання: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "коментар щодо відкликання: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
 "відкликання\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
 "ідентифікатора користувача «%s»\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: немає підключа для зв’язування ключів\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: некоректне зв’язування підключів\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: немає підключа для відкликання ключа\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: некоректне відкликання підключа\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: вилучено кратне відкликання підключа\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущено підключ\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: додано безпосередній підпис ключа\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "помилка під час спроби отримання області пам’яті: %s\n"
+
+#: g10/key-check.c:396
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"неможливо перевірити підпис із непідтримуваним алгоритмом створення "
+"відкритого ключа (%d): %s.\n"
+
+#: g10/key-check.c:405
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"неможливо перевірити підпис із непідтримуваним алгоритмом створення "
+"контрольної суми %d: %s.\n"
+
+#: g10/key-check.c:571
+msgid " (reordered signatures follow)"
+msgstr " (нижче наведено перевпорядковані підписи)"
+
+#: g10/key-check.c:698
+#, c-format
+msgid "key %s:\n"
+msgstr "ключ %s:\n"
+
+#: g10/key-check.c:706
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "вилучено %d дублікат підпису\n"
+msgstr[1] "вилучено %d дублікати підписів\n"
+msgstr[2] "вилучено %d дублікатів підписів\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d підпис не перевірено через те, що немає ключа\n"
+msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
+msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d помилкових підпис\n"
+msgstr[1] "%d помилкових підписи\n"
+msgstr[2] "%d помилкових підписів\n"
+
+#: g10/key-check.c:732
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "перевпорядковано %d підпис\n"
+msgstr[1] "перевпорядковано %d підписи\n"
+msgstr[2] "перевпорядковано %d підписів\n"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Попередження: виявлено помилки, перевірка виконувалася лише для "
+"самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "створено сховище ключів «%s»\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "створено сховище ключів «%s»\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "ресурс блоку ключів «%s»: %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "помилка під час спроби відкрити базу даних ключів: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
@@ -4145,8 +4213,8 @@
 msgid "Really sign? (y/N) "
 msgstr "Підписати? (y/N або т/Н) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "помилка під час спроби підписування: %s\n"
@@ -4329,10 +4397,8 @@
 msgstr "Доступний закритий ключ.\n"
 
 #: g10/keyedit.c:1465
-#, fuzzy
-#| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
-msgstr "Доступний закритий ключ.\n"
+msgstr "Доступні закриті підключі.\n"
 
 #: g10/keyedit.c:1567
 msgid "Need the secret key to do this.\n"
@@ -4349,7 +4415,7 @@
 "  «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
 "  (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "Ключ відкликано."
 
@@ -4402,7 +4468,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "Вилучити основний ключ? (y/N або т/Н) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "Вам слід вибрати лише один ключ.\n"
 
@@ -4479,7 +4545,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "Вийти без збереження? (y/N або т/Н) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
@@ -4525,107 +4591,120 @@
 msgid "Nothing to sign.\n"
 msgstr "Нічого підписувати.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "Не підписано вами.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "невдала спроба перевірити створений підпис: %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» не є коректним записом завершення строку дії\n"
 
-#: g10/keyedit.c:2925
-#, fuzzy, c-format
-#| msgid "\"%s\" is not a fingerprint\n"
+#: g10/keyedit.c:3159
+#, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
-msgstr "«%s» не є відбитком\n"
+msgstr "«%s» не є належним відбитком\n"
 
-#: g10/keyedit.c:2949
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found\n"
+#: g10/keyedit.c:3183
+#, c-format
 msgid "subkey \"%s\" not found\n"
-msgstr "ключ «%s» не знайдено\n"
+msgstr "не знайдено підключ «%s»\n"
+
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "Контрольна сума: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "Можливості: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "Сервер ключів без можливості зміни"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Основний сервер ключів: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "Примітки: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Цей ключ може бути відкликано %s ключем %s"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(важливий)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "створено: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "відкликано: %s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "не діє з: %s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "діє до: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "використання: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "номер картки: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "надійність: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "чинність: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "Цей ключ було вимкнено"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4633,17 +4712,17 @@
 "Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
 "до перезапуску програми.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "відкликано"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "збіг строк дії"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4654,17 +4733,17 @@
 "              цієї команди можна зробити основним інший ідентифікатор "
 "користувача.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4674,35 +4753,35 @@
 "до відмови\n"
 "         у використанні цього ключа деякими версіями PGP.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4710,20 +4789,20 @@
 msgstr[1] "Вилучено %d підписи.\n"
 msgstr[2] "Вилучено %d підписів.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "Нічого не вилучено.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "некоректний"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4731,17 +4810,17 @@
 msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
 msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4751,42 +4830,42 @@
 "призвести до відмови\n"
 "         у використанні цього ключа деякими версіями PGP.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "не можна призначати ключ власним підписаним відкликанням\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "цей ключ вже було позначено як призначений для відкликання\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
 "Н) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4794,245 +4873,237 @@
 "Ви справді хочете змінити час вичерпання строку дії для декількох підключів? "
 "(y/N або т/Н) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Зміна часу завершення строку дії для підключа.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Зміна часу завершення строку дії для основного ключа.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
 
-#: g10/keyedit.c:4547
-#, fuzzy
-#| msgid "Changing expiration time for a subkey.\n"
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
-msgstr "Зміна часу завершення строку дії для підключа.\n"
+msgstr "Змінюємо використання підключа.\n"
 
-#: g10/keyedit.c:4550
-#, fuzzy
-#| msgid "Changing expiration time for the primary key.\n"
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
-msgstr "Зміна часу завершення строку дії для основного ключа.\n"
+msgstr "Змінюємо використання основного підключа.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "підписування підключа %s вже перехресно сертифіковано\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "підключ %s не призначено для підписування, отже його не потрібно перехресно "
 "сертифікувати\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "Вкажіть адресу вашого основного сервера ключів: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "Вкажіть примітку: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "Продовжувати? (y/N або т/Н) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ідентифікатора користувача з індексом %d не існує\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора користувача з хешем %s не існує\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індексом %d не існує\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Ідентифікатор користувача: «%s»\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "підписано вашим ключем %s %s%s%s\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (неекспортовний)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Строк дії цього підпису завершується %s.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "Не підписано вами.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (невідкликуваний)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "відкликано вашим ключем %s у %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "Ви маєте намір відкликати ці підписи:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "немає закритого ключа\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "спроба відкликати ідентифікатор, який не належить користувачеві: %s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ідентифікатор користувача «%s» вже відкликано\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
 "майбутньому\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Підключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "некоректне значення параметра «%s»\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "запис переваги «%s» продубльовано\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "занадто багато записів переваг шифрів\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "занадто багато записів переваг контрольних сум\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "занадто багато записів переваг стискання\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "некоректний запис «%s» у рядку переваг\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "записування безпосереднього підпису\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "записування самопідпису\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "записування підпису прив’язування ключа\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "розмір ключа округлено до %u-бітового\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5040,19 +5111,19 @@
 "УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
 "розміром контрольної суми\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "Підписати"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "Сертифікувати"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "Зашифрувати"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "Пройти розпізнавання"
 
@@ -5066,163 +5137,163 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Можливі дії з ключем %s: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "Поточні дозволені дії: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) увімкнути або вимкнути можливість підписування\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) увімкнути або вимкнути можливість шифрування\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 "   (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) вийти\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA і RSA (типовий)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA і Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (лише підписування)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (лише підписування)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (лише шифрування)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (лише шифрування)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (із визначенням можливостей власноруч)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (із визначенням можливостей власноруч)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC та ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (лише підписування)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (із визначенням можливостей власноруч)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (лише шифрування)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) Вже записаний ключ\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) Вже записаний ключ з картки\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "Вкажіть keygrip: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "Немає ключів з таким значенням keygrip\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "помилка читання картки: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серійний номер картки: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "Доступні ключі:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Якою має бути довжина підключа? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запитана довжина ключа — %u бітів\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Вкажіть потрібну вам еліптичну криву:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5238,7 +5309,7 @@
 "      <n>m = строк чинності у n місяців\n"
 "      <n>y = строк чинності у n років\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5254,38 +5325,38 @@
 "      <n>m = строк чинності підпису у n місяців\n"
 "      <n>y = строк чинності підпису у n років\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "Яким є строк чинності ключа? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Яким є строк чинності підпису? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "некоректне значення\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "Ключ не має обмеження строку дії\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "Підпис не має обмеження строку дії\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ діє до %s\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Підпис діє до %s\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5293,11 +5364,11 @@
 "У вашій системі неможливий показ дат після 2038 року.\n"
 "Але програма коректно оброблятиме ці дати до 2106 року.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "Все правильно? (y/N або т/Н) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5312,7 +5383,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5329,49 +5400,49 @@
 "    \"Ivan Ivanenko (farmer) <iivanenko@moyahata.ua>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "Справжнє ім’я: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "Некоректний символ у імені\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Не можна використовувати символи «%s» і «%s» у назві\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "Ім’я не може починатися з цифри\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ім’я має бути не коротшим за 5 літер\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "Адреса ел. пошти: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "Некоректна адреса електронної пошти\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "Коментар: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "Некоректний символ у коментарі\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Вами використано таблицю символів «%s».\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5382,7 +5453,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@ -5399,32 +5470,32 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "Спочатку виправте помилку\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5436,13 +5507,13 @@
 "під час створення простого числа. Це надасть змогу генератору\n"
 "псевдовипадкових чисел створити краще випадкове число.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Помилка під час спроби створення ключа: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5453,66 +5524,66 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "Продовжити? (Y (так)/n (ні)) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ для «%s» вже існує\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "Створити попри це? (y (так)/N (ні)) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "створюємо попри усе\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
 "створення ключа.\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Створення ключа скасовано.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "записуємо відкритий ключ до «%s»\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "відкритий і закритий ключі створено і підписано.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5520,7 +5591,7 @@
 "Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
 "скористатися командою «--edit-key» для створення підключа з цією метою.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5528,7 +5599,7 @@
 "ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
 "проблема з годинником)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5536,22 +5607,22 @@
 "ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
 "або проблема з годинником)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Закриті частини основного ключа недоступні.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Закриті частини основного ключа зберігаються на картці.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "Створити? (y/N або т/Н) "
 
@@ -5587,22 +5658,6 @@
 msgstr[1] "%d добрих підписи\n"
 msgstr[2] "%d добрих підписів\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d помилкових підпис\n"
-msgstr[1] "%d помилкових підписи\n"
-msgstr[2] "%d помилкових підписів\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d підпис не перевірено через те, що немає ключа\n"
-msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
-msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5625,29 +5680,29 @@
 msgid "Keyring"
 msgstr "Сховище ключів"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "Основний відбиток ключа:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "      Відбиток підключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "Відбиток основного ключа:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "       Відбиток підключа:"
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      Відбиток ключа ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "Серійний номер картки ="
 
@@ -5680,7 +5735,7 @@
 msgstr[1] " (%lu підписи)\n"
 msgstr[2] " (%lu підписів)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створено сховище ключів\n"
@@ -5732,7 +5787,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5740,450 +5795,450 @@
 msgstr[1] "оновлюємо %d ключі з %s\n"
 msgstr[2] "оновлюємо %d ключів з %s\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "УВАГА: не вдалося оновити ключ %s за допомогою %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ «%s» не знайдено на сервері ключів\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не знайдено на сервері ключів\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "надсилаємо запит щодо ключа %s до %s сервера %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "надсилаємо запит щодо ключа %s з %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "немає відомих серверів ключів\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено «%s»: %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "надсилаємо ключ %s на %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "надсилаємо запит щодо ключа з «%s»\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "дивний розмір для зашифрованого ключа сеансу (%d)\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "зашифрований %s ключ сеансу\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 "пароль створено за допомогою невідомого алгоритму створення контрольних сум "
 "%d\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "відкритий ключ — %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "зашифровані відкритим ключем дані: належний DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, створено "
 "%s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключем %s, ідентифікатор %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "невдала спроба розшифровування відкритим ключем: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано за допомогою %lu паролів\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано за допомогою 1 пароля\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "припускаємо, що дані зашифровано %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Шифр IDEA недоступний, спробуємо скористатися замість нього %s\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "УВАГА: цілісність повідомлення не захищено\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "невдала спроба розшифрування: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "розшифровано\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "невдала спроба розшифрування: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "початкова назва файла=«%.*s»\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "підпису не знайдено\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПОМИЛКОВИЙ підпис від «%s»"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Прострочений підпис від «%s»"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Належний підпис від «%s»"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "перевірку підписів придушено\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Підпис створено %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               за допомогою %s ключа %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               видавець «%s»\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ доступний на: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[непевний]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                або «%s»"
 
-#: g10/mainproc.c:2323
-#, fuzzy, c-format
-#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+#: g10/mainproc.c:2438
+#, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
-msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
+msgstr ""
+"УВАГА: цей ключ не можна використовувати для підписування у режимі %s\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Строк дії підпису вичерпано %s\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Підпис діє до %s\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "двійковий"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "текстовий"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "невідомо"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не вдалося перевірити підпис: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не є від’єднаним підписом\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "окремий підпис класу 0x%02x\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "підпис у застарілому форматі (PGP 2.x)\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "помилка fstat щодо «%s» у %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "помилка fstat(%d) у %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "УВАГА: використовуємо експериментальний алгоритм створення відкритого ключа "
 "%s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
 "УВАГА: ключі підписування і шифрування Elgamal вважаються застарілими\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "УВАГА: використовуємо експериментальний алгоритм шифрування %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "УВАГА: використовуємо експериментальний алгоритм обчислення контрольних сум "
 "%s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "УВАГА: алгоритм обчислення контрольних сум %s вважається застарілим\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "Note: signatures using the %s algorithm are rejected\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "(повідомлена помилка: %s)\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "(повідомлена помилка: %s <%s>)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "(подальша інформація: "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: застарілий параметр «%s»\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "УВАГА: «%s» вважається застарілим параметром\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "будь ласка, скористайтеся «%s%s»\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "УВАГА: «%s» вважається застарілою командою — не користуйтеся нею\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: «%s» є застарілим у цьому файлі — він працює лише у %s\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "УВАГА: «%s%s» є застарілим параметром — він не працюватиме, окрім як на %s\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "Нестиснений"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "uncompressed|немає"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначний параметр «%s»\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "невідомий параметр «%s»\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "невідома слабка контрольна сума «%s»\n"
@@ -6216,73 +6271,73 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "припускаємо підписані дані у «%s»\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "робота з алгоритмом створення відкритого ключа %d неможлива\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "УВАГА: потенційно небезпечний зашифрований симетричним алгоритмом ключ "
 "сеансу\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Критична примітка підпису: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "підпакет типу %d містить критичний набір бітів\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема з агентом: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "Вкажіть пароль\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "скасовано користувачем\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ідентифікатор основного ключа %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Вкажіть пароль для розблокування закритого ключа OpenPGP:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Вкажіть пароль для імпортування закритого ключа OpenPGP:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Вкажіть пароль для експортування закритого підключа OpenPGP:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Вкажіть пароль для експортування закритого ключа OpenPGP:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Справді хочете остаточно вилучити закритий підключ OpenPGP:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Справді хочете остаточно вилучити закритий ключ OpenPGP:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6339,7 +6394,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Це потрібна вам фотографія (y/N/q)? "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "показ фотоідентифікатора неможливий!\n"
@@ -6644,12 +6699,12 @@
 msgid "no valid addressees\n"
 msgstr "немає коректних адрес\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@ -6690,10 +6745,9 @@
 msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
 
 #: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:493
-#, fuzzy, c-format
-#| msgid "certificate is not usable for encryption\n"
+#, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
-msgstr "сертифікат непридатний для шифрування\n"
+msgstr "ключ %s не можна використовувати для розшифровування у режимі %s\n"
 
 #: g10/pubkey-enc.c:131
 #, c-format
@@ -6705,27 +6759,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "добре, ми є анонімним отримувачем.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "застаріле кодування DEK не підтримується\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрування %d%s є невідомим або вимкненим\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "УВАГА: не виявлено алгоритму шифрування %s у перевагах отримувача\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "ЗАУВАЖЕННЯ: строк дії закритого ключа %s завершився %s\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "ЗАУВАЖЕННЯ: ключ було відкликано"
@@ -6923,11 +6977,10 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "УВАГА: конфлікт контрольних сум підписів у повідомленні\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
+#, c-format
 msgid "key %s may not be used for signing in %s mode\n"
-msgstr "не можна використовувати %s у режимі %s\n"
+msgstr "ключ %s не можна використовувати для підписування у режимі %s\n"
 
 #: g10/sig-check.c:199
 #, c-format
@@ -7002,30 +7055,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
 
-#: g10/sig-check.c:482
-#, fuzzy, c-format
-#| msgid "standalone signature of class 0x%02x\n"
+#: g10/sig-check.c:480
+#, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
-msgstr "окремий підпис класу 0x%02x\n"
+msgstr "помилковий підпис з ключа %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "окремий підпис класу 0x%02x\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "припускаємо помилковий підпису від ключа %s через невідомий критичний біт\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: немає підключа для підпису відкликання підключа\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: немає підключа для підпису прив’язування підключа\n"
@@ -7054,12 +7106,12 @@
 "УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
 "(занадто велика). Використовуємо нерозгорнутою.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s підпис від: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7067,12 +7119,12 @@
 "УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
 "відповідає параметрам отримувача\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "підписування:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "Буде використано шифрування %s\n"
@@ -7100,7 +7152,7 @@
 "це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
 "для підписування!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запис щодо довіри %lu, тип %d: помилка записування: %s\n"
@@ -7145,12 +7197,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "помилка читання у «%s»: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: помилка синхронізації: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "не вдалося створити блокування для «%s»\n"
@@ -7160,12 +7212,12 @@
 msgid "can't lock '%s'\n"
 msgstr "не вдалося заблокувати «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "запис trustdb %lu: помилка lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "запис trustdb %lu: помилка запису (n=%d): %s\n"
@@ -7180,103 +7232,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталогу не існує!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "немає доступу до «%s»: %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: не вдалося створити запис щодо версії: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: створено некоректну trustdb\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: створено trustdb\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "ЗАУВАЖЕННЯ: запис до trustdb заборонено\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: некоректна trustdb\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: не вдалося створити таблицю хешів: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: помилка оновлення запису версії: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: помилка читання запису версії: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: помилка записування запису версії: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: помилка lseek: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: помилка читання (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не є файлом trustdb\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запис версії з номером запису %lu\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: некоректна версія файла %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: помилка під час спроби читання вільного запису: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: помилка записування запису каталогу (dir): %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: не вдалося обнулити запис: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: не вдалося додати запис: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Помилка: trustdb пошкоджено.\n"
@@ -7529,10 +7581,8 @@
 "(B)Поганий? "
 
 #: g10/tofu.c:1975
-#, fuzzy
-#| msgid "Defaulting to unknown."
 msgid "Defaulting to unknown.\n"
-msgstr "Типовим значенням є «невідомий»."
+msgstr "Типовим значенням є «невідомий».\n"
 
 #: g10/tofu.c:2090 g10/tofu.c:2225
 #, c-format
@@ -7688,107 +7738,106 @@
 msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
 
 #: g10/tofu.c:3531
-#, fuzzy, c-format
-#| msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+#, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: шифруємо до %s, для якого не виявлено не відкликаних "
-"ідентифікаторів користувача.\n"
+"ідентифікаторів користувача\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: прийнято як надійний ключ\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s зустрічається у trustdb декілька разів\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: немає відкритого ключа для надійного ключа — пропущено\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s позначено як ключ з необмеженою довірою\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запис довіри %lu, тип запиту %d: помилка читання: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запис довіри %lu не належить до вказаного типу %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Ви можете спробувати повторно створити trustdb за допомогою команд:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 "Якщо результат буде незадовільним, будь ласка, зверніться до підручника\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "використання невідомої моделі довіри (%d) неможливе — припускаємо модель "
 "довіри %s\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "використовуємо модель довіри %s\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "потреби у перевірці trustdb немає\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "наступну перевірку trustdb призначено на %s\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "потреби у перевірці trustdb на основі моделі довіри «%s» немає\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "відкритий ключ %s не знайдено: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "перевірка trustdb\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7796,7 +7845,7 @@
 msgstr[1] "оброблено %d ключі"
 msgstr[2] "оброблено %d ключів"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7804,17 +7853,17 @@
 msgstr[1] " (очищено %d значення чинності)\n"
 msgstr[2] " (очищено %d значень чинності)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "не знайдено ключів з необмеженою довірою\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7822,7 +7871,7 @@
 "глибина: %d  чинність: %3d  підписано: %3d  надійність: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@ -7932,65 +7981,80 @@
 "Синтаксис: kbxutil [параметри] [файли]\n"
 "Перегляд, експортування, імпортування даних Keybox\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Будь ласка, вкажіть пінкод для ключа, призначеного для створення якісних "
+"підписів."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Вкажіть пінкод для стандартних ключів."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 "Не знайдено основи числення RSA або основа числення не належить до %d-"
 "бітових\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 "Не вистачає відкритого показника RSA або розмірність показника перевищує %d "
 "бітів\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Зворотний виклик пінкоду повернув повідомлення про помилку: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN ще не було змінено\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Вкажіть новий пінкод для стандартних ключів."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||Вкажіть пінкод для стандартних ключів."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Будь ласка, вкажіть новий код розблокування пінкоду (PUK) для "
 "стандартних ключів."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для стандартних "
 "ключів."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Будь ласка, вкажіть новий пінкод для ключа, призначеного для створення "
 "якісних підписів."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
-"||Будь ласка, вкажіть пінкод для ключа, призначеного для створення якісних "
-"підписів."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -7998,7 +8062,7 @@
 "|NP|Будь ласка, вкажіть новий код розблокування пінкоду (PUK) для створення "
 "якісних підписів."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8006,47 +8070,47 @@
 "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для створення якісних "
 "підписів."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "помилка під час отримання нового пінкоду: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "не вдалося зберегти відбиток: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "не вдалося зберегти дату створення: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "помилка отримання стану CHV з картки\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "відповідь не містить основи числення RSA\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "відповідь не містить відкритого показника RSA\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "відповідь не містить відкритого ключа еліптичної кривої\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "відповідь не містить даних відкритого ключа\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "помилка читання відкритого ключа: %s\n"
@@ -8054,58 +8118,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "використовуємо типовий пінкод як %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "не вдалося використати типовий пінкод як %s: %s — вимикаємо подальше типове "
 "використання\n"
 
-#: scd/app-openpgp.c:2224
-#, fuzzy
-#| msgid "||Please enter the PIN"
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
-msgstr "||Вкажіть пінкод"
+msgstr "||Будь ласка, розблокуйте картку"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "Пінкод для CHV%d занадто короткий; мінімальна довжина — %d\n"
 
-#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "помилка перевірки CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "картку заблоковано!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8122,24 +8172,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Вкажіть адміністративний пінкод"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "доступ до адміністративних команд не налаштовано\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||Вкажіть пінкод"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Вкажіть код скидання коду картки"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Занадто короткий код скидання; мінімальна довжина — %d\n"
@@ -8147,88 +8197,88 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|Новий код скидання"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новий адміністративний пінкод"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|Новий пінкод"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Вкажіть адміністративний пінкод та новий адміністративний пінкод"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Вкажіть пінкод та новий пінкод"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "помилка читання даних програми\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "помилка читання відбитка DO\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ вже існує\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "вже створений ключ буде замінено\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "створення нового ключа\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "записування нового ключа\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "не вказано часової позначки створення\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "Не знайдено простого числа RSA %s або число не належить до %d-бітових\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "не вдалося зберегти ключ: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "непідтримувана крива\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "зачекайте на завершення створення ключа...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "помилка під час створення ключа\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8236,33 +8286,33 @@
 msgstr[1] "створення ключа завершено (за %d секунди)\n"
 msgstr[2] "створення ключа завершено (за %d секунд)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "некоректна структура картки OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "відбиток на картці не відповідає запитаному\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "вже створено підписів: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@ -8278,55 +8328,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|Початковий новий пінкод"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "запустити у режимі декількох серверів (основному режимі)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|встановити вказаний рівень діагностики"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|записувати журнал до файла"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|з’єднатися зі зчитувачем на вказаному порту"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|використовувати вказаний драйвер ct-API"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|використовувати вказаний драйвер PC/SC"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "не використовувати вбудованого драйвера CCID"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|від’єднати бездіяльну вказану кількість секунд картку"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "не використовувати додаткову клавіатуру зчитувача"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "заборонити використання команд з адміністрування картки"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "використовувати змінну довжину вхідних даних для зчитувача"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Використання: @SCDAEMON@ [параметри] (-h — довідка)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8334,310 +8384,327 @@
 "Синтаксис: scdaemon [параметри] [команди [аргументи]]\n"
 "Фонова служба карток пам’яті для @GNUPG@\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
 "фоновому режимі\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "запущено запуск обробки для дескриптора %d\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "роботу обробника для дескриптора %d перервано\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "модель перевірки, запитана сертифікатом: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "ланцюжок"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "оболонка"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "не підтримується критичне розширення сертифікації %s"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "сертифікат видавця не позначено як сертифікат служби сертифікації (CA)"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "правила, позначені як критичні, без налаштування"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "не вдалося відкрити «%s»: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Зауваження: заборонено некритичні правила сертифікації"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "заборонено правила сертифікації"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "не вдалося отримати відбиток\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "пошук видавця за зовнішньою адресою\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "кількість відповідних видавців: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "не вдалося отримати authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "пошук видавця у кеші dirmngr\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "кількість відповідних сертифікатів: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "не вдалося розмістити дескриптор keyDB\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "сертифікат відкликано"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "стан сертифікату є невідомим"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "будь ласка, переконайтеся, що «dirmngr» встановлено належним чином\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "помилка під час перевірки CRL: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертифікат з некоректною чинністю: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "сертифікат ще не набув чинності"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "кореневий сертифікат ще не набув чинності"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "проміжний сертифікат ще не набув чинності"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "строк дії сертифіката завершився"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "строк дії кореневого сертифіката завершився"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "строк дії проміжного сертифіката завершився"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "не вистачає обов’язкових атрибутів сертифіката: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "сертифікат з некоректною чинністю"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "підпис не було створено під час строку дії сертифіката"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "сертифікат не було створено під час строку чинності видавця"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "проміжний сертифікат не було створено під час строку чинності видавця"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       підпис створено "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (   сертифікат створено "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (   сертифікат чинний з "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     видавець чинний з "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "відбиток=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "кореневий сертифікат було позначено як надійний\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "не увімкнено інтерактивне позначення надійності у gpg-agent\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "інтерактивне позначення надійності вимкнено для цього сеансу\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "УВАГА: невідомий час створення підпису — припускаємо поточний час"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "у сертифікаті не було знайдено даних щодо видавця"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "кореневий сертифікат не позначено як надійний"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "помилка перевірки списку довіри: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "занадто довгий ланцюжок сертифікації\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не знайдено видавця сертифіката"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "сертифікат має ПОМИЛКОВИЙ підпис"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "виявлено інший можливий відповідний сертифікат служби сертифікації (CA) — "
 "повторюємо спробу"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "ланцюжок сертифікації є довшим за дозволений CA (%d)"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "сертифікат є належним\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "належний проміжний сертифікат\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "належний кореневий сертифікат\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "перемикаємося на ланцюгову модель"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "використана модель перевірки: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-бітовий хеш не є коректним для %u-бітового ключа %s\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "вихід за межі області пам’яті\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(це алгоритм MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "немає"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[Помилка — некоректне кодування]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[Помилка — вихід за межі пам’яті]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[Помилка — немає назви]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[Помилка — некоректний DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8652,141 +8719,141 @@
 "С/Н %s, ідентифікатор 0x%08lX,\n"
 "створено %s, застаріває %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не вказано використання ключа — припускаємо всі можливі використання\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "сертифікат не мав використовуватися для сертифікації\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "сертифікат не мав використовуватися для підписування відповідей OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "сертифікат не мав використовуватися для шифрування\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "сертифікат не мав використовуватися для підписування\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "сертифікат непридатний для шифрування\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "сертифікат непридатний для підписування\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "рядок %d: некоректний алгоритм\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 "рядок %d: некоректна довжина ключа %u (коректні значення: від %d до %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "рядок %d: не вказано назви призначення\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "рядок %d: некоректна мітка назви призначення «%.*s»\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "рядок %d: некоректна назва призначення «%s» на позиції %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "рядок %d: некоректна адреса електронної пошти\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "рядок %d: некоректний серійний номер\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "рядок %d: некоректна мітка назви видавця «%.*s»\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "рядок %d: некоректна назва видавця «%s» на позиції %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "рядок %d: вказано некоректну дату\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr ""
 "рядок %d: помилка під час спроби отримання ключа підписування за допомогою "
 "keygrip «%s»: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "рядок %d: вказано некоректний алгоритм хешування\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "рядок %d: некоректний authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "рядок %d: некоректне значення subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "рядок %d: некоректний синтаксис розширення\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "рядок %d: помилка читання ключа «%s» з картки: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr ""
 "рядок %d: помилка під час отримання ключа за допомогою keygrip «%s»: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "рядок %d: помилка створення ключа: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8921,7 +8988,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "сертифіката «%s» не знайдено: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "помилка під час блокування сховища ключів: %s\n"
@@ -8946,126 +9013,126 @@
 msgid "no valid recipients given\n"
 msgstr "не вказано коректних отримувачів\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "показати ключ зовнішніх ключів"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "показати ланцюжок сертифікації"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "імпортувати сертифікати"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "експортувати сертифікати"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "зареєструвати картку пам’яті"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "передати команду dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "виклик gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "створити дані, закодовані у BASE64"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "вважати вхідні дані даними у форматі PEM"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "вважати вхідні дані даними у форматі BASE64"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "вважати вхідні дані даними у двійковому форматі"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "не використовувати САС"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "перевіряти чинність за допомогою OCSP"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "кількість сертифікатів, які слід включити"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взяти дані щодо правил з вказаного файла"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "не перевіряти правила сертифікатів"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "Надіслати запит щодо незнайдених сертифікатів видавця"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "взагалі не використовувати термінал"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|записувати журнал режиму сервера до файла"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|записувати журнал перевірки до файла"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "пакетний режим: нічого не запитувати"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "вважати відповіддю на більшість питань «так»"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "вважати відповіддю на більшість питань «ні»"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|додати сховище ключів до списку сховищ ключів"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 "|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "використовувати цей сервер ключів для пошуку"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|використовувати вказаний алгоритм шифрування"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|NAME|використовувати вказаний алгоритм обчислення контрольної суми "
 "повідомлення"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Використання: @GPGSM@ [параметри] [файли] (-h — довідка)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9076,47 +9143,47 @@
 "протоколу S/MIME\n"
 "Типова дія залежатиме від вхідних даних\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "невідома модель перевірки «%s»\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: не вказано назви вузла\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: вказано пароль, але не вказано користувача\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: пропускаємо цей рядок\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "не вдалося обробити сервер ключів\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "імпортуємо загальні сертифікати «%s»\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "підписування за допомогою «%s» неможливе: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "некоректна команда (немає неявної команди)\n"
@@ -9136,7 +9203,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "помилка під час основних перевірок сертифіката — не імпортовано\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
@@ -9146,42 +9213,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "помилка під час спроби імпортування сертифіката: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "помилка під час спроби читання вхідних даних: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "не вдалося отримати відбиток\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "проблем з пошуком вже створеного сертифіката: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "помилка під час спроби знайти придатну до запису keyDB: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "помилка під час спроби збереження сертифіката: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "проблема з повторним пошуком сертифіката: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "помилка під час спроби збереження позначок: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "Помилка - "
 
@@ -9217,7 +9279,7 @@
 "\n"
 "%s%sВи справді хочете це зробити?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9254,22 +9316,23 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "помилка перевірки якості сертифікатів: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "Підпис створено "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[дату не вказано]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " використовуємо ідентифікатор сертифіката 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "алгоритм: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9277,17 +9340,17 @@
 "некоректний підпис: атрибут контрольної суми повідомлення не збігається з "
 "обчисленою сумою\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "Правильний підпис від"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                або"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Це якісний підпис\n"
@@ -9355,276 +9418,274 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "помилка під час спроби завантаження сертифіката «%s»: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "остаточно завантажені сертифікати: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    динамічно кешовані сертифікати: %u\n"
 
-#: dirmngr/certcache.c:820
-#, fuzzy, c-format
-#| msgid "    runtime cached certificates: %u\n"
+#: dirmngr/certcache.c:823
+#, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
-msgstr "    динамічно кешовані сертифікати: %u\n"
+msgstr "           довірені сертифікати: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "сертифікат вже кешовано\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "сертифікат кешовано\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "помилка під час спроби кешування сертифіката: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "некоректний рядок відбитка SHA1 «%s»\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "помилка під час спроби отримання сертифіката за серійним номером: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "помилка під час спроби отримання сертифіката за призначенням: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "у сертифікаті не виявлено запису видавця\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "помилка під час спроби отримання authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "створення каталогу «%s»\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "помилка під час спроби створення каталогу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ігноруємо каталог бази даних «%s»\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "помилка під час спроби читання каталогу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "вилучаємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "не вилучаємо файл «%s»\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "помилка під час спроби закриття файла кешу: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "не вдалося відкрити файл каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "помилка під час спроби створення нового файла каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "помилка під час спроби запису нового файла каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "помилка під час спроби закриття нового файла каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "створено новий файл каталогу кешу «%s»\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "не вдалося повторно відкрити файл каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "першим записом «%s» не є версія\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "застаріла версія каталогу кешу — спорожнюємо\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "застаріла версія каталогу кешу — пропускаємо\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "виявлено зайве поле у записі CRL «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "виявлено некоректний рядок у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "виявлено дублікат запису у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "непідтримуваний тип запису у «%s», рядок %u пропущено\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "некоректний хеш видавця у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "немає DN видавця «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "некоректна позначка часу у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "УВАГА: некоректний хеш файла кешу у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "виявлено помилки у файлі каталогу кешу\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "будь ласка, перевірте причину і вилучіть цей файл вручну\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "не вдалося створити тимчасовий файл каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "помилка під час спроби закрити «%s»: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "помилка під час спроби перейменування «%s» на «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "не вдалося хешувати «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "помилка під час спроби встановлення контексту хешування MD5: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "помилка під час спроби хешування «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "некоректне форматування контрольної суми для «%s»\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "забагато відкритих файлів кешу; більше файлів відкрити не можна\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "відкриваємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "помилка під час спроби відкриття файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "помилка під час спроби ініціалізації файла кешу «%s» для читання: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "виклик unlock_db_file для закритого файла\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "виклик unlock_db_file для розблокованого файла\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "не вдалося створити об’єкт кешування: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "немає CRL для ідентифікатора видавця %s\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "кешований CRL для ідентифікатора видавця %s є занадто старим; потрібне "
 "оновлення\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9633,203 +9694,205 @@
 "задіяно force-crl-refresh і %d хвилин тому передано для ідентифікатора "
 "видавця %s; потрібне оновлення\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "задіяно force-crl-refresh для ідентифікатора видавця %s; потрібне оновлення\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "доступний CRL для ідентифікатора видавця %s не може бути використано\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "кешований CRL для ідентифікатора видавця %s підроблено; потрібне оновлення\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "УВАГА: некоректна довжина запису кешу для серійного номера "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr ""
 "проблема під час спроби читання запису кешування для серійного номера %s: "
 "%s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "серійний номер %s не є коректним; причина=%02X дата=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "серійний номер %s є коректним, його немає у CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "помилка під час спроби отримання даних з файла кешу: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "невідомий алгоритм хешування «%s»\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "помилка використання gcry_md_open для алгоритму %d: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "отримано некоректний вираз S з libksba\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "спроба перетворення виразу S зазнала невдачі: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "невідомий алгоритм хешування «%s»\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "помилка використання gcry_md_open для алгоритму %d: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "спроба створення виразу S зазнала невдачі: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "помилка ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "помилка під час спроби отримання даних щодо часу оновлення з CRL: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "часи оновлення цього CRL: поточне=%s наступне=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не вказано nextUpdate; вважаємо періодом чинності один день\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "помилка під час спроби отримання запису CRL: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "помилка під час спроби додавання пункту до файла тимчасового кешу: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "не виявлено видавця CRL у CRL: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "пошук видавця CRL сертифіката за authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "помилка перевірки підпису CRL: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "помилка під час спроби перевірки чинності сертифіката видавця CRL: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "помилка ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "помилка ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "вилучено застарілий тимчасовий файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під час спроби вилучення застарілого тимчасового файла кешу «%s»: "
 "%s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "помилка під час спроби створення тимчасового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "помилка crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під час спроби завершення запису тимчасового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "помилка під час спроби закриття тимчасового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "УВАГА: новий CRL все ще занадто старий; його строк дії завершується %s — "
 "попри це завантажуємо\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "новий CRL все ще занадто старий; його строк дії завершується %s\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "невідомий критичний додаток CRL %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "помилка під час читання додатків CRL: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "створюємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема під час перейменування «%s» на «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9838,12 +9901,12 @@
 "помилка під час спроби оновлення файла каталогу — запис кешу буде втрачено "
 "під час наступного запуску програми\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Початок дампу CRL (отримано за допомогою %s)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9851,54 +9914,54 @@
 " ПОМИЛКА: CRL не буде використано, оскільки він все ще застарілий після "
 "оновлення!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " ПОМИЛКА: CRL не буде використано через невідомий критичний додаток!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ПОМИЛКА: CRL не буде використано\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ПОМИЛКА: цей кешований CRL можливо було підроблено!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " УВАГА: некоректна довжина запису кешу\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема під час читання запису кешу: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема під час спроби читання ключа кешу: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "помилка під час спроби читання запису кешу з бази даних: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "Кінець дампу CRL\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "помилка crl_fetch за DP: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "помилка crl_cache_insert за DP: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "помилка crl_cache_insert за видавцем: %s\n"
@@ -9936,57 +9999,57 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "пошук сертифікатів неможливий через вимкнений %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "використовувати OCSP замість CRL"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "перевірити, чи запущено dirmngr"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "додати сертифікат до кешу"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "перевірити сертифікат"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "шукати сертифікат"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "шукати лише локально збережені сертифікати"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "очікувати адресу для --lookup"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "завантажити CRL до dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "особливий режим для використання Squid"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "сертифікати мало бути вказано у форматі PEM"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "примусово використовувати типовий відповідач OCSP"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "Використання: dirmngr-client [параметри] [файл_сертифіката|шаблон] (-h — "
 "довідка)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9998,82 +10061,82 @@
 "Процес повертає 0, якщо сертифікат є коректним, 1 якщо він не є\n"
 "коректним, інші коди для загальних помилок.\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "помилка під час спроби читання сертифіката з stdin: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "помилка під час спроби читання сертифіката з «%s»: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "сертифікат занадто великий для використання\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "не вдалося встановити з’єднання з dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "помилка пошуку: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "спроба завантаження CRL «%s» завершилася невдало: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "фонову службу dirmngr запущено\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "не вдалося перевірити сертифікат: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "сертифікат є коректним\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "сертифікат відкликано\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "помилка під час перевірки сертифіката: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "отримано стан: «%s»\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "помилка під час спроби запису у кодуванні base64: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "непідтримуваний запит «%s»\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "мало бути вказано абсолютний шлях до файла\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "пошук «%s»\n"
@@ -10098,92 +10161,92 @@
 msgid "flush the cache"
 msgstr "спорожнити кеш"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|записувати журнал режиму сервера до файла"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "запустити без запиту до користувача"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "примусове завантаження застарілих САС"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "дозволити надсилання запитів OCSP"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "дозволити інтерактивну перевірку версії програмного забезпечення"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "заборонити використання HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "заборонити використання LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "ігнорувати точки поширення САС протоколу HTTP"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "ігнорувати точки поширення САС протоколу LDAP"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ігнорувати адреси служб OCSP з сертифікатами"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не використовувати резервні вузли з --ldap-proxy"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|встановити вказаний час очікування даних від LDAP"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|відповідь OCSP підписано FPR"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|повертати не більше за вказану кількість записів на запит"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10193,11 +10256,11 @@
 "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
 "довідника (man) «info»)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10205,134 +10268,134 @@
 "Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
 "Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "коректними рівнями зневаджування є: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "використання: %s [параметри]"
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "не можна використовувати двокрапки у назві сокета\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "помилка під час обробки CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: занадто довгий рядок — пропущено\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: виявлено некоректний відбиток\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: помилка під час читання: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "примусове завершення роботи\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "отримано сигнал %d — дій не визначено\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "повернути всі значення у форматі записів"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr ""
 "|NAME|ігнорувати частину вузла і встановити з’єднання за вказаною назвою"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|встановити з’єднання з вузлом за вказаною назвою"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|встановити з’єднання на вказаному порті"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|використовувати вказаного користувача для розпізнавання"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|використовувати вказаний пароль для розпізнавання"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "визначити пароль за $DIRMNGR_LDAP_PASS"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|надіслати запит до DN щодо вказаного рядка"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|використовувати вказаний рядок для фільтрування"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|повернути атрибут за вказаним рядком"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "Використання: dirmngr_ldap [параметри] [адреса] (-h — довідка)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10342,145 +10405,139 @@
 "Вбудований допоміжний інструмент LDAP для Dirmngr\n"
 "Інтерфейс і параметри можуть змінюватися без додаткового оголошення\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "некоректний номер порту %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "сканування результату для атрибуту «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "помилка під час спроби запису до stdout: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          доступний атрибут «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "атрибут «%s» не знайдено\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "знайдено атрибут «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "обробка адреси «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          користувач «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          прохід «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          вузол «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          порт %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        фільтр «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          атрибут «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "у «%s» немає назви вузла\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "не вказано атрибута для запису «%s»\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "УВАГА: використано буде лише перший атрибут\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "спроба прив’язування до «%s:%d» зазнала невдачі: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "помилка під час спроби пошуку «%s»: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "«%s» не є адресою LDAP\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "«%s» є некоректною адресою LDAP\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "помилка під час спроби доступу до «%s»: стан http %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "Адресу «%s» переспрямовано до «%s» (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "занадто багато переспрямувань\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "записуємо до «%s»\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "помилка під час спроби отримання області пам’яті: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10531,7 +10588,7 @@
 msgid "malloc failed: %s\n"
 msgstr "помилка malloc: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: некоректний шаблон «%s»\n"
@@ -10661,11 +10718,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "не вдалося розмістити контекст OCSP: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "не вдалося отримати authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10734,7 +10786,7 @@
 msgstr "у ідентифікаторі сертифіката немає серійного номера"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "помилка assuan_inquire: %s\n"
@@ -10764,32 +10816,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "перевищено max_replies у %d\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "не вдалося розмістити структуру керування: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "не вдалося розмістити контекст assuan: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "не вдалося ініціалізувати сервер: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема з прийняттям Assuan: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "помилка обробки за допомогою Assuan: %s\n"
@@ -10828,56 +10880,56 @@
 msgid "certificate chain is good\n"
 msgstr "коректний ланцюжок сертифікації\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "сертифікат не мав використовуватися для підписування CRL\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "без повідомлень"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "вивести дані у шістнадцятковому форматі"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "декодувати отримані рядки даних"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "з’єднатися з dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|встановити з’єднання з вказаним сокетом Assuan"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|встановити з’єднання з сервером Assuan за вказаною адресою"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "запустити сервер Assuan, вказаний у командному рядку"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "не використовувати розширений режим з’єднання"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|виконати команди з вказаного файла під час запуску"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "виконати /subst під час запуску"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Використання: @GPG@-connect-agent [параметри] (-h — довідка)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10885,45 +10937,45 @@
 "Синтаксис: @GPG@-connect-agent [параметри]\n"
 "Встановити з’єднання з запущеним агентом і надіслати команди\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 "щоб скористатися параметром «%s», слід вказати програму та додаткові "
 "аргументи\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр «%s» проігноровано через «%s»\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "помилка під час спроби отримання рядка: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "рядок є надто довгим, його пропущено\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "рядок скорочено через вбудований символ Nul\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "невідома команда «%s»\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "помилка надсилання рядка: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "помилка під час спроби надсилання стандартних параметрів: %s\n"
@@ -11116,94 +11168,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Скористайтеся спочатку командою «toggle».\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Помилка зовнішньої перевірки компонента %s"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "Зауважте, що специфікації груп буде проігноровано\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "помилка під час спроби закрити «%s»\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "помилка під час спроби обробити «%s»'\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "показати список всіх компонентів"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "перевірити всі програми"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|показати список параметрів"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|змінити параметри"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|перевірити параметри"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "застосувати загальні типові значення"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|оновити файли налаштувань на основі файла ФАЙЛ"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "отримати назви каталогів налаштувань для @GPGCONF@"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "показати загальний файл налаштувань"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "перевірити загальний файл налаштувань"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "надіслати запит до бази даних версій програмного забезпечення"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "перезавантажити всі або вказаний компонент"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "запустити вказаний компонент"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "завершити роботу вказаного компонента"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "використати файл для виведення даних"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "якщо можна, задіяти зміни у динамічному режимі"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Використання: @GPGCONF@ [параметри] (-h — довідка)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11211,203 +11263,150 @@
 "Синтаксис: @GPGCONF@ [параметри]\n"
 "Керування параметрами налаштування інструментів системи @GNUPG@\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "Слід вказати один аргумент компонента"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "Компонент не знайдено"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "Не можна вказувати аргументів"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr ""
+"Використання: gpg-check-pattern [параметри] файл_шаблонів (-h — довідка)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Команди:\n"
-" "
+"Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
+"Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "спосіб розшифрування"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
 
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "спосіб шифрування"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Команди:\n"
+#~ " "
 
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "клас інструмента (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "спосіб розшифрування"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "назва файла програми"
+#~ msgid "encryption modus"
+#~ msgstr "спосіб шифрування"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "файл закритого ключа (обов’язковий)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "клас інструмента (confucius)"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "назва файла виведених даних (типово stdin)"
+#~ msgid "program filename"
+#~ msgstr "назва файла програми"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Використання: symcryptrun [параметри] (-h — довідка)"
+#~ msgid "secret key file (required)"
+#~ msgstr "файл закритого ключа (обов’язковий)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Синтаксис: symcryptrun --class КЛАС --program ПРОГРАМА --keyfile ФАЙЛ_КЛЮЧА "
-"[параметри...] КОМАНДА [файл_вхідних_даних]\n"
-"Виклик інструмента простого симетричного шифрування\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "назва файла виведених даних (типово stdin)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "перервано спробу виконання %s для %s зі станом %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Використання: symcryptrun [параметри] (-h — довідка)"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "невдала спроба виконання %s для %s зі станом %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Синтаксис: symcryptrun --class КЛАС --program ПРОГРАМА --keyfile "
+#~ "ФАЙЛ_КЛЮЧА [параметри...] КОМАНДА [файл_вхідних_даних]\n"
+#~ "Виклик інструмента простого симетричного шифрування\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "не вдалося створити тимчасовий каталог «%s»: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "перервано спробу виконання %s для %s зі станом %i\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "не вдалося відкрити %s для запису: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "невдала спроба виконання %s для %s зі станом %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "помилка під час запису до %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "не вдалося створити тимчасовий каталог «%s»: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "помилка читання з %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "не вдалося відкрити %s для запису: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "помилка під час спроби закрити %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "помилка під час запису до %s: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "не вказано параметра --program\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "помилка читання з %s: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "передбачено підтримку лише --decrypt і --encrypt\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "помилка під час спроби закрити %s: %s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "параметра --keyfile не передбачено\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "не вказано параметра --program\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "не вдалося розмістити у пам’яті вектор аргументів\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "передбачено підтримку лише --decrypt і --encrypt\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "не вдалося створити канал: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "параметра --keyfile не передбачено\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "не вдалося створити pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "не вдалося розмістити у пам’яті вектор аргументів\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "не вдалося створити відгалуження: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "не вдалося створити канал: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "помилка execv: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "не вдалося створити pty: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "помилка select: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "не вдалося створити відгалуження: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "помилка читання: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "помилка execv: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "помилка читання з pty: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "помилка select: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "помилка waitpid: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "помилка читання: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "дочірня підпрограма завершила роботу зі станом %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "помилка читання з pty: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "не вдалося розмістити у пам’яті рядок infile: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "помилка waitpid: %s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "не вдалося розмістити у пам’яті рядок outfile: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "дочірня підпрограма завершила роботу зі станом %i\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "має бути вказано %s або %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "не вдалося розмістити у пам’яті рядок infile: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "не вказано клас\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "не вдалося розмістити у пам’яті рядок outfile: %s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "підтримки класу %s не передбачено\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "має бути вказано %s або %s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Використання: gpg-check-pattern [параметри] файл_шаблонів (-h — довідка)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "не вказано клас\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
-"Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "підтримки класу %s не передбачено\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " використовуємо ідентифікатор сертифіката 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11527,43 +11526,6 @@
 #~ msgstr ""
 #~ "Помилка: особисті дані D0 є занадто довгими (максимум — %d символів).\n"
 
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr ""
-#~ "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
-#~ "відкритого ключа (%d): %s.\n"
-
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr ""
-#~ "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
-#~ "контрольної суми %d: %s.\n"
-
-#~ msgid " (reordered signatures follow)"
-#~ msgstr " (нижче наведено перевпорядковані підписи)"
-
-#~ msgid "key %s:\n"
-#~ msgstr "ключ %s:\n"
-
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "вилучено %d дублікат підпису\n"
-#~ msgstr[1] "вилучено %d дублікати підписів\n"
-#~ msgstr[2] "вилучено %d дублікатів підписів\n"
-
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "перевпорядковано %d підпис\n"
-#~ msgstr[1] "перевпорядковано %d підписи\n"
-#~ msgstr[2] "перевпорядковано %d підписів\n"
-
-#~ msgid ""
-#~ "Warning: errors found and only checked self-signatures, run '%s' to check "
-#~ "all signatures.\n"
-#~ msgstr ""
-#~ "Попередження: виявлено помилки, перевірка виконувалася лише для "
-#~ "самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
-
 #~ msgid ", "
 #~ msgstr ", "
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/zh_CN.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/zh_CN.gmo sont différents
diff -Nru gnupg2-2.2.20/po/zh_CN.po gnupg2-2.2.27/po/zh_CN.po
--- gnupg2-2.2.20/po/zh_CN.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/zh_CN.po	2021-01-11 18:47:18.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.3.0-beta485\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2018-12-07 20:59+0800\n"
 "Last-Translator: Chuhao Li <lchopn@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -20,7 +20,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "获取 pinentry 锁失败: %s\n"
@@ -31,45 +31,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|好"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|取消"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|是"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|否"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN："
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|在密码管理器中保存"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "您真的想要使您的密码在屏幕上可见吗？"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|使密码可见"
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|隐藏密码"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "强度："
 
@@ -79,33 +79,33 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "请输入您的 PIN，从而为此会话解锁私钥"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入您的密码，从而为此会话解锁私钥"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr "PIN："
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "密码："
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "不匹配 - 请重试"
 
@@ -113,36 +113,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "重复："
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "PIN 太长"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "密码太长"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "PIN 中含有无效字符"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "错误的 PIN"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
@@ -151,31 +155,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "长度超过 %d 位的 ssh 密钥不被支持\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "无法创建 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "无法打开 ‘%s’： %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -234,7 +238,7 @@
 "请输入一个密码，以便于在 gpg-agent 的密钥存储中保护接收到的私钥 %%0A   %s"
 "%%0A   %s%%0A"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "从以下套接字创建流时失败： %s\n"
@@ -359,17 +363,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告：您输入了一个不安全的密码。"
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "请输入密码以%0A保护您的新密钥"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密码"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -377,134 +381,134 @@
 "@选项:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模式运行 （后台）"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "以服务进程模式运行 （前台）"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "以管理进程模式运行"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读取选项"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "未能从控制台分离"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "为服务器使用日志文件"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 作为 PIN-Entry 程序"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 作为 SCdaemon 程序"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "不使用 SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "忽略改变 TTY 的请求"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "忽略改变 X display 的请求"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒后过期"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "在签名时不使用 PIN 缓存"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 msgid "disallow the use of an external password cache"
 msgstr "禁止使用一个外部的密码缓存"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "禁止客户端将一个密钥标记为“信任”"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "允许预设置的密码"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr "禁止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "运行密码通过 Emacs 回显"
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "启用 ssh 支持"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "启用 putty 支持"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "请向 <@EMAIL@> 报告程序缺陷。\n"
 "请向 <i18n-zh@googlegroups.com> 邮件列表反映简体中文的翻译问题或建议。\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法： @GPG_AGENT@ [选项] （-h 获取帮助）"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -512,147 +516,135 @@
 "语法： @GPG_AGENT@ [options] [command [args]]\n"
 "@GNUPG@ 私钥管理器\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "注意：没有默认配置文件‘%s’\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "选项文件‘%s’：%s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注意：‘%s’不被认为是一个选项\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字名称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "一个 gpg-agent 实例正在运行 - 不启动新的实例\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获取套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的权限： %s\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监听套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "无法创建目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读取 fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "句柄 0x%lx 于文件描述符 %d 启动\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "句柄 0x%lx 于文件描述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 句柄 0x%lx 于文件描述符 %d 启动\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 句柄 0x%lx 于文件描述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "此会话中没有 gpg-agent 实例运行\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法： gpg-preset-passphrase [选项] KEYGRIP (-h 获取帮助)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -660,8 +652,8 @@
 "语法： gpg-preset-passphrase [options] KEYGRIP\n"
 "密码缓存管理\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -669,9 +661,9 @@
 "@命令：\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -681,11 +673,11 @@
 "选项：\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法： gpg-protect-tool [选项] (-h 获取帮助)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -693,21 +685,21 @@
 "语法：gpg-protect-tool [options] [args]\n"
 "私钥管理工具\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码以解密 PKCS#12 对象。"
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码以保护新的 PKCS#12 对象。"
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "请输入密码以在 GnuPG 系统内部保护已导入的对象。"
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -715,18 +707,18 @@
 "请输入所需的密码或者 PIN\n"
 "以完成这一操作。"
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "请求密码时出现错误： %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "打开‘%s’时出现错误：%s\n"
@@ -736,32 +728,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "文件‘%s’ 的第 %d 行：%s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "已忽略声明 “%s” ，其位于‘%s’的第 %d 行\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "系统信任列表 ‘%s’ 不可用\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "错误的指纹，其位于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "无效的密钥标记，其位于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "读取 ‘%s’ 的第 %d 行时出现错误：%s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "读取受信任的根证书列表时出现错误\n"
@@ -774,18 +766,18 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "您要无限地信任%%0A  “%s”%%0A为正确的认证用户证书吗?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "是"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "否"
@@ -798,7 +790,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -808,35 +800,35 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "正确"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "错误"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注意：此密码从未被修改过。%0A请立即修改。"
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "此密码自从 %.4s-%.2s-%.2s 起未被修改过。%%0A请立即修改。"
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "更改密码"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "我要稍后修改"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -844,11 +836,11 @@
 msgstr ""
 "您真的想要删除这个被以下的 keygrip 所标识的密钥吗 %%0A  %s%%0A  %%C%%0A？"
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "删除密钥"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -856,12 +848,12 @@
 "警告：这个密钥也被列为用于 SSH！\n"
 "删除这个密钥可能使您失去访问远程主机的能力。"
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 要求散列值长度为 8 位的倍数\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s 密钥使用了一个不安全的（%u 位）散列\n"
@@ -871,7 +863,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu 位的散列对于一个 %u 位的 %s 密钥无效\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
@@ -881,7 +873,7 @@
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公钥算法 %d (%s) 不被支持\n"
@@ -910,7 +902,7 @@
 msgstr "为管道创建流时出现错误： %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "在 fork 进程时出现错误： %s\n"
@@ -956,27 +948,27 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent 的选项设置存在问题\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告： %s 具有不安全的文件所有权 “%s”\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：%s 具有不安全的文件权限位 “%s”\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "等待 ‘%s’ 可被访问...\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "将 ‘%s’ 重命名为 ‘%s’ 时失败：%s\n"
@@ -1036,7 +1028,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "在分配足够的内存时出现错误： %s\n"
@@ -1153,7 +1145,7 @@
 msgstr "算法： %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "不支持的算法：%s"
@@ -1228,39 +1220,39 @@
 msgid "Root certificate trustworthy"
 msgstr "根证书可靠"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "未找到该证书的证书吊销列表（CRL）"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "可用的证书吊销列表（CRL）太旧"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "针对证书的 CRL/OCSP 检查"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "包括的证书"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "没有审计日志条目。"
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "未知操作"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent 可用"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr 可用"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "没有关于 ‘%s’ 的可用帮助。"
@@ -1269,7 +1261,7 @@
 msgid "ignoring garbage line"
 msgstr "忽略无用行"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[未设定]"
 
@@ -1278,82 +1270,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "无效的 radix64 字符 %02x 已被跳过\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "未预期的参数"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "读取错误"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "关键字太长"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "无效的参数"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "无效的命令"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "无效的别名定义"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "out of core"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "无效的命令"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "未知命令‘%s’\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "与预期不符的字符封装： "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "无效的选项"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s” 的参数缺失\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s” 的参数无效\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "选项 “%.50s” 不需要参数\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "无效的命令 \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "选项 “%.50s” 含义模糊\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "命令 “%.50s” 含义模糊\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "out of core\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "无效的选项 “%.50s”\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "注意：没有默认配置文件‘%s’\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "选项文件‘%s’：%s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1369,42 +1393,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "从 ‘%s’ 转换到 ‘%s’ 时失败：%s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "创建临时文件 ‘%s’ 失败： %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "移除旧的锁文件 （由 %d 创建）\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "等待锁（由 %d%s 持有） %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "（死锁？） "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "锁 ‘%s’ 未被建立： %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "等待锁 %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需要 %s，拥有 %s）\n"
@@ -1582,13 +1605,13 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "注意： 使用 “%s” 来重启他们。\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s 与 %s 模式不兼容\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
@@ -1635,24 +1658,24 @@
 msgid "server uses an invalid certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "字符封装：%s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡，号码为 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
@@ -1662,140 +1685,140 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "这一命令只在版本 2 的卡上可用\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "重置代码不可用或不再可用\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "您的选择是？ "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr "先生"
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 #, fuzzy
 #| msgid "Mrs."
 msgid "Ms."
 msgstr "女士"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "非强制"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "强制"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用纯 ASCII 字符。\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符 “<”。\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "卡片持有人的姓： "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "卡片持有人的名： "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成后的姓名太长（至多 %d 个字符）。\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "拉取公钥的 URL： "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "读取 ‘%s’ 时出现错误：%s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "登录数据（帐户名）： "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "个人 DO 数据： "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "语言偏好： "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：偏好字符串长度无效。\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：偏好字符串中存在无效字符。\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 #, fuzzy
 #| msgid "Salutation (M = Mr., F = Mrs., or space): "
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "称呼（M = 先生，F = 女士，或者留空)： "
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "CA 指纹： "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "密钥操作无法实现：%s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "替换现存的密钥？(y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested\n"
@@ -1812,97 +1835,97 @@
 "     请检查您的卡片的文档以确定支持哪种密钥\n"
 "     类型和长度。\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要使用的密钥长度？(%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥长度必须在 %u 与 %u 间\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr "正在改变卡片的密钥属性： "
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 msgid "Signature key\n"
 msgstr "签名密钥\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 msgid "Encryption key\n"
 msgstr "加密密钥\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 msgid "Authentication key\n"
 msgstr "身份验证密钥\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥类型：\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "此卡片将会被重新配置以生成一个 %u 位的新密钥\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "此卡片将会被重新配置以生成一个以下类型的密钥： %s\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "改变密钥 %d 的密钥属性时出现错误： %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "获取卡片信息时出现错： %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "此命令不被此卡片支持\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "创建加密密钥的离卡备份？ (Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注意： 已有密钥被存储于卡片上！\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "替换现存的密钥？(y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1913,165 +1936,165 @@
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要生成的密钥类型：\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 身份验证密钥\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失败： %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注意： 这一命令将会销毁所有储存于卡片上的密钥！\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 msgid "Continue? (y/N) "
 msgstr "继续？ (y/N) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "真的要执行恢复出厂设置吗？ (输入“yes”) "
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "退出此菜单"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "显示此帮助"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "更改拉取密钥的 URL"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "更改语言偏好"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 msgid "change card holder's salutation"
 msgstr "变更卡片持有人的称呼"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "开关签名的强制 PIN 设置"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "使用重置代码解锁 PIN"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr "销毁所有密钥和数据"
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 msgid "setup KDF for PIN authentication"
 msgstr "针对 PIN 身份验证设置 KDF"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 msgid "change the key attribute"
 msgstr "更改密钥属性"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "管理员命令可用\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "管理员命令不可用\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的命令  （尝试“help”）\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "无法打开 ‘%s’\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "未找到密钥 ‘%s’：%s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2130,8 +2153,8 @@
 msgstr "子密钥"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
@@ -2156,95 +2179,101 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "创建密码时出现错误：%s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "由于在 S2K 模式，不能使用一个对称的 ESK 封包\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, fuzzy, c-format
 #| msgid "using cipher %s.%s\n"
 msgid "using cipher %s\n"
 msgstr "使用密文 %s.%s\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "密文算法 ‘%s’ 可能不能被用于 %s 模式\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "摘要算法‘%s’不能在 %s 模式下使用\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告： 强制对称密文 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "密文算法 ‘%s’ 可能不能被用于 %s 模式\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告： 密钥 %s 在 %s 模式下不适用于加密\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告： 强制压缩算法 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行对称密文算法 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, fuzzy, c-format
 #| msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s 已加密给 \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "选项 ‘%s’ 可能不能用于 %s 模式\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, fuzzy, c-format
 #| msgid "%s.%s encrypted data\n"
 msgid "%s encrypted data\n"
 msgstr "%s.%s 已加密的数据\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告： 消息使用了一个弱密钥以对称密文的形式加密\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密封包时出现问题\n"
@@ -2334,7 +2363,7 @@
 msgstr " - 已跳过"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "正在写入‘%s’\n"
@@ -2369,262 +2398,268 @@
 msgid "[User ID not found]"
 msgstr "[用户标识未找到]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "自动拉取‘%s’，通过 %s\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "拉取‘%s’通过 %s 时出现错误： %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "无指纹"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "正在通过 %s 检查一个已过期密钥的新拷贝\n"
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥 “%s”：%s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "（检查选项 ‘%s’ 的参数）\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告：未使用‘%s’作为默认密钥：%s\n"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "使用 “%s” 作为默认签名用私钥\n"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "传递给‘%s’的所有值被忽略\n"
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子密钥 %s 而非主密钥 %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "生成一份签名"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "生成一份明文签名"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称密文加密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "解密数据（默认）"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "生成一个新的密钥对"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "快速生成一个新的密钥对"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 msgid "quickly add a new user-id"
 msgstr "快速添加一个新的用户标识"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 msgid "quickly revoke a user-id"
 msgstr "快速吊销一个用户标识"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 msgid "quickly set a new expiration date"
 msgstr "快速设置一个过期日期"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "完整功能的密钥对生成"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "快速签名一个密钥"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "快速本地签名一个密钥"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly revoke a user-id"
+msgid "quickly revoke a key signature"
+msgstr "快速吊销一个用户标识"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "签名一个密钥"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "本地签名一个密钥"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "签名或编辑一个密钥"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "个密钥导出到一个公钥服务器上"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "在公钥服务器上搜索密钥"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有密钥"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "打印卡片状态"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "更改卡片上的数据"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "更改卡片的 PIN"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "更新信任数据库"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "打印消息摘要"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "以服务器模式运行"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|设置一个密钥的 TOFU 政策"
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "创建 ASCII 字符封装的输出"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|为 USER-ID 加密"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|使用 USER-ID 来签名或者解密"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为禁用）"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "使用规范的文本模式"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|写输出到 FILE"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "不做任何更改"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "覆盖前提示"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "使用严格的 OpenPGP 行为"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2632,7 +2667,7 @@
 "@\n"
 "（请参考手册页以获得所有命令和选项的完整列表）\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2652,11 +2687,11 @@
 " --list-keys [names]        列出密钥\n"
 " --fingerprint [names]      显示指纹\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法： @GPG@ [options] [files] (-h 获取帮助)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2666,7 +2701,7 @@
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2674,568 +2709,557 @@
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "公钥： "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "密文： "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "散列： "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "压缩：  "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法： %s [选项] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找不到 = 标志\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录权限位不安全\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的上级目录权限不安全\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的上级目录权限位不安全\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信息"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示所有注记"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子密钥"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help”来列出选择）\n"
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "注意：旧的默认配置文件‘%s’已被忽略\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注意：%s 不适用于一般使用！\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” 不是一个合适的邮件地址\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模式‘%s’\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "无效的请求来源‘%s’\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "在签名验证中只显示主要用户标识"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验证选项\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验证选项\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置运行路径为 %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储文件！\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s \n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允许与 %s 并用\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时不起作用\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚假的系统时间运行： "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, fuzzy, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, fuzzy, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大证书链深度（max-cert-depth）一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认认证级别（default-cert-level）；必须为 0，1，2 或 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小认证级别（default-cert-level）；必须为 1，2 或 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认偏好设置\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文偏好设置\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘要算法偏好设置\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "摘要算法‘%s’不能在 %s 模式下使用\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’不能在 %s 模式下使用\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您不能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "您不能在使用 --symmetric --sign --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "发送至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥服务器搜索失败：%s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥服务器刷新失败：%s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符封装时失败：%s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符封装时失败：%s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解析密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’不像是一个有效的密钥标识、指纹或者 keygrip\n"
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "警告：没有提供命令。正在尝试猜测您的意图...\n"
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消息…\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的证书策略 URL 无效\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|从钥匙环 FILE 文件中取得密钥"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲突仅视为警告"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr "|ALGO|拒绝由 ALGO 生成的签名"
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (-h 获取帮助)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3429,7 +3453,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的偏好设置：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
@@ -3439,7 +3463,7 @@
 msgid "key %s: %s\n"
 msgstr "密钥 %s： %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "被导入筛查器拒绝"
 
@@ -3463,7 +3487,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自签名所致\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
@@ -3478,7 +3502,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "写入钥匙环 ‘%s’ 时出现错误： %s\n"
@@ -3548,17 +3572,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s” 未改变\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "密钥 %s：私钥已存在\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "密钥 %s：发送至代理人程序时出现错误：%s\n"
@@ -3571,227 +3595,292 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "要迁移 ‘%s’，对每一张智能卡，执行：%s\n"
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "私钥 %s：%s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "私钥导入被禁止\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的密文算法 %d - 已跳过\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "吊销原因： "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "吊销注释： "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥 - 无法应用吊销证书\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块：%s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s - 已拒绝\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s” 吊销证书已被导入\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s” 使用了不支持的公钥算法\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s” 自身签名无效\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "密钥 %s：无效的直接密钥签名\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子密钥\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子密钥绑定\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子密钥绑定\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销用的子密钥\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子密钥吊销\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子密钥吊销\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识 “%s”\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子密钥\n"
 
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：非可导出签名（验证级别 0x%02X）- 已跳过\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误 - 已跳过\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名级别（0x%02X） - 已跳过\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识 - 已合并\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销用密钥 %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销用密钥 %s 不存在。\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已添加吊销证书 “%s”\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已添加直接密钥签名\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "分配内存时出现错误：%s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "密钥 %s：不支持的公钥算法\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "卡片不支持摘要算法 %s\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "良好签名来自于"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "密钥 %s： %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+#| msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "用户标识 “%s”：%d 个签名被移除\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d 个签名因密钥遗失而未被检查\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d 个损坏签名\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "良好签名来自于"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "创建钥匙箱‘%s’时出现错误：%s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "创建钥匙环‘%s’时出现错误：%s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "钥匙箱‘%s’已创建\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "钥匙环‘%s’已创建\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "密钥区块资源‘%s’：%s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "打开密钥数据库时出现错误：%s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
@@ -4022,8 +4111,8 @@
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N) "
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -4212,7 +4301,7 @@
 "  信任签名，‘nr’前缀（nrsign）进行不可吊销签名，\n"
 "  或者上述三种前缀的任意组合（ltsign、tnrsign 等）。\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
@@ -4265,7 +4354,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移动主密钥吗？(y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "您必须选择一个密钥。\n"
 
@@ -4339,7 +4428,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而退出吗？(y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变更所以不需要更新。\n"
@@ -4382,120 +4471,135 @@
 msgid "Nothing to sign.\n"
 msgstr "没有可被签名的东西。\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "并非由您签名。\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "检查已建立的签名时发生错误： %s\n"
+
+#: g10/keyedit.c:3116
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’不是一个有效的过期时间\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s” 不是一个正确的指纹\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "子密钥 “%s” 未找到\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr "AEAD： "
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "摘要： "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "特点： "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可修改"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器： "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "注记： "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "没有关于 PGP 2.x 样式用户标识的偏好设置。\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列密钥在 %s 被 %s 的密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这个密钥可被 %s 的密钥 %s 吊销"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "（敏感的）"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "吊销于：%s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "过期于：%s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "卡号： "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "这个密钥已经被禁用"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，所显示的密钥有效性不一定正确。\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4504,17 +4608,17 @@
 "警告： 没有用户标识被标记为主要。 此命令可能会\n"
 "              导致一个不同的用户标识被假定为主要。\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告： 您的加密用子密钥将在不久后过期。\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "您可能也想要变更它的过期日期。\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4523,70 +4627,70 @@
 "警告：这是一个 PGP2 样式的密钥。增加照片标识可能会导致某些版本的\n"
 "     PGP 拒绝这个密钥。\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "这样的用户标识已经存在于这个密钥上了！\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自签名吗？(y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识 “%s” 已被压缩：%s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "用户标识 “%s”：%d 个签名被移除\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识 “%s”：已被最小化\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识 “%s”：无用部分已清理\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4595,292 +4699,288 @@
 "警告：这是一个 PGP2 样式的密钥。增加指定吊销者\n"
 "     可能会导致某些版本的 PGP 无法识别这个密钥。\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识： "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
-#: g10/keyedit.c:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "这个密钥已被指派为一个吊销者\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥设置为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这个密钥设置为指定吊销者吗？(y/N)： "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "您确定要改变多个子密钥的过期时间吗？ (y/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子密钥的过期时间。\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主密钥的过期时间。\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的过期时间\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 msgid "Changing usage of a subkey.\n"
 msgstr "变更一个子密钥的用途。\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 msgid "Changing usage of the primary key.\n"
 msgstr "变更主密钥的用途。\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子密钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子密钥 %s 不签名，因此不需要被交叉验证\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "请选定仅一个用户标识。\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识 “%s” 上的 v3 自签名\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选公钥服务器的 URL： "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "输入注记： "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "没有属于密钥标识‘%s’的子密钥。\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子密钥\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "此签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "并非由您签名。\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经签名来密钥 %s 上的这些用户标识：\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 吊销于 %s\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "尝试吊销一个非用户标识：%s\n"
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识 “%s” 已经被吊销。\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "不能吊销最后一个有效的用户标识。\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 的照片标识，大小 %ld，属于密钥 %s （用户标识 %d）\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "选项‘%s’有无效的值\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "偏好设置‘%s’重复\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "过多的密文偏好设置\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "过多的散列算法偏好设置\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "过多的压缩算法偏好设置\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "正在写入自签名\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效；改用 %u 位\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr "警告：一些 OpenPGP 程序不能处理具有此摘要长度的 DSA 密钥\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "签名（Sign）"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "认证（Certify）"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "加密（Encrypt）"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "身份验证（Authenticate）"
 
@@ -4894,162 +4994,162 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥的可实现的功能： "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "目前启用的功能： "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 签名功能开关\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 加密功能开关\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 身份验证功能开关\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA 和 RSA （默认）\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA 和 Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA（仅用于签名）\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA（仅用于签名）\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal（仅用于加密）\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA（仅用于加密）\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA（自定义用途）\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA（自定义用途）\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC 和 ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC（仅用于签名）\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC（自定义用途）\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC（仅用于加密）\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) 现存的密钥\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) 卡片上现存的密钥\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "输入 keygrip： "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "不是一个有效的 keygrip （需要 40 位十六进制数）\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "没有此 keygrip 关联的密钥\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "读取卡片时出现错误：%s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "卡片的序列号：%s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "可用的密钥：\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥的长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "您想要为此子密钥使用的密钥长度？(%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "请求的密钥长度是 %u 位\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "请选择您想要使用的椭圆曲线：\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5065,7 +5165,7 @@
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5081,38 +5181,38 @@
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是？(%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "无效的值\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5120,11 +5220,11 @@
 "您的系统无法显示 2038 年以后的日期。\n"
 "然而，它可以正确地处理到 2106 年之前的日期。\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "这些内容正确吗？ (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5138,7 +5238,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5153,49 +5253,49 @@
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "真实姓名： "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "字符‘%s’和‘%s’不能出现在姓名中\n"
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "电子邮件地址： "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "注释： "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5206,7 +5306,7 @@
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -5221,31 +5321,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5256,13 +5356,13 @@
 "、移动鼠标、读写硬盘之类的）将会是一个不错的主意；这会让随机数\n"
 "发生器有更好的机会获得足够的熵。\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "密钥生成失败：%s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5273,64 +5373,64 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "继续吗？ (Y/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "一个 \"%s\" 的密钥已经存在\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "无论如何都要创建吗？(y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "无论如何都创建\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注意：使用 “%s %s” 以获得一个功能完整的密钥产生对话框。\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注意：卡片密钥的备份已保存到‘%s’\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在将公钥写至‘%s’\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "无可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并被签名。\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5338,34 +5438,34 @@
 "请注意这个密钥不能用于加密。您可能想要使用“--edit-key”命令来\n"
 "生成一个用于此用途的子密钥。\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥创建子密钥是不与 OpenPGP 兼容的\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主密钥的私钥部分不可用。\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主密钥的私钥部分存储在卡上。\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "真的要创建吗？(y/N) "
 
@@ -5399,18 +5499,6 @@
 msgid_plural "%d good signatures\n"
 msgstr[0] "%d 个良好签名\n"
 
-#: g10/keylist.c:479
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 个损坏签名\n"
-
-#: g10/keylist.c:483
-#, c-format
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "%d 个签名因密钥遗失而未被检查\n"
-
 #: g10/keylist.c:488
 #, c-format
 msgid "%d signature not checked due to an error\n"
@@ -5427,29 +5515,29 @@
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "主密钥指纹："
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "     子密钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr " 主密钥指纹："
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "      子密钥指纹："
 
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      密钥指纹 ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      卡片序列号 ="
 
@@ -5476,7 +5564,7 @@
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu 个签名)\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已创建\n"
@@ -5527,139 +5615,139 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” 不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "正在更新 %d 把密钥，从 %s \n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法通过 %s 更新密钥 %s ：%s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥 “%s”\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在请求密钥 %s 从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在请求密钥 %s 从 %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, c-format
 msgid "no keyserver known\n"
 msgstr "无已知的公钥服务器\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳过 “%s”： %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "正在发送密钥 %s 到 %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在从 %s 请求密钥\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "奇怪的加密会话密钥长度（%d）\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, fuzzy, c-format
 #| msgid "%s.%s encrypted session key\n"
 msgid "%s encrypted session key\n"
 msgstr "%s.%s 已加密的会话密钥\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密数据：完好的数据加密密钥（DEK）\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，标识为 %s，生成于 %s\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、密钥号为 %s\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告： 检测到多重纯文本\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 密文算法不可用，尝试使用 %s 代替\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：消息未受到完整性保护\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5669,304 +5757,304 @@
 "看起来此信息就是合法的。这是因为那个时候完整性\n"
 "保护还没有被广泛地采用。\n"
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "使用选项‘%s’来无论如何都要解密。\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "解密强制失败！\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发送者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书 - 请使用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理此有歧义的签名数据\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，密钥号 %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               签发者 \"%s\"\n"
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "密钥在以下地方可用： "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 “%s”"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告： 此密钥在 %s 模式下不适用于签名\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 签名，摘要算法 %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr "，密钥算法 "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "警告：不是一个分离签名；文件‘%s’没有被验证！\n"
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式（PGP 2.x）签名\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 方法在 %s 中失败 ：%s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中失败：%s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "警告：Elgamal 签名+加密的密钥已被弃用\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告：使用试验性质的密文算法 %s\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：散列算法 %s 已被弃用\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "注意：使用 %s 算法的签名已被拒绝\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "Note: signatures using the %s algorithm are rejected\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "注意：使用 %s 算法的签名已被拒绝\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "（已报告错误：%s）\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "（已报告错误：%s <%s>）\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr "（更多信息： "
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：被弃用的选项 “%s”\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s” 是一个已被弃用的选项\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请用“%s%s”代替\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s” 命令已被弃用 - 不要使用它\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: “%s” 在此文件中已被淘汰 - 其仅在 %s 中起作用\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "警告：“%s%s”是一个已经被淘汰的选项 - 它除了在 %s 上之外不起作用\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "此消息可能不能被 %s 使用\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA 公钥需要以 8 位的倍数的 SEC 进行编码\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "未知的弱摘要‘%s’\n"
@@ -5999,70 +6087,70 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "假定被签名的数据在‘%s’\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "未知的紧急签名注记： "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类型的子包设定了紧急位\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理人程序出现问题：%s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " （主密钥标识 %s）"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "请输入密码以解锁 OpenPGP 私钥："
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "请输入密码以导入 OpenPGP 私钥："
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "请输入密码以导出 OpenPGP 私密子密钥："
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "请输入密码以导出 OpenPGP 私钥："
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "您真的想要永久删除此 OpenPGP 私密子密钥吗："
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "您真的想要永久删除此 OpenPGP 私密密钥吗："
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6117,7 +6205,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
@@ -6412,12 +6500,12 @@
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注意：密钥 %s 没有 %s 特性\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注意：密钥 %s 没有关于 %s 的偏好设置\n"
@@ -6470,27 +6558,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名接收者。\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "密文算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：接收者的偏好设置中找不到密文算法 %s\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "注意：密钥已被吊销"
@@ -6677,7 +6765,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签名散列值与报文不一致\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "密钥 %s 在 %s 模式中不适用于签名\n"
@@ -6736,27 +6824,27 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "注意：签名密钥 %s 已被吊销\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "损坏的密钥签名来自密钥 %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "损坏的数据签名来自密钥 %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有用于子密钥吊销签名的子密钥\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有用于子密钥绑定签名的子密钥\n"
@@ -6779,23 +6867,23 @@
 "unexpanded.\n"
 msgstr "警告：首选公钥服务器 URL %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强制摘要算法 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, fuzzy, c-format
 #| msgid "%s.%s encryption will be used\n"
 msgid "%s encryption will be used\n"
@@ -6820,7 +6908,7 @@
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一个由 PGP 生成的 ElGamal 密钥，其用于签名时不安全！"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@ -6865,12 +6953,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "读取‘%s’时出现错误：%s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：sync 失败：%s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "无法为‘%s’创建锁\n"
@@ -6880,12 +6968,12 @@
 msgid "can't lock '%s'\n"
 msgstr "无法锁定‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
@@ -6900,103 +6988,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "无法访问‘%s’：%s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数据库\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出现错误： %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出现错误： %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "错误：信任度数据库已被破坏。\n"
@@ -7338,126 +7426,126 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "警告：正在加密给 %s，其不具有不可吊销的用户标识。\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’不是一个有效的长格式 keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：接受为受信任的密钥\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数据库中出现多于一次\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：受信任的密钥没有公钥 - 已跳过\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为绝对信任\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "您可以通过下列命令尝试重建信任度数据库：\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "如果那样不起作用，请查阅手册。\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型（%d）- 假定为 %s 信任模型\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "在‘%s’信任模型下无需进行 trustdb 检查\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "在‘%s’信任模型下无需进行 trustdb 更新\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "公钥 %s 未找到：%s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "已处理 %d 把密钥"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " （%d 个有效计数已被清除）\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "未找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任密钥 %s 的公钥未找到\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d  有效性：%3d  已签名：%3d  信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -7568,105 +7656,120 @@
 "语法：kbxutil [选项] [文件]\n"
 "列出、导出或导入钥匙箱数据\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr "%s数字: %s%%0A持有者: %s%s"
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "剩余尝试：%d"
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||请为这个密钥输入 PIN 以创建合格的签名。"
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||请输入标准密钥的 PIN。"
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "尚未变更 NullPIN\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|请为标准密钥输入一个新的 PIN。"
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||请输入标准密钥的 PIN。"
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请为标准密钥输入一个新的 PIN 解锁码（PUK）。"
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请输入标准密钥的 PIN 解锁码（PUK）。"
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|请为这个密钥输入一个新的 PIN 以创建合格的签名。"
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||请为这个密钥输入 PIN 以创建合格的签名。"
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|NP|请为这个密钥输入一个新的 PIN 解锁码（PUK）以创建合格的签名。"
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|请为这个密钥输入 PIN 解锁码（PUK）以创建合格的签名。"
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出现错误：%s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存储指纹失败：%s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存储创建日期失败：%s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡片中拉取 CHV 状态时出现错误\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应不包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应不包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "响应不包含 EC 公钥\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "响应不包含公钥数据\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "读取公钥失败：%s\n"
@@ -7674,54 +7777,42 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s数字: %s%%0A持有者: %s%%0A计数: %lu%s"
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr "%s数字: %s%%0A持有者: %s%s"
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr "剩余尝试：%d"
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "使用默认 PIN 作为 %s\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "使用默认 PIN 作为 %s 失败：%s - 禁用进一步的默认使用\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 msgid "||Please unlock the card"
 msgstr "||请解锁卡片"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "卡片被永久锁定！\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7730,24 +7821,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管理员 PIN"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "未配置到管理员命令的访问\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入卡片的重置代码"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重置代码太短；最小长度为 %d\n"
@@ -7755,119 +7846,119 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|新的重置代码"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|新的 PIN"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||请输入原管理员 PIN 和新管理员 PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||请输入原 PIN 和新 PIN"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 DO 时出现错误\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "正在写入新密钥\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存储密钥失败：%s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, c-format
 msgid "unsupported curve\n"
 msgstr "不支持的曲线\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "请等待密钥生成…\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "密钥生成完成（%d 秒）\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构（DO 0x93）\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指纹与请求的不匹配\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支持摘要算法 %s\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能访问 %s - 无效的 OpenPGP 卡？\n"
@@ -7883,55 +7974,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|初始化新 PIN"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "正在以多服务器模式运行（前台）"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|设置调试级别至 LEVEL"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|将日志写入 FILE"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|连接到端口 N 上的读卡器"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|使用 NAME 作为 ct-API 驱动"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|使用 NAME 作为 PC/SC 驱动"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "不使用内置的 CCID 驱动"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|在 N 秒的不活跃之后断开卡片的连接"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "不使用读卡器的小键盘"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "拒绝使用卡片的管理员命令"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "使用小键盘的变长输入"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法：@SCDAEMON@ [选项] (-h 获取帮助)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -7939,306 +8030,323 @@
 "语法：scdaemon [选项] [命令 [参数]]\n"
 "@GNUPG@ 智能卡守护进程\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "请使用‘--daemon’选项以在后台运行此程序\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d 的句柄已启动\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的句柄已关闭\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "证书所请求的验证模型：%s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "链"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "外壳"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "紧急认证扩展 %s 不被支持"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "签发者证书没有被标记为 CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "注意：非紧急认证策略不被允许"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "证书策略不被允许"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "获取指纹失败\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "在外部位置查找签发者\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "匹配的签发者数目：%d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "无法获取 authorityInfoAccess：%s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "在 Dirmngr 缓存中查找签发者\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "匹配的证书数：%d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr 仅缓存的密钥查找失败：%s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "分配 keyDB 句柄时失败\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "证书已被吊销"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "证书的状态未知"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "请确定“dirmngr”被正确安装\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查 CRL 时失败：%s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "证书的有效期无效：%s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "证书尚未验证"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "根证书尚未验证"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "中间证书尚未验证"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "证书已过期"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "根证书已过期"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "中间证书已过期"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "请求的证书属性缺失：%s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "证书有效期无效"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "签名不是在证书的有效期内被创建的"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "签名不是在签发者的有效期内被创建的"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "中间证书不是在签发者的有效期内被创建的"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  （  签名创建于 "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  （证书创建于 "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  （证书有效期从 "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  （    签发者有效期从 "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指纹 = %s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根证书现已被标记为信任\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "交互式标记为信任未在 gpg-agent 中开启\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "交互式标记为信任在此会话中被关闭\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告：签名的创建时间未知 - 猜测为当前时间"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "证书中没有找到签发者"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "自签名证书具有损坏的签名"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根证书未被标记为信任"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "证书链过长\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "签发者证书未找到"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "证书具有损坏的签名"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到另一个可能匹配的 CA 证书 - 正在重试"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "证书链长于 CA 允许的长度（%d）"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "证书有效\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中间证书有效\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根证书良好\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "正在切换为链模型"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用的验证模型：%s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "一个 %u 位的散列对于一个 %u 位的 %s 密钥是无效的\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "（这是 MD2 算法）\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "none"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[错误 - 无效编码]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[错误 - out of core]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[错误 - 无名称]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[错误 - 无效 DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8252,137 +8360,137 @@
 "S/N %s，ID 0x%08lX，\n"
 "创建于 %s，过期于 %s。\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "没有指定密钥用途 - 假设为所有用途\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "获取密钥用途信息时出现错误：%s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "证书本不应被用于认证\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "证书本不应被用于认 OCSP 响应签名\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "证书本不应被用于加密\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "证书本不应被用于签名\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "证书不可用于加密\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "证书不可用于签名\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "第 %d 行：无效的算法\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "第 %d 行：无效的密钥长度 %u （有效值为从 %d 到 %d）\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "第 %d 行：未指定主题名称\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "第 %d 行：无效的主题名称标签‘%.*s’\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "第 %d 行：无效的主题名称‘%s’位于 %d\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "第 %d 行：不是有效的电子邮件地址\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "第 %d 行：无效的序列号\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "第 %d 行：无效的签发者姓名标签‘%.*s’\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "第 %d 行：无效的签发者名称‘%s’，位于 %d\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "第 %d 行：无效的日期\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "第 %d 行：通过 keygrip '%s' 获取签名密钥时出现错误：%s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "第 %d 行：无效的散列算法\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "第 %d 行：无效的 authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "第 %d 行：无效的 subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "第 %d 行：无效的扩展语法\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "第 %d 行：读取密钥 '%s' 从以下卡片时出现错误: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "第 %d 行：通过 keygrip '%s' 获取密钥时出现错误：%s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "第 %d 行：密钥生成失败：%s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8513,7 +8621,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "证书‘%s’未找到：%s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "锁定钥匙箱时出现错误：%s\n"
@@ -8538,123 +8646,123 @@
 msgid "no valid recipients given\n"
 msgstr "未指定有效的接收者\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "列出外部密钥"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "列出证书链"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "导入证书"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "导出证书"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "注册一张智能卡"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "传递一条命令给 dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "调用 gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "创建 base-64 编码的输出"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "假定输入的是 PEM 格式"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "假定输入的是 base-64 格式"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "假定输入的是二进制格式"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "从不查询 CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "使用 OCSP 检查有效性"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|要包含的证书数目"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|从 FILE 处获取策略信息"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "不检查证书策略"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "获取缺失的签发者证书"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "始终不使用终端"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|将服务器模式的日志写入到 FILE"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|将审计日志写入 FILE"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "批处理模式：永不询问"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "在多数问题上假定回答为是"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "在多数问题上假定回答为否"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|添加钥匙环到钥匙环列表"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|使用 USER-ID 作为默认的私钥"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此公钥服务器来查找密钥"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|使用名称为 NAME 的密文算法"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|使用以 NAME 命名的信息摘要算法"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法：@GPGSM@ [选项] [文件] (-h 获取帮助)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8664,47 +8772,47 @@
 "使用 S/MIME 协议以签名、检查、加密或者解密\n"
 "默认操作取决于输入的数据\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注意：将不加密给‘%s’：%s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的验证模型‘%s’\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: 未指定主机名\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: 给定密码但未给定用户\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳过此行\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "无法解析公钥服务器\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在导入通用证书‘%s’\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "无法使用‘%s’签名：%s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "无效的命令（不存在隐式的命令）\n"
@@ -8724,7 +8832,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本证书检查失败 - 未被导入\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "获取存储选项时出现错误：%s\n"
@@ -8734,42 +8842,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "导入证书时出现错误：%s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "读取输入时出现错误：%s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "获取指纹失败\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "查找现存证书时出现问题：%s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "寻找可写入的 keyDB 时出现错误：%s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "存储证书时出现错误：%s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "重新搜索证书时出现问题：%s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存储选项时出现错误：%s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "错误 - "
 
@@ -8804,7 +8907,7 @@
 "\n"
 "%s%s您真的确定您要这样做吗？"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8837,38 +8940,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查合格证书失败：%s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "已签名 "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[日期未指定]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " 正在使用的证书标识 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "算法： %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "无效的签名：消息摘要属性与计算得到的不匹配\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "良好签名来自于"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                亦即"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "这是一个合格的签名\n"
@@ -8936,281 +9040,280 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "加载证书‘%s’时出现错误：%s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "永久载入的证书： %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    运行时缓存的证书： %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           信任的证书： %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "证书已被缓存。\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "证书已缓存\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "缓存证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "无效的 SHA1 指纹字串 '%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "通过 S/N 获取证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "通过主题获取证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "没有找到证书的签发者\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "获取 authorityKeyIdentifier 时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "正在创建目录‘%s’\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "创建目录‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "忽略数据库文件夹‘%s’\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "读取文件夹‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "正在移除缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "未能移除文件‘%s’\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "关闭缓存文件时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "打开缓存目录文件‘%s’失败：%s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "创建新的缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "写入新的缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "关闭新的缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "新的缓存目录文件‘%s’已创建\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "重新打开缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "‘%s’的第一条记录不是版本信息\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "缓存目录的旧版 - 正在清理\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "缓存目录的旧版 - 放弃\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "在‘%s’的 CRL 记录的第 %u 行检测到额外信息\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "在‘%s’的第 %u 行检测到无效的行\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "在‘%s’的第 %u 行检测到重复的条目\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "已跳过‘%s’的第 %u 行的不支持的记录\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr ""
 "在‘%s’的第 %u 行检测到无效的签发者散列\n"
 "\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr ""
 "在‘%s’的第 %u 行没有签发者 DN\n"
 "\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr ""
 "在‘%s’的第 %u 行检测到无效的时间戳\n"
 "\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 "警告：在‘%s’的第 %u 行检测到无效的缓存文件\n"
 "\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "在缓存目录文件中检测到错误\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "请检查理由并手动删除那个文件\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "创建临时缓存目录文件‘%s’时失败：%s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "关闭‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "将‘%s’重命名为‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "无法取‘%s’的散列：%s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "设置 MD5 散列上下文时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "计算‘%s’的散列时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "‘%s’具有无效的校验和格式\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "已经打开太多缓存文件；无法打开更多\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "正在打开缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "打开缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "为读取初始化缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "对一个已关闭的文件调用 unlock_db_file 方法\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "对一个已解锁的文件调用 unlock_db_file 方法\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "创建新的缓存对象失败：%s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "签发者标识为 %s 的 CRL 不可用\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "签发者标识 %s 的 CRL 缓存太旧；要求更新\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9218,257 +9321,259 @@
 msgstr ""
 "force-crl-refresh 选项已启用并且已过去 %d 分钟，签发者标识为 %s ; 要求更新\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "签发者标识  %s 的 force-crl-refresh 选项已启用; 要求更新\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "签发者标识 %s 的可用 CRL 不能被使用\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr "签发者标识 %s 缓存的 CRL 被修改；我们需要更新\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "警告：S/N 具有无效的缓存记录长度 "
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "读取 S/N %s 的缓存记录时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s 无效；原因=%02X  日期=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s 有效，其未被列入 CRL\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "从缓存文件中获取数据时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "未知的散列算法‘%s’\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "算法 %d 的 gcry_md_open 方法失败：%s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "从  libksba 获得了无效的 S 表达式\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "转换 S 表达式时失败：%s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "未知的散列算法‘%s’\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "算法 %d 的 gcry_md_open 方法失败：%s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "创建 S 表达式时失败：%s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "从 CRL 获取更新次数时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, fuzzy, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "此 CRL 的更新时间：此次=%s 下一次=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate 参数未被指定；假设有效期为一天\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "获取 CRL 项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "向临时缓存文件中插入项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "没有在 CRL 中找到 CRL 签发者： %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在通过 authorityKeyIdentifier 定位 CRL 签发者\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 签名验证失败：%s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "检查 CRL 签署者证书的有效性时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "移除过期的缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除过期的缓存文件‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "创建临时缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完成临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "关闭临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "警告：新的 CRL 仍然太旧；其已在 %s 过期 - 无论如何先加载\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL 仍然太旧；其已在 %s 过期\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的紧急 CRL 扩展 %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "读取 CRL 扩展时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "正在创建缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "将‘%s’重命名为‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr "更新 DIR 文件时失败 - 缓存条目将会在下次程序启动时丢失\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "开始 CRL 导出（已通过 %s 取回）\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr " 错误：此 CRL 将不会被使用，因为它在一次更新之后仍然太旧！\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " 错误：此 CRL 将不会被使用，因为一个未知的紧急扩展！\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 错误：此 CRL 将不会被使用\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 错误：此缓存的 CRL 可能已经被篡改！\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告： 无效的缓存记录长度\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "读取缓存记录时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "读取缓存的密钥时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "从数据库读取缓存项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "结束 CRL 导出\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "通过 DP 的 crl_fetch 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "通过 DP 的 crl_cache_insert 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "通过签发者的 crl_cache_insert 失败：%s\n"
@@ -9506,55 +9611,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "由于 %s 被关闭，无法进行证书搜索\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "使用 OCSP 代替 CRLs"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "检查 dirmngr 是否正在运行"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "添加一个证书到缓存"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "验证一个证书"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "查找一个证书"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "只查找本地存储的证书"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "--lookup 选项需要一个 URL"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "将一个 CRL 载入 dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "被 Squid 使用的特殊模式"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "预期为 PEM 格式的证书"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "强制使用默认的 OCSP 响应者"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "用法： dirmngr-client [选项] [certfile|pattern] （-h 获取帮助）\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9566,82 +9671,82 @@
 "如果证书有效，这一进程将返回 0；如果证书无效\n"
 "将返回 1；其他错误代码则代表一般性的失败\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "从标准输入（stdin）读取证书时出现错误：%s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "从‘%s’读取证书时出现错误：%s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "证书太大以至于没有意义\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "无法连接至 dirmngr：%s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "查找失败：%s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "载入 CRL ‘%s’ 时 失败：%s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "一个 dirmngr 守护进程已开启并正在运行\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "证书验证失败：%s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "证书有效\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "证书已被吊销\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "证书检查失败：%s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "已获取状态：‘%s’\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "写入 base64 编码时出现错误：%s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "不支持的查询 '%s'\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "需要绝对文件名\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "正在查找‘%s’\n"
@@ -9666,92 +9771,92 @@
 msgid "flush the cache"
 msgstr "刷新缓存"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|将服务器模式的日志写入到 FILE"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "在不询问用户的情况下运行"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "强制载入过期的 CRLs"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "允许发送 OCSP 请求"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr "允许在线软件版本检查"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "抑制 HTTP 的使用"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "抑制 LDAP 的使用"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分发点"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分发点"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略证书包含的 OCSP 服务 URLs"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|重定向 HTTP 请求到 URL"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|使用 HOST 进行 LDAP 查询"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "使用 --ldap-proxy 选项以不使用回退主机"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|从 FILE 中读取 LDAP 服务器列表"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "添加从 CRL 分发点发现的新服务器到服务器列表"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|设置 LDAP 超时时间为 N 秒"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|使用 URL 处的 OCSP 响应者"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP 响应由 FPR 签名"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|在一次查询中最多返回 N 个项目"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA 证书"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr "通过 Tor 转发所有网络流量"
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9760,11 +9865,11 @@
 "@\n"
 "(参阅 \"info\" 手册以获取一份所有命令及选项的完整列表)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法：@DIRMNGR@ [选项] (-h 获取帮助)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9772,132 +9877,132 @@
 "语法：@DIRMNGR@ [选项] [命令 [参数]]\n"
 "@GNUPG@ 的公钥服务器、CRL 和 OCSP 访问\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的调试等级为：%s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法：%s [选项] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字名称中不允许使用冒号\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获取 CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处理 CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行太长 - 跳过\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 检测到无效指纹\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 读取错误：%s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 已忽略行尾部的垃圾数据\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "接收到 SIGHUP 信号 -正在重新读取配置文件并刷新缓存\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "接收到 SIGUSR2 信号 - 未定义要进行的操作\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "接收到 SIGTERM 信号 - 正在关闭...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "接收到 SIGTERM 信号 - 仍然有 %d 个活动的连接\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "强制关闭\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT 信号 - 立即关闭\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到 %d 信号 - 未定义要进行的操作\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "以记录导向的格式返回所有值"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|NAME|忽略主机部分并通过 NAME 进行连接"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|NAME|连接到以 NAME 命名的主机"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|连接到端口 N"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|NAME|使用用户名称 NAME 进行身份验证"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|PASS|使用密码 PASS 进行身份验证"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "从 $DIRMNGR_LDAP_PASS 取得密码"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|STRING|查询 DN STRING"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|STRING|使用 STRING 作为过滤器扩展"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|STRING|返回属性 STRING"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "用法： dirmngr_ldap [选项] [URL] （-h 获取帮助）\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -9907,145 +10012,139 @@
 "Dirmngr 的内部 LDAP 助手\n"
 "接口和选项可能在没有通知的情况下改变\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "无效的端口号 %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "为属性‘%s’搜索结果\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "写入到标准输出（stdout）时出现错误：%s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          可用属性‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "属性‘%s’未找到\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "找到属性‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "正在处理 URL ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          用户‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          密码‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          主机‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          端口 %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            DN ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        过滤器 ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          属性 ‘%s’\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "‘%s’中没有主机名\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "未指定查询‘%s’的属性\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "警告：仅使用第一个属性\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "LDAP 初始化至 ‘%s:%d’ 时失败：%s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "绑定至‘%s:%d’时失败：%s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "搜索‘%s’时失败：%s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "‘%s’不是一个 LDAP URL\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘%s’是一个无效的 LDAP URL\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "访问‘%s’时出现错误：http 状态码 %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' 重定向到 '%s' (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "过多重定向\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "分配内存时出现错误：%s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10096,7 +10195,7 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc 方法失败：%s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch：无效的模式‘%s’\n"
@@ -10226,11 +10325,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "分配 OCSP 上下文时失败：%s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "无法获取 authorityInfoAccess：%s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10299,7 +10393,7 @@
 msgstr "证书 ID 中的序列号缺失"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 方法失败：%s\n"
@@ -10329,32 +10423,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "超过设置的 max_replies %d\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "无法分配控制结构：%s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "分配 assuan 上下文时失败：%s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "初始化服务器时失败：%s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "向 Assuan 注册命令时失败：%s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接受出现问题：%s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 处理时失败：%s\n"
@@ -10392,56 +10486,56 @@
 msgid "certificate chain is good\n"
 msgstr "证书链良好\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "证书本不应被用于 CRL 签名\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "静默"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "以十六进制编码打印数据"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "解码接收到的数据行"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "连接到 dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|连接到名称为 NAME 的 Assuan 套接字"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|连接到地址为 ADDR 的 Assuan 服务器"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "运行命令行中指定的 Assuan 服务器"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "不使用扩展连接模式"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|在启动时从 FILE 处执行命令"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "在启动时运行 /subst"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "用法：@GPG@-connect-agent [选项] (-h 获取帮助)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10449,43 +10543,43 @@
 "语法：@GPG@-connect-agent [选项]\n"
 "连接到一个正在运行的代理人程序并发送命令\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "选项 “%s” 要求一个程序和可选参数\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "已忽略选项 “%s”，因为 “%s”\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收行失败：%s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "行太长 - 跳过\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "行已被截断，因为内嵌有 Nul 字符\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "未知命令‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "发送行失败：%s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "发送标准选项时出现错误：%s\n"
@@ -10677,94 +10771,94 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "注意： 使用 “%s” 来重启他们。\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "组件 %s 的外部验证失败"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "注意，群组规范已被忽略\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "关闭‘%s’时出现错误\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "处理‘%s’时出现错误\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "列出所有组件"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "检查所有程序"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|列出选项"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|变更选项"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|检查选项"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "应用全局默认值"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|使用 FILE 更新配置文件"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "为 @GPGCONF@ 获取配置目录"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "列出全局配置文件"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "检查全局配置文件"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 msgid "query the software version database"
 msgstr "查询软件版本数据库"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "重新载入全部或者给定的组件"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "启动一个给定的组件"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "关闭一个给定的组件"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "若可能，在运行时激活变更"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "用法：@GPGCONF@ [选项] (-h 获取帮助)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10772,203 +10866,150 @@
 "语法 @GPGCONF@ [选项]\n"
 "管理 @GNUPG@ 系统的工具的配置选项 \n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "需要一个组件参数"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "组件未找到"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "没有参数被允许"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "用法：gpg-check-pattern [选项] patternfile （-h 获取帮助）\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"命令：\n"
-" "
+"语法：gpg-check-pattern [选项] patternfile\n"
+"按照 patternfile 检查一个由标准输入（stdin）给定的密码\n"
 
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "解密模式"
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "加密模式"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "注意：旧的默认配置文件‘%s’已被忽略\n"
 
-#: tools/symcryptrun.c:173
-#, fuzzy
-msgid "tool class (confucius)"
-msgstr "工具类（confucius）"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "命令：\n"
+#~ " "
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "程序文件名"
+#~ msgid "decryption modus"
+#~ msgstr "解密模式"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "私钥文件（必须）"
+#~ msgid "encryption modus"
+#~ msgstr "加密模式"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "输入文件名（默认为标准输入 stdin）"
+#, fuzzy
+#~ msgid "tool class (confucius)"
+#~ msgstr "工具类（confucius）"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "用法：symcryptrun [选项] (-h 获取帮助)"
+#~ msgid "program filename"
+#~ msgstr "程序文件名"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"语法：symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"调用一个简单的对称加密工具\n"
+#~ msgid "secret key file (required)"
+#~ msgstr "私钥文件（必须）"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s 在 %s 上被取消，返回状态 %i\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "输入文件名（默认为标准输入 stdin）"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s 在 %s 上失败，返回状态 %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "用法：symcryptrun [选项] (-h 获取帮助)"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "无法创建临时目录‘%s’：%s\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "语法：symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "调用一个简单的对称加密工具\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "不能为写入打开 %s ：%s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s 在 %s 上被取消，返回状态 %i\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "写入 %s 时出现错误：%s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s 在 %s 上失败，返回状态 %i\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "读取 %s 时出现错误：%s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "无法创建临时目录‘%s’：%s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "关闭 %s 时出现错误：%s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "不能为写入打开 %s ：%s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "未提供 --program 选项\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "写入 %s 时出现错误：%s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "只要 --decrypt 和 --encrypt 被支持\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "读取 %s 时出现错误：%s\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "没有提供 --keyfile 选项\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "关闭 %s 时出现错误：%s\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "无法分配 args 向量\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "未提供 --program 选项\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "无法创建管道：%s\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "只要 --decrypt 和 --encrypt 被支持\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "无法创建 pty：%s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "没有提供 --keyfile 选项\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "无法执行 fork 方法：%s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "无法分配 args 向量\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv 方法失败：%s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "无法创建管道：%s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select 失败：%s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "无法创建 pty：%s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read 失败：%s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "无法执行 fork 方法：%s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty 读取失败：%s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv 方法失败：%s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid 方法失败：%s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select 失败：%s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "子进程被终止，返回状态为 %i\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "read 失败：%s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "无法分配 infile 字符串：%s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty 读取失败：%s\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "无法分配 outfile 字符串：%s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid 方法失败：%s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "必须给定 %s 或 %s 中的任意一个\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "子进程被终止，返回状态为 %i\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "没有给定类\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "无法分配 infile 字符串：%s\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "类 %s 不被支持\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "无法分配 outfile 字符串：%s\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "用法：gpg-check-pattern [选项] patternfile （-h 获取帮助）\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "必须给定 %s 或 %s 中的任意一个\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"语法：gpg-check-pattern [选项] patternfile\n"
-"按照 patternfile 检查一个由标准输入（stdin）给定的密码\n"
+#~ msgid "no class provided\n"
+#~ msgstr "没有给定类\n"
+
+#~ msgid "class %s is not supported\n"
+#~ msgstr "类 %s 不被支持\n"
+
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " 正在使用的证书标识 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "option '%s' may not be used in %s mode\n"
@@ -11051,9 +11092,6 @@
 #~ msgid "         \"%s\": preference for AEAD algorithm %s\n"
 #~ msgstr "         \"%s\"：关于 AEAD 算法 %s 的偏好设置\n"
 
-#~ msgid "AEAD: "
-#~ msgstr "AEAD： "
-
 #~ msgid "too many AEAD preferences\n"
 #~ msgstr "过多的 AEAD 偏好设置\n"
 
Les fichiers binaires /tmp/HNjQYL0SDY/gnupg2-2.2.20/po/zh_TW.gmo et /tmp/xF6ffeaI4R/gnupg2-2.2.27/po/zh_TW.gmo sont différents
diff -Nru gnupg2-2.2.20/po/zh_TW.po gnupg2-2.2.27/po/zh_TW.po
--- gnupg2-2.2.20/po/zh_TW.po	2020-03-20 15:40:35.000000000 +0100
+++ gnupg2-2.2.27/po/zh_TW.po	2021-01-11 18:47:18.000000000 +0100
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-03-20 15:40+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2019-11-04 09:49+0100\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -21,7 +21,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: agent/call-pinentry.c:322
+#: agent/call-pinentry.c:323
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
@@ -32,47 +32,47 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:528
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:529
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|取消 (_C)"
 
-#: agent/call-pinentry.c:530
+#: agent/call-pinentry.c:531
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:531
+#: agent/call-pinentry.c:532
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|個人識別碼 (PIN):"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:534
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|取消 (_C)"
 
-#: agent/call-pinentry.c:534
+#: agent/call-pinentry.c:535
 #, fuzzy
 #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:537
+#: agent/call-pinentry.c:538
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
@@ -80,7 +80,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:869
+#: agent/call-pinentry.c:870
 msgid "Quality:"
 msgstr "優劣程度: %s"
 
@@ -90,35 +90,35 @@
 #. 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:890
+#: agent/call-pinentry.c:891
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "上列輸入文字的優劣程度.\n"
 "關於此規範的細節, 請洽你的系統管理者."
 
-#: agent/call-pinentry.c:1010
+#: agent/call-pinentry.c:1040
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
 
-#: agent/call-pinentry.c:1013
+#: agent/call-pinentry.c:1043
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
-#: agent/protect-tool.c:715 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1080 agent/call-pinentry.c:1285
+#: agent/protect-tool.c:724
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
-#: tools/symcryptrun.c:451
+#: agent/call-pinentry.c:1107 agent/call-pinentry.c:1359
+#: agent/command-ssh.c:3130 agent/genkey.c:416
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
 
@@ -126,36 +126,40 @@
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
 #. Do not translate the "SETERROR" keyword.
-#: agent/call-pinentry.c:1099
+#. TRANSLATORS: 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:1129 agent/call-pinentry.c:1380
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:1110
+#: agent/call-pinentry.c:1140 agent/call-pinentry.c:1391
 msgid "Repeat:"
 msgstr "重複:"
 
-#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
+#: agent/call-pinentry.c:1151 agent/call-pinentry.c:1163
+#: agent/call-pinentry.c:1401 agent/call-pinentry.c:1413
 msgid "PIN too long"
 msgstr "個人識別碼 (PIN) 太長"
 
-#: agent/call-pinentry.c:1139
+#: agent/call-pinentry.c:1152 agent/call-pinentry.c:1402
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:1147
+#: agent/call-pinentry.c:1160 agent/call-pinentry.c:1410
 msgid "Invalid characters in PIN"
 msgstr "個人識別碼 (PIN) 含有無效的字符"
 
-#: agent/call-pinentry.c:1152
+#: agent/call-pinentry.c:1165 agent/call-pinentry.c:1415
 msgid "PIN too short"
 msgstr "個人識別碼 (PIN) 太短"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad PIN"
 msgstr "不良的個人識別碼 (PIN)"
 
-#: agent/call-pinentry.c:1171
+#: agent/call-pinentry.c:1184 agent/call-pinentry.c:1433
 msgid "Bad Passphrase"
 msgstr "不良的密語"
 
@@ -164,31 +168,31 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
-#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
-#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
-#: g10/sign.c:1299 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "無法建立 '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:889
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
-#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
-#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
-#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
-#: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
-#: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
+#: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
+#: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
+#: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
+#: dirmngr/dirmngr.c:1722
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: agent/command-ssh.c:2601 g10/card-util.c:687 g10/card-util.c:708
 #: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
@@ -248,7 +252,7 @@
 msgstr ""
 "請輸入密語以保護收到的私鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:3666
+#: agent/command-ssh.c:3667
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串流失敗: %s\n"
@@ -374,17 +378,17 @@
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 你輸入了不安全的密語."
 
-#: agent/genkey.c:480
+#: agent/genkey.c:482
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "請輸入密語至%0A以保護你的新金鑰"
 
-#: agent/genkey.c:606
+#: agent/genkey.c:608
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
-#: tools/gpg-check-pattern.c:69
+#: agent/gpg-agent.c:163 agent/preset-passphrase.c:75 scd/scdaemon.c:115
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -392,138 +396,138 @@
 "@選項:\n"
 " "
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
+#: agent/gpg-agent.c:165 scd/scdaemon.c:120 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "以服務模式執行 (背景)"
 
-#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:166 scd/scdaemon.c:117 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:168 dirmngr/dirmngr.c:168
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "以伺服器模式執行"
 
-#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:170 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:121 sm/gpgsm.c:310 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:181 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:108
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
-#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
-#: dirmngr/dirmngr_ldap.c:135
+#: agent/gpg-agent.c:171 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
+#: sm/gpgsm.c:311 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr_ldap.c:136
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:172 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "sh-style command output"
 msgstr "sh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
+#: agent/gpg-agent.c:173 scd/scdaemon.c:124 dirmngr/dirmngr.c:184
 msgid "csh-style command output"
 msgstr "csh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
-#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:174 scd/scdaemon.c:125 sm/gpgsm.c:341
+#: dirmngr/dirmngr.c:185
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從指定檔案中讀取選項"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:183 scd/scdaemon.c:135 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
-#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:188
 msgid "use a log file for the server"
 msgstr "為伺服器使用日誌檔"
 
-#: agent/gpg-agent.c:185
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 
-#: agent/gpg-agent.c:190
+#: agent/gpg-agent.c:195
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
-#: agent/gpg-agent.c:192
+#: agent/gpg-agent.c:197
 msgid "do not use the SCdaemon"
 msgstr "不要使用 SCdaemon"
 
-#: agent/gpg-agent.c:196
+#: agent/gpg-agent.c:201
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|名稱|連線至位於指定名稱的主機"
 
-#: agent/gpg-agent.c:212
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的要求"
 
-#: agent/gpg-agent.c:214
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的要求"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:222
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:231
+#: agent/gpg-agent.c:236
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 
-#: agent/gpg-agent.c:233
+#: agent/gpg-agent.c:238
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "不允許重複使用舊密語"
 
-#: agent/gpg-agent.c:235
+#: agent/gpg-agent.c:240
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "不允許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:243
 msgid "allow presetting passphrase"
 msgstr "允許預先設定密語"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:245
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:243
+#: agent/gpg-agent.c:248
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
-#: agent/gpg-agent.c:245
+#: agent/gpg-agent.c:250
 msgid "enable ssh support"
 msgstr "啟用 ssh 支援"
 
-#: agent/gpg-agent.c:247
+#: agent/gpg-agent.c:252
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:255
 msgid "enable putty support"
 msgstr "啟用 putty 支援"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
-#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
-#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
-#: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: agent/gpg-agent.c:531 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1070 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:298
+#: sm/gpgsm.c:567 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:404
+#: dirmngr/dirmngr_ldap.c:207 tools/gpg-connect-agent.c:205 tools/gpgconf.c:146
+#: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:526
+#: agent/gpg-agent.c:540
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:528
+#: agent/gpg-agent.c:542
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -531,148 +535,136 @@
 "語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
 "@GNUPG@ 私鑰管理\n"
 
-#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
-#: dirmngr/dirmngr.c:482
+#: agent/gpg-agent.c:587 g10/gpg.c:1262 scd/scdaemon.c:370 sm/gpgsm.c:715
+#: dirmngr/dirmngr.c:488
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "給定的除錯等級 '%s' 無效\n"
 
-#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
-#: sm/gpgsm.c:1630
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
+#: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
-#: dirmngr/dirmngr.c:952
-#, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "請注意: 沒有預設選項檔 '%s'\n"
-
-#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
-#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
-#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "選項檔 '%s': %s\n"
-
-#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
-#: dirmngr/dirmngr.c:965
+#: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
-#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "請注意: '%s' 並不當成選項\n"
 
-#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
+#: agent/gpg-agent.c:2159 scd/scdaemon.c:1096 dirmngr/dirmngr.c:1219
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
+#: agent/gpg-agent.c:2176 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1232
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket 名稱 '%s' 太長\n"
 
-#: agent/gpg-agent.c:2240
+#: agent/gpg-agent.c:2215
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1264
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1136 dirmngr/dirmngr.c:1267
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
-#: dirmngr/dirmngr.c:1282
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1144 dirmngr/dirmngr.c:1276
 #, fuzzy, c-format
 #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgid "can't set permissions of '%s': %s\n"
 msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 
-#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1156 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在候聽 socket '%s'\n"
 
-#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
-#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:517
+#: g10/exec.c:261 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "無法建立目錄 '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
-#: g10/openfile.c:418 sm/keydb.c:103
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:520
+#: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
-#: agent/gpg-agent.c:2355
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
 
-#: agent/gpg-agent.c:2359
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "無法使用 '%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1172 dirmngr/dirmngr.c:2047
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2729
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2809
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1362 dirmngr/dirmngr.c:2261
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1427
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
 
-#: agent/preset-passphrase.c:104
+#: agent/preset-passphrase.c:107
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -680,8 +672,8 @@
 "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
-#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
+#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:204
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:78
 msgid ""
 "@Commands:\n"
 " "
@@ -689,9 +681,9 @@
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:100 tools/symcryptrun.c:171
+#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: sm/gpgsm.c:252 dirmngr/dirmngr.c:179 tools/gpg-connect-agent.c:76
+#: tools/gpgconf.c:105
 msgid ""
 "@\n"
 "Options:\n"
@@ -701,11 +693,11 @@
 "選項:\n"
 " "
 
-#: agent/protect-tool.c:155
+#: agent/protect-tool.c:158
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法: gpg-protect-tool [選項] (或用 -h 求助)\n"
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:160
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -713,21 +705,21 @@
 "語法: gpg-protect-tool [選項] [引數]\n"
 "私鑰維護工具\n"
 
-#: agent/protect-tool.c:694
+#: agent/protect-tool.c:703
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語來取消 PKCS#12 物件的保護."
 
-#: agent/protect-tool.c:699
+#: agent/protect-tool.c:708
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語來保護新的 PKCS#12 物件."
 
-#: agent/protect-tool.c:705
+#: agent/protect-tool.c:714
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
-#: agent/protect-tool.c:710
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -735,18 +727,18 @@
 "請輸入完成這項操作所需的\n"
 "密語或個人識別碼 (PIN)."
 
-#: agent/protect-tool.c:721 tools/symcryptrun.c:462
+#: agent/protect-tool.c:730
 #, c-format
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:723 tools/symcryptrun.c:458
+#: agent/protect-tool.c:732
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢問密語時出錯: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
-#: tools/gpgconf.c:408
+#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1629
+#: tools/gpgconf.c:418
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
@@ -756,32 +748,32 @@
 msgid "file '%s', line %d: %s\n"
 msgstr "檔案 '%s', 第 %d 列: %s\n"
 
-#: agent/trustlist.c:192 agent/trustlist.c:200
+#: agent/trustlist.c:193 agent/trustlist.c:201
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "陳述句 \"%s\" 忽略於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:206
+#: agent/trustlist.c:207
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "沒有系統信任清單 '%s' 可用\n"
 
-#: agent/trustlist.c:250
+#: agent/trustlist.c:251
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "不良的指紋於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:275 agent/trustlist.c:282
+#: agent/trustlist.c:276 agent/trustlist.c:283
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:316 common/helpfile.c:136
+#: agent/trustlist.c:317 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "讀取 '%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:434 agent/trustlist.c:503
+#: agent/trustlist.c:436 agent/trustlist.c:505
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀取已信任根憑證清單時出錯\n"
@@ -794,18 +786,18 @@
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:664
+#: agent/trustlist.c:667
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:673 common/audit.c:467
+#: agent/trustlist.c:676 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:673 agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -818,7 +810,7 @@
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:707
+#: agent/trustlist.c:710
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -828,35 +820,35 @@
 #. 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:721
+#: agent/trustlist.c:724
 msgid "Correct"
 msgstr "正確"
 
-#: agent/trustlist.c:721
+#: agent/trustlist.c:724
 msgid "Wrong"
 msgstr "錯了"
 
-#: agent/findkey.c:283
+#: agent/findkey.c:301
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "請注意: 密語從未變更過.%0A請現在就變更."
 
-#: agent/findkey.c:299
+#: agent/findkey.c:317
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s.  請現在就變更."
 
-#: agent/findkey.c:313 agent/findkey.c:320
+#: agent/findkey.c:331 agent/findkey.c:338
 msgid "Change passphrase"
 msgstr "更改密語"
 
-#: agent/findkey.c:321
+#: agent/findkey.c:339
 msgid "I'll change it later"
 msgstr "我稍後再變更"
 
-#: agent/findkey.c:1504
+#: agent/findkey.c:1522
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -864,11 +856,11 @@
 "%%0A?"
 msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 
-#: agent/findkey.c:1528 agent/findkey.c:1542
+#: agent/findkey.c:1546 agent/findkey.c:1560
 msgid "Delete key"
 msgstr "刪除金鑰"
 
-#: agent/findkey.c:1539
+#: agent/findkey.c:1557
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -876,12 +868,12 @@
 "警告: 這把金鑰同時列為 SSH 所使用!\n"
 "刪除這把金鑰可能會讓你失去存取遠端機器的能力."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:97
+#: agent/pksign.c:187 sm/certcheck.c:100
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
@@ -891,7 +883,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
 
-#: agent/pksign.c:523
+#: agent/pksign.c:518
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
@@ -901,7 +893,7 @@
 msgid "secret key parts are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1540
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公鑰演算法 %d (%s) 未支援\n"
@@ -930,7 +922,7 @@
 msgstr "建立管道串流時出錯: %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
+#: common/exechelp-posix.c:851 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "衍生執行程序時出錯: %s\n"
@@ -977,28 +969,28 @@
 msgid "problem setting the gpg-agent options\n"
 msgstr "設定 gpg-agent 選項時發生問題\n"
 
-#: common/sysutils.c:148
+#: common/sysutils.c:168
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: common/sysutils.c:250
+#: common/sysutils.c:408
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:440
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 
-#: common/sysutils.c:691
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "正在等候代理程式出現 ... (%d 秒)\n"
 
-#: common/sysutils.c:717
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
@@ -1058,7 +1050,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "配置 %lu 位元組時超出核心"
 
-#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:896 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "配置足夠的記憶體時出錯: %s\n"
@@ -1174,7 +1166,7 @@
 msgstr "演算法: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3451
+#: scd/app-openpgp.c:3555
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "未支援的演算法: %s"
@@ -1249,39 +1241,39 @@
 msgid "Root certificate trustworthy"
 msgstr "根憑證可信賴"
 
-#: common/audit.c:1111 sm/certchain.c:1079
+#: common/audit.c:1112 sm/certchain.c:1235
 msgid "no CRL found for certificate"
 msgstr "找不到用於憑證的 CRL"
 
-#: common/audit.c:1114 sm/certchain.c:1089
+#: common/audit.c:1115 sm/certchain.c:1245
 msgid "the available CRL is too old"
 msgstr "可用的 CRL 太舊了"
 
-#: common/audit.c:1119
+#: common/audit.c:1120
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP 憑證檢查"
 
-#: common/audit.c:1139
+#: common/audit.c:1140
 msgid "Included certificates"
 msgstr "包含在內的憑證"
 
-#: common/audit.c:1194
+#: common/audit.c:1195
 msgid "No audit log entries."
 msgstr "沒有稽核日誌項目."
 
-#: common/audit.c:1243
+#: common/audit.c:1244
 msgid "Unknown operation"
 msgstr "未知的操作"
 
-#: common/audit.c:1261
+#: common/audit.c:1262
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent 可以使用"
 
-#: common/audit.c:1271
+#: common/audit.c:1272
 msgid "Dirmngr usable"
 msgstr "Dirmngr 可以使用"
 
-#: common/audit.c:1307
+#: common/audit.c:1308
 #, c-format
 msgid "No help available for '%s'."
 msgstr "'%s' 沒有可用的說明."
@@ -1290,7 +1282,7 @@
 msgid "ignoring garbage line"
 msgstr "忽略垃圾列"
 
-#: common/gettime.c:890
+#: common/gettime.c:919
 msgid "[none]"
 msgstr "[ 無 ]"
 
@@ -1299,82 +1291,114 @@
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "已跳過無效的 radix64 字符 %02x\n"
 
-#: common/argparse.c:365
+#: common/argparse.c:520
 msgid "argument not expected"
 msgstr "沒料到有引數"
 
-#: common/argparse.c:367
+#: common/argparse.c:522
 msgid "read error"
 msgstr "讀取錯誤"
 
-#: common/argparse.c:369
+#: common/argparse.c:524
 msgid "keyword too long"
 msgstr "關鍵字太長"
 
-#: common/argparse.c:371
+#: common/argparse.c:526
 msgid "missing argument"
 msgstr "無效的引數"
 
-#: common/argparse.c:373
+#: common/argparse.c:528
 msgid "invalid argument"
 msgstr "無效的引數"
 
-#: common/argparse.c:375
+#: common/argparse.c:530
 msgid "invalid command"
 msgstr "無效的指令"
 
-#: common/argparse.c:377
+#: common/argparse.c:532
 msgid "invalid alias definition"
 msgstr "無效的別名定義"
 
-#: common/argparse.c:379
+#: common/argparse.c:534 common/argparse.c:571
+msgid "permission error"
+msgstr ""
+
+#: common/argparse.c:536 common/argparse.c:569
 msgid "out of core"
 msgstr "超出核心"
 
-#: common/argparse.c:381
+#: common/argparse.c:540 common/argparse.c:575
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "無效的指令"
+
+#: common/argparse.c:542 common/argparse.c:577
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "未知的指令 '%s'\n"
+
+#: common/argparse.c:544 common/argparse.c:579
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "未預期的封裝: "
+
+#: common/argparse.c:546
 msgid "invalid option"
 msgstr "無效的選項"
 
-#: common/argparse.c:389
+#: common/argparse.c:556
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" 選項遺失了引數\n"
 
-#: common/argparse.c:391 g10/gpg.c:3543
+#: common/argparse.c:558 g10/gpg.c:3490
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: common/argparse.c:393
+#: common/argparse.c:560
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "\"%.50s\" 選項沒料到會有引數\n"
 
-#: common/argparse.c:395
+#: common/argparse.c:563
 #, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "無效的指令 \"%.50s\"\n"
 
-#: common/argparse.c:397
+#: common/argparse.c:565
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" 選項不明確\n"
 
-#: common/argparse.c:399
+#: common/argparse.c:567
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" 指令不明確\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1330
-#, c-format
-msgid "out of core\n"
-msgstr "超出核心\n"
-
-#: common/argparse.c:403
+#: common/argparse.c:581
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "無效的選項 \"%.50s\"\n"
 
+#: common/argparse.c:1745 common/argparse.c:1840
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "請注意: 沒有預設選項檔 '%s'\n"
+
+#: common/argparse.c:1832
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "選項檔 '%s': %s\n"
+
+#: common/argparse.c:2255
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
 #: common/utf8conv.c:123
 #, c-format
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1390,42 +1414,41 @@
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
 
-#: common/dotlock.c:707
+#: common/dotlock.c:724
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "建立暫存檔失敗 '%s': %s\n"
 
-#: common/dotlock.c:771
+#: common/dotlock.c:786
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: common/dotlock.c:1116
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
 
-#: common/dotlock.c:1152
+#: common/dotlock.c:1165
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
 
-#: common/dotlock.c:1153
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr "(死結嗎?) "
 
-#: common/dotlock.c:1192
+#: common/dotlock.c:1205
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "未鎖定 '%s': %s\n"
 
-#: common/dotlock.c:1219
+#: common/dotlock.c:1232
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
-#: dirmngr/dirmngr.c:867
+#: common/init.c:185 sm/gpgsm.c:949 dirmngr/dirmngr.c:862 dirmngr/dirmngr.c:871
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
@@ -1610,14 +1633,14 @@
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:620 g10/sign.c:412
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2253
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1663,24 +1686,24 @@
 msgid "server uses an invalid certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/call-dirmngr.c:437
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1902
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1939
+#: g10/card-util.c:91 g10/card-util.c:1908
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
-#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2237 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
@@ -1690,136 +1713,136 @@
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版卡片纔能用這個指令\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2779
+#: g10/card-util.c:107 scd/app-openpgp.c:2864
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
-#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: g10/card-util.c:140 g10/card-util.c:1426 g10/card-util.c:1688
+#: g10/card-util.c:1780 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:300 g10/card-util.c:351
+#: g10/card-util.c:260 g10/card-util.c:311
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:545
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:583
+#: g10/card-util.c:546
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:610
+#: g10/card-util.c:573
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:749
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:788
+#: g10/card-util.c:751
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:790
+#: g10/card-util.c:753
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:807
+#: g10/card-util.c:770
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:809
+#: g10/card-util.c:772
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:827
+#: g10/card-util.c:790
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:848
+#: g10/card-util.c:811
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
-#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
-#: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
+#: g10/card-util.c:905 g10/decrypt-data.c:490 g10/import.c:387 g10/import.c:734
+#: g10/import.c:786 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1668
+#: tools/gpgconf.c:431 tools/gpgconf.c:477
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "讀取 '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
-#: dirmngr/crlcache.c:929
+#: g10/card-util.c:938 g10/decrypt-data.c:493 g10/export.c:2467
+#: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:1002
+#: g10/card-util.c:965
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:1040
+#: g10/card-util.c:1003
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:1125
+#: g10/card-util.c:1088
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1096
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1105
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1127
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1141
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1163
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1223
+#: g10/card-util.c:1186
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:1273
+#: g10/card-util.c:1236
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:1274
+#: g10/card-util.c:1237
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
+#: g10/card-util.c:1250 g10/keygen.c:4486 g10/keygen.c:5565
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1372
+#: g10/card-util.c:1335
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1352
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1829,108 +1852,108 @@
 "      如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
 "      看看這張卡片支援哪些尺寸.\n"
 
-#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1374 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想要用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
+#: g10/card-util.c:1384 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1392 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/card-util.c:1448
+#: g10/card-util.c:1411
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1450
+#: g10/card-util.c:1413
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1452
+#: g10/card-util.c:1415
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1454
+#: g10/card-util.c:1417
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1419 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇你要使用的金鑰種類:\n"
 
-#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1420 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1458
+#: g10/card-util.c:1421
 #, fuzzy, c-format
 #| msgid "   (%d) ECC and ECC\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC 和 ECC\n"
 
-#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
-#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
-#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
+#: g10/card-util.c:1433 g10/card-util.c:1700 g10/card-util.c:1800
+#: g10/keyedit.c:899 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
+#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1543
+#: g10/card-util.c:1506
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
 
-#: g10/card-util.c:1548
+#: g10/card-util.c:1511
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
 
-#: g10/card-util.c:1584
+#: g10/card-util.c:1547
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
 
-#: g10/card-util.c:1600 g10/card-util.c:2113
+#: g10/card-util.c:1563 g10/card-util.c:2090
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
+#: g10/card-util.c:1569 g10/card-util.c:1914 g10/card-util.c:2096
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/card-util.c:1652
+#: g10/card-util.c:1615
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1666
+#: g10/card-util.c:1629
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 
-#: g10/card-util.c:1669
+#: g10/card-util.c:1632
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1681
+#: g10/card-util.c:1644
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1941,175 +1964,175 @@
 "   PIN = '%s'     管理者 PIN = '%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1716
+#: g10/card-util.c:1679
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1718 g10/card-util.c:1808
+#: g10/card-util.c:1681 g10/card-util.c:1771
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1719 g10/card-util.c:1810
+#: g10/card-util.c:1682 g10/card-util.c:1773
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1720 g10/card-util.c:1812
+#: g10/card-util.c:1683 g10/card-util.c:1775
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1805
+#: g10/card-util.c:1768
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1851
+#: g10/card-util.c:1814
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失敗: %s\n"
 
-#: g10/card-util.c:1950
+#: g10/card-util.c:1919
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 
-#: g10/card-util.c:1953
+#: g10/card-util.c:1922
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "是否繼續? (Y/n) "
 
-#: g10/card-util.c:1958
+#: g10/card-util.c:1927
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2136
+#: g10/card-util.c:2113
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: g10/card-util.c:2165 g10/keyedit.c:1259
+#: g10/card-util.c:2142 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2144
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:2168 g10/keyedit.c:1262
+#: g10/card-util.c:2145 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2147
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2150
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2151
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2152
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2153
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2154
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2155
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2157
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2158
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:2182
+#: g10/card-util.c:2159
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2160
 msgid "menu to change or unblock the PIN"
 msgstr "變更或重設個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:2184
+#: g10/card-util.c:2161
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:2185
+#: g10/card-util.c:2162
 msgid "unblock the PIN using a Reset Code"
 msgstr "用重設碼來解凍個人識別碼 (PIN)"
 
-#: g10/card-util.c:2186
+#: g10/card-util.c:2163
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2187
+#: g10/card-util.c:2164
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|名字|使用指定名字做為認證用的使用者名稱"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2165
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2312
+#: g10/card-util.c:2289
 msgid "gpg/card> "
 msgstr "gpg/卡片> "
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2330
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:2384
+#: g10/card-util.c:2361
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:2386
+#: g10/card-util.c:2363
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:2489 g10/keyedit.c:2228
+#: g10/card-util.c:2466 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:986
+#: g10/decrypt.c:191 g10/encrypt.c:1002
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "無法開啟 '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
-#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
+#: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
-#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2169,8 +2192,8 @@
 msgstr "子鑰"
 
 #: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
-#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
-#: g10/keyedit.c:2973
+#: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2987
+#: g10/keyedit.c:3056 g10/keyedit.c:3207
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
@@ -2195,95 +2218,102 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1447
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
 
-#: g10/encrypt.c:214
+#: g10/encrypt.c:209
 #, c-format
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encrypt.c:228
+#: g10/encrypt.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encrypt.c:238 g10/encrypt.c:652
+#: g10/encrypt.c:233 g10/encrypt.c:668
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' 已經被壓縮了\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
+#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告: '%s' 是個空檔案\n"
 
-#: g10/encrypt.c:533
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
+#: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
+#, fuzzy, c-format
+#| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
+
+#: g10/encrypt.c:549
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "正在從 '%s' 讀取\n"
 
-#: g10/encrypt.c:581
+#: g10/encrypt.c:597
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
-
-#: g10/encrypt.c:624 sm/encrypt.c:489
+#: g10/encrypt.c:640 sm/encrypt.c:490
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1139
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
-#: g10/encrypt.c:845
+#: g10/encrypt.c:861
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encrypt.c:933
+#: g10/encrypt.c:949
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encrypt.c:961 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "你不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:320
+#: g10/decrypt-data.c:240 g10/mainproc.c:391
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:324
+#: g10/decrypt-data.c:243 g10/mainproc.c:396
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
-#: g10/decrypt-data.c:176 sm/decrypt.c:130
+#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:130
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/decrypt-data.c:188
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "處理已加密封包有問題\n"
@@ -2373,7 +2403,7 @@
 msgstr " - 已跳過"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1000 g10/sign.c:1303
+#: g10/sign.c:1013 g10/sign.c:1327
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "正在寫入 '%s'\n"
@@ -2408,272 +2438,278 @@
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:1290
+#: g10/getkey.c:1297
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "已自動取回 '%s' (經由 %s )\n"
 
-#: g10/getkey.c:1296
+#: g10/getkey.c:1303
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
 
-#: g10/getkey.c:1298
+#: g10/getkey.c:1305
 msgid "No fingerprint"
 msgstr "沒有指紋"
 
-#: g10/getkey.c:1519
+#: g10/getkey.c:1526
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1941 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/getkey.c:1937 g10/pkclist.c:988
+#: g10/getkey.c:1944 g10/pkclist.c:988
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "\"%.50s\" 選項遺失了引數\n"
 
-#: g10/getkey.c:2013
+#: g10/getkey.c:2020
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|名字|使用指定名字做為預設私鑰"
 
-#: g10/getkey.c:2021
+#: g10/getkey.c:2028
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|名字|使用指定名字做為預設私鑰"
 
-#: g10/getkey.c:2028
+#: g10/getkey.c:2035
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2859
+#: g10/getkey.c:2880
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:3706
+#: g10/getkey.c:3730
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:4249 g10/gpg.c:2099
+#: g10/getkey.c:4275 g10/gpg.c:2107
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:440 sm/gpgsm.c:204
+#: g10/gpg.c:442 sm/gpgsm.c:206
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:443
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:443 sm/gpgsm.c:206
+#: g10/gpg.c:445 sm/gpgsm.c:208
 msgid "make a detached signature"
 msgstr "建立分離式簽章"
 
-#: g10/gpg.c:444 sm/gpgsm.c:207
+#: g10/gpg.c:446 sm/gpgsm.c:209
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:209
+#: g10/gpg.c:450 sm/gpgsm.c:211
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:210
+#: g10/gpg.c:452 sm/gpgsm.c:212
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:452 sm/gpgsm.c:211
+#: g10/gpg.c:454 sm/gpgsm.c:213
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:454
+#: g10/gpg.c:456
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:459 sm/gpgsm.c:216
+#: g10/gpg.c:461 sm/gpgsm.c:218
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:460 sm/gpgsm.c:214
+#: g10/gpg.c:462 sm/gpgsm.c:216
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:462 sm/gpgsm.c:217
+#: g10/gpg.c:464 sm/gpgsm.c:219
 msgid "generate a new key pair"
 msgstr "產生新的金鑰對"
 
-#: g10/gpg.c:465
+#: g10/gpg.c:467
 msgid "quickly generate a new key pair"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:470
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:475
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:478
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:481
 msgid "full featured key pair generation"
 msgstr "全能金鑰對生成"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:484
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:485 sm/gpgsm.c:220
+#: g10/gpg.c:487 sm/gpgsm.c:222
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:489
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:491
 msgid "quickly sign a key"
 msgstr "快速簽署金鑰"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "quickly sign a key locally"
 msgstr "快速在本機簽署金鑰"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:495
+#, fuzzy
+#| msgid "quickly generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "快速產生新的金鑰對"
+
+#: g10/gpg.c:496
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:497
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:498
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:496 sm/gpgsm.c:238
+#: g10/gpg.c:500 sm/gpgsm.c:240
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: g10/gpg.c:500
+#: g10/gpg.c:504
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:505
 msgid "export keys to a keyserver"
 msgstr "把金鑰匯出至金鑰伺服器"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:506
 msgid "import keys from a keyserver"
 msgstr "從金鑰伺服器匯入金鑰"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:509
 msgid "search for keys on a keyserver"
 msgstr "在金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺服器更新所有的金鑰"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:519
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:522
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:523
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:521
+#: g10/gpg.c:525
 msgid "change a card's PIN"
 msgstr "變更卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:537
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:542
+#: g10/gpg.c:546
 msgid "print message digests"
 msgstr "印出訊息摘要"
 
-#: g10/gpg.c:545 sm/gpgsm.c:233
+#: g10/gpg.c:549 sm/gpgsm.c:235
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:551
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:551 sm/gpgsm.c:252
+#: g10/gpg.c:555 sm/gpgsm.c:254
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:554 sm/gpgsm.c:269
+#: g10/gpg.c:558 sm/gpgsm.c:271
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
 
-#: g10/gpg.c:570 sm/gpgsm.c:305
+#: g10/gpg.c:574 sm/gpgsm.c:307
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:576
+#: g10/gpg.c:580
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:583
+#: g10/gpg.c:587
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
+#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:309
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至指定檔案"
 
-#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
+#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:321 tools/gpgconf.c:110
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:615
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:661
+#: g10/gpg.c:665
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:688 sm/gpgsm.c:362
+#: g10/gpg.c:692 sm/gpgsm.c:364
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2681,7 +2717,7 @@
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:691
+#: g10/gpg.c:695
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2711,11 +2747,11 @@
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:1084
+#: g10/gpg.c:1092
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:1087
+#: g10/gpg.c:1095
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2725,7 +2761,7 @@
 "簽署, 檢查, 加密, 解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:1098 sm/gpgsm.c:585
+#: g10/gpg.c:1106 sm/gpgsm.c:591
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2733,578 +2769,566 @@
 "\n"
 "已支援的演算法:\n"
 
-#: g10/gpg.c:1101
+#: g10/gpg.c:1109
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:1108 g10/keyedit.c:3047
+#: g10/gpg.c:1116 g10/keyedit.c:3281
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:1115
+#: g10/gpg.c:1123
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:1122 g10/keyedit.c:3096
+#: g10/gpg.c:1130 g10/keyedit.c:3347
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:1191 sm/gpgsm.c:659
+#: g10/gpg.c:1199 sm/gpgsm.c:665
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法: %s [選項] %s\n"
 
-#: g10/gpg.c:1380 sm/gpgsm.c:748
+#: g10/gpg.c:1388 sm/gpgsm.c:754
 #, c-format
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1398
+#: g10/gpg.c:1406
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1596
+#: g10/gpg.c:1604
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1607
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1610
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1616
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1611
+#: g10/gpg.c:1619
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1614
+#: g10/gpg.c:1622
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1620
+#: g10/gpg.c:1628
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1623
+#: g10/gpg.c:1631
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1626
+#: g10/gpg.c:1634
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1632
+#: g10/gpg.c:1640
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1635
+#: g10/gpg.c:1643
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1646
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1854
+#: g10/gpg.c:1862
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的組態項目 '%s'\n"
 
-#: g10/gpg.c:1971
+#: g10/gpg.c:1979
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:1973
+#: g10/gpg.c:1981
 msgid "show key usage information during key listings"
 msgstr "列出金鑰時顯示金鑰用途資訊"
 
-#: g10/gpg.c:1975
+#: g10/gpg.c:1983
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:1977
+#: g10/gpg.c:1985
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:1979
+#: g10/gpg.c:1987
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1991
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:1985
+#: g10/gpg.c:1993
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:1987
+#: g10/gpg.c:1995
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:1989
+#: g10/gpg.c:1997
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:1991
+#: g10/gpg.c:1999
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:2001
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
-#: g10/gpg.c:1995
+#: g10/gpg.c:2003
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2118
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的選項 '%s'\n"
 
-#: g10/gpg.c:2112
+#: g10/gpg.c:2120
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2262
-#, c-format
-msgid "Note: old default options file '%s' ignored\n"
-msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
-
-#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不採用 %s!\n"
 
-#: g10/gpg.c:3070 g10/gpg.c:3082
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' 不是有效的簽章使用期限\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "第 %d 列: 不是有效的電子郵件地址\n"
 
-#: g10/gpg.c:3136 sm/gpgsm.c:1164
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無效的個人識別碼項目模式 '%s'\n"
 
-#: g10/gpg.c:3142 sm/gpgsm.c:1170
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3196
+#: g10/gpg.c:3143
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' 不是有效的字元集\n"
 
-#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3183
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3186
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:3255 g10/gpg.c:3270
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3223
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3226
 #, c-format
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3238
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3246
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3248
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3252
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3266
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:3531
+#: g10/gpg.c:3478
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3711 sm/gpgsm.c:1534
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3734
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: g10/gpg.c:3770
+#: g10/gpg.c:3712
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3817
+#: g10/gpg.c:3759
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3840
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3784
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3786
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3788
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3791
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3795
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
-#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
-
-#: g10/gpg.c:3971
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
 
-#: g10/gpg.c:4114
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:4126
+#: g10/gpg.c:4069
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:4198
+#: g10/gpg.c:4141
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:4227
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4291
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4660 g10/keyserver.c:1847
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:4671
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4646
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4696
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:4709
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:4776
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:4787
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:4879
+#: g10/gpg.c:4841
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
-#: g10/gpg.c:5031 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "載入憑證 '%s' 時出錯: %s\n"
 
-#: g10/gpg.c:5044
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5100
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5111
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:5456
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:5458
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:5491
+#: g10/gpg.c:5453
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpgv.c:79
+#: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
 
-#: g10/gpgv.c:82
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
+#: g10/gpgv.c:86 sm/gpgsm.c:354 tools/gpgconf.c:112
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
 
-#: g10/gpgv.c:89
+#: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
 msgstr ""
 
-#: g10/gpgv.c:148
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:150
+#: g10/gpgv.c:154
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -3505,7 +3529,7 @@
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1887 g10/import.c:3000
+#: g10/import.c:1887 g10/import.c:3001
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
@@ -3515,7 +3539,7 @@
 msgid "key %s: %s\n"
 msgstr "金鑰 %s: %s\n"
 
-#: g10/import.c:1894 g10/import.c:2972
+#: g10/import.c:1894 g10/import.c:2973
 msgid "rejected by import screener"
 msgstr "遭到匯入篩選程式駁回"
 
@@ -3539,7 +3563,7 @@
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能肇因於遺失自我簽章所致\n"
 
-#: g10/import.c:2050 g10/import.c:3386
+#: g10/import.c:2050 g10/import.c:3387
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
@@ -3554,7 +3578,7 @@
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3464
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
@@ -3624,17 +3648,17 @@
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 未改變\n"
 
-#: g10/import.c:2639 g10/import.c:2834
+#: g10/import.c:2640 g10/import.c:2835
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰已匯入\n"
 
-#: g10/import.c:2647
+#: g10/import.c:2648
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "金鑰 %s: 私鑰已存在\n"
 
-#: g10/import.c:2655
+#: g10/import.c:2656
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
@@ -3647,142 +3671,142 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2824
+#: g10/import.c:2825
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:2971
+#: g10/import.c:2972
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "私鑰 %s: %s\n"
 
-#: g10/import.c:2992 g10/import.c:3031
+#: g10/import.c:2993 g10/import.c:3032
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:3019
+#: g10/import.c:3020
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 
-#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3182 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3183 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3184 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3185 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3186 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
-#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
+#: g10/import.c:3311 g10/keylist.c:1254 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
+#: g10/import.c:3330 g10/keylist.c:1273 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
-#: g10/import.c:3379
+#: g10/import.c:3380
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3411
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 
-#: g10/import.c:3417
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:3437
+#: g10/import.c:3438
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:3472
+#: g10/import.c:3473
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 
-#: g10/import.c:3558
+#: g10/import.c:3559
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:3575
+#: g10/import.c:3576
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
 
-#: g10/import.c:3577
+#: g10/import.c:3578
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 
-#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
+#: g10/import.c:3595 g10/import.c:3623 g10/import.c:3679
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 
-#: g10/import.c:3595
+#: g10/import.c:3596
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3610
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 
-#: g10/import.c:3624
+#: g10/import.c:3625
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:3643
+#: g10/import.c:3644
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
 
-#: g10/import.c:3667
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3681
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:3695
+#: g10/import.c:3696
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:3739
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:3766
+#: g10/import.c:3767
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -3791,88 +3815,154 @@
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:3797
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:3808
+#: g10/import.c:3809
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:3826
+#: g10/import.c:3827
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:3840
+#: g10/import.c:3841
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:3848
+#: g10/import.c:3849
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:4021
+#: g10/import.c:4022
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:4086
+#: g10/import.c:4087
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:4102
+#: g10/import.c:4103
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:4168
+#: g10/import.c:4169
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:4206
+#: g10/import.c:4207
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/keydb.c:429 g10/keydb.c:456 sm/keydb.c:213 sm/keydb.c:226
+#: g10/key-check.c:133 dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
+#: dirmngr/ldap-wrapper.c:855
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "配置記憶體時出錯: %s\n"
+
+#: g10/key-check.c:396
+#, fuzzy, c-format
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+
+#: g10/key-check.c:405
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "卡片不支援 %s 摘要演算法\n"
+
+#: g10/key-check.c:571
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "完好的簽章來自於"
+
+#: g10/key-check.c:698
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "金鑰 %s: %s\n"
+
+#: g10/key-check.c:706
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+
+#: g10/key-check.c:715 g10/keylist.c:483
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
+
+#: g10/key-check.c:723 g10/keylist.c:479
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d 份損壞的簽章\n"
+
+#: g10/key-check.c:732
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "完好的簽章來自於"
+
+#: g10/key-check.c:742
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+
+#: g10/keydb.c:431 g10/keydb.c:458 sm/keydb.c:191 sm/keydb.c:204
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
 
-#: g10/keydb.c:432 g10/keydb.c:459
+#: g10/keydb.c:434 g10/keydb.c:461
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keydb.c:468 sm/keydb.c:232
+#: g10/keydb.c:470 sm/keydb.c:210
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "鑰匙盒 '%s' 已建立\n"
 
-#: g10/keydb.c:470
+#: g10/keydb.c:472
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "鑰匙圈 '%s' 已建立\n"
 
-#: g10/keydb.c:861
+#: g10/keydb.c:863
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "金鑰區塊資源 '%s': %s\n"
 
-#: g10/keydb.c:967
+#: g10/keydb.c:969
 #, fuzzy, c-format
 #| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: g10/keydb.c:1793
+#: g10/keydb.c:1795
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
@@ -4107,8 +4197,8 @@
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:464
+#: g10/keyedit.c:1030 g10/keyedit.c:6154 g10/keyedit.c:6237 g10/keyedit.c:6366
+#: g10/keyedit.c:6428 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -4301,7 +4391,7 @@
 "  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:2806 g10/keyedit.c:2874
+#: g10/keyedit.c:1648 g10/keyedit.c:2667 g10/keyedit.c:3040 g10/keyedit.c:3108
 msgid "Key is revoked."
 msgstr "金鑰已撤銷."
 
@@ -4356,7 +4446,7 @@
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1818 g10/keyedit.c:4543
+#: g10/keyedit.c:1818 g10/keyedit.c:4803
 msgid "You must select exactly one key.\n"
 msgstr "你一定祇得選擇一把金鑰.\n"
 
@@ -4430,7 +4520,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:2827 g10/keyedit.c:2980
+#: g10/keyedit.c:2216 g10/keyedit.c:2762 g10/keyedit.c:3061 g10/keyedit.c:3214
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
@@ -4477,109 +4567,124 @@
 msgid "Nothing to sign.\n"
 msgstr "沒有東西可以簽署.\n"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2937 g10/keyedit.c:6019
+#, c-format
+msgid "Not signed by you.\n"
+msgstr "並非由你所簽署.\n"
+
+#: g10/keyedit.c:2995
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "檢查已建立的簽章時出錯: %s\n"
+
+#: g10/keyedit.c:3116
 #, fuzzy, c-format
 #| msgid "'%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' 不是有效的簽章使用期限\n"
 
-#: g10/keyedit.c:2925
+#: g10/keyedit.c:3159
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" 不是指紋\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3183
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3306
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keyedit.c:3323
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3380
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3397
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:3155 g10/keylist.c:376
+#: g10/keyedit.c:3412 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:3163 g10/keyedit.c:3164
+#: g10/keyedit.c:3420 g10/keyedit.c:3421
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3669
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
-#: g10/keyedit.c:3481
+#: g10/keyedit.c:3741
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:3765
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:3511
+#: g10/keyedit.c:3771
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:3553 g10/keyedit.c:3700 g10/keylist.c:264 g10/keyserver.c:538
+#: g10/keyedit.c:3813 g10/keyedit.c:3960 g10/keylist.c:264 g10/keyserver.c:538
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2104
+#: g10/keyedit.c:3816 g10/keylist.c:2149
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:3558 g10/keylist.c:2110
+#: g10/keyedit.c:3818 g10/keylist.c:2155
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
+#: g10/keyedit.c:3820 g10/keyedit.c:3962 g10/keylist.c:266 g10/keylist.c:2161
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:3562
+#: g10/keyedit.c:3822
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:3570 g10/keyedit.c:3590 g10/keylist.c:269
+#: g10/keyedit.c:3830 g10/keyedit.c:3850 g10/keylist.c:269
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:3629
+#: g10/keyedit.c:3889
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:3633
+#: g10/keyedit.c:3893
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:3640
+#: g10/keyedit.c:3900
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:3658
+#: g10/keyedit.c:3918
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4587,17 +4692,17 @@
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非你重新執行程式.\n"
 
-#: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:3979 g10/keyedit.c:4410 g10/keyserver.c:548
+#: g10/mainproc.c:2371 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:3981 g10/keyedit.c:4412 g10/keyserver.c:552
+#: g10/mainproc.c:2373 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:3838
+#: g10/keyedit.c:4098
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4606,17 +4711,17 @@
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 "      導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:4150
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告: 你的加密子鑰很快將到期.\n"
 
-#: g10/keyedit.c:3891
+#: g10/keyedit.c:4151
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "你可能也會想變更其使用期限.\n"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:4210
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4625,72 +4730,72 @@
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3955 g10/keyedit.c:4245
+#: g10/keyedit.c:4215 g10/keyedit.c:4505
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3961
+#: g10/keyedit.c:4221
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2896
+#: g10/keyedit.c:4236 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 
-#: g10/keyedit.c:4078
+#: g10/keyedit.c:4338
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4088
+#: g10/keyedit.c:4348
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4092
+#: g10/keyedit.c:4352
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4359
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:4115
+#: g10/keyedit.c:4375
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:4119
+#: g10/keyedit.c:4379
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:4154
+#: g10/keyedit.c:4414
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:4156
+#: g10/keyedit.c:4416
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:4162
+#: g10/keyedit.c:4422
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4430
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
-#: g10/keyedit.c:4171
+#: g10/keyedit.c:4431
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:4240
+#: g10/keyedit.c:4500
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4699,15 +4804,15 @@
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:4251
+#: g10/keyedit.c:4511
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4528
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4554
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
@@ -4715,26 +4820,26 @@
 #  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:4309
+#: g10/keyedit.c:4569
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:4331
+#: g10/keyedit.c:4591
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4609
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4615
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4683
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4743,261 +4848,257 @@
 "N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4691
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4747
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:4547
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:4550
+#: g10/keyedit.c:4810
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:4668
+#: g10/keyedit.c:4928
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4934
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:5051
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:4832 g10/keyedit.c:4946 g10/keyedit.c:5059 g10/keyedit.c:5197
+#: g10/keyedit.c:5092 g10/keyedit.c:5206 g10/keyedit.c:5319 g10/keyedit.c:5457
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:5003
+#: g10/keyedit.c:5263
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5342
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:5083
+#: g10/keyedit.c:5343
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:5143
+#: g10/keyedit.c:5403
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:5290
+#: g10/keyedit.c:5550
 msgid "Proceed? (y/N) "
 msgstr "是否繼續? (y/N) "
 
-#: g10/keyedit.c:5360
+#: g10/keyedit.c:5620
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:5422
+#: g10/keyedit.c:5682
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:5523
+#: g10/keyedit.c:5783
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:5545
+#: g10/keyedit.c:5805
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:5686
+#: g10/keyedit.c:5946
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:5689 g10/keyedit.c:5791 g10/keyedit.c:5839
+#: g10/keyedit.c:5949 g10/keyedit.c:6051 g10/keyedit.c:6099
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:5691 g10/keyedit.c:5793 g10/keyedit.c:5841
+#: g10/keyedit.c:5951 g10/keyedit.c:6053 g10/keyedit.c:6101
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:5695
+#: g10/keyedit.c:5955
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:5700
+#: g10/keyedit.c:5960
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:5705
+#: g10/keyedit.c:5965
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:5759
-msgid "Not signed by you.\n"
-msgstr "並非由你所簽署.\n"
-
-#: g10/keyedit.c:5765
+#: g10/keyedit.c:6025
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:5794
+#: g10/keyedit.c:6054
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:5801
+#: g10/keyedit.c:6061
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:5826
+#: g10/keyedit.c:6086
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正要撤銷這些簽章:\n"
 
-#: g10/keyedit.c:5849
+#: g10/keyedit.c:6109
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:5882
+#: g10/keyedit.c:6142
 #, c-format
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:5930
+#: g10/keyedit.c:6190
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5940
+#: g10/keyedit.c:6200
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:5957
+#: g10/keyedit.c:6217
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:6053
+#: g10/keyedit.c:6313
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "你不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:6091
+#: g10/keyedit.c:6351
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6153
+#: g10/keyedit.c:6413
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6250
+#: g10/keyedit.c:6510
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:170
+#: g10/keygen.c:169
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid value for option '%s'\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/keygen.c:323
+#: g10/keygen.c:322
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "偏好設定 '%s' 重複了\n"
 
-#: g10/keygen.c:330
+#: g10/keygen.c:329
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:332
+#: g10/keygen.c:331
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:334
+#: g10/keygen.c:333
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:494
+#: g10/keygen.c:493
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "偏好字串中含有無效的項目 '%s'\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:972
 #, c-format
 msgid "writing direct signature\n"
 msgstr "寫入直接簽章中\n"
 
-#: g10/keygen.c:1019
+#: g10/keygen.c:1018
 #, c-format
 msgid "writing self signature\n"
 msgstr "寫入自我簽章中\n"
 
-#: g10/keygen.c:1076
+#: g10/keygen.c:1075
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
-#: g10/keygen.c:1657 g10/keygen.c:1662
+#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
+#: g10/keygen.c:1656 g10/keygen.c:1661
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
+#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1542
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1723
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1726
 msgid "Certify"
 msgstr "保證"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1729
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1733
+#: g10/keygen.c:1732
 msgid "Authenticate"
 msgstr "鑑定"
 
@@ -5011,162 +5112,162 @@
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1754
+#: g10/keygen.c:1753
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1785
+#: g10/keygen.c:1784
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1790
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1796
+#: g10/keygen.c:1795
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1799
+#: g10/keygen.c:1798
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1801
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1805
+#: g10/keygen.c:1804
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA 和 RSA (預設)\n"
 
-#: g10/keygen.c:1935
+#: g10/keygen.c:1934
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA 和 Elgamal\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1937
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1945
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能用於加密)\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1947
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能用於加密)\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1953
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1955
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:1962
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC 和 ECC\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1963
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) ECC (僅能用於簽署)\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1965
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "   (%d) ECC (你能自己設定性能)\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1967
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "   (%d) ECC (僅能用於加密)\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1971
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "   (%d) 現有的金鑰\n"
 
-#: g10/keygen.c:1974
+#: g10/keygen.c:1973
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card\n"
 msgstr "   (%d) 卡片上現存的金鑰\n"
 
-#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "請輸入金鑰鑰柄: "
 
-#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
 
-#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "沒有金鑰有此金鑰鑰柄\n"
 
-#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
+#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "讀取卡片時出錯: %s\n"
 
-#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "卡片序號: %s\n"
 
-#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "可用金鑰:\n"
 
-#: g10/keygen.c:2294 g10/keygen.c:2308
+#: g10/keygen.c:2297 g10/keygen.c:2311
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:2349
+#: g10/keygen.c:2352
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:2357
+#: g10/keygen.c:2360
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:2420
+#: g10/keygen.c:2423
 msgid "Please select which elliptic curve you want:\n"
 msgstr "請選擇你要使用的橢圓曲線:\n"
 
-#: g10/keygen.c:2608
+#: g10/keygen.c:2611
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5182,7 +5283,7 @@
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:2619
+#: g10/keygen.c:2622
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5198,38 +5299,38 @@
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:2642
+#: g10/keygen.c:2645
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:2647
+#: g10/keygen.c:2650
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:2660 g10/keygen.c:2685
+#: g10/keygen.c:2663 g10/keygen.c:2688
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2670
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:2668
+#: g10/keygen.c:2671
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:2673
+#: g10/keygen.c:2676
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:2674
+#: g10/keygen.c:2677
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:2678
+#: g10/keygen.c:2681
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5237,11 +5338,11 @@
 "你的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:2691
+#: g10/keygen.c:2694
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:2759
+#: g10/keygen.c:2762
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5255,7 +5356,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2774
+#: g10/keygen.c:2777
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5270,49 +5371,49 @@
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:2793
+#: g10/keygen.c:2796
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:2802
+#: g10/keygen.c:2805
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:2803
+#: g10/keygen.c:2806
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:2807
+#: g10/keygen.c:2810
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2813
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:2820
+#: g10/keygen.c:2823
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:2826
+#: g10/keygen.c:2829
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:2835
+#: g10/keygen.c:2838
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2844
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:2877
+#: g10/keygen.c:2880
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "你正在使用 '%s' 字元集.\n"
 
-#: g10/keygen.c:2883
+#: g10/keygen.c:2886
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5323,7 +5424,7 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2888
+#: g10/keygen.c:2891
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
@@ -5338,31 +5439,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2913
+#: g10/keygen.c:2916
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2926
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2924
+#: g10/keygen.c:2927
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2929
+#: g10/keygen.c:2932
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2933
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2949
+#: g10/keygen.c:2952
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2995
+#: g10/keygen.c:2998
 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"
@@ -5373,13 +5474,13 @@
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
-#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
+#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
+#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:4283
+#: g10/keygen.c:4287
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5390,64 +5491,64 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4285
+#: g10/keygen.c:4289
 msgid "Continue? (Y/n) "
 msgstr "是否繼續? (Y/n) "
 
-#: g10/keygen.c:4306
+#: g10/keygen.c:4310
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" 的金鑰已存在\n"
 
-#: g10/keygen.c:4311
+#: g10/keygen.c:4315
 msgid "Create anyway? (y/N) "
 msgstr "無論如何還是要建立嗎? (y/N) "
 
-#: g10/keygen.c:4317
+#: g10/keygen.c:4321
 #, c-format
 msgid "creating anyway\n"
 msgstr "總之還是在建立\n"
 
-#: g10/keygen.c:4718
+#: g10/keygen.c:4722
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
 
-#: g10/keygen.c:4767
+#: g10/keygen.c:4771
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:4827
+#: g10/keygen.c:4831
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "無法建立備份檔案 '%s': %s\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:4851
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
 
-#: g10/keygen.c:5006 g10/keygen.c:5168
+#: g10/keygen.c:5010 g10/keygen.c:5172
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在寫入公鑰至 '%s'\n"
 
-#: g10/keygen.c:5162
+#: g10/keygen.c:5166
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:5176
+#: g10/keygen.c:5180
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keygen.c:5209
+#: g10/keygen.c:5213
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:5225
+#: g10/keygen.c:5229
 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"
@@ -5455,34 +5556,34 @@
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:5400 g10/keygen.c:5589
+#: g10/keygen.c:5404 g10/keygen.c:5593
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:5402 g10/keygen.c:5591
+#: g10/keygen.c:5406 g10/keygen.c:5595
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:5413 g10/keygen.c:5602
+#: g10/keygen.c:5417 g10/keygen.c:5606
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
 
-#: g10/keygen.c:5425 g10/keygen.c:5427
+#: g10/keygen.c:5429 g10/keygen.c:5431
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keygen.c:5434 g10/keygen.c:5436
+#: g10/keygen.c:5438 g10/keygen.c:5440
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keygen.c:5455 g10/keygen.c:5616
+#: g10/keygen.c:5459 g10/keygen.c:5620
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
@@ -5517,20 +5618,6 @@
 msgid_plural "%d good signatures\n"
 msgstr[0] "%d 份損壞的簽章\n"
 
-#: g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
-
-#: g10/keylist.c:483
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
-msgid "%d signature not checked due to a missing key\n"
-msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
-
 #: g10/keylist.c:488
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
@@ -5549,30 +5636,30 @@
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1963
+#: g10/keylist.c:2008
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1965
+#: g10/keylist.c:2010
 msgid "     Subkey fingerprint:"
 msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1973
+#: g10/keylist.c:2018
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1975 g10/keylist.c:1985
+#: g10/keylist.c:2020 g10/keylist.c:2030
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1980 g10/keylist.c:1996
+#: g10/keylist.c:2025 g10/keylist.c:2041
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:2047
+#: g10/keylist.c:2092
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
@@ -5602,7 +5689,7 @@
 msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 份損壞的簽章\n"
 
-#: g10/keyring.c:1640
+#: g10/keyring.c:1641
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
@@ -5653,449 +5740,449 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 
-#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#: g10/keyserver.c:1438 g10/keyserver.c:1471
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1430
+#: g10/keyserver.c:1445
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1549
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1552
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1709
+#: g10/keyserver.c:1743
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1713
+#: g10/keyserver.c:1747
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1997
+#: g10/keyserver.c:1852 g10/keyserver.c:2031
 #, fuzzy, c-format
 #| msgid "invalid keyserver options\n"
 msgid "no keyserver known\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1867 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/keyserver.c:1837
+#: g10/keyserver.c:1871
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1878
+#: g10/keyserver.c:1912
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在向 '%s' 請求金鑰\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1928
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓取 URI %s: %s\n"
 
-#: g10/mainproc.c:262
+#: g10/mainproc.c:283
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:389
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:400
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的 %d 摘要演算法所產生\n"
 
-#: g10/mainproc.c:401
+#: g10/mainproc.c:481
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:477
+#: g10/mainproc.c:557
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:590
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:514 g10/pkclist.c:228
+#: g10/mainproc.c:594 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:518
+#: g10/mainproc.c:598
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 所加密\n"
 
-#: g10/mainproc.c:539
+#: g10/mainproc.c:619
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:555 g10/mainproc.c:859
+#: g10/mainproc.c:641 g10/mainproc.c:970
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告: 看到了多份明文\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:649
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:651
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:599 g10/mainproc.c:620
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:692 g10/mainproc.c:723
+#: g10/mainproc.c:779 g10/mainproc.c:817
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:790
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:706
+#: g10/mainproc.c:793
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:798
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:719
+#: g10/mainproc.c:810
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:728
+#: g10/mainproc.c:823
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:841
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:775
+#: g10/mainproc.c:886
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
 
-#: g10/mainproc.c:782
+#: g10/mainproc.c:893
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:1037
+#: g10/mainproc.c:1148
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1341 g10/mainproc.c:1384
+#: g10/mainproc.c:1452 g10/mainproc.c:1495
 #, c-format
 msgid "no signature found\n"
 msgstr "找不到簽章\n"
 
-#: g10/mainproc.c:1737
+#: g10/mainproc.c:1852
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1739
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1741
+#: g10/mainproc.c:1856
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1761
+#: g10/mainproc.c:1876
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已抑制\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1985
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這個不明確的簽章資料\n"
 
-#: g10/mainproc.c:1886 g10/mainproc.c:1893
+#: g10/mainproc.c:2001 g10/mainproc.c:2008
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1887 g10/mainproc.c:1894
+#: g10/mainproc.c:2002 g10/mainproc.c:2009 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1898
+#: g10/mainproc.c:2013
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:2019
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1955
+#: g10/mainproc.c:2070
 #, c-format
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2210
+#: g10/mainproc.c:2325
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:2248
+#: g10/mainproc.c:2363
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2438
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/mainproc.c:2341
+#: g10/mainproc.c:2456
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:2345
+#: g10/mainproc.c:2460
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署將在 %s 到期\n"
 
-#: g10/mainproc.c:2356
+#: g10/mainproc.c:2471
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
 
-#: g10/mainproc.c:2357
+#: g10/mainproc.c:2472
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:2358
+#: g10/mainproc.c:2473
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2473 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2360
+#: g10/mainproc.c:2475
 msgid ", key algorithm "
 msgstr ", 金鑰演算法 "
 
-#: g10/mainproc.c:2395
+#: g10/mainproc.c:2510
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2433
+#: g10/mainproc.c:2548
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
+#: g10/mainproc.c:2644 g10/mainproc.c:2663 g10/mainproc.c:2787
 #, c-format
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2582
+#: g10/mainproc.c:2697
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2591
+#: g10/mainproc.c:2706
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2676
+#: g10/mainproc.c:2791
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
+#: g10/misc.c:106 g10/misc.c:136 g10/misc.c:212
 #, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
 msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:171
+#: g10/misc.c:175
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:280
+#: g10/misc.c:284
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
 
-#: g10/misc.c:287
+#: g10/misc.c:291
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:305
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
 
-#: g10/misc.c:320
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 
-#: g10/misc.c:329
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 
-#: g10/misc.c:354
+#: g10/misc.c:360
 #, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:376
 #, fuzzy, c-format
 #| msgid "Note: signatures using the %s algorithm are rejected\n"
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
 msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
 
-#: g10/misc.c:394
+#: g10/misc.c:400
 #, fuzzy, c-format
 #| msgid "%s:%u: read error: %s\n"
 msgid "(reported error: %s)\n"
 msgstr "%s:%u: 讀取錯誤: %s\n"
 
-#: g10/misc.c:397
+#: g10/misc.c:403
 #, fuzzy, c-format
 #| msgid "read error in '%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "'%s' 讀取錯誤: %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:422
 #, c-format
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1086
+#: g10/misc.c:1171
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:1090
+#: g10/misc.c:1175
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: 已不建議使用 \"%s\" 選項\n"
 
-#: g10/misc.c:1092
+#: g10/misc.c:1177
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:1099
+#: g10/misc.c:1184
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
 
-#: g10/misc.c:1109
+#: g10/misc.c:1194
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅對 %s 有影響\n"
 
-#: g10/misc.c:1113
+#: g10/misc.c:1198
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1262
 msgid "Uncompressed"
 msgstr "未壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1202
+#: g10/misc.c:1287
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未壓縮|無"
 
-#: g10/misc.c:1309
+#: g10/misc.c:1394
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1484
+#: g10/misc.c:1569
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "不明確的選項 '%s'\n"
 
-#: g10/misc.c:1509
+#: g10/misc.c:1594
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的選項 '%s'\n"
 
-#: g10/misc.c:1747
+#: g10/misc.c:1832
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
 
-#: g10/misc.c:1769
+#: g10/misc.c:1854
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6129,71 +6216,71 @@
 msgid "assuming signed data in '%s'\n"
 msgstr "假設被簽署的資料在 '%s'\n"
 
-#: g10/parse-packet.c:286
+#: g10/parse-packet.c:289
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作 %d 公開金鑰演算法\n"
 
-#: g10/parse-packet.c:1216
+#: g10/parse-packet.c:1231
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 
-#: g10/parse-packet.c:1670
+#: g10/parse-packet.c:1708
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "關鍵簽章註記: "
 
-#: g10/parse-packet.c:1795
+#: g10/parse-packet.c:1833
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
+#: g10/passphrase.c:73 g10/passphrase.c:275 g10/passphrase.c:308
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題: %s\n"
 
-#: g10/passphrase.c:244
+#: g10/passphrase.c:258
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:255
+#: g10/passphrase.c:269
 #, c-format
 msgid "cancelled by user\n"
 msgstr "由使用者所取消\n"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:510
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:503
+#: g10/passphrase.c:517
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
 
-#: g10/passphrase.c:507
+#: g10/passphrase.c:521
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
 
-#: g10/passphrase.c:512
+#: g10/passphrase.c:526
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
 
-#: g10/passphrase.c:515
+#: g10/passphrase.c:529
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
 
-#: g10/passphrase.c:520
+#: g10/passphrase.c:534
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
 
-#: g10/passphrase.c:523
+#: g10/passphrase.c:537
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "%s\n"
@@ -6249,7 +6336,7 @@
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:390
+#: g10/photoid.c:395
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
@@ -6555,12 +6642,12 @@
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/pkclist.c:1667
+#: g10/pkclist.c:1677
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
 
-#: g10/pkclist.c:1692
+#: g10/pkclist.c:1702
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@ -6614,27 +6701,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好, 我們就是匿名收件者.\n"
 
-#: g10/pubkey-enc.c:324
+#: g10/pubkey-enc.c:321
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支援舊式的 DEK 編碼\n"
 
-#: g10/pubkey-enc.c:352
+#: g10/pubkey-enc.c:349
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "%d%s 編密演算法未知或已停用\n"
 
-#: g10/pubkey-enc.c:396
+#: g10/pubkey-enc.c:393
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
 
-#: g10/pubkey-enc.c:429
+#: g10/pubkey-enc.c:426
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
 
-#: g10/pubkey-enc.c:436
+#: g10/pubkey-enc.c:433
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "請注意: 金鑰已撤銷"
@@ -6835,7 +6922,7 @@
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告: 簽章摘要與訊息不一致\n"
 
-#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "key %s may not be used for signing in %s mode\n"
@@ -6901,29 +6988,29 @@
 msgid "Note: signature key %s has been revoked\n"
 msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
 
-#: g10/sig-check.c:482
+#: g10/sig-check.c:480
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/sig-check.c:494
+#: g10/sig-check.c:492
 #, fuzzy, c-format
 #| msgid "standalone signature of class 0x%02x\n"
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/sig-check.c:561
+#: g10/sig-check.c:559
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:1158
+#: g10/sig-check.c:1156
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:1161
+#: g10/sig-check.c:1159
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
@@ -6946,23 +7033,23 @@
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:470
+#: g10/sign.c:476
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:1033
+#: g10/sign.c:1046
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:1164
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1441
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -6986,7 +7073,7 @@
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:384
+#: g10/tdbdump.c:57 g10/trustdb.c:381
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -7031,12 +7118,12 @@
 msgid "read error in '%s': %s\n"
 msgstr "'%s' 讀取錯誤: %s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:399
+#: g10/tdbdump.c:234 g10/trustdb.c:396
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:144 sm/keydb.c:356
+#: g10/tdbio.c:144 sm/keydb.c:336
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "無法為 '%s' 建立鎖定\n"
@@ -7046,12 +7133,12 @@
 msgid "can't lock '%s'\n"
 msgstr "無法鎖定 '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1850
+#: g10/tdbio.c:224 g10/tdbio.c:1852
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1861
+#: g10/tdbio.c:232 g10/tdbio.c:1863
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
@@ -7066,103 +7153,103 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
+#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "無法存取 '%s': %s\n"
 
-#: g10/tdbio.c:760
+#: g10/tdbio.c:762
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:765
+#: g10/tdbio.c:767
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:768
+#: g10/tdbio.c:770
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:824
+#: g10/tdbio.c:826
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:833
+#: g10/tdbio.c:835
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:870
+#: g10/tdbio.c:872
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:878
+#: g10/tdbio.c:880
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:902 g10/tdbio.c:936 g10/tdbio.c:954 g10/tdbio.c:974
-#: g10/tdbio.c:1011 g10/tdbio.c:1780 g10/tdbio.c:1809
+#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
+#: g10/tdbio.c:1013 g10/tdbio.c:1782 g10/tdbio.c:1811
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:983
+#: g10/tdbio.c:985
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1530
+#: g10/tdbio.c:1532
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1541
+#: g10/tdbio.c:1543
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1566
+#: g10/tdbio.c:1568
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1591
+#: g10/tdbio.c:1593
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1599
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1816
+#: g10/tdbio.c:1818
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1822
+#: g10/tdbio.c:1824
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1831
+#: g10/tdbio.c:1833
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零失敗: %s\n"
 
-#: g10/tdbio.c:1867
+#: g10/tdbio.c:1869
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加記錄失敗: %s\n"
 
-#: g10/tdbio.c:1928
+#: g10/tdbio.c:1930
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "錯誤: 信任資料庫已毀損.\n"
@@ -7524,127 +7611,127 @@
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:229
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' 不是有效的長式金鑰 ID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 
-#: g10/trustdb.c:308
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:316
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "金鑰 %s 已標記成徹底信任了\n"
 
-#: g10/trustdb.c:363
+#: g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 
-#: g10/trustdb.c:369
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
-#: g10/trustdb.c:444
+#: g10/trustdb.c:441
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "你可以試著用下列指令來重建信任資料庫:\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:450
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "如果行不通的話, 請查閱手冊\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:500
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:509
+#: g10/trustdb.c:506
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:558
+#: g10/trustdb.c:555
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:564 g10/trustdb.c:2255
+#: g10/trustdb.c:561 g10/trustdb.c:2238
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:573
+#: g10/trustdb.c:570
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:813 g10/trustdb.c:1400
+#: g10/trustdb.c:810 g10/trustdb.c:1397
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1030
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1035
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:1976
+#: g10/trustdb.c:1959
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "目前已處理 %lu 把金鑰\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:1962
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2032
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2063
+#: g10/trustdb.c:2046
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 
-#: g10/trustdb.c:2181
+#: g10/trustdb.c:2164
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2262
+#: g10/trustdb.c:2245
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -7764,106 +7851,121 @@
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:745 scd/app-openpgp.c:3560
+#. TRANSLATORS: Put a \x1f right before a colon.  This can be
+#. * used by pinentry to nicely align the names and values.  Keep
+#. * the %s at the start and end of the string.
+#: scd/app-p15.c:3369 scd/app-openpgp.c:2153
+#, c-format
+msgid "%sNumber: %s%%0AHolder: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-p15.c:3388 scd/app-openpgp.c:2169
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-p15.c:3459 scd/app-nks.c:1110
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
+
+#: scd/app-p15.c:3462 scd/app-nks.c:1092
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
+
+#: scd/app-nks.c:709 scd/app-openpgp.c:3664
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-nks.c:753 scd/app-openpgp.c:3572
+#: scd/app-nks.c:717 scd/app-openpgp.c:3676
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
-#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
-#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
+#: scd/app-nks.c:797 scd/app-openpgp.c:2326 scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2512 scd/app-openpgp.c:2530 scd/app-openpgp.c:2827
+#: scd/app-openpgp.c:2874 scd/app-openpgp.c:2989 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
 
-#: scd/app-nks.c:866
+#: scd/app-nks.c:830
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN 還沒有變更過\n"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1091
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
 
-#: scd/app-nks.c:1128
-msgid "||Please enter the PIN for the standard keys."
-msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
-
-#: scd/app-nks.c:1134
+#: scd/app-nks.c:1098
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|請輸入標準金鑰將採用的 PIN 重設碼 (PUK)."
 
-#: scd/app-nks.c:1136
+#: scd/app-nks.c:1100
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
 
-#: scd/app-nks.c:1144
+#: scd/app-nks.c:1108
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
 
-#: scd/app-nks.c:1146
-msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
-
-#: scd/app-nks.c:1154
+#: scd/app-nks.c:1118
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|NP|請輸入金鑰的新 PIN 重設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:1156
+#: scd/app-nks.c:1120
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
+#: scd/app-nks.c:1227 scd/app-openpgp.c:2908 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:827
+#: scd/app-openpgp.c:860
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:840
+#: scd/app-openpgp.c:873
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
+#: scd/app-openpgp.c:1272 scd/app-openpgp.c:2855 scd/app-openpgp.c:5020
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1393
+#: scd/app-openpgp.c:1430
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1400
+#: scd/app-openpgp.c:1437
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1547
 #, fuzzy, c-format
 #| msgid "response does not contain the EC public point\n"
 msgid "response does not contain the EC public key\n"
 msgstr "回應中未包含 EC 公用指數\n"
 
-#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
+#: scd/app-openpgp.c:1665 scd/app-openpgp.c:4284
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1710
+#: scd/app-openpgp.c:1772
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
@@ -7871,56 +7973,44 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:2140
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2077
-#, c-format
-msgid "%sNumber: %s%%0AHolder: %s%s"
-msgstr ""
-
-#. TRANSLATORS: This is the number of remaining attempts to
-#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2093
-#, c-format
-msgid "Remaining attempts: %d"
-msgstr ""
-
-#: scd/app-openpgp.c:2204
+#: scd/app-openpgp.c:2280
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "以 %s 做為預設 PIN\n"
 
-#: scd/app-openpgp.c:2211
+#: scd/app-openpgp.c:2287
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
 
-#: scd/app-openpgp.c:2224
+#: scd/app-openpgp.c:2300
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
+#: scd/app-openpgp.c:2352 scd/app-openpgp.c:2537 scd/app-openpgp.c:2834
 #, 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:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
-#: scd/app-openpgp.c:4479
+#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2413 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:4642
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
+#: scd/app-openpgp.c:2449 scd/app-openpgp.c:5029
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:2363
+#: scd/app-openpgp.c:2453
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -7930,24 +8020,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2373
+#: scd/app-openpgp.c:2463
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|請輸入管理者 PIN"
 
-#: scd/app-openpgp.c:2395
+#: scd/app-openpgp.c:2484
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: scd/app-openpgp.c:2736
+#: scd/app-openpgp.c:2821
 msgid "||Please enter the PIN"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2785
+#: scd/app-openpgp.c:2870
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2880 scd/app-openpgp.c:2941
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
@@ -7955,121 +8045,121 @@
 #. 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:2818
+#: scd/app-openpgp.c:2903
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增重設碼"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2819
+#: scd/app-openpgp.c:2904
 msgid "|N|New PIN"
 msgstr "|N|新增個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:2985
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
 
-#: scd/app-openpgp.c:2901
+#: scd/app-openpgp.c:2986
 msgid "||Please enter the PIN and New PIN"
 msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
+#: scd/app-openpgp.c:3048 scd/app-openpgp.c:4344
 #, c-format
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
+#: scd/app-openpgp.c:3054 scd/app-openpgp.c:4351
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:2979
+#: scd/app-openpgp.c:3064
 #, c-format
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3068
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:2985
+#: scd/app-openpgp.c:3070
 #, c-format
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3072
 #, c-format
 msgid "writing new key\n"
 msgstr "正在寫入新的金鑰\n"
 
-#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
+#: scd/app-openpgp.c:3645 scd/app-openpgp.c:3997
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
+#: scd/app-openpgp.c:3686 scd/app-openpgp.c:3694
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
+#: scd/app-openpgp.c:3827 scd/app-openpgp.c:4104
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:3886
+#: scd/app-openpgp.c:3991
 #, fuzzy, c-format
 #| msgid "unsupported inquiry '%s'\n"
 msgid "unsupported curve\n"
 msgstr "未支援的查詢 '%s'\n"
 
-#: scd/app-openpgp.c:4155
+#: scd/app-openpgp.c:4261
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:4163
+#: scd/app-openpgp.c:4269
 #, c-format
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:4169
+#: scd/app-openpgp.c:4275
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4309
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4253
+#: scd/app-openpgp.c:4359
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:4368
+#: scd/app-openpgp.c:4558
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:4453
+#: scd/app-openpgp.c:4616
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:4950
+#: scd/app-openpgp.c:5034
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
+#: scd/app-openpgp.c:5346 scd/app-openpgp.c:5357
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -8085,55 +8175,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|開始新增個人識別碼 (PIN)"
 
-#: scd/scdaemon.c:118
+#: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
 
-#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
+#: scd/scdaemon.c:129 sm/gpgsm.c:345 dirmngr/dirmngr.c:187
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為指定等級"
 
-#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|檔案|將日誌寫入至指定檔案"
 
-#: scd/scdaemon.c:137
+#: scd/scdaemon.c:138
 msgid "|N|connect to reader at port N"
 msgstr "|N|從 N 埠連線至讀卡機"
 
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
 
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
 msgid "do not use the internal CCID driver"
 msgstr "不要使用內部的 CCID 驅動程式"
 
-#: scd/scdaemon.c:150
+#: scd/scdaemon.c:151
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 
-#: scd/scdaemon.c:153
+#: scd/scdaemon.c:154
 msgid "do not use a reader's pinpad"
 msgstr "不要使用讀卡機鍵盤"
 
-#: scd/scdaemon.c:158
+#: scd/scdaemon.c:159
 msgid "deny the use of admin card commands"
 msgstr "禁用管理者卡片指令"
 
-#: scd/scdaemon.c:161
+#: scd/scdaemon.c:162
 msgid "use variable length input for pinpad"
 msgstr "輸入 PIN 時在輸入區顯示成變動長度"
 
-#: scd/scdaemon.c:307
+#: scd/scdaemon.c:311
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
 
-#: scd/scdaemon.c:309
+#: scd/scdaemon.c:313
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8141,306 +8231,323 @@
 "語法: scdaemon [選項] [指令 [引數]]\n"
 "@GNUPG@ 智慧卡服務\n"
 
-#: scd/scdaemon.c:830
+#: scd/scdaemon.c:806
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
 
-#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
+#: scd/scdaemon.c:1183 dirmngr/dirmngr.c:2082
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程式已啟動\n"
 
-#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2090
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程式已終止\n"
 
-#: sm/certchain.c:194
+#: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "憑證所要求的驗證模型: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:2008
+#: sm/certchain.c:199 sm/certchain.c:2164
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:196 sm/certchain.c:2008
+#: sm/certchain.c:200 sm/certchain.c:2164
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:256 dirmngr/validate.c:144
+#: sm/certchain.c:260 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "未支援關鍵憑證擴充欄位 %s"
 
-#: sm/certchain.c:295 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:242
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "發行者憑證並未標記為 CA"
 
-#: sm/certchain.c:333
+#: sm/certchain.c:337
 msgid "critical marked policy without configured policies"
 msgstr "關鍵已標記原則沒有已組態的原則"
 
-#: sm/certchain.c:343
+#: sm/certchain.c:347
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "開啟 '%s' 失敗: %s\n"
 
-#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "請注意: 不允許非關鍵的憑證原則"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "未允許憑證原則"
 
-#: sm/certchain.c:608
+#: sm/certchain.c:595 sm/keydb.c:1106 sm/keydb.c:1192
+#, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "取得指紋失敗\n"
+
+#: sm/certchain.c:624
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "從外部位置尋找發行者\n"
 
-#: sm/certchain.c:628
+#: sm/certchain.c:644
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "吻合的發行者數量: %d\n"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "無法取得 authorityInfoAccess: %s\n"
+
+#: sm/certchain.c:791
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "從 Dirmngr 快取尋找發行者\n"
 
-#: sm/certchain.c:701
+#: sm/certchain.c:816
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "吻合的憑證數量: %d\n"
 
-#: sm/certchain.c:704
+#: sm/certchain.c:819
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
 
-#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
-#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
-#: sm/sign.c:337 sm/verify.c:115
+#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:265
+#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1113 sm/keydb.c:1199
+#: sm/sign.c:337 sm/verify.c:118
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "配置 keyDB 代號失敗\n"
 
-#: sm/certchain.c:1069
+#: sm/certchain.c:1225
 msgid "certificate has been revoked"
 msgstr "憑證已撤銷"
 
-#: sm/certchain.c:1084
+#: sm/certchain.c:1240
 msgid "the status of the certificate is unknown"
 msgstr "憑證的狀態未知"
 
-#: sm/certchain.c:1091
+#: sm/certchain.c:1247
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
 
-#: sm/certchain.c:1097
+#: sm/certchain.c:1253
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查 CRL 時失敗: %s"
 
-#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
+#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "有效性無效的憑證: %s"
 
-#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
+#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "憑證尚未生效"
 
-#: sm/certchain.c:1142 sm/certchain.c:1227
+#: sm/certchain.c:1298 sm/certchain.c:1383
 msgid "root certificate not yet valid"
 msgstr "根憑證尚未生效"
 
-#: sm/certchain.c:1143 sm/certchain.c:1228
+#: sm/certchain.c:1299 sm/certchain.c:1384
 msgid "intermediate certificate not yet valid"
 msgstr "媒介憑證尚未生效"
 
-#: sm/certchain.c:1156 dirmngr/validate.c:526
+#: sm/certchain.c:1312 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "憑證已過期"
 
-#: sm/certchain.c:1157
+#: sm/certchain.c:1313
 msgid "root certificate has expired"
 msgstr "根憑證已過期"
 
-#: sm/certchain.c:1158
+#: sm/certchain.c:1314
 msgid "intermediate certificate has expired"
 msgstr "媒介憑證已過期"
 
-#: sm/certchain.c:1200
+#: sm/certchain.c:1356
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "遺失所需的憑證屬性: %s%s%s"
 
-#: sm/certchain.c:1209
+#: sm/certchain.c:1365
 msgid "certificate with invalid validity"
 msgstr "有效性無效的憑證"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1402
 msgid "signature not created during lifetime of certificate"
 msgstr "簽章並非在憑證生存時間內所造"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1404
 msgid "certificate not created during lifetime of issuer"
 msgstr "憑證並非在發行者生存時間內所造"
 
-#: sm/certchain.c:1249
+#: sm/certchain.c:1405
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "媒介憑證並非在發行者生存時間內所造"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1409
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (            簽章建立於 "
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1410
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (            憑證建立於 "
 
-#: sm/certchain.c:1257
+#: sm/certchain.c:1413
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (憑證有效自 "
 
-#: sm/certchain.c:1258
+#: sm/certchain.c:1414
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (        發行者有效自 "
 
-#: sm/certchain.c:1288 dirmngr/validate.c:577
+#: sm/certchain.c:1444 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指紋=%s\n"
 
-#: sm/certchain.c:1297
+#: sm/certchain.c:1453
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根憑證現在已標記為已信任\n"
 
-#: sm/certchain.c:1310
+#: sm/certchain.c:1466
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
 
-#: sm/certchain.c:1316
+#: sm/certchain.c:1472
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "互動式標記為已信任在此作業階段中已停用\n"
 
-#: sm/certchain.c:1375
+#: sm/certchain.c:1531
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告: 簽章創造時間未知 - 假設為此刻"
 
-#: sm/certchain.c:1439
+#: sm/certchain.c:1595
 msgid "no issuer found in certificate"
 msgstr "憑證中找不到發行者"
 
-#: sm/certchain.c:1517
+#: sm/certchain.c:1673
 msgid "self-signed certificate has a BAD signature"
 msgstr "自簽憑證有 不良 簽章"
 
-#: sm/certchain.c:1586 dirmngr/validate.c:575
+#: sm/certchain.c:1742 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根憑證未標記為已信任"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1758
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "憑證鏈太長\n"
 
-#: sm/certchain.c:1645 dirmngr/validate.c:642
+#: sm/certchain.c:1801 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "找不到發行者憑證"
 
-#: sm/certchain.c:1678 dirmngr/validate.c:668
+#: sm/certchain.c:1834 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "憑證有 不良 簽章"
 
-#: sm/certchain.c:1710 dirmngr/validate.c:692
+#: sm/certchain.c:1866 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
 
-#: sm/certchain.c:1769 dirmngr/validate.c:717
+#: sm/certchain.c:1925 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
 
-#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
+#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "憑證完好\n"
 
-#: sm/certchain.c:1812
+#: sm/certchain.c:1968
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "媒介憑證良好\n"
 
-#: sm/certchain.c:1813
+#: sm/certchain.c:1969
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根憑證完好\n"
 
-#: sm/certchain.c:1995
+#: sm/certchain.c:2151
 msgid "switching to chain model"
 msgstr "切換至鏈模型"
 
-#: sm/certchain.c:2004
+#: sm/certchain.c:2160
 #, c-format
 msgid "validation model used: %s"
 msgstr "已使用的驗證模型: %s"
 
-#: sm/certcheck.c:107
+#: sm/certcheck.c:110
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 
-#: sm/certcheck.c:244 sm/verify.c:210
+#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1324 dirmngr/validate.c:903
+#: dirmngr/validate.c:927
+#, c-format
+msgid "out of core\n"
+msgstr "超出核心\n"
+
+#: sm/certcheck.c:371 sm/verify.c:213
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
 msgid "none"
 msgstr "無"
 
-#: sm/certdump.c:552 sm/certdump.c:617
+#: sm/certdump.c:631 sm/certdump.c:696
 msgid "[Error - invalid encoding]"
 msgstr "[錯誤 - 無效的編碼]"
 
-#: sm/certdump.c:560
+#: sm/certdump.c:639
 msgid "[Error - out of core]"
 msgstr "[錯誤 - 超出核心]"
 
-#: sm/certdump.c:596
+#: sm/certdump.c:675
 msgid "[Error - No name]"
 msgstr "[錯誤 - 沒有名稱]"
 
-#: sm/certdump.c:623
+#: sm/certdump.c:702
 msgid "[Error - invalid DN]"
 msgstr "[錯誤 - 無效的 DN]"
 
-#: sm/certdump.c:836
+#: sm/certdump.c:915
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8454,137 +8561,137 @@
 "S/N %s, ID 0x%08lX,\n"
 "建立於 %s, 於 %s 到期.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1111
+#: sm/certlist.c:122 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1121
+#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得金鑰用途資訊時出錯: %s\n"
 
-#: sm/certlist.c:143 dirmngr/validate.c:1152
+#: sm/certlist.c:143 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "憑證應該還未被用於憑證\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1162
+#: sm/certlist.c:156 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1145
+#: sm/certlist.c:169 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "憑證應該還未被用於加密\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1135
+#: sm/certlist.c:170 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "憑證應該還未被用於簽署\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1146
+#: sm/certlist.c:171 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "憑證無法用於加密\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1136
+#: sm/certlist.c:172 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "憑證無法用於簽署\n"
 
-#: sm/certreqgen.c:464
+#: sm/certreqgen.c:465
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "第 %d 列: 無效的演算法\n"
 
-#: sm/certreqgen.c:478
+#: sm/certreqgen.c:481
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "第 %d 列: 金鑰長度 %u 無效 (有效範圍是從 %d 至 %d)\n"
 
-#: sm/certreqgen.c:496
+#: sm/certreqgen.c:499
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "第 %d 列: 沒有給定的物件名稱\n"
 
-#: sm/certreqgen.c:505
+#: sm/certreqgen.c:508
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "第 %d 列: 無效的主旨名稱標籤 '%.*s'\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:511
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "第 %d 列: 無效的主旨名稱 '%s'  於第 %d 位置\n"
 
-#: sm/certreqgen.c:525
+#: sm/certreqgen.c:528
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "第 %d 列: 不是有效的電子郵件地址\n"
 
-#: sm/certreqgen.c:544
+#: sm/certreqgen.c:547
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "第 %d 列: 無效的序號\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:563
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "第 %d 列: 無效的發行者名稱標籤 '%.*s'\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:566
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "第 %d 列: 無效的發行者名稱 '%s'  於第 %d 位置\n"
 
-#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#: sm/certreqgen.c:578 sm/certreqgen.c:589
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "第 %d 列: 無效的給定日期\n"
 
-#: sm/certreqgen.c:599
+#: sm/certreqgen.c:602
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得簽署金鑰時出錯: %s\n"
 
-#: sm/certreqgen.c:618
+#: sm/certreqgen.c:621
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "第 %d 列: 無效的給定雜湊演算法\n"
 
-#: sm/certreqgen.c:633
+#: sm/certreqgen.c:636
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "第 %d 列: 無效的 authority-key-id\n"
 
-#: sm/certreqgen.c:648
+#: sm/certreqgen.c:651
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "第 %d 列: 無效的 subject-key-id\n"
 
-#: sm/certreqgen.c:686
+#: sm/certreqgen.c:689
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "第 %d 列: 無效的擴充語法\n"
 
-#: sm/certreqgen.c:699
+#: sm/certreqgen.c:702
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "第 %d 列: 從卡片讀取金鑰 '%s' 時出錯: %s\n"
 
-#: sm/certreqgen.c:712
+#: sm/certreqgen.c:715
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得金鑰時出錯: %s\n"
 
-#: sm/certreqgen.c:729
+#: sm/certreqgen.c:732
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
 
-#: sm/certreqgen.c:1328
+#: sm/certreqgen.c:1331
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8715,7 +8822,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "找不到憑證 '%s': %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
+#: sm/delete.c:122 sm/keydb.c:1209 sm/keydb.c:1307
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
@@ -8740,123 +8847,123 @@
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list external keys"
 msgstr "列出外部金鑰"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:217
 msgid "list certificate chain"
 msgstr "列出憑證鏈"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:225
 msgid "import certificates"
 msgstr "匯入憑證"
 
-#: sm/gpgsm.c:224
+#: sm/gpgsm.c:226
 msgid "export certificates"
 msgstr "匯出憑證"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:234
 msgid "register a smartcard"
 msgstr "註冊智慧卡"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "pass a command to the dirmngr"
 msgstr "將指令遞送給 dirmngr"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
 msgid "invoke gpg-protect-tool"
 msgstr "叫用 gpg-protect-tool"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:256
 msgid "create base-64 encoded output"
 msgstr "建立以 base-64 編碼過的輸出"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in PEM format"
 msgstr "假設輸入的是 PEM 格式"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in base-64 format"
 msgstr "假設輸入的是 base-64 格式"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "assume input is in binary format"
 msgstr "假設輸入的是二進制格式"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:276
 msgid "never consult a CRL"
 msgstr "永遠不要查閱 CRL"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "check validity using OCSP"
 msgstr "用 OCSP 檢查有效性"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "|N|number of certificates to include"
 msgstr "|N|要包含的憑證數量"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:294
 msgid "|FILE|take policy information from FILE"
 msgstr "|檔案|從指定檔案中取得原則資訊"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "do not check certificate policies"
 msgstr "不要檢查憑證原則"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:301
 msgid "fetch missing issuer certificates"
 msgstr "取回遺失的發行者憑證"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "don't use the terminal at all"
 msgstr "完全不要使用終端機"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "|FILE|write an audit log to FILE"
 msgstr "|檔案|將稽核日誌寫入至指定檔案"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "batch mode: never ask"
 msgstr "批次模式: 永遠不詢問"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "assume yes on most questions"
 msgstr "假設大部分的問題都回答是"
 
-#: sm/gpgsm.c:322
+#: sm/gpgsm.c:324
 msgid "assume no on most questions"
 msgstr "假設大部分的問題都回答否"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
 
-#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
+#: sm/gpgsm.c:340 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|名稱|使用指定名稱的編密演算法"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:359
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|名稱|使用指定名稱的訊息摘要演算法"
 
-#: sm/gpgsm.c:564
+#: sm/gpgsm.c:570
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:567
+#: sm/gpgsm.c:573
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8866,47 +8973,47 @@
 "用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:777
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "請注意: 將無法加密為 '%s': %s\n"
 
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:788
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的驗證模型 '%s'\n"
 
-#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:839 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: 沒有給定主機名稱\n"
 
-#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:858 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: 給定的密碼沒有使用者\n"
 
-#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:879 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳過這一列\n"
 
-#: sm/gpgsm.c:1443
+#: sm/gpgsm.c:1449
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "無法剖析金鑰伺服器\n"
 
-#: sm/gpgsm.c:1705
+#: sm/gpgsm.c:1712
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在匯入通用憑證 '%s'\n"
 
-#: sm/gpgsm.c:1748
+#: sm/gpgsm.c:1755
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "無法用 '%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:2115
+#: sm/gpgsm.c:2122
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
@@ -8926,7 +9033,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 
-#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#: sm/import.c:472 sm/keydb.c:1229 sm/keydb.c:1319
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "取得已存放的旗標時出錯: %s\n"
@@ -8936,42 +9043,37 @@
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1435
+#: sm/import.c:751 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取輸入時出錯: %s\n"
 
-#: sm/keydb.c:1126 sm/keydb.c:1212
-#, c-format
-msgid "failed to get the fingerprint\n"
-msgstr "取得指紋失敗\n"
-
-#: sm/keydb.c:1168
+#: sm/keydb.c:1148
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "查找既有憑證的問題: %s\n"
 
-#: sm/keydb.c:1180
+#: sm/keydb.c:1160
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
 
-#: sm/keydb.c:1188
+#: sm/keydb.c:1168
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "存放憑證時出錯: %s\n"
 
-#: sm/keydb.c:1240
+#: sm/keydb.c:1220
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "重新搜尋憑證的問題: %s\n"
 
-#: sm/keydb.c:1261 sm/keydb.c:1350
+#: sm/keydb.c:1241 sm/keydb.c:1330
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
 
-#: sm/keylist.c:686
+#: sm/keylist.c:693
 msgid "Error - "
 msgstr "錯誤 - "
 
@@ -9006,7 +9108,7 @@
 "\n"
 "%s%s請問你是否真的確定要這樣做了?"
 
-#: sm/qualified.c:215 sm/verify.c:653
+#: sm/qualified.c:215 sm/verify.c:678
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9039,38 +9141,39 @@
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查合格憑證時失敗: %s\n"
 
-#: sm/verify.c:486
+#: sm/verify.c:463
 #, c-format
 msgid "Signature made "
 msgstr "簽章建立於 "
 
-#: sm/verify.c:490
+#: sm/verify.c:475
 #, c-format
 msgid "[date not given]"
 msgstr "[   未給定日期  ]"
 
-#: sm/verify.c:491
-#, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr " 以憑證 ID 0x%08lX\n"
+#: sm/verify.c:479
+#, fuzzy, c-format
+#| msgid "algorithm: %s"
+msgid "algorithm:"
+msgstr "演算法: %s"
 
-#: sm/verify.c:510
+#: sm/verify.c:535
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
 
-#: sm/verify.c:631
+#: sm/verify.c:656
 #, c-format
 msgid "Good signature from"
 msgstr "完好的簽章來自於"
 
-#: sm/verify.c:632
+#: sm/verify.c:657
 #, c-format
 msgid "                aka"
 msgstr "                亦即"
 
-#: sm/verify.c:650
+#: sm/verify.c:675
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "這是一份合格簽章\n"
@@ -9138,531 +9241,532 @@
 msgid "error loading certificate '%s': %s\n"
 msgstr "載入憑證 '%s' 時出錯: %s\n"
 
-#: dirmngr/certcache.c:816
+#: dirmngr/certcache.c:819
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "固定載入的憑證: %u\n"
 
-#: dirmngr/certcache.c:818
+#: dirmngr/certcache.c:821
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    執行時期快取的憑證: %u\n"
 
-#: dirmngr/certcache.c:820
+#: dirmngr/certcache.c:823
 #, fuzzy, c-format
 #| msgid "    runtime cached certificates: %u\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "    執行時期快取的憑證: %u\n"
 
-#: dirmngr/certcache.c:848 dirmngr/dirmngr-client.c:385
+#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:393
 #, c-format
 msgid "certificate already cached\n"
 msgstr "憑證早已快取\n"
 
-#: dirmngr/certcache.c:850
+#: dirmngr/certcache.c:853
 #, c-format
 msgid "certificate cached\n"
 msgstr "憑證已快取\n"
 
-#: dirmngr/certcache.c:852 dirmngr/certcache.c:872
-#: dirmngr/dirmngr-client.c:389
+#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:397
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "快取憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:935
+#: dirmngr/certcache.c:938
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "無效的 SHA1 指紋字串 '%s'\n"
 
-#: dirmngr/certcache.c:1381 dirmngr/certcache.c:1390
+#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "以序號取得憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
+#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "以主旨取得憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "憑證中找不到發行者\n"
 
-#: dirmngr/certcache.c:1701
+#: dirmngr/certcache.c:1704
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:212
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "正在建立目錄 '%s'\n"
 
-#: dirmngr/crlcache.c:220
+#: dirmngr/crlcache.c:216
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "建立目錄 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:248
+#: dirmngr/crlcache.c:244
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "正在忽略資料庫目錄 '%s'\n"
 
-#: dirmngr/crlcache.c:257
+#: dirmngr/crlcache.c:253
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "讀取目錄 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:278
+#: dirmngr/crlcache.c:274
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "正在移除快取檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:287
+#: dirmngr/crlcache.c:283
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "不移除檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:376 dirmngr/crlcache.c:1122 dirmngr/crlcache.c:2214
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "關閉快取檔案時出錯: %s\n"
 
-#: dirmngr/crlcache.c:414 dirmngr/crlcache.c:798
+#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "開啟快取目錄檔案 '%s' 失敗: %s\n"
 
-#: dirmngr/crlcache.c:424
+#: dirmngr/crlcache.c:420
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "建立新快取目錄檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:431
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "寫入新快取目錄檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:438
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "關閉新快取目錄檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:443
+#: dirmngr/crlcache.c:439
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "新的快取目錄檔案 '%s' 已建立\n"
 
-#: dirmngr/crlcache.c:448
+#: dirmngr/crlcache.c:444
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "重新開啟快取目錄檔案 '%s' 失敗: %s\n"
 
-#: dirmngr/crlcache.c:476
+#: dirmngr/crlcache.c:472
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "第一個 '%s' 記錄並非版本\n"
 
-#: dirmngr/crlcache.c:491
+#: dirmngr/crlcache.c:487
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "舊版的快取目錄 - 正在清理\n"
 
-#: dirmngr/crlcache.c:507
+#: dirmngr/crlcache.c:503
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "舊版的快取目錄 - 正在放棄\n"
 
-#: dirmngr/crlcache.c:618
+#: dirmngr/crlcache.c:614
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "'%s' 的 crl 記錄內偵測到額外的欄位位於第 %u 列\n"
 
-#: dirmngr/crlcache.c:626
+#: dirmngr/crlcache.c:622
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "偵測到 '%s' 第 %u 列有無效的列\n"
 
-#: dirmngr/crlcache.c:635
+#: dirmngr/crlcache.c:631
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "偵測到 '%s' 第 %u 列有重複的項目\n"
 
-#: dirmngr/crlcache.c:650
+#: dirmngr/crlcache.c:646
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "'%s' 第 %u 列有未支援的紀錄類型故已跳過\n"
 
-#: dirmngr/crlcache.c:676
+#: dirmngr/crlcache.c:672
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "'%s' 第 %u 列有無效的發行者雜湊\n"
 
-#: dirmngr/crlcache.c:682
+#: dirmngr/crlcache.c:678
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "'%s' 第 %u 列沒有發行者 DN\n"
 
-#: dirmngr/crlcache.c:689
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "'%s' 第 %u 列有無效的時間戳印\n"
 
-#: dirmngr/crlcache.c:695
+#: dirmngr/crlcache.c:691
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "警告: '%s' 第 %u 列有無效的快取檔案雜湊\n"
 
-#: dirmngr/crlcache.c:701
+#: dirmngr/crlcache.c:697
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "已於快取 dir 檔案內偵測到錯誤\n"
 
-#: dirmngr/crlcache.c:702
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "請檢查其原因並手動刪除該檔案\n"
 
-#: dirmngr/crlcache.c:830 dirmngr/crlcache.c:844
+#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "建立暫存快取目錄檔案 '%s' 失敗: %s\n"
 
-#: dirmngr/crlcache.c:940
+#: dirmngr/crlcache.c:936
 #, c-format
 msgid "error closing '%s': %s\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:952
+#: dirmngr/crlcache.c:948
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1006
+#: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "無法計算 '%s' 的雜湊: %s\n"
 
-#: dirmngr/crlcache.c:1014
+#: dirmngr/crlcache.c:1010
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "設定 MD5 雜湊脈絡時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1030
+#: dirmngr/crlcache.c:1026
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "計算 '%s' 的雜湊時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1058
+#: dirmngr/crlcache.c:1054
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "無效的 '%s' 格式化加總檢核碼\n"
 
-#: dirmngr/crlcache.c:1111
+#: dirmngr/crlcache.c:1107
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "太多開啟的快取檔案; 無法再開啟更多檔案了\n"
 
-#: dirmngr/crlcache.c:1129
+#: dirmngr/crlcache.c:1125
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "開啟快取檔案 '%s' 時失敗\n"
 
-#: dirmngr/crlcache.c:1148
+#: dirmngr/crlcache.c:1144
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "開啟快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1157
+#: dirmngr/crlcache.c:1153
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "初始化快取檔案 '%s' 用於讀取時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1178
+#: dirmngr/crlcache.c:1174
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "正在對已關閉的檔案叫用 unlock_db_file\n"
 
-#: dirmngr/crlcache.c:1180
+#: dirmngr/crlcache.c:1176
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "正在對已解除鎖定的檔案叫用 unlock_db_file\n"
 
-#: dirmngr/crlcache.c:1234
+#: dirmngr/crlcache.c:1230
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "建立新快取物件失敗: %s\n"
 
-#: dirmngr/crlcache.c:1291
+#: dirmngr/crlcache.c:1287
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "發行者 ID %s 沒有可用的 CRL\n"
 
-#: dirmngr/crlcache.c:1298
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "發行者 ID %s 的快取 CRL 太過老舊; 需要更新\n"
 
-#: dirmngr/crlcache.c:1312
+#: dirmngr/crlcache.c:1308
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr "force-crl-refresh 啟用且已經過 %d 分鐘 (發行者 ID %s); 需要更新\n"
 
-#: dirmngr/crlcache.c:1320
+#: dirmngr/crlcache.c:1316
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refresh 啟用 (發行者 ID %s); 需要更新\n"
 
-#: dirmngr/crlcache.c:1329
+#: dirmngr/crlcache.c:1325
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "發行者 ID %s 的可用 CRL 無法使用\n"
 
-#: dirmngr/crlcache.c:1340
+#: dirmngr/crlcache.c:1336
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr "發行者 ID %s 的快取 CRL 已遭竄改; 我們需要更新\n"
 
-#: dirmngr/crlcache.c:1352
+#: dirmngr/crlcache.c:1348
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "警告: 快取記錄長度無效, S/N"
 
-#: dirmngr/crlcache.c:1362
+#: dirmngr/crlcache.c:1358
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "讀取序號 %s 的快取記錄時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:1365
+#: dirmngr/crlcache.c:1361
 #, c-format
 msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 msgstr "S/N %s 無效; 原因=%02X  日期=%.15s\n"
 
-#: dirmngr/crlcache.c:1376
+#: dirmngr/crlcache.c:1372
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s 有效, 但位列入 CRL 內\n"
 
-#: dirmngr/crlcache.c:1384
+#: dirmngr/crlcache.c:1380
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "從快取檔案取得資料時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1547 dirmngr/validate.c:914
-#, c-format
-msgid "unknown hash algorithm '%s'\n"
-msgstr "未知的雜湊演算法 '%s'\n"
-
-#: dirmngr/crlcache.c:1554
-#, c-format
-msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
-
-#: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
+#: dirmngr/crlcache.c:1763
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "從 libksba 得到無效的 S-表示式\n"
 
-#: dirmngr/crlcache.c:1598 dirmngr/crlcache.c:1617 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "轉換 S-表示式時失敗: %s\n"
 
-#: dirmngr/crlcache.c:1632 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "未知的雜湊演算法 '%s'\n"
+
+#: dirmngr/crlcache.c:1637
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
+
+#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "建立 S-表示式時失敗: %s\n"
 
-#: dirmngr/crlcache.c:1705
+#: dirmngr/crlcache.c:1871
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 失敗: %s\n"
 
-#: dirmngr/crlcache.c:1720
+#: dirmngr/crlcache.c:1886
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "取得 CRL 更新時間時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1727
+#: dirmngr/crlcache.c:1893
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "此 CRL 的更新時間: 本次=%s 下次=%s\n"
 
-#: dirmngr/crlcache.c:1731
+#: dirmngr/crlcache.c:1897
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "無給定 nextUpdate; 先假設有效期是一天\n"
 
-#: dirmngr/crlcache.c:1751
+#: dirmngr/crlcache.c:1917
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "取得 CRL 項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1766
+#: dirmngr/crlcache.c:1932
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "安插項目至暫存快取檔案時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1793
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL 中找不到 CRL 發行者: %s\n"
 
-#: dirmngr/crlcache.c:1808
+#: dirmngr/crlcache.c:1974
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證位置\n"
 
-#: dirmngr/crlcache.c:1854
+#: dirmngr/crlcache.c:2020
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 簽章驗證失敗: %s\n"
 
-#: dirmngr/crlcache.c:1866
+#: dirmngr/crlcache.c:2032
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2008
+#: dirmngr/crlcache.c:2174
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2015
+#: dirmngr/crlcache.c:2181
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2049
+#: dirmngr/crlcache.c:2215
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "已移除陳舊的暫存快取檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:2053
+#: dirmngr/crlcache.c:2219
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除陳舊的暫存快取檔案 '%s' 時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2063
+#: dirmngr/crlcache.c:2229
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "建立暫存快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2073
+#: dirmngr/crlcache.c:2239
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2249
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完成暫存快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2090
+#: dirmngr/crlcache.c:2256
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "關閉暫存快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2115
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "警告: 新的 CRL 仍然太老舊; 早已在 %s 逾期 - 不過還是載入\n"
 
-#: dirmngr/crlcache.c:2119
+#: dirmngr/crlcache.c:2285
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL 仍然太老舊; 早已在 %s 逾期\n"
 
-#: dirmngr/crlcache.c:2135
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的關鍵 CRL 擴充欄位 %s\n"
 
-#: dirmngr/crlcache.c:2145
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "讀取 CRL 擴充欄位時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2196
+#: dirmngr/crlcache.c:2362
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "建立快取檔案 '%s' 時出錯\n"
 
-#: dirmngr/crlcache.c:2228
+#: dirmngr/crlcache.c:2394
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "把 '%s' 重新新命成 '%s' 時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2242
+#: dirmngr/crlcache.c:2408
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr "更新 DIR 檔案時失敗 - 下次程式啟動時將失去快取項目\n"
 
-#: dirmngr/crlcache.c:2279
+#: dirmngr/crlcache.c:2445
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "開始 CRL 傾印 (經由 %s 取得)\n"
 
-#: dirmngr/crlcache.c:2302
+#: dirmngr/crlcache.c:2468
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr " 錯誤: 將不採用此 CRL, 因為更新之後仍然太過老舊!\n"
 
-#: dirmngr/crlcache.c:2305
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
 
-#: dirmngr/crlcache.c:2308
+#: dirmngr/crlcache.c:2474
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 錯誤: 將不採用此 CRL\n"
 
-#: dirmngr/crlcache.c:2315
+#: dirmngr/crlcache.c:2481
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
 
-#: dirmngr/crlcache.c:2333
+#: dirmngr/crlcache.c:2499
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告: 無效的快取記錄長度\n"
 
-#: dirmngr/crlcache.c:2340
+#: dirmngr/crlcache.c:2506
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "讀取快取記錄時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2351
+#: dirmngr/crlcache.c:2517
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "讀取快取金鑰時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2382
+#: dirmngr/crlcache.c:2548
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "從資料庫讀取快取項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2385
+#: dirmngr/crlcache.c:2551
 msgid "End CRL dump\n"
 msgstr "CRL 傾印結束\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2672
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2683
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2577
+#: dirmngr/crlcache.c:2743
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
@@ -9701,55 +9805,55 @@
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "不可能進行憑證搜尋, 因為已停用 %s\n"
 
-#: dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr-client.c:72
 msgid "use OCSP instead of CRLs"
 msgstr "改以 OCSP 代替 CRL"
 
-#: dirmngr/dirmngr-client.c:72
+#: dirmngr/dirmngr-client.c:73
 msgid "check whether a dirmngr is running"
 msgstr "檢查 dirmngr 是否正在執行"
 
-#: dirmngr/dirmngr-client.c:73
+#: dirmngr/dirmngr-client.c:74
 msgid "add a certificate to the cache"
 msgstr "加入憑證至快取"
 
-#: dirmngr/dirmngr-client.c:74
+#: dirmngr/dirmngr-client.c:75
 msgid "validate a certificate"
 msgstr "驗證憑證"
 
-#: dirmngr/dirmngr-client.c:75
+#: dirmngr/dirmngr-client.c:76
 msgid "lookup a certificate"
 msgstr "查找憑證"
 
-#: dirmngr/dirmngr-client.c:76
+#: dirmngr/dirmngr-client.c:77
 msgid "lookup only locally stored certificates"
 msgstr "僅查找存放於本地端的憑證憑證"
 
-#: dirmngr/dirmngr-client.c:77
+#: dirmngr/dirmngr-client.c:78
 msgid "expect an URL for --lookup"
 msgstr "應該要給 --lookup 某個網址"
 
-#: dirmngr/dirmngr-client.c:78
+#: dirmngr/dirmngr-client.c:79
 msgid "load a CRL into the dirmngr"
 msgstr "載入 CRL 至 dirmngr"
 
-#: dirmngr/dirmngr-client.c:79
+#: dirmngr/dirmngr-client.c:80
 msgid "special mode for use by Squid"
 msgstr "搭配 Squid 使用的特殊模式"
 
-#: dirmngr/dirmngr-client.c:80
+#: dirmngr/dirmngr-client.c:81
 msgid "expect certificates in PEM format"
 msgstr "預期憑證應為 PEM 格式"
 
-#: dirmngr/dirmngr-client.c:82
+#: dirmngr/dirmngr-client.c:83
 msgid "force the use of the default OCSP responder"
 msgstr "強制使用預設的 OCSP 回應程式"
 
-#: dirmngr/dirmngr-client.c:169
+#: dirmngr/dirmngr-client.c:172
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr "用法: dirmngr-client [選項] [憑證檔案|模式](或用 -h 求助)\n"
 
-#: dirmngr/dirmngr-client.c:173
+#: dirmngr/dirmngr-client.c:176
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -9761,82 +9865,82 @@
 "如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
 "則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
 
-#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#: dirmngr/dirmngr-client.c:282 dirmngr/dirmngr-client.c:912
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "從標準輸入讀取憑證時出錯: %s\n"
 
-#: dirmngr/dirmngr-client.c:281
+#: dirmngr/dirmngr-client.c:289
 #, c-format
 msgid "error reading certificate from '%s': %s\n"
 msgstr "從 '%s' 讀取憑證時出錯: %s\n"
 
-#: dirmngr/dirmngr-client.c:295
+#: dirmngr/dirmngr-client.c:303
 #, c-format
 msgid "certificate too large to make any sense\n"
 msgstr "憑證大到全然不合理的境界\n"
 
-#: dirmngr/dirmngr-client.c:310
+#: dirmngr/dirmngr-client.c:318
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "無法連接至 dirmngr: %s\n"
 
-#: dirmngr/dirmngr-client.c:332
+#: dirmngr/dirmngr-client.c:340
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "查找失敗: %s\n"
 
-#: dirmngr/dirmngr-client.c:347
+#: dirmngr/dirmngr-client.c:355
 #, c-format
 msgid "loading CRL '%s' failed: %s\n"
 msgstr "載入 CRL '%s' 時失敗: %s\n"
 
-#: dirmngr/dirmngr-client.c:375
+#: dirmngr/dirmngr-client.c:383
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
 msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
 
-#: dirmngr/dirmngr-client.c:397
+#: dirmngr/dirmngr-client.c:405
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "憑證之驗證失敗: %s\n"
 
-#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+#: dirmngr/dirmngr-client.c:412 dirmngr/dirmngr-client.c:923
 #, c-format
 msgid "certificate is valid\n"
 msgstr "憑證有效\n"
 
-#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+#: dirmngr/dirmngr-client.c:418 dirmngr/dirmngr-client.c:931
 #, c-format
 msgid "certificate has been revoked\n"
 msgstr "憑證已遭撤銷\n"
 
-#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#: dirmngr/dirmngr-client.c:423 dirmngr/dirmngr-client.c:933
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "憑證檢查失敗: %s\n"
 
-#: dirmngr/dirmngr-client.c:428
+#: dirmngr/dirmngr-client.c:436
 #, c-format
 msgid "got status: '%s'\n"
 msgstr "得到狀態: '%s'\n"
 
-#: dirmngr/dirmngr-client.c:443
+#: dirmngr/dirmngr-client.c:451
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "寫入 base64 編碼時出錯: %s\n"
 
-#: dirmngr/dirmngr-client.c:701
+#: dirmngr/dirmngr-client.c:709
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "未支援的查詢 '%s'\n"
 
-#: dirmngr/dirmngr-client.c:803
+#: dirmngr/dirmngr-client.c:811
 #, c-format
 msgid "absolute file name expected\n"
 msgstr "應該要有絕對檔名\n"
 
-#: dirmngr/dirmngr-client.c:848
+#: dirmngr/dirmngr-client.c:856
 #, c-format
 msgid "looking up '%s'\n"
 msgstr "正在查找 '%s'\n"
@@ -9861,92 +9965,92 @@
 msgid "flush the cache"
 msgstr "清除快取"
 
-#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: dirmngr/dirmngr.c:190 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
 #: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "run without asking a user"
 msgstr "以不詢問使用者的方式執行"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "force loading of outdated CRLs"
 msgstr "強迫載入過時的 CRL"
 
-#: dirmngr/dirmngr.c:192
+#: dirmngr/dirmngr.c:193
 msgid "allow sending OCSP requests"
 msgstr "允許送出 OCSP 請求"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of HTTP"
 msgstr "避免使用 HTTP"
 
-#: dirmngr/dirmngr.c:196
+#: dirmngr/dirmngr.c:197
 msgid "inhibit the use of LDAP"
 msgstr "避免使用 LDAP"
 
-#: dirmngr/dirmngr.c:198
+#: dirmngr/dirmngr.c:199
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分布點"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:201
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分布點"
 
-#: dirmngr/dirmngr.c:202
+#: dirmngr/dirmngr.c:203
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略含有 OCSP 伺服器網址的憑證"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:206
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
 
-#: dirmngr/dirmngr.c:207
+#: dirmngr/dirmngr.c:208
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|主機|指定 LDAP 查詢主機"
 
-#: dirmngr/dirmngr.c:209
+#: dirmngr/dirmngr.c:210
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "不要將主機備案與 --ldap-proxy 並用"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:215
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
 
-#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:218 dirmngr/dirmngr_ldap.c:137
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|把 LDAP 逾時設成 N 秒"
 
-#: dirmngr/dirmngr.c:220
+#: dirmngr/dirmngr.c:221
 msgid "|URL|use OCSP responder at URL"
 msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
 
-#: dirmngr/dirmngr.c:222
+#: dirmngr/dirmngr.c:223
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:229
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|單次查詢不要傳回超過 N 筆項目"
 
-#: dirmngr/dirmngr.c:233
+#: dirmngr/dirmngr.c:234
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:263
+#: dirmngr/dirmngr.c:265
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9955,11 +10059,11 @@
 "@\n"
 "(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
 
-#: dirmngr/dirmngr.c:401
+#: dirmngr/dirmngr.c:407
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
 
-#: dirmngr/dirmngr.c:403
+#: dirmngr/dirmngr.c:409
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9967,132 +10071,132 @@
 "語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
 "@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
 
-#: dirmngr/dirmngr.c:483
+#: dirmngr/dirmngr.c:489
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的除錯等級為: %s\n"
 
-#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
-#: tools/gpgconf.c:770
+#: dirmngr/dirmngr.c:575 tools/gpgconf.c:647 tools/gpgconf.c:682
+#: tools/gpgconf.c:780
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法: %s [選項] "
 
-#: dirmngr/dirmngr.c:1218
+#: dirmngr/dirmngr.c:1212
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "socket 名稱內不允許使用冒號\n"
 
-#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1444 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1652
+#: dirmngr/dirmngr.c:1645
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 列太長 - 已跳過\n"
 
-#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
+#: dirmngr/dirmngr.c:1700 dirmngr/dirmngr.c:1784
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 偵測到無效的指紋\n"
 
-#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
+#: dirmngr/dirmngr.c:1736 dirmngr/dirmngr.c:1762 tools/gpgconf-comp.c:4191
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 讀取錯誤: %s\n"
 
-#: dirmngr/dirmngr.c:1798
+#: dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 列尾的垃圾已忽略\n"
 
-#: dirmngr/dirmngr.c:1864
+#: dirmngr/dirmngr.c:1860
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
 
-#: dirmngr/dirmngr.c:1904
+#: dirmngr/dirmngr.c:1900
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "收到 SIGUSR2 - 無定義行動\n"
 
-#: dirmngr/dirmngr.c:1909
+#: dirmngr/dirmngr.c:1905
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "收到 SIGTERM - 正在關閉 ...\n"
 
-#: dirmngr/dirmngr.c:1911
+#: dirmngr/dirmngr.c:1907
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 
-#: dirmngr/dirmngr.c:1916
+#: dirmngr/dirmngr.c:1912
 #, c-format
 msgid "shutdown forced\n"
 msgstr "已強迫關閉\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1920
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT - 立即關閉\n"
 
-#: dirmngr/dirmngr.c:1931
+#: dirmngr/dirmngr.c:1927
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到訊號 %d - 無定義行動\n"
 
-#: dirmngr/dirmngr_ldap.c:137
+#: dirmngr/dirmngr_ldap.c:138
 msgid "return all values in a record oriented format"
 msgstr "以記錄導向格式傳回所有數值"
 
-#: dirmngr/dirmngr_ldap.c:140
+#: dirmngr/dirmngr_ldap.c:141
 msgid "|NAME|ignore host part and connect through NAME"
 msgstr "|名稱|忽略主機的部份並改以指定名稱連線"
 
-#: dirmngr/dirmngr_ldap.c:141
+#: dirmngr/dirmngr_ldap.c:142
 msgid "|NAME|connect to host NAME"
 msgstr "|名稱|連線至位於指定名稱的主機"
 
-#: dirmngr/dirmngr_ldap.c:142
+#: dirmngr/dirmngr_ldap.c:143
 msgid "|N|connect to port N"
 msgstr "|N|連線至 N 連接埠"
 
-#: dirmngr/dirmngr_ldap.c:143
+#: dirmngr/dirmngr_ldap.c:144
 msgid "|NAME|use user NAME for authentication"
 msgstr "|名字|使用指定名字做為認證用的使用者名稱"
 
-#: dirmngr/dirmngr_ldap.c:144
+#: dirmngr/dirmngr_ldap.c:145
 msgid "|PASS|use password PASS for authentication"
 msgstr "|密碼|使用指定密碼作為認證"
 
-#: dirmngr/dirmngr_ldap.c:146
+#: dirmngr/dirmngr_ldap.c:147
 msgid "take password from $DIRMNGR_LDAP_PASS"
 msgstr "從 $DIRMNGR_LDAP_PASS 取得密碼使用"
 
-#: dirmngr/dirmngr_ldap.c:147
+#: dirmngr/dirmngr_ldap.c:148
 msgid "|STRING|query DN STRING"
 msgstr "|字串|以只指定字串查詢 DN"
 
-#: dirmngr/dirmngr_ldap.c:148
+#: dirmngr/dirmngr_ldap.c:149
 msgid "|STRING|use STRING as filter expression"
 msgstr "|字串|以指定字串作為過濾器表示式"
 
-#: dirmngr/dirmngr_ldap.c:149
+#: dirmngr/dirmngr_ldap.c:150
 msgid "|STRING|return the attribute STRING"
 msgstr "|字串|以指定字串傳回屬性"
 
-#: dirmngr/dirmngr_ldap.c:208
+#: dirmngr/dirmngr_ldap.c:211
 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 msgstr "用法: dirmngr_ldap [選項] [網址] (或用 -h 求助)\n"
 
-#: dirmngr/dirmngr_ldap.c:211
+#: dirmngr/dirmngr_ldap.c:214
 msgid ""
 "Syntax: dirmngr_ldap [options] [URL]\n"
 "Internal LDAP helper for Dirmngr\n"
@@ -10102,145 +10206,139 @@
 "Dirmngr 的內部 LDAP 協助程式\n"
 "介面及選項均可能未經通知即變更\n"
 
-#: dirmngr/dirmngr_ldap.c:336
+#: dirmngr/dirmngr_ldap.c:340
 #, c-format
 msgid "invalid port number %d\n"
 msgstr "無效的連接埠號碼 %d\n"
 
-#: dirmngr/dirmngr_ldap.c:452
+#: dirmngr/dirmngr_ldap.c:456
 #, c-format
 msgid "scanning result for attribute '%s'\n"
 msgstr "正在掃描屬性 '%s' 之結果\n"
 
-#: dirmngr/dirmngr_ldap.c:459 dirmngr/dirmngr_ldap.c:542
-#: dirmngr/dirmngr_ldap.c:566 dirmngr/dirmngr_ldap.c:578
-#: dirmngr/dirmngr_ldap.c:716
+#: dirmngr/dirmngr_ldap.c:463 dirmngr/dirmngr_ldap.c:546
+#: dirmngr/dirmngr_ldap.c:570 dirmngr/dirmngr_ldap.c:582
+#: dirmngr/dirmngr_ldap.c:720
 #, c-format
 msgid "error writing to stdout: %s\n"
 msgstr "寫入標準輸出時出錯: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:476
+#: dirmngr/dirmngr_ldap.c:480
 #, c-format
 msgid "          available attribute '%s'\n"
 msgstr "          可用屬性 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:514
+#: dirmngr/dirmngr_ldap.c:518
 #, c-format
 msgid "attribute '%s' not found\n"
 msgstr "找不到屬性 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:521
+#: dirmngr/dirmngr_ldap.c:525
 #, c-format
 msgid "found attribute '%s'\n"
 msgstr "找到屬性 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:630
+#: dirmngr/dirmngr_ldap.c:634
 #, c-format
 msgid "processing url '%s'\n"
 msgstr "正在處理網址 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:632
+#: dirmngr/dirmngr_ldap.c:636
 #, c-format
 msgid "          user '%s'\n"
 msgstr "          使用者 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:634
+#: dirmngr/dirmngr_ldap.c:638
 #, c-format
 msgid "          pass '%s'\n"
 msgstr "          密碼 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:636
+#: dirmngr/dirmngr_ldap.c:640
 #, c-format
 msgid "          host '%s'\n"
 msgstr "          主機 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:637
+#: dirmngr/dirmngr_ldap.c:641
 #, c-format
 msgid "          port %d\n"
 msgstr "          連接埠 %d\n"
 
-#: dirmngr/dirmngr_ldap.c:639
+#: dirmngr/dirmngr_ldap.c:643
 #, c-format
 msgid "            DN '%s'\n"
 msgstr "            域名 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:641
+#: dirmngr/dirmngr_ldap.c:645
 #, c-format
 msgid "        filter '%s'\n"
 msgstr "        過濾器 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:646 dirmngr/dirmngr_ldap.c:649
+#: dirmngr/dirmngr_ldap.c:650 dirmngr/dirmngr_ldap.c:653
 #, c-format
 msgid "          attr '%s'\n"
 msgstr "          屬性 '%s'\n"
 
-#: dirmngr/dirmngr_ldap.c:655
+#: dirmngr/dirmngr_ldap.c:659
 #, c-format
 msgid "no host name in '%s'\n"
 msgstr "'%s' 中沒有主機名稱\n"
 
-#: dirmngr/dirmngr_ldap.c:660
+#: dirmngr/dirmngr_ldap.c:664
 #, c-format
 msgid "no attribute given for query '%s'\n"
 msgstr "查詢 '%s' 無給定屬性\n"
 
-#: dirmngr/dirmngr_ldap.c:666
+#: dirmngr/dirmngr_ldap.c:670
 #, c-format
 msgid "WARNING: using first attribute only\n"
 msgstr "警告: 僅使用第一個屬性\n"
 
-#: dirmngr/dirmngr_ldap.c:675
+#: dirmngr/dirmngr_ldap.c:679
 #, c-format
 msgid "LDAP init to '%s:%d' failed: %s\n"
 msgstr "LDAP 初始至 '%s:%d' 失敗: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:698
+#: dirmngr/dirmngr_ldap.c:702
 #, c-format
 msgid "binding to '%s:%d' failed: %s\n"
 msgstr "綁定至 '%s:%d' 時失敗: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:725
+#: dirmngr/dirmngr_ldap.c:729
 #, c-format
 msgid "searching '%s' failed: %s\n"
 msgstr "搜尋 '%s' 時失敗: %s\n"
 
-#: dirmngr/dirmngr_ldap.c:757
+#: dirmngr/dirmngr_ldap.c:761
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' 不是一個 LDAP 位址\n"
 
-#: dirmngr/dirmngr_ldap.c:763
+#: dirmngr/dirmngr_ldap.c:767
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' 是無效的 LDAP 網址\n"
 
-#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1987 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
 
-#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3629 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
 
-#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3635 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "太多重新導向\n"
 
-#: dirmngr/http.c:3727
+#: dirmngr/http.c:3747
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
 msgstr "正在寫入 '%s'\n"
 
-#: dirmngr/ldap-wrapper-ce.c:393 dirmngr/ldap-wrapper.c:838
-#: dirmngr/ldap-wrapper.c:855
-#, c-format
-msgid "error allocating memory: %s\n"
-msgstr "配置記憶體時出錯: %s\n"
-
 #: dirmngr/ldap-wrapper.c:237
 #, c-format
 msgid "error printing log line: %s\n"
@@ -10291,7 +10389,7 @@
 msgid "malloc failed: %s\n"
 msgstr "動態記憶體配置失敗: %s\n"
 
-#: dirmngr/ldap.c:626
+#: dirmngr/ldap.c:627
 #, c-format
 msgid "start_cert_fetch: invalid pattern '%s'\n"
 msgstr "start_cert_fetch: 無效的模式 '%s'\n"
@@ -10422,11 +10520,6 @@
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "配置 OCSP 脈絡失敗: %s\n"
 
-#: dirmngr/ocsp.c:682
-#, c-format
-msgid "can't get authorityInfoAccess: %s\n"
-msgstr "無法取得 authorityInfoAccess: %s\n"
-
 #: dirmngr/ocsp.c:689
 #, c-format
 msgid "no default OCSP responder defined\n"
@@ -10495,7 +10588,7 @@
 msgstr "憑證 ID 中遺失 serialno"
 
 #: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2567
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 失敗: %s\n"
@@ -10525,32 +10618,32 @@
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d 已超出\n"
 
-#: dirmngr/server.c:2857
+#: dirmngr/server.c:2856
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "無法配置控制結構: %s\n"
 
-#: dirmngr/server.c:2868
+#: dirmngr/server.c:2867
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "配置 assuan 脈絡失敗: %s\n"
 
-#: dirmngr/server.c:2889
+#: dirmngr/server.c:2888
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "伺服器啟始失敗: %s\n"
 
-#: dirmngr/server.c:2897
+#: dirmngr/server.c:2896
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "向 Assuan 註冊指令時失敗: %s\n"
 
-#: dirmngr/server.c:2930
+#: dirmngr/server.c:2929
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接受問題: %s\n"
 
-#: dirmngr/server.c:2949
+#: dirmngr/server.c:2948
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 處理時失敗: %s\n"
@@ -10588,56 +10681,56 @@
 msgid "certificate chain is good\n"
 msgstr "憑證鏈完好\n"
 
-#: dirmngr/validate.c:1169
+#: dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "憑證應該還未被用於 CRL 簽署\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:109
 msgid "quiet"
 msgstr "安靜模式"
 
-#: tools/gpg-connect-agent.c:79
+#: tools/gpg-connect-agent.c:80
 msgid "print data out hex encoded"
 msgstr "列印資料超出十六進制編碼範圍"
 
-#: tools/gpg-connect-agent.c:80
+#: tools/gpg-connect-agent.c:81
 msgid "decode received data lines"
 msgstr "對已收到的資料列解碼"
 
-#: tools/gpg-connect-agent.c:81
+#: tools/gpg-connect-agent.c:82
 msgid "connect to the dirmngr"
 msgstr "連線至 dirmngr"
 
-#: tools/gpg-connect-agent.c:84
+#: tools/gpg-connect-agent.c:85
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|名稱|連線至指定名稱的 Assuan socket"
 
-#: tools/gpg-connect-agent.c:86
+#: tools/gpg-connect-agent.c:87
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "run the Assuan server given on the command line"
 msgstr "執行命令列所給定的 Assuan 伺服器"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "do not use extended connect mode"
 msgstr "不要使用延伸連線模式"
 
-#: tools/gpg-connect-agent.c:92
+#: tools/gpg-connect-agent.c:93
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|檔案|啟動時執行指定檔案中的指令"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "run /subst on startup"
 msgstr "啟動時執行 /subst"
 
-#: tools/gpg-connect-agent.c:205
+#: tools/gpg-connect-agent.c:208
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "用法: @GPG@-connect-agent [選項] (或用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:208
+#: tools/gpg-connect-agent.c:211
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10645,43 +10738,43 @@
 "語法: @GPG@-connect-agent [選項]\n"
 "連線至運作中的代理程式並送出指令\n"
 
-#: tools/gpg-connect-agent.c:1249
+#: tools/gpg-connect-agent.c:1254
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 
-#: tools/gpg-connect-agent.c:1260 tools/gpg-connect-agent.c:1266
-#: tools/gpg-connect-agent.c:1272
+#: tools/gpg-connect-agent.c:1265 tools/gpg-connect-agent.c:1271
+#: tools/gpg-connect-agent.c:1277
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 
-#: tools/gpg-connect-agent.c:1370 tools/gpg-connect-agent.c:1865
+#: tools/gpg-connect-agent.c:1375 tools/gpg-connect-agent.c:1870
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:1460
+#: tools/gpg-connect-agent.c:1465
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "列太長 - 已跳過\n"
 
-#: tools/gpg-connect-agent.c:1464
+#: tools/gpg-connect-agent.c:1469
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "列因嵌入的 Nul 字符而縮短了\n"
 
-#: tools/gpg-connect-agent.c:1839
+#: tools/gpg-connect-agent.c:1844
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "未知的指令 '%s'\n"
 
-#: tools/gpg-connect-agent.c:1857
+#: tools/gpg-connect-agent.c:1862
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "送出列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:2253
+#: tools/gpg-connect-agent.c:2259
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "送出標準選項時出錯: %s\n"
@@ -10885,100 +10978,100 @@
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: tools/gpgconf-comp.c:3445
+#: tools/gpgconf-comp.c:3446
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "元件 %s 的外部驗證失敗"
 
-#: tools/gpgconf-comp.c:3596
+#: tools/gpgconf-comp.c:3597
 msgid "Note that group specifications are ignored\n"
 msgstr "請注意群組規格已忽略\n"
 
-#: tools/gpgconf-comp.c:4194
+#: tools/gpgconf-comp.c:4195
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:4196
+#: tools/gpgconf-comp.c:4197
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "計算 '%s' 的雜湊時出錯: %s\n"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:80
 msgid "list all components"
 msgstr "列出所有的元件"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:81
 msgid "check all programs"
 msgstr "檢查所有的程式"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:82
 msgid "|COMPONENT|list options"
 msgstr "|元件|列出選項"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:83
 msgid "|COMPONENT|change options"
 msgstr "|元件|變更選項"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|check options"
 msgstr "|元件|檢查選項"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:86
 msgid "apply global default values"
 msgstr "套用全域預設值"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:88
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|檔案|從指定檔案中取得原則資訊"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:90
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "取得 @GPGCONF@ 的組態目錄"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:92
 msgid "list global configuration file"
 msgstr "列出全域組態檔"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:94
 msgid "check global configuration file"
 msgstr "檢查全域組態檔案"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:96
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "更新信任資料庫"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "reload all or a given component"
 msgstr "重新載入所有或給定的元件"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:98
 msgid "launch a given component"
 msgstr "啟動給定的元件"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:99
 msgid "kill a given component"
 msgstr "刪除給定的元件"
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:107
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: tools/gpgconf.c:106
+#: tools/gpgconf.c:111
 msgid "activate changes at runtime, if possible"
 msgstr "如果可能的話, 在執行期啟用變更"
 
-#: tools/gpgconf.c:139
+#: tools/gpgconf.c:149
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
 
-#: tools/gpgconf.c:142
+#: tools/gpgconf.c:152
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10986,202 +11079,149 @@
 "語法: @GPGCONF@ [選項]\n"
 "管理 @GNUPG@ 系統工具的組態選項\n"
 
-#: tools/gpgconf.c:639 tools/gpgconf.c:674
+#: tools/gpgconf.c:649 tools/gpgconf.c:684
 msgid "Need one component argument"
 msgstr "需要一個元件引數"
 
-#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
+#: tools/gpgconf.c:658 tools/gpgconf.c:708 tools/gpgconf.c:756
 msgid "Component not found"
 msgstr "找不到元件"
 
-#: tools/gpgconf.c:772
+#: tools/gpgconf.c:782
 msgid "No argument allowed"
 msgstr "未允許使用引數"
 
-#: tools/symcryptrun.c:166
+#: tools/gpg-check-pattern.c:147
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "用法: gpg-check-pattern [選項] 樣式檔案 (或用 -h 求助)\n"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"指令:\n"
-" "
-
-#: tools/symcryptrun.c:168
-msgid "decryption modus"
-msgstr "解密方式"
-
-#: tools/symcryptrun.c:169
-msgid "encryption modus"
-msgstr "加密方式"
-
-#: tools/symcryptrun.c:173
-msgid "tool class (confucius)"
-msgstr "工具類別 (confucius)"
+"語法: gpg-check-pattern [選項] 樣式檔案\n"
+"用樣式檔案來檢查由標準輸入給定的密語\n"
 
-#: tools/symcryptrun.c:174
-msgid "program filename"
-msgstr "程式檔名"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
 
-#: tools/symcryptrun.c:176
-msgid "secret key file (required)"
-msgstr "私鑰檔案 (必要)"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "指令:\n"
+#~ " "
+
+#~ msgid "decryption modus"
+#~ msgstr "解密方式"
+
+#~ msgid "encryption modus"
+#~ msgstr "加密方式"
+
+#~ msgid "tool class (confucius)"
+#~ msgstr "工具類別 (confucius)"
+
+#~ msgid "program filename"
+#~ msgstr "程式檔名"
 
-#: tools/symcryptrun.c:177
-msgid "input file name (default stdin)"
-msgstr "輸入檔名 (預設是標準輸入)"
+#~ msgid "secret key file (required)"
+#~ msgstr "私鑰檔案 (必要)"
 
-#: tools/symcryptrun.c:221
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "用法: symcryptrun [選項] (或用 -h 求助)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "輸入檔名 (預設是標準輸入)"
 
-#: tools/symcryptrun.c:224
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選項...] 指"
-"令 [輸入檔案]\n"
-"叫用單純對稱式加密工具\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "用法: symcryptrun [選項] (或用 -h 求助)"
 
-#: tools/symcryptrun.c:290
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s 於 %s 以 %i 狀態中止了\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選"
+#~ "項...] 指令 [輸入檔案]\n"
+#~ "叫用單純對稱式加密工具\n"
 
-#: tools/symcryptrun.c:297
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s 於 %s 以 %i 狀態失敗了\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s 於 %s 以 %i 狀態中止了\n"
 
-#: tools/symcryptrun.c:329
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "無法建立暫存目錄 '%s': %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s 於 %s 以 %i 狀態失敗了\n"
 
-#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "無法開啟 %s 來寫入: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "無法建立暫存目錄 '%s': %s\n"
 
-#: tools/symcryptrun.c:397
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "寫入 %s 時出錯: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "無法開啟 %s 來寫入: %s\n"
 
-#: tools/symcryptrun.c:404
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "讀取 %s 時出錯: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "寫入 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "關閉 %s 時出錯: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "讀取 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:502
-#, c-format
-msgid "no --program option provided\n"
-msgstr "沒有提供 --program 選項\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "關閉 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:508
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "祇支援 --decrypt 和 --encrypt\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "沒有提供 --program 選項\n"
 
-#: tools/symcryptrun.c:514
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "沒有提供 --keyfile 選項\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "祇支援 --decrypt 和 --encrypt\n"
 
-#: tools/symcryptrun.c:525
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "無法配置引數向量\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "沒有提供 --keyfile 選項\n"
 
-#: tools/symcryptrun.c:543
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "無法建立管道: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "無法配置引數向量\n"
 
-#: tools/symcryptrun.c:550
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "無法建立 pty: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "無法建立管道: %s\n"
 
-#: tools/symcryptrun.c:566
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "無法衍生: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "無法建立 pty: %s\n"
 
-#: tools/symcryptrun.c:594
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv 失敗: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "無法衍生: %s\n"
 
-#: tools/symcryptrun.c:623
-#, c-format
-msgid "select failed: %s\n"
-msgstr "挑選失敗: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv 失敗: %s\n"
 
-#: tools/symcryptrun.c:640
-#, c-format
-msgid "read failed: %s\n"
-msgstr "讀取失敗: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "挑選失敗: %s\n"
 
-#: tools/symcryptrun.c:692
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty 讀取失敗: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "讀取失敗: %s\n"
 
-#: tools/symcryptrun.c:744
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid 失敗: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty 讀取失敗: %s\n"
 
-#: tools/symcryptrun.c:758
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "子代以 %i 狀態中止了\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid 失敗: %s\n"
 
-#: tools/symcryptrun.c:813
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "無法配置檔內字串: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "子代以 %i 狀態中止了\n"
 
-#: tools/symcryptrun.c:826
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "無法配置檔外字串: %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "無法配置檔內字串: %s\n"
 
-#: tools/symcryptrun.c:999
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "一定要給定 %s 或 %s 其中之一\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "無法配置檔外字串: %s\n"
 
-#: tools/symcryptrun.c:1021
-#, c-format
-msgid "no class provided\n"
-msgstr "沒有提供類別\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "一定要給定 %s 或 %s 其中之一\n"
 
-#: tools/symcryptrun.c:1030
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "未支援 %s 類別\n"
+#~ msgid "no class provided\n"
+#~ msgstr "沒有提供類別\n"
 
-#: tools/gpg-check-pattern.c:144
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "用法: gpg-check-pattern [選項] 樣式檔案 (或用 -h 求助)\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "未支援 %s 類別\n"
 
-#: tools/gpg-check-pattern.c:147
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"語法: gpg-check-pattern [選項] 樣式檔案\n"
-"用樣式檔案來檢查由標準輸入給定的密語\n"
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr " 以憑證 ID 0x%08lX\n"
 
 #, fuzzy
 #~| msgid "you may not use %s while in %s mode\n"
@@ -11299,40 +11339,6 @@
 #~ msgid "Error: Private DO too long (limit is %d characters).\n"
 #~ msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
-#, fuzzy
-#~| msgid "key %s: unsupported public key algorithm\n"
-#~ msgid ""
-#~ "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-#~ msgstr "金鑰 %s: 未支援的公鑰演算法\n"
-
-#, fuzzy
-#~| msgid "card does not support digest algorithm %s\n"
-#~ msgid ""
-#~ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-#~ msgstr "卡片不支援 %s 摘要演算法\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid " (reordered signatures follow)"
-#~ msgstr "完好的簽章來自於"
-
-#, fuzzy
-#~| msgid "key %s: %s\n"
-#~ msgid "key %s:\n"
-#~ msgstr "金鑰 %s: %s\n"
-
-#, fuzzy
-#~| msgid "User ID \"%s\": %d signature removed\n"
-#~ msgid "%d duplicate signature removed\n"
-#~ msgid_plural "%d duplicate signatures removed\n"
-#~ msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
-
-#, fuzzy
-#~| msgid "Good signature from"
-#~ msgid "%d signature reordered\n"
-#~ msgid_plural "%d signatures reordered\n"
-#~ msgstr[0] "完好的簽章來自於"
-
 #~ msgid "new configuration file '%s' created\n"
 #~ msgstr "新的組態檔案 '%s' 已建立\n"
 
diff -Nru gnupg2-2.2.20/README gnupg2-2.2.27/README
--- gnupg2-2.2.20/README	2020-03-18 16:29:04.000000000 +0100
+++ gnupg2-2.2.27/README	2021-01-11 18:36:58.000000000 +0100
@@ -3,8 +3,8 @@
                              Version 2.2
 
           Copyright 1997-2019 Werner Koch
-          Copyright 1998-2020 Free Software Foundation, Inc.
-          Copyright 2003-2020 g10 Code GmbH
+          Copyright 1998-2021 Free Software Foundation, Inc.
+          Copyright 2003-2021 g10 Code GmbH
 
 
 * INTRODUCTION
diff -Nru gnupg2-2.2.20/regexp/jimregexp.c gnupg2-2.2.27/regexp/jimregexp.c
--- gnupg2-2.2.20/regexp/jimregexp.c	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/jimregexp.c	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,1923 @@
+/*
+ * vi:se ts=8:
+ *
+ * regcomp and regexec -- regsub and regerror are elsewhere
+ *
+ *	Copyright (c) 1986 by University of Toronto.
+ *	Written by Henry Spencer.  Not derived from licensed software.
+ *
+ *	Permission is granted to anyone to use this software for any
+ *	purpose on any computer system, and to redistribute it freely,
+ *	subject to the following restrictions:
+ *
+ *	1. The author is not responsible for the consequences of use of
+ *		this software, no matter how awful, even if they arise
+ *		from defects in it.
+ *
+ *	2. The origin of this software must not be misrepresented, either
+ *		by explicit claim or by omission.
+ *
+ *	3. Altered versions must be plainly marked as such, and must not
+ *		be misrepresented as being the original software.
+ *** THIS IS AN ALTERED VERSION.  It was altered by John Gilmore,
+ *** hoptoad!gnu, on 27 Dec 1986, to add \n as an alternative to |
+ *** to assist in implementing egrep.
+ *** THIS IS AN ALTERED VERSION.  It was altered by John Gilmore,
+ *** hoptoad!gnu, on 27 Dec 1986, to add \< and \> for word-matching
+ *** as in BSD grep and ex.
+ *** THIS IS AN ALTERED VERSION.  It was altered by John Gilmore,
+ *** hoptoad!gnu, on 28 Dec 1986, to optimize characters quoted with \.
+ *** THIS IS AN ALTERED VERSION.  It was altered by James A. Woods,
+ *** ames!jaw, on 19 June 1987, to quash a regcomp() redundancy.
+ *** THIS IS AN ALTERED VERSION.  It was altered by Christopher Seiwald
+ *** seiwald@vix.com, on 28 August 1993, for use in jam.  Regmagic.h
+ *** was moved into regexp.h, and the include of regexp.h now uses "'s
+ *** to avoid conflicting with the system regexp.h.  Const, bless its
+ *** soul, was removed so it can compile everywhere.  The declaration
+ *** of strchr() was in conflict on AIX, so it was removed (as it is
+ *** happily defined in string.h).
+ *** THIS IS AN ALTERED VERSION.  It was altered by Christopher Seiwald
+ *** seiwald@perforce.com, on 20 January 2000, to use function prototypes.
+ *** THIS IS AN ALTERED VERSION.  It was altered by Christopher Seiwald
+ *** seiwald@perforce.com, on 05 November 2002, to const string literals.
+ *
+ *   THIS IS AN ALTERED VERSION.  It was altered by Steve Bennett <steveb@workware.net.au>
+ *   on 16 October 2010, to remove static state and add better Tcl ARE compatibility.
+ *   This includes counted repetitions, UTF-8 support, character classes,
+ *   shorthand character classes, increased number of parentheses to 100,
+ *   backslash escape sequences. It also removes \n as an alternative to |.
+ *
+ *** THIS IS AN ALTERED VERSION.  It was altered to offer POSIX-like
+ *** regular expression routines of regcomp/regexec/regerror/regfree,
+ *** with UTF-8 support, by NIIBE Yutaka <gniibe@fsij.org> on
+ *** 2020-02-14.
+ *
+ * Beware that some of this code is subtly aware of the way operator
+ * precedence is structured in regular expressions.  Serious changes in
+ * regular-expression syntax might require a total rethink.
+ */
+
+#if defined(JIM_REGEXP)
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "jimregexp.h"
+#include "utf8.h"
+
+#define UCHAR(c) ((unsigned char)(c))
+
+/* An arbitrary limit, but this seems enough. Must be less than 1000. */
+#define REG_MAX_PAREN 100
+
+/*
+ * Structure for regexp "program".  This is essentially a linear encoding
+ * of a nondeterministic finite-state machine (aka syntax charts or
+ * "railroad normal form" in parsing technology).  Each node is an opcode
+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
+ * all nodes except BRANCH implement concatenation; a "next" pointer with
+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
+ * opposed to a collection of them) is never concatenated with anything
+ * because of operator precedence.)  The operand of some types of node is
+ * a literal string; for others, it is a node leading into a sub-FSM.  In
+ * particular, the operand of a BRANCH node is the first node of the branch.
+ * (NB this is *not* a tree structure:  the tail of the branch connects
+ * to the thing following the set of BRANCHes.)  The opcodes are:
+ */
+
+/* definition		number	opnd?	meaning */
+#define	END	0	/* no	End of program. */
+#define	BOL	1	/* no	Match "" at beginning of line. */
+#define	EOL	2	/* no	Match "" at end of line. */
+#define	ANY	3	/* no	Match any one character. */
+#define	ANYOF	4	/* str	Match any character in this string. */
+#define	ANYBUT	5	/* str	Match any character not in this string. */
+#define	BRANCH	6	/* node	Match this alternative, or the next... */
+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
+#define	EXACTLY	8	/* str	Match this string. */
+#define	NOTHING	9	/* no	Match empty string. */
+#define	REP	10	/* max,min	Match this (simple) thing [min,max] times. */
+#define	REPMIN	11	/* max,min	Match this (simple) thing [min,max] times, minimal match. */
+#define	REPX	12	/* max,min	Match this (complex) thing [min,max] times. */
+#define	REPXMIN	13	/* max,min	Match this (complex) thing [min,max] times, minimal match. */
+#define	BOLX	14	/* no	Match "" at beginning of input. */
+#define	EOLX	15	/* no	Match "" at end of input. */
+#define	WORDA	16	/* no	Match "" at wordchar, where prev is nonword */
+#define	WORDZ	17	/* no	Match "" at nonwordchar, where prev is word */
+
+#define	OPENNC 	1000	/* no	Non-capturing parentheses - must be OPEN-1 */
+#define	OPEN   	1001	/* no	Mark this point in input as start of #n. */
+			/*	OPEN+1 is number 1, etc. */
+
+/* must not be any other opts between OPEN and CLOSE */
+
+#define	CLOSENC	2000 	/* no	Non-capturing parentheses - must be CLOSE-1 */
+#define	CLOSE	2001 	/* no	Analogous to OPEN. */
+#define	CLOSE_END	(CLOSE+REG_MAX_PAREN)
+
+/*
+ * The first word of the regexp internal "program" is actually this magic
+ * number; the start node begins in the second word.
+ */
+#define	REG_MAGIC	0xFADED00D
+
+/*
+ * Opcode notes:
+ *
+ * BRANCH	The set of branches constituting a single choice are hooked
+ *		together with their "next" pointers, since precedence prevents
+ *		anything being concatenated to any individual branch.  The
+ *		"next" pointer of the last BRANCH in a choice points to the
+ *		thing following the whole choice.  This is also where the
+ *		final "next" pointer of each individual branch points; each
+ *		branch starts with the operand node of a BRANCH node.
+ *
+ * BACK		Normal "next" pointers all implicitly point forward; BACK
+ *		exists to make loop structures possible.
+ *
+ * REP,REPX	Repeated matches ('?', '*', '+' and {min,max}) are implemented
+ *              as either simple repeats (REP) or complex repeats (REPX).
+ *              These opcodes include a "min" and "max" count after the opcode.
+ *		This is followed by a fourth "current count" word that is
+ *		only used by REPX, as it implements a recursive match.
+ *		REPMIN and REPXMIN are identical except they implement minimal repeats.
+ *
+ * OPEN,CLOSE	...are numbered at compile time.
+ */
+
+/*
+ * A node is one word of opcode followed by one word of "next" pointer.
+ * The "next" pointer value is a positive offset from the opcode of the node
+ * containing it.
+ * An operand, if any, simply follows the node.  (Note that much of the
+ * code generation knows about this implicit relationship.)
+ */
+#define	OP(preg, p)	(preg->program[p])
+#define	NEXT(preg, p)	(preg->program[p + 1])
+#define	OPERAND(p)	((p) + 2)
+
+/*
+ * See regmagic.h for one further detail of program structure.
+ */
+
+
+/*
+ * Utility definitions.
+ */
+
+#define	FAIL(R,M)	{ (R)->err = (M); return (M); }
+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?' || (c) == '{')
+#define	META		"^$.[()|?{+*"
+
+/*
+ * Flags to be passed up and down.
+ */
+#define	HASWIDTH	1	/* Known never to match null string. */
+#define	SIMPLE		2	/* Simple enough to be STAR/PLUS operand. */
+#define	SPSTART		4	/* Starts with * or +. */
+#define	WORST		0	/* Worst case. */
+
+#define MAX_REP_COUNT 1000000
+
+/*
+ * Forward declarations for regcomp()'s friends.
+ */
+static int reg(regex_t *preg, int paren /* Parenthesized? */, int *flagp );
+static int regpiece(regex_t *preg, int *flagp );
+static int regbranch(regex_t *preg, int *flagp );
+static int regatom(regex_t *preg, int *flagp );
+static int regnode(regex_t *preg, int op );
+static int regnext(regex_t *preg, int p );
+static void regc(regex_t *preg, int b );
+static int reginsert(regex_t *preg, int op, int size, int opnd );
+static void regtail(regex_t *preg, int p, int val);
+static void regoptail(regex_t *preg, int p, int val );
+static int regopsize(regex_t *preg, int p );
+
+static int reg_range_find(const int *string, int c);
+static const char *str_find(const char *string, int c, int nocase);
+static int prefix_cmp(const int *prog, int proglen, const char *string, int nocase);
+
+/*#define DEBUG*/
+#ifdef DEBUG
+static int regnarrate = 0;
+static void regdump(regex_t *preg);
+static const char *regprop( int op );
+#endif
+
+
+/**
+ * Returns the length of the null-terminated integer sequence.
+ */
+static int str_int_len(const int *seq)
+{
+	int n = 0;
+	while (*seq++) {
+		n++;
+	}
+	return n;
+}
+
+/*
+ - regcomp - compile a regular expression into internal code
+ *
+ * We can't allocate space until we know how big the compiled form will be,
+ * but we can't compile it (and thus know how big it is) until we've got a
+ * place to put the code.  So we cheat:  we compile it twice, once with code
+ * generation turned off and size counting turned on, and once "for real".
+ * This also means that we don't allocate space until we are sure that the
+ * thing really will compile successfully, and we never have to move the
+ * code and thus invalidate pointers into it.  (Note that it has to be in
+ * one piece because free() must be able to free it all.)
+ *
+ * Beware that the optimization-preparation code in here knows about some
+ * of the structure of the compiled regexp.
+ */
+int regcomp(regex_t *preg, const char *exp, int cflags)
+{
+	int scan;
+	int longest;
+	unsigned len;
+	int flags;
+
+#ifdef DEBUG
+	fprintf(stderr, "Compiling: '%s'\n", exp);
+#endif
+	memset(preg, 0, sizeof(*preg));
+
+	if (exp == NULL)
+		FAIL(preg, REG_ERR_NULL_ARGUMENT);
+
+	/* First pass: determine size, legality. */
+	preg->cflags = cflags;
+	preg->regparse = exp;
+
+	/* Allocate space. */
+	preg->proglen = (strlen(exp) + 1) * 5;
+	preg->program = malloc(preg->proglen * sizeof(int));
+	if (preg->program == NULL)
+		FAIL(preg, REG_ERR_NOMEM);
+
+	/* Note that since we store a magic value as the first item in the program,
+	 * program offsets will never be 0
+	 */
+	regc(preg, REG_MAGIC);
+	if (reg(preg, 0, &flags) == 0) {
+		return preg->err;
+	}
+
+	/* Small enough for pointer-storage convention? */
+	if (preg->re_nsub >= REG_MAX_PAREN)		/* Probably could be 65535L. */
+		FAIL(preg,REG_ERR_TOO_BIG);
+
+	/* Dig out information for optimizations. */
+	preg->regstart = 0;	/* Worst-case defaults. */
+	preg->reganch = 0;
+	preg->regmust = 0;
+	preg->regmlen = 0;
+	scan = 1;			/* First BRANCH. */
+	if (OP(preg, regnext(preg, scan)) == END) {		/* Only one top-level choice. */
+		scan = OPERAND(scan);
+
+		/* Starting-point info. */
+		if (OP(preg, scan) == EXACTLY) {
+			preg->regstart = preg->program[OPERAND(scan)];
+		}
+		else if (OP(preg, scan) == BOL)
+			preg->reganch++;
+
+		/*
+		 * If there's something expensive in the r.e., find the
+		 * longest literal string that must appear and make it the
+		 * regmust.  Resolve ties in favor of later strings, since
+		 * the regstart check works with the beginning of the r.e.
+		 * and avoiding duplication strengthens checking.  Not a
+		 * strong reason, but sufficient in the absence of others.
+		 */
+		if (flags&SPSTART) {
+			longest = 0;
+			len = 0;
+			for (; scan != 0; scan = regnext(preg, scan)) {
+				if (OP(preg, scan) == EXACTLY) {
+					int plen = str_int_len(preg->program + OPERAND(scan));
+					if (plen >= len) {
+						longest = OPERAND(scan);
+						len = plen;
+					}
+				}
+			}
+			preg->regmust = longest;
+			preg->regmlen = len;
+		}
+	}
+
+#ifdef DEBUG
+	regdump(preg);
+#endif
+
+	return 0;
+}
+
+/*
+ - reg - regular expression, i.e. main body or parenthesized thing
+ *
+ * Caller must absorb opening parenthesis.
+ *
+ * Combining parenthesis handling with the base level of regular expression
+ * is a trifle forced, but the need to tie the tails of the branches to what
+ * follows makes it hard to avoid.
+ */
+static int reg(regex_t *preg, int paren /* Parenthesized? */, int *flagp )
+{
+	int ret;
+	int br;
+	int ender;
+	int parno = 0;
+	int flags;
+
+	*flagp = HASWIDTH;	/* Tentatively. */
+
+	/* Make an OPEN node, if parenthesized. */
+	if (paren) {
+		if (preg->regparse[0] == '?' && preg->regparse[1] == ':') {
+			/* non-capturing paren */
+			preg->regparse += 2;
+			parno = -1;
+		}
+		else {
+			parno = ++preg->re_nsub;
+		}
+		ret = regnode(preg, OPEN+parno);
+	} else
+		ret = 0;
+
+	/* Pick up the branches, linking them together. */
+	br = regbranch(preg, &flags);
+	if (br == 0)
+		return 0;
+	if (ret != 0)
+		regtail(preg, ret, br);	/* OPEN -> first. */
+	else
+		ret = br;
+	if (!(flags&HASWIDTH))
+		*flagp &= ~HASWIDTH;
+	*flagp |= flags&SPSTART;
+	while (*preg->regparse == '|') {
+		preg->regparse++;
+		br = regbranch(preg, &flags);
+		if (br == 0)
+			return 0;
+		regtail(preg, ret, br);	/* BRANCH -> BRANCH. */
+		if (!(flags&HASWIDTH))
+			*flagp &= ~HASWIDTH;
+		*flagp |= flags&SPSTART;
+	}
+
+	/* Make a closing node, and hook it on the end. */
+	ender = regnode(preg, (paren) ? CLOSE+parno : END);
+	regtail(preg, ret, ender);
+
+	/* Hook the tails of the branches to the closing node. */
+	for (br = ret; br != 0; br = regnext(preg, br))
+		regoptail(preg, br, ender);
+
+	/* Check for proper termination. */
+	if (paren && *preg->regparse++ != ')') {
+		preg->err = REG_ERR_UNMATCHED_PAREN;
+		return 0;
+	} else if (!paren && *preg->regparse != '\0') {
+		if (*preg->regparse == ')') {
+			preg->err = REG_ERR_UNMATCHED_PAREN;
+			return 0;
+		} else {
+			preg->err = REG_ERR_JUNK_ON_END;
+			return 0;
+		}
+	}
+
+	return(ret);
+}
+
+/*
+ - regbranch - one alternative of an | operator
+ *
+ * Implements the concatenation operator.
+ */
+static int regbranch(regex_t *preg, int *flagp )
+{
+	int ret;
+	int chain;
+	int latest;
+	int flags;
+
+	*flagp = WORST;		/* Tentatively. */
+
+	ret = regnode(preg, BRANCH);
+	chain = 0;
+	while (*preg->regparse != '\0' && *preg->regparse != ')' &&
+	       *preg->regparse != '|') {
+		latest = regpiece(preg, &flags);
+		if (latest == 0)
+			return 0;
+		*flagp |= flags&HASWIDTH;
+		if (chain == 0) {/* First piece. */
+			*flagp |= flags&SPSTART;
+		}
+		else {
+			regtail(preg, chain, latest);
+		}
+		chain = latest;
+	}
+	if (chain == 0)	/* Loop ran zero times. */
+		(void) regnode(preg, NOTHING);
+
+	return(ret);
+}
+
+/*
+ - regpiece - something followed by possible [*+?]
+ *
+ * Note that the branching code sequences used for ? and the general cases
+ * of * and + are somewhat optimized:  they use the same NOTHING node as
+ * both the endmarker for their branch list and the body of the last branch.
+ * It might seem that this node could be dispensed with entirely, but the
+ * endmarker role is not redundant.
+ */
+static int regpiece(regex_t *preg, int *flagp)
+{
+	int ret;
+	char op;
+	int next;
+	int flags;
+	int min;
+	int max;
+
+	ret = regatom(preg, &flags);
+	if (ret == 0)
+		return 0;
+
+	op = *preg->regparse;
+	if (!ISMULT(op)) {
+		*flagp = flags;
+		return(ret);
+	}
+
+	if (!(flags&HASWIDTH) && op != '?') {
+		preg->err = REG_ERR_OPERAND_COULD_BE_EMPTY;
+		return 0;
+	}
+
+	/* Handle braces (counted repetition) by expansion */
+	if (op == '{') {
+		char *end;
+
+		min = strtoul(preg->regparse + 1, &end, 10);
+		if (end == preg->regparse + 1) {
+			preg->err = REG_ERR_BAD_COUNT;
+			return 0;
+		}
+		if (*end == '}') {
+			max = min;
+		}
+		else if (*end == '\0') {
+			preg->err = REG_ERR_UNMATCHED_BRACES;
+			return 0;
+		}
+		else {
+			preg->regparse = end;
+			max = strtoul(preg->regparse + 1, &end, 10);
+			if (*end != '}') {
+				preg->err = REG_ERR_UNMATCHED_BRACES;
+				return 0;
+			}
+		}
+		if (end == preg->regparse + 1) {
+			max = MAX_REP_COUNT;
+		}
+		else if (max < min || max >= 100) {
+			preg->err = REG_ERR_BAD_COUNT;
+			return 0;
+		}
+		if (min >= 100) {
+			preg->err = REG_ERR_BAD_COUNT;
+			return 0;
+		}
+
+		preg->regparse = strchr(preg->regparse, '}');
+	}
+	else {
+		min = (op == '+');
+		max = (op == '?' ? 1 : MAX_REP_COUNT);
+	}
+
+	if (preg->regparse[1] == '?') {
+		preg->regparse++;
+		next = reginsert(preg, flags & SIMPLE ? REPMIN : REPXMIN, 5, ret);
+	}
+	else {
+		next = reginsert(preg, flags & SIMPLE ? REP: REPX, 5, ret);
+	}
+	preg->program[ret + 2] = max;
+	preg->program[ret + 3] = min;
+	preg->program[ret + 4] = 0;
+
+	*flagp = (min) ? (WORST|HASWIDTH) : (WORST|SPSTART);
+
+	if (!(flags & SIMPLE)) {
+		int back = regnode(preg, BACK);
+		regtail(preg, back, ret);
+		regtail(preg, next, back);
+	}
+
+	preg->regparse++;
+	if (ISMULT(*preg->regparse)) {
+		preg->err = REG_ERR_NESTED_COUNT;
+		return 0;
+	}
+
+	return ret;
+}
+
+/**
+ * Add all characters in the inclusive range between lower and upper.
+ *
+ * Handles a swapped range (upper < lower).
+ */
+static void reg_addrange(regex_t *preg, int lower, int upper)
+{
+	if (lower > upper) {
+		reg_addrange(preg, upper, lower);
+	}
+	/* Add a range as length, start */
+	regc(preg, upper - lower + 1);
+	regc(preg, lower);
+}
+
+/**
+ * Add a null-terminated literal string as a set of ranges.
+ */
+static void reg_addrange_str(regex_t *preg, const char *str)
+{
+	while (*str) {
+		reg_addrange(preg, *str, *str);
+		str++;
+	}
+}
+
+/**
+ * Extracts the next unicode char from utf8.
+ *
+ * If 'upper' is set, converts the char to uppercase.
+ */
+static int reg_utf8_tounicode_case(const char *s, int *uc, int upper)
+{
+	int l = utf8_tounicode(s, uc);
+	if (upper) {
+		*uc = utf8_upper(*uc);
+	}
+	return l;
+}
+
+/**
+ * Converts a hex digit to decimal.
+ *
+ * Returns -1 for an invalid hex digit.
+ */
+static int hexdigitval(int c)
+{
+	if (c >= '0' && c <= '9')
+		return c - '0';
+	if (c >= 'a' && c <= 'f')
+		return c - 'a' + 10;
+	if (c >= 'A' && c <= 'F')
+		return c - 'A' + 10;
+	return -1;
+}
+
+/**
+ * Parses up to 'n' hex digits at 's' and stores the result in *uc.
+ *
+ * Returns the number of hex digits parsed.
+ * If there are no hex digits, returns 0 and stores nothing.
+ */
+static int parse_hex(const char *s, int n, int *uc)
+{
+	int val = 0;
+	int k;
+
+	for (k = 0; k < n; k++) {
+		int c = hexdigitval(*s++);
+		if (c == -1) {
+			break;
+		}
+		val = (val << 4) | c;
+	}
+	if (k) {
+		*uc = val;
+	}
+	return k;
+}
+
+/**
+ * Call for chars after a backlash to decode the escape sequence.
+ *
+ * Stores the result in *ch.
+ *
+ * Returns the number of bytes consumed.
+ */
+static int reg_decode_escape(const char *s, int *ch)
+{
+	int n;
+	const char *s0 = s;
+
+	*ch = *s++;
+
+	switch (*ch) {
+		case 'b': *ch = '\b'; break;
+		case 'e': *ch = 27; break;
+		case 'f': *ch = '\f'; break;
+		case 'n': *ch = '\n'; break;
+		case 'r': *ch = '\r'; break;
+		case 't': *ch = '\t'; break;
+		case 'v': *ch = '\v'; break;
+		case 'u':
+			if (*s == '{') {
+				/* Expect \u{NNNN} */
+				n = parse_hex(s + 1, 6, ch);
+				if (n > 0 && s[n + 1] == '}' && *ch >= 0 && *ch <= 0x1fffff) {
+					s += n + 2;
+				}
+				else {
+					/* Invalid, so just treat as an escaped 'u' */
+					*ch = 'u';
+				}
+			}
+			else if ((n = parse_hex(s, 4, ch)) > 0) {
+				s += n;
+			}
+			break;
+		case 'U':
+			if ((n = parse_hex(s, 8, ch)) > 0) {
+				s += n;
+			}
+			break;
+		case 'x':
+			if ((n = parse_hex(s, 2, ch)) > 0) {
+				s += n;
+			}
+			break;
+		case '\0':
+			s--;
+			*ch = '\\';
+			break;
+	}
+	return s - s0;
+}
+
+/*
+ - regatom - the lowest level
+ *
+ * Optimization:  gobbles an entire sequence of ordinary characters so that
+ * it can turn them into a single node, which is smaller to store and
+ * faster to run.  Backslashed characters are exceptions, each becoming a
+ * separate node; the code is simpler that way and it's not worth fixing.
+ */
+static int regatom(regex_t *preg, int *flagp)
+{
+	int ret;
+	int flags;
+	int nocase = (preg->cflags & REG_ICASE);
+
+	int ch;
+	int n = reg_utf8_tounicode_case(preg->regparse, &ch, nocase);
+
+	*flagp = WORST;		/* Tentatively. */
+
+	preg->regparse += n;
+	switch (ch) {
+	/* FIXME: these chars only have meaning at beg/end of pat? */
+	case '^':
+		ret = regnode(preg, BOL);
+		break;
+	case '$':
+		ret = regnode(preg, EOL);
+		break;
+	case '.':
+		ret = regnode(preg, ANY);
+		*flagp |= HASWIDTH|SIMPLE;
+		break;
+	case '[': {
+			const char *pattern = preg->regparse;
+
+			if (*pattern == '^') {	/* Complement of range. */
+				ret = regnode(preg, ANYBUT);
+				pattern++;
+			} else
+				ret = regnode(preg, ANYOF);
+
+			/* Special case. If the first char is ']' or '-', it is part of the set */
+			if (*pattern == ']' || *pattern == '-') {
+				reg_addrange(preg, *pattern, *pattern);
+				pattern++;
+			}
+
+			while (*pattern != ']') {
+				/* Is this a range? a-z */
+				int start;
+				int end;
+
+				enum {
+					CC_ALPHA, CC_ALNUM, CC_SPACE, CC_BLANK, CC_UPPER, CC_LOWER,
+					CC_DIGIT, CC_XDIGIT, CC_CNTRL, CC_GRAPH, CC_PRINT, CC_PUNCT,
+					CC_NUM
+				};
+				int cc;
+
+				if (!*pattern) {
+					preg->err = REG_ERR_UNMATCHED_BRACKET;
+					return 0;
+				}
+
+				pattern += reg_utf8_tounicode_case(pattern, &start, nocase);
+				if (start == '\\') {
+					/* First check for class shorthand escapes */
+					switch (*pattern) {
+						case 's':
+							pattern++;
+							cc = CC_SPACE;
+							goto cc_switch;
+						case 'd':
+							pattern++;
+							cc = CC_DIGIT;
+							goto cc_switch;
+						case 'w':
+							pattern++;
+							reg_addrange(preg, '_', '_');
+							cc = CC_ALNUM;
+							goto cc_switch;
+					}
+					pattern += reg_decode_escape(pattern, &start);
+					if (start == 0) {
+						preg->err = REG_ERR_NULL_CHAR;
+						return 0;
+					}
+					if (start == '\\' && *pattern == 0) {
+						preg->err = REG_ERR_INVALID_ESCAPE;
+						return 0;
+					}
+				}
+				if (pattern[0] == '-' && pattern[1] && pattern[1] != ']') {
+					/* skip '-' */
+					pattern += utf8_tounicode(pattern, &end);
+					pattern += reg_utf8_tounicode_case(pattern, &end, nocase);
+					if (end == '\\') {
+						pattern += reg_decode_escape(pattern, &end);
+						if (end == 0) {
+							preg->err = REG_ERR_NULL_CHAR;
+							return 0;
+						}
+						if (start == '\\' && *pattern == 0) {
+							preg->err = REG_ERR_INVALID_ESCAPE;
+							return 0;
+						}
+					}
+
+					reg_addrange(preg, start, end);
+					continue;
+				}
+				if (start == '[' && pattern[0] == ':') {
+					static const char *character_class[] = {
+						":alpha:", ":alnum:", ":space:", ":blank:", ":upper:", ":lower:",
+						":digit:", ":xdigit:", ":cntrl:", ":graph:", ":print:", ":punct:",
+					};
+
+					for (cc = 0; cc < CC_NUM; cc++) {
+						n = strlen(character_class[cc]);
+						if (strncmp(pattern, character_class[cc], n) == 0) {
+							/* Found a character class */
+							pattern += n + 1;
+							break;
+						}
+					}
+					if (cc != CC_NUM) {
+cc_switch:
+						switch (cc) {
+							case CC_ALNUM:
+								reg_addrange(preg, '0', '9');
+								/* Fall through */
+							case CC_ALPHA:
+								if ((preg->cflags & REG_ICASE) == 0) {
+									reg_addrange(preg, 'a', 'z');
+								}
+								reg_addrange(preg, 'A', 'Z');
+								break;
+							case CC_SPACE:
+								reg_addrange_str(preg, " \t\r\n\f\v");
+								break;
+							case CC_BLANK:
+								reg_addrange_str(preg, " \t");
+								break;
+							case CC_UPPER:
+								reg_addrange(preg, 'A', 'Z');
+								break;
+							case CC_LOWER:
+								reg_addrange(preg, 'a', 'z');
+								break;
+							case CC_XDIGIT:
+								reg_addrange(preg, 'a', 'f');
+								reg_addrange(preg, 'A', 'F');
+								/* Fall through */
+							case CC_DIGIT:
+								reg_addrange(preg, '0', '9');
+								break;
+							case CC_CNTRL:
+								reg_addrange(preg, 0, 31);
+								reg_addrange(preg, 127, 127);
+								break;
+							case CC_PRINT:
+								reg_addrange(preg, ' ', '~');
+								break;
+							case CC_GRAPH:
+								reg_addrange(preg, '!', '~');
+								break;
+							case CC_PUNCT:
+								reg_addrange(preg, '!', '/');
+								reg_addrange(preg, ':', '@');
+								reg_addrange(preg, '[', '`');
+								reg_addrange(preg, '{', '~');
+								break;
+						}
+						continue;
+					}
+				}
+				/* Not a range, so just add the char */
+				reg_addrange(preg, start, start);
+			}
+			regc(preg, '\0');
+
+			if (*pattern) {
+				pattern++;
+			}
+			preg->regparse = pattern;
+
+			*flagp |= HASWIDTH|SIMPLE;
+		}
+		break;
+	case '(':
+		ret = reg(preg, 1, &flags);
+		if (ret == 0)
+			return 0;
+		*flagp |= flags&(HASWIDTH|SPSTART);
+		break;
+	case '\0':
+	case '|':
+	case ')':
+		preg->err = REG_ERR_INTERNAL;
+		return 0;	/* Supposed to be caught earlier. */
+	case '?':
+	case '+':
+	case '*':
+	case '{':
+		preg->err = REG_ERR_COUNT_FOLLOWS_NOTHING;
+		return 0;
+	case '\\':
+		ch = *preg->regparse++;
+		switch (ch) {
+		case '\0':
+			preg->err = REG_ERR_INVALID_ESCAPE;
+			return 0;
+		case 'A':
+			ret = regnode(preg, BOLX);
+			break;
+		case 'Z':
+			ret = regnode(preg, EOLX);
+			break;
+		case '<':
+		case 'm':
+			ret = regnode(preg, WORDA);
+			break;
+		case '>':
+		case 'M':
+			ret = regnode(preg, WORDZ);
+			break;
+		case 'd':
+		case 'D':
+			ret = regnode(preg, ch == 'd' ? ANYOF : ANYBUT);
+			reg_addrange(preg, '0', '9');
+			regc(preg, '\0');
+			*flagp |= HASWIDTH|SIMPLE;
+			break;
+		case 'w':
+		case 'W':
+			ret = regnode(preg, ch == 'w' ? ANYOF : ANYBUT);
+			if ((preg->cflags & REG_ICASE) == 0) {
+				reg_addrange(preg, 'a', 'z');
+			}
+			reg_addrange(preg, 'A', 'Z');
+			reg_addrange(preg, '0', '9');
+			reg_addrange(preg, '_', '_');
+			regc(preg, '\0');
+			*flagp |= HASWIDTH|SIMPLE;
+			break;
+		case 's':
+		case 'S':
+			ret = regnode(preg, ch == 's' ? ANYOF : ANYBUT);
+			reg_addrange_str(preg," \t\r\n\f\v");
+			regc(preg, '\0');
+			*flagp |= HASWIDTH|SIMPLE;
+			break;
+		/* FIXME: Someday handle \1, \2, ... */
+		default:
+			/* Handle general quoted chars in exact-match routine */
+			/* Back up to include the backslash */
+			preg->regparse--;
+			goto de_fault;
+		}
+		break;
+	de_fault:
+	default: {
+			/*
+			 * Encode a string of characters to be matched exactly.
+			 */
+			int added = 0;
+
+			/* Back up to pick up the first char of interest */
+			preg->regparse -= n;
+
+			ret = regnode(preg, EXACTLY);
+
+			/* Note that a META operator such as ? or * consumes the
+			 * preceding char.
+			 * Thus we must be careful to look ahead by 2 and add the
+			 * last char as it's own EXACTLY if necessary
+			 */
+
+			/* Until end of string or a META char is reached */
+			while (*preg->regparse && strchr(META, *preg->regparse) == NULL) {
+				n = reg_utf8_tounicode_case(preg->regparse, &ch, (preg->cflags & REG_ICASE));
+				if (ch == '\\' && preg->regparse[n]) {
+					/* Non-trailing backslash.
+					 * Is this a special escape, or a regular escape?
+					 */
+					if (strchr("<>mMwWdDsSAZ", preg->regparse[n])) {
+						/* A special escape. All done with EXACTLY */
+						break;
+					}
+					/* Decode it. Note that we add the length for the escape
+					 * sequence to the length for the backlash so we can skip
+					 * the entire sequence, or not as required.
+					 */
+					n += reg_decode_escape(preg->regparse + n, &ch);
+					if (ch == 0) {
+						preg->err = REG_ERR_NULL_CHAR;
+						return 0;
+					}
+				}
+
+				/* Now we have one char 'ch' of length 'n'.
+				 * Check to see if the following char is a MULT
+				 */
+
+				if (ISMULT(preg->regparse[n])) {
+					/* Yes. But do we already have some EXACTLY chars? */
+					if (added) {
+						/* Yes, so return what we have and pick up the current char next time around */
+						break;
+					}
+					/* No, so add this single char and finish */
+					regc(preg, ch);
+					added++;
+					preg->regparse += n;
+					break;
+				}
+
+				/* No, so just add this char normally */
+				regc(preg, ch);
+				added++;
+				preg->regparse += n;
+			}
+			regc(preg, '\0');
+
+			*flagp |= HASWIDTH;
+			if (added == 1)
+				*flagp |= SIMPLE;
+			break;
+		}
+		break;
+	}
+
+	return(ret);
+}
+
+static void reg_grow(regex_t *preg, int n)
+{
+	if (preg->p + n >= preg->proglen) {
+		preg->proglen = (preg->p + n) * 2;
+		preg->program = realloc(preg->program, preg->proglen * sizeof(int));
+	}
+}
+
+/*
+ - regnode - emit a node
+ */
+/* Location. */
+static int regnode(regex_t *preg, int op)
+{
+	reg_grow(preg, 2);
+
+	/* The OP followed by a next pointer */
+	preg->program[preg->p++] = op;
+	preg->program[preg->p++] = 0;
+
+	/* Return the start of the node */
+	return preg->p - 2;
+}
+
+/*
+ - regc - emit (if appropriate) a byte of code
+ */
+static void regc(regex_t *preg, int b )
+{
+	reg_grow(preg, 1);
+	preg->program[preg->p++] = b;
+}
+
+/*
+ - reginsert - insert an operator in front of already-emitted operand
+ *
+ * Means relocating the operand.
+ * Returns the new location of the original operand.
+ */
+static int reginsert(regex_t *preg, int op, int size, int opnd )
+{
+	reg_grow(preg, size);
+
+	/* Move everything from opnd up */
+	memmove(preg->program + opnd + size, preg->program + opnd, sizeof(int) * (preg->p - opnd));
+	/* Zero out the new space */
+	memset(preg->program + opnd, 0, sizeof(int) * size);
+
+	preg->program[opnd] = op;
+
+	preg->p += size;
+
+	return opnd + size;
+}
+
+/*
+ - regtail - set the next-pointer at the end of a node chain
+ */
+static void regtail(regex_t *preg, int p, int val)
+{
+	int scan;
+	int temp;
+	int offset;
+
+	/* Find last node. */
+	scan = p;
+	for (;;) {
+		temp = regnext(preg, scan);
+		if (temp == 0)
+			break;
+		scan = temp;
+	}
+
+	if (OP(preg, scan) == BACK)
+		offset = scan - val;
+	else
+		offset = val - scan;
+
+	preg->program[scan + 1] = offset;
+}
+
+/*
+ - regoptail - regtail on operand of first argument; nop if operandless
+ */
+
+static void regoptail(regex_t *preg, int p, int val )
+{
+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
+	if (p != 0 && OP(preg, p) == BRANCH) {
+		regtail(preg, OPERAND(p), val);
+	}
+}
+
+/*
+ * regexec and friends
+ */
+
+/*
+ * Forwards.
+ */
+static int regtry(regex_t *preg, const char *string );
+static int regmatch(regex_t *preg, int prog);
+static int regrepeat(regex_t *preg, int p, int max);
+
+/*
+ - regexec - match a regexp against a string
+ */
+int regexec(regex_t  *preg,  const  char *string, size_t nmatch, regmatch_t pmatch[], int eflags)
+{
+	const char *s;
+	int scan;
+
+	/* Be paranoid... */
+	if (preg == NULL || preg->program == NULL || string == NULL) {
+		return REG_ERR_NULL_ARGUMENT;
+	}
+
+	/* Check validity of program. */
+	if (*preg->program != REG_MAGIC) {
+		return REG_ERR_CORRUPTED;
+	}
+
+#ifdef DEBUG
+	fprintf(stderr, "regexec: %s\n", string);
+	regdump(preg);
+#endif
+
+	preg->eflags = eflags;
+	preg->pmatch = pmatch;
+	preg->nmatch = nmatch;
+	preg->start = string;	/* All offsets are computed from here */
+
+	/* Must clear out the embedded repeat counts of REPX and REPXMIN opcodes */
+	for (scan = OPERAND(1); scan != 0; scan += regopsize(preg, scan)) {
+		int op = OP(preg, scan);
+		if (op == END)
+			break;
+		if (op == REPX || op == REPXMIN)
+			preg->program[scan + 4] = 0;
+	}
+
+	/* If there is a "must appear" string, look for it. */
+	if (preg->regmust != 0) {
+		s = string;
+		while ((s = str_find(s, preg->program[preg->regmust], preg->cflags & REG_ICASE)) != NULL) {
+			if (prefix_cmp(preg->program + preg->regmust, preg->regmlen, s, preg->cflags & REG_ICASE) >= 0) {
+				break;
+			}
+			s++;
+		}
+		if (s == NULL)	/* Not present. */
+			return REG_NOMATCH;
+	}
+
+	/* Mark beginning of line for ^ . */
+	preg->regbol = string;
+
+	/* Simplest case:  anchored match need be tried only once (maybe per line). */
+	if (preg->reganch) {
+		if (eflags & REG_NOTBOL) {
+			/* This is an anchored search, but not an BOL, so possibly skip to the next line */
+			goto nextline;
+		}
+		while (1) {
+			if (regtry(preg, string)) {
+				return REG_NOERROR;
+			}
+			if (*string) {
+nextline:
+				if (preg->cflags & REG_NEWLINE) {
+					/* Try the next anchor? */
+					string = strchr(string, '\n');
+					if (string) {
+						preg->regbol = ++string;
+						continue;
+					}
+				}
+			}
+			return REG_NOMATCH;
+		}
+	}
+
+	/* Messy cases:  unanchored match. */
+	s = string;
+	if (preg->regstart != '\0') {
+		/* We know what char it must start with. */
+		while ((s = str_find(s, preg->regstart, preg->cflags & REG_ICASE)) != NULL) {
+			if (regtry(preg, s))
+				return REG_NOERROR;
+			s++;
+		}
+	}
+	else
+		/* We don't -- general case. */
+		while (1) {
+			if (regtry(preg, s))
+				return REG_NOERROR;
+			if (*s == '\0') {
+				break;
+			}
+			else {
+				int c;
+				s += utf8_tounicode(s, &c);
+			}
+		}
+
+	/* Failure. */
+	return REG_NOMATCH;
+}
+
+/*
+ - regtry - try match at specific point
+ */
+			/* 0 failure, 1 success */
+static int regtry( regex_t *preg, const char *string )
+{
+	int i;
+
+	preg->reginput = string;
+
+	for (i = 0; i < preg->nmatch; i++) {
+		if (preg->pmatch) {
+			preg->pmatch[i].rm_so = -1;
+			preg->pmatch[i].rm_eo = -1;
+		}
+	}
+	if (regmatch(preg, 1)) {
+		if (preg->pmatch) {
+			preg->pmatch[0].rm_so = string - preg->start;
+			preg->pmatch[0].rm_eo = preg->reginput - preg->start;
+		}
+		return(1);
+	} else
+		return(0);
+}
+
+/**
+ * Returns bytes matched if 'pattern' is a prefix of 'string'.
+ *
+ * If 'nocase' is non-zero, does a case-insensitive match.
+ *
+ * Returns -1 on not found.
+ */
+static int prefix_cmp(const int *prog, int proglen, const char *string, int nocase)
+{
+	const char *s = string;
+	while (proglen && *s) {
+		int ch;
+		int n = reg_utf8_tounicode_case(s, &ch, nocase);
+		if (ch != *prog) {
+			return -1;
+		}
+		prog++;
+		s += n;
+		proglen--;
+	}
+	if (proglen == 0) {
+		return s - string;
+	}
+	return -1;
+}
+
+/**
+ * Searchs for 'c' in the range 'range'.
+ *
+ * Returns 1 if found, or 0 if not.
+ */
+static int reg_range_find(const int *range, int c)
+{
+	while (*range) {
+		/*printf("Checking %d in range [%d,%d]\n", c, range[1], (range[0] + range[1] - 1));*/
+		if (c >= range[1] && c <= (range[0] + range[1] - 1)) {
+			return 1;
+		}
+		range += 2;
+	}
+	return 0;
+}
+
+/**
+ * Search for the character 'c' in the utf-8 string 'string'.
+ *
+ * If 'nocase' is set, the 'string' is assumed to be uppercase
+ * and 'c' is converted to uppercase before matching.
+ *
+ * Returns the byte position in the string where the 'c' was found, or
+ * NULL if not found.
+ */
+static const char *str_find(const char *string, int c, int nocase)
+{
+	if (nocase) {
+		/* The "string" should already be converted to uppercase */
+		c = utf8_upper(c);
+	}
+	while (*string) {
+		int ch;
+		int n = reg_utf8_tounicode_case(string, &ch, nocase);
+		if (c == ch) {
+			return string;
+		}
+		string += n;
+	}
+	return NULL;
+}
+
+/**
+ * Returns true if 'ch' is an end-of-line char.
+ *
+ * In REG_NEWLINE mode, \n is considered EOL in
+ * addition to \0
+ */
+static int reg_iseol(regex_t *preg, int ch)
+{
+	if (preg->cflags & REG_NEWLINE) {
+		return ch == '\0' || ch == '\n';
+	}
+	else {
+		return ch == '\0';
+	}
+}
+
+static int regmatchsimplerepeat(regex_t *preg, int scan, int matchmin)
+{
+	int nextch = '\0';
+	const char *save;
+	int no;
+	int c;
+
+	int max = preg->program[scan + 2];
+	int min = preg->program[scan + 3];
+	int next = regnext(preg, scan);
+
+	/*
+	 * Lookahead to avoid useless match attempts
+	 * when we know what character comes next.
+	 */
+	if (OP(preg, next) == EXACTLY) {
+		nextch = preg->program[OPERAND(next)];
+	}
+	save = preg->reginput;
+	no = regrepeat(preg, scan + 5, max);
+	if (no < min) {
+		return 0;
+	}
+	if (matchmin) {
+		/* from min up to no */
+		max = no;
+		no = min;
+	}
+	/* else from no down to min */
+	while (1) {
+		if (matchmin) {
+			if (no > max) {
+				break;
+			}
+		}
+		else {
+			if (no < min) {
+				break;
+			}
+		}
+		preg->reginput = save + utf8_index(save, no);
+		reg_utf8_tounicode_case(preg->reginput, &c, (preg->cflags & REG_ICASE));
+		/* If it could work, try it. */
+		if (reg_iseol(preg, nextch) || c == nextch) {
+			if (regmatch(preg, next)) {
+				return(1);
+			}
+		}
+		if (matchmin) {
+			/* Couldn't or didn't, add one more */
+			no++;
+		}
+		else {
+			/* Couldn't or didn't -- back up. */
+			no--;
+		}
+	}
+	return(0);
+}
+
+static int regmatchrepeat(regex_t *preg, int scan, int matchmin)
+{
+	int *scanpt = preg->program + scan;
+
+	int max = scanpt[2];
+	int min = scanpt[3];
+
+	/* Have we reached min? */
+	if (scanpt[4] < min) {
+		/* No, so get another one */
+		scanpt[4]++;
+		if (regmatch(preg, scan + 5)) {
+			return 1;
+		}
+		scanpt[4]--;
+		return 0;
+	}
+	if (scanpt[4] > max) {
+		return 0;
+	}
+
+	if (matchmin) {
+		/* minimal, so try other branch first */
+		if (regmatch(preg, regnext(preg, scan))) {
+			return 1;
+		}
+		/* No, so try one more */
+		scanpt[4]++;
+		if (regmatch(preg, scan + 5)) {
+			return 1;
+		}
+		scanpt[4]--;
+		return 0;
+	}
+	/* maximal, so try this branch again */
+	if (scanpt[4] < max) {
+		scanpt[4]++;
+		if (regmatch(preg, scan + 5)) {
+			return 1;
+		}
+		scanpt[4]--;
+	}
+	/* At this point we are at max with no match. Try the other branch */
+	return regmatch(preg, regnext(preg, scan));
+}
+
+/*
+ - regmatch - main matching routine
+ *
+ * Conceptually the strategy is simple:  check to see whether the current
+ * node matches, call self recursively to see whether the rest matches,
+ * and then act accordingly.  In practice we make some effort to avoid
+ * recursion, in particular by going through "ordinary" nodes (that don't
+ * need to know whether the rest of the match failed) by a loop instead of
+ * by recursion.
+ */
+/* 0 failure, 1 success */
+static int regmatch(regex_t *preg, int prog)
+{
+	int scan;	/* Current node. */
+	int next;		/* Next node. */
+	const char *save;
+
+	scan = prog;
+
+#ifdef DEBUG
+	if (scan != 0 && regnarrate)
+		fprintf(stderr, "%s(\n", regprop(scan));
+#endif
+	while (scan != 0) {
+		int n;
+		int c;
+#ifdef DEBUG
+		if (regnarrate) {
+			fprintf(stderr, "%3d: %s...\n", scan, regprop(OP(preg, scan)));	/* Where, what. */
+		}
+#endif
+		next = regnext(preg, scan);
+		n = reg_utf8_tounicode_case(preg->reginput, &c, (preg->cflags & REG_ICASE));
+
+		switch (OP(preg, scan)) {
+		case BOLX:
+			if ((preg->eflags & REG_NOTBOL)) {
+				return(0);
+			}
+			/* Fall through */
+		case BOL:
+			if (preg->reginput != preg->regbol) {
+				return(0);
+			}
+			break;
+		case EOLX:
+			if (c != 0) {
+				/* For EOLX, only match real end of line, not newline */
+				return 0;
+			}
+			break;
+		case EOL:
+			if (!reg_iseol(preg, c)) {
+				return(0);
+			}
+			break;
+		case WORDA:
+			/* Must be looking at a letter, digit, or _ */
+			if ((!isalnum(UCHAR(c))) && c != '_')
+				return(0);
+			/* Prev must be BOL or nonword */
+			if (preg->reginput > preg->regbol &&
+				(isalnum(UCHAR(preg->reginput[-1])) || preg->reginput[-1] == '_'))
+				return(0);
+			break;
+		case WORDZ:
+			/* Can't match at BOL */
+			if (preg->reginput > preg->regbol) {
+				/* Current must be EOL or nonword */
+				if (reg_iseol(preg, c) || !isalnum(UCHAR(c)) || c != '_') {
+					c = preg->reginput[-1];
+					/* Previous must be word */
+					if (isalnum(UCHAR(c)) || c == '_') {
+						break;
+					}
+				}
+			}
+			/* No */
+			return(0);
+
+		case ANY:
+			if (reg_iseol(preg, c))
+				return 0;
+			preg->reginput += n;
+			break;
+		case EXACTLY: {
+				int opnd;
+				int len;
+				int slen;
+
+				opnd = OPERAND(scan);
+				len = str_int_len(preg->program + opnd);
+
+				slen = prefix_cmp(preg->program + opnd, len, preg->reginput, preg->cflags & REG_ICASE);
+				if (slen < 0) {
+					return(0);
+				}
+				preg->reginput += slen;
+			}
+			break;
+		case ANYOF:
+			if (reg_iseol(preg, c) || reg_range_find(preg->program + OPERAND(scan), c) == 0) {
+				return(0);
+			}
+			preg->reginput += n;
+			break;
+		case ANYBUT:
+			if (reg_iseol(preg, c) || reg_range_find(preg->program + OPERAND(scan), c) != 0) {
+				return(0);
+			}
+			preg->reginput += n;
+			break;
+		case NOTHING:
+			break;
+		case BACK:
+			break;
+		case BRANCH:
+			if (OP(preg, next) != BRANCH)		/* No choice. */
+				next = OPERAND(scan);	/* Avoid recursion. */
+			else {
+				do {
+					save = preg->reginput;
+					if (regmatch(preg, OPERAND(scan))) {
+						return(1);
+					}
+					preg->reginput = save;
+					scan = regnext(preg, scan);
+				} while (scan != 0 && OP(preg, scan) == BRANCH);
+				return(0);
+				/* NOTREACHED */
+			}
+			break;
+		case REP:
+		case REPMIN:
+			return regmatchsimplerepeat(preg, scan, OP(preg, scan) == REPMIN);
+
+		case REPX:
+		case REPXMIN:
+			return regmatchrepeat(preg, scan, OP(preg, scan) == REPXMIN);
+
+		case END:
+			return 1;	/* Success! */
+
+		case OPENNC:
+		case CLOSENC:
+			return regmatch(preg, next);
+
+		default:
+			if (OP(preg, scan) >= OPEN+1 && OP(preg, scan) < CLOSE_END) {
+				save = preg->reginput;
+				if (regmatch(preg, next)) {
+					if (OP(preg, scan) < CLOSE) {
+						int no = OP(preg, scan) - OPEN;
+						if (no < preg->nmatch && preg->pmatch && preg->pmatch[no].rm_so == -1) {
+							preg->pmatch[no].rm_so = save - preg->start;
+						}
+					}
+					else {
+						int no = OP(preg, scan) - CLOSE;
+						if (no < preg->nmatch && preg->pmatch && preg->pmatch[no].rm_eo == -1) {
+							preg->pmatch[no].rm_eo = save - preg->start;
+						}
+					}
+					return(1);
+				}
+				/* Restore input position after failure */
+				preg->reginput = save;
+				return(0);
+			}
+			return REG_ERR_INTERNAL;
+		}
+
+		scan = next;
+	}
+
+	/*
+	 * We get here only if there's trouble -- normally "case END" is
+	 * the terminating point.
+	 */
+	return REG_ERR_INTERNAL;
+}
+
+/*
+ - regrepeat - repeatedly match something simple, report how many
+ */
+static int regrepeat(regex_t *preg, int p, int max)
+{
+	int count = 0;
+	const char *scan;
+	int opnd;
+	int ch;
+	int n;
+
+	scan = preg->reginput;
+	opnd = OPERAND(p);
+	switch (OP(preg, p)) {
+	case ANY:
+		while (!reg_iseol(preg, *scan) && count < max) {
+			count++;
+			scan += utf8_charlen(*scan);
+		}
+		break;
+	case EXACTLY:
+		while (count < max) {
+			n = reg_utf8_tounicode_case(scan, &ch, preg->cflags & REG_ICASE);
+			if (preg->program[opnd] != ch) {
+				break;
+			}
+			count++;
+			scan += n;
+		}
+		break;
+	case ANYOF:
+		while (count < max) {
+			n = reg_utf8_tounicode_case(scan, &ch, preg->cflags & REG_ICASE);
+			if (reg_iseol(preg, ch) || reg_range_find(preg->program + opnd, ch) == 0) {
+				break;
+			}
+			count++;
+			scan += n;
+		}
+		break;
+	case ANYBUT:
+		while (count < max) {
+			n = reg_utf8_tounicode_case(scan, &ch, preg->cflags & REG_ICASE);
+			if (reg_iseol(preg, ch) || reg_range_find(preg->program + opnd, ch) != 0) {
+				break;
+			}
+			count++;
+			scan += n;
+		}
+		break;
+	default:		/* Oh dear.  Called inappropriately. */
+		preg->err = REG_ERR_INTERNAL;
+		count = 0;	/* Best compromise. */
+		break;
+	}
+	preg->reginput = scan;
+
+	return(count);
+}
+
+/*
+ - regnext - dig the "next" pointer out of a node
+ */
+static int regnext(regex_t *preg, int p )
+{
+	int offset;
+
+	offset = NEXT(preg, p);
+
+	if (offset == 0)
+		return 0;
+
+	if (OP(preg, p) == BACK)
+		return(p-offset);
+	else
+		return(p+offset);
+}
+
+/*
+ - regopsize - returns the size of opcode + operands at 'p' in words
+ */
+static int regopsize(regex_t *preg, int p )
+{
+	/* Almost all opcodes are 2 words, but some are more */
+	switch (OP(preg, p)) {
+		case REP:
+		case REPMIN:
+		case REPX:
+		case REPXMIN:
+			return 5;
+
+		case ANYOF:
+		case ANYBUT:
+		case EXACTLY: {
+			int s = p + 2;
+			while (preg->program[s++]) {
+			}
+			return s - p;
+		}
+	}
+	return 2;
+}
+
+#if defined(DEBUG) && !defined(JIM_BOOTSTRAP)
+
+/*
+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
+ */
+static void regdump(regex_t *preg)
+{
+	int s;
+	int op = EXACTLY;	/* Arbitrary non-END op. */
+	int next;
+	char buf[MAX_UTF8_LEN + 1];
+
+	int i;
+	for (i = 1; i < preg->p; i++) {
+		printf("%02x ", (unsigned char)preg->program[i]);
+		if (i % 16 == 0) {
+			printf("\n");
+		}
+	}
+	printf("\n");
+
+	s = 1;
+	while (op != END && s < preg->p) {	/* While that wasn't END last time... */
+		op = OP(preg, s);
+		printf("%3d: %s", s, regprop(op));	/* Where, what. */
+		next = regnext(preg, s);
+		if (next == 0)		/* Next ptr. */
+			printf("(0)");
+		else
+			printf("(%d)", next);
+		s += 2;
+		if (op == REP || op == REPMIN || op == REPX || op == REPXMIN) {
+			int max = preg->program[s];
+			int min = preg->program[s + 1];
+			if (max == 65535) {
+				printf("{%d,*}", min);
+			}
+			else {
+				printf("{%d,%d}", min, max);
+			}
+			printf(" %d", preg->program[s + 2]);
+			s += 3;
+		}
+		else if (op == ANYOF || op == ANYBUT) {
+			/* set of ranges */
+
+			while (preg->program[s]) {
+				int len = preg->program[s++];
+				int first = preg->program[s++];
+				buf[utf8_getchars(buf, first)] = 0;
+				printf("%s", buf);
+				if (len > 1) {
+					buf[utf8_getchars(buf, first + len - 1)] = 0;
+					printf("-%s", buf);
+				}
+			}
+			s++;
+		}
+		else if (op == EXACTLY) {
+			/* Literal string, where present. */
+
+			while (preg->program[s]) {
+				buf[utf8_getchars(buf, preg->program[s])] = 0;
+				printf("%s", buf);
+				s++;
+			}
+			s++;
+		}
+		putchar('\n');
+	}
+
+	if (op == END) {
+		/* Header fields of interest. */
+		if (preg->regstart) {
+			buf[utf8_getchars(buf, preg->regstart)] = 0;
+			printf("start '%s' ", buf);
+		}
+		if (preg->reganch)
+			printf("anchored ");
+		if (preg->regmust != 0) {
+			int i;
+			printf("must have:");
+			for (i = 0; i < preg->regmlen; i++) {
+				putchar(preg->program[preg->regmust + i]);
+			}
+			putchar('\n');
+		}
+	}
+	printf("\n");
+}
+
+/*
+ - regprop - printable representation of opcode
+ */
+static const char *regprop( int op )
+{
+	static char buf[50];
+
+	switch (op) {
+	case BOL:
+		return "BOL";
+	case EOL:
+		return "EOL";
+	case BOLX:
+		return "BOLX";
+	case EOLX:
+		return "EOLX";
+	case ANY:
+		return "ANY";
+	case ANYOF:
+		return "ANYOF";
+	case ANYBUT:
+		return "ANYBUT";
+	case BRANCH:
+		return "BRANCH";
+	case EXACTLY:
+		return "EXACTLY";
+	case NOTHING:
+		return "NOTHING";
+	case BACK:
+		return "BACK";
+	case END:
+		return "END";
+	case REP:
+		return "REP";
+	case REPMIN:
+		return "REPMIN";
+	case REPX:
+		return "REPX";
+	case REPXMIN:
+		return "REPXMIN";
+	case WORDA:
+		return "WORDA";
+	case WORDZ:
+		return "WORDZ";
+	case OPENNC:
+		return "OPEN";
+	case CLOSENC:
+		return "CLOSE";
+	default:
+		if (op >= OPEN && op < CLOSE) {
+			snprintf(buf, sizeof(buf), "OPEN%d", op-OPEN);
+		}
+		else if (op >= CLOSE && op < CLOSE_END) {
+			snprintf(buf, sizeof(buf), "CLOSE%d", op-CLOSE);
+		}
+		else {
+			snprintf(buf, sizeof(buf), "?%d?\n", op);
+		}
+		return(buf);
+	}
+}
+#endif /* JIM_BOOTSTRAP */
+
+size_t regerror(int errcode, const regex_t *preg, char *errbuf,  size_t errbuf_size)
+{
+	static const char *error_strings[] = {
+		"success",
+		"no match",
+		"bad pattern",
+		"null argument",
+		"unknown error",
+		"too big",
+		"out of memory",
+		"too many ()",
+		"parentheses () not balanced",
+		"braces {} not balanced",
+		"invalid repetition count(s)",
+		"extra characters",
+		"*+ of empty atom",
+		"nested count",
+		"internal error",
+		"count follows nothing",
+		"invalid escape \\ sequence",
+		"corrupted program",
+		"contains null char",
+		"brackets [] not balanced",
+	};
+	const char *err;
+
+        (void)preg;
+
+	if (errcode < 0 || errcode >= REG_ERR_NUM) {
+		err = "Bad error code";
+	}
+	else {
+		err = error_strings[errcode];
+	}
+
+	return snprintf(errbuf, errbuf_size, "%s", err);
+}
+
+void regfree(regex_t *preg)
+{
+	free(preg->program);
+}
+
+#endif
diff -Nru gnupg2-2.2.20/regexp/jimregexp.h gnupg2-2.2.27/regexp/jimregexp.h
--- gnupg2-2.2.20/regexp/jimregexp.h	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/jimregexp.h	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,110 @@
+#ifndef JIMREGEXP_H
+#define JIMREGEXP_H
+
+/** regexp(3)-compatible regular expression implementation for Jim.
+ *
+ * See jimregexp.c for details
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdlib.h>
+
+typedef struct {
+	int rm_so;
+	int rm_eo;
+} regmatch_t;
+
+/*
+ * The "internal use only" fields in regexp.h are present to pass info from
+ * compile to execute that permits the execute phase to run lots faster on
+ * simple cases.  They are:
+ *
+ * regstart	char that must begin a match; '\0' if none obvious
+ * reganch	is the match anchored (at beginning-of-line only)?
+ * regmust	string (pointer into program) that match must include, or NULL
+ * regmlen	length of regmust string
+ *
+ * Regstart and reganch permit very fast decisions on suitable starting points
+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
+ * of lines that cannot possibly match.  The regmust tests are costly enough
+ * that regcomp() supplies a regmust only if the r.e. contains something
+ * potentially expensive (at present, the only such thing detected is * or +
+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
+ * supplied because the test in regexec() needs it and regcomp() is computing
+ * it anyway.
+ */
+
+struct regexp {
+	/* -- public -- */
+	int re_nsub;		/* number of parenthesized subexpressions */
+
+	/* -- private -- */
+	int cflags;			/* Flags used when compiling */
+	int err;			/* Any error which occurred during compile */
+	int regstart;		/* Internal use only. */
+	int reganch;		/* Internal use only. */
+	int regmust;		/* Internal use only. */
+	int regmlen;		/* Internal use only. */
+	int *program;		/* Allocated */
+
+	/* working state - compile */
+	const char *regparse;		/* Input-scan pointer. */
+	int p;				/* Current output pos in program */
+	int proglen;		/* Allocated program size */
+
+	/* working state - exec */
+	int eflags;				/* Flags used when executing */
+	const char *start;		/* Initial string pointer. */
+	const char *reginput;	/* Current input pointer. */
+	const char *regbol;		/* Beginning of input, for ^ check. */
+
+	/* Input to regexec() */
+	regmatch_t *pmatch;		/* submatches will be stored here */
+	int nmatch;				/* size of pmatch[] */
+};
+
+typedef struct regexp regex_t;
+
+#define REG_EXTENDED 0
+#define REG_NEWLINE 1
+#define REG_ICASE 2
+
+#define REG_NOTBOL 16
+
+enum {
+	REG_NOERROR,      /* Success.  */
+	REG_NOMATCH,      /* Didn't find a match (for regexec).  */
+	REG_BADPAT,		  /* >= REG_BADPAT is an error */
+	REG_ERR_NULL_ARGUMENT,
+	REG_ERR_UNKNOWN,
+	REG_ERR_TOO_BIG,
+	REG_ERR_NOMEM,
+	REG_ERR_TOO_MANY_PAREN,
+	REG_ERR_UNMATCHED_PAREN,
+	REG_ERR_UNMATCHED_BRACES,
+	REG_ERR_BAD_COUNT,
+	REG_ERR_JUNK_ON_END,
+	REG_ERR_OPERAND_COULD_BE_EMPTY,
+	REG_ERR_NESTED_COUNT,
+	REG_ERR_INTERNAL,
+	REG_ERR_COUNT_FOLLOWS_NOTHING,
+	REG_ERR_INVALID_ESCAPE,
+	REG_ERR_CORRUPTED,
+	REG_ERR_NULL_CHAR,
+	REG_ERR_UNMATCHED_BRACKET,
+	REG_ERR_NUM
+};
+
+int regcomp(regex_t *preg, const char *regex, int cflags);
+int regexec(regex_t  *preg,  const  char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
+size_t regerror(int errcode, const regex_t *preg, char *errbuf,  size_t errbuf_size);
+void regfree(regex_t *preg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru gnupg2-2.2.20/regexp/Makefile.am gnupg2-2.2.27/regexp/Makefile.am
--- gnupg2-2.2.20/regexp/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/Makefile.am	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,39 @@
+# Makefile for common gnupg modules
+# Copyright (C) 2020 g10 Code GmbH
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libregexp.a
+
+AM_CPPFLAGS = -DJIM_REGEXP -DJIM_UTF8 -DUSE_UTF8
+
+AM_CFLAGS =
+
+libregexp_a_SOURCES = jimregexp.h utf8.h jimregexp.c utf8.c
+libregexp_a_CFLAGS = $(AM_CFLAGS)
+
+EXTRA_DIST = parse-unidata.awk UnicodeData.txt _unicode_mapping.c
+
+if MAINTAINER_MODE
+BUILT_SOURCES = _unicode_mapping.c
+MAINTAINERCLEANFILES = _unicode_mapping.c
+
+_unicode_mapping.c: parse-unidata.awk UnicodeData.txt
+	$(AWK) $(AWK_HEX_NUMBER_OPTION) -f $(srcdir)/parse-unidata.awk \
+	       $(srcdir)/UnicodeData.txt >$@
+endif
diff -Nru gnupg2-2.2.20/regexp/Makefile.in gnupg2-2.2.27/regexp/Makefile.in
--- gnupg2-2.2.20/regexp/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -0,0 +1,717 @@
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile for common gnupg modules
+# Copyright (C) 2020 g10 Code GmbH
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = regexp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/tar-ustar.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libregexp_a_AR = $(AR) $(ARFLAGS)
+libregexp_a_LIBADD =
+am_libregexp_a_OBJECTS = libregexp_a-jimregexp.$(OBJEXT) \
+	libregexp_a-utf8.$(OBJEXT)
+libregexp_a_OBJECTS = $(am_libregexp_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libregexp_a-jimregexp.Po \
+	./$(DEPDIR)/libregexp_a-utf8.Po
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libregexp_a_SOURCES)
+DIST_SOURCES = $(libregexp_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/mkinstalldirs
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_CPPFLAGS = @LIBUSB_CPPFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_C99_CFLAGS = @USE_C99_CFLAGS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YAT2M = @YAT2M@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LIBRARIES = libregexp.a
+AM_CPPFLAGS = -DJIM_REGEXP -DJIM_UTF8 -DUSE_UTF8
+AM_CFLAGS = 
+libregexp_a_SOURCES = jimregexp.h utf8.h jimregexp.c utf8.c
+libregexp_a_CFLAGS = $(AM_CFLAGS)
+EXTRA_DIST = parse-unidata.awk UnicodeData.txt _unicode_mapping.c
+@MAINTAINER_MODE_TRUE@BUILT_SOURCES = _unicode_mapping.c
+@MAINTAINER_MODE_TRUE@MAINTAINERCLEANFILES = _unicode_mapping.c
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu regexp/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu regexp/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libregexp.a: $(libregexp_a_OBJECTS) $(libregexp_a_DEPENDENCIES) $(EXTRA_libregexp_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libregexp.a
+	$(AM_V_AR)$(libregexp_a_AR) libregexp.a $(libregexp_a_OBJECTS) $(libregexp_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libregexp.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libregexp_a-jimregexp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libregexp_a-utf8.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+libregexp_a-jimregexp.o: jimregexp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -MT libregexp_a-jimregexp.o -MD -MP -MF $(DEPDIR)/libregexp_a-jimregexp.Tpo -c -o libregexp_a-jimregexp.o `test -f 'jimregexp.c' || echo '$(srcdir)/'`jimregexp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libregexp_a-jimregexp.Tpo $(DEPDIR)/libregexp_a-jimregexp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jimregexp.c' object='libregexp_a-jimregexp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -c -o libregexp_a-jimregexp.o `test -f 'jimregexp.c' || echo '$(srcdir)/'`jimregexp.c
+
+libregexp_a-jimregexp.obj: jimregexp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -MT libregexp_a-jimregexp.obj -MD -MP -MF $(DEPDIR)/libregexp_a-jimregexp.Tpo -c -o libregexp_a-jimregexp.obj `if test -f 'jimregexp.c'; then $(CYGPATH_W) 'jimregexp.c'; else $(CYGPATH_W) '$(srcdir)/jimregexp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libregexp_a-jimregexp.Tpo $(DEPDIR)/libregexp_a-jimregexp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jimregexp.c' object='libregexp_a-jimregexp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -c -o libregexp_a-jimregexp.obj `if test -f 'jimregexp.c'; then $(CYGPATH_W) 'jimregexp.c'; else $(CYGPATH_W) '$(srcdir)/jimregexp.c'; fi`
+
+libregexp_a-utf8.o: utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -MT libregexp_a-utf8.o -MD -MP -MF $(DEPDIR)/libregexp_a-utf8.Tpo -c -o libregexp_a-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libregexp_a-utf8.Tpo $(DEPDIR)/libregexp_a-utf8.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utf8.c' object='libregexp_a-utf8.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -c -o libregexp_a-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c
+
+libregexp_a-utf8.obj: utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -MT libregexp_a-utf8.obj -MD -MP -MF $(DEPDIR)/libregexp_a-utf8.Tpo -c -o libregexp_a-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libregexp_a-utf8.Tpo $(DEPDIR)/libregexp_a-utf8.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utf8.c' object='libregexp_a-utf8.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregexp_a_CFLAGS) $(CFLAGS) -c -o libregexp_a-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi`
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/libregexp_a-jimregexp.Po
+	-rm -f ./$(DEPDIR)/libregexp_a-utf8.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/libregexp_a-jimregexp.Po
+	-rm -f ./$(DEPDIR)/libregexp_a-utf8.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+@MAINTAINER_MODE_TRUE@_unicode_mapping.c: parse-unidata.awk UnicodeData.txt
+@MAINTAINER_MODE_TRUE@	$(AWK) $(AWK_HEX_NUMBER_OPTION) -f $(srcdir)/parse-unidata.awk \
+@MAINTAINER_MODE_TRUE@	       $(srcdir)/UnicodeData.txt >$@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru gnupg2-2.2.20/regexp/parse-unidata.awk gnupg2-2.2.27/regexp/parse-unidata.awk
--- gnupg2-2.2.20/regexp/parse-unidata.awk	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/parse-unidata.awk	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,62 @@
+#
+# parse-unidata.awk - generate a table (unicode_case_mapping_upper)
+#
+# Copyright (C) 2020 g10 Code GmbH
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+#
+
+# Parse the unicode data from:
+#   https://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
+# to generate case mapping table
+
+BEGIN {
+    print("/* Generated from UnicodeData.txt */")
+    print("")
+    print("static const struct casemap unicode_case_mapping_upper[] = {")
+    FS = ";"
+    count = 0
+}
+
+{
+    code = int("0x" $1)
+    name = $2
+    class = $3
+    upper = $13
+    lower = $14
+    title = $15
+
+    if (code <= 127) {
+	next
+    }
+    if (code > 65535) {
+	next
+    }
+    if ($3 !~ /^L.*/) {
+	next
+    }
+    if (upper != "") {
+	printf("\t{ 0x" tolower($1) ", 0x" tolower(upper) " },")
+	count++
+	if ((count % 4) == 0) {
+	    print("")
+	}
+    }
+}
+
+END {
+    print("\n};")
+}
diff -Nru gnupg2-2.2.20/regexp/UnicodeData.txt gnupg2-2.2.27/regexp/UnicodeData.txt
--- gnupg2-2.2.20/regexp/UnicodeData.txt	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/UnicodeData.txt	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,33797 @@
+0000;<control>;Cc;0;BN;;;;;N;NULL;;;;
+0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;
+0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;
+0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;
+0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;
+0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;
+0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;
+0007;<control>;Cc;0;BN;;;;;N;BELL;;;;
+0008;<control>;Cc;0;BN;;;;;N;BACKSPACE;;;;
+0009;<control>;Cc;0;S;;;;;N;CHARACTER TABULATION;;;;
+000A;<control>;Cc;0;B;;;;;N;LINE FEED (LF);;;;
+000B;<control>;Cc;0;S;;;;;N;LINE TABULATION;;;;
+000C;<control>;Cc;0;WS;;;;;N;FORM FEED (FF);;;;
+000D;<control>;Cc;0;B;;;;;N;CARRIAGE RETURN (CR);;;;
+000E;<control>;Cc;0;BN;;;;;N;SHIFT OUT;;;;
+000F;<control>;Cc;0;BN;;;;;N;SHIFT IN;;;;
+0010;<control>;Cc;0;BN;;;;;N;DATA LINK ESCAPE;;;;
+0011;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL ONE;;;;
+0012;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL TWO;;;;
+0013;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL THREE;;;;
+0014;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL FOUR;;;;
+0015;<control>;Cc;0;BN;;;;;N;NEGATIVE ACKNOWLEDGE;;;;
+0016;<control>;Cc;0;BN;;;;;N;SYNCHRONOUS IDLE;;;;
+0017;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION BLOCK;;;;
+0018;<control>;Cc;0;BN;;;;;N;CANCEL;;;;
+0019;<control>;Cc;0;BN;;;;;N;END OF MEDIUM;;;;
+001A;<control>;Cc;0;BN;;;;;N;SUBSTITUTE;;;;
+001B;<control>;Cc;0;BN;;;;;N;ESCAPE;;;;
+001C;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR FOUR;;;;
+001D;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR THREE;;;;
+001E;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR TWO;;;;
+001F;<control>;Cc;0;S;;;;;N;INFORMATION SEPARATOR ONE;;;;
+0020;SPACE;Zs;0;WS;;;;;N;;;;;
+0021;EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+0022;QUOTATION MARK;Po;0;ON;;;;;N;;;;;
+0023;NUMBER SIGN;Po;0;ET;;;;;N;;;;;
+0024;DOLLAR SIGN;Sc;0;ET;;;;;N;;;;;
+0025;PERCENT SIGN;Po;0;ET;;;;;N;;;;;
+0026;AMPERSAND;Po;0;ON;;;;;N;;;;;
+0027;APOSTROPHE;Po;0;ON;;;;;N;APOSTROPHE-QUOTE;;;;
+0028;LEFT PARENTHESIS;Ps;0;ON;;;;;Y;OPENING PARENTHESIS;;;;
+0029;RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;CLOSING PARENTHESIS;;;;
+002A;ASTERISK;Po;0;ON;;;;;N;;;;;
+002B;PLUS SIGN;Sm;0;ES;;;;;N;;;;;
+002C;COMMA;Po;0;CS;;;;;N;;;;;
+002D;HYPHEN-MINUS;Pd;0;ES;;;;;N;;;;;
+002E;FULL STOP;Po;0;CS;;;;;N;PERIOD;;;;
+002F;SOLIDUS;Po;0;CS;;;;;N;SLASH;;;;
+0030;DIGIT ZERO;Nd;0;EN;;0;0;0;N;;;;;
+0031;DIGIT ONE;Nd;0;EN;;1;1;1;N;;;;;
+0032;DIGIT TWO;Nd;0;EN;;2;2;2;N;;;;;
+0033;DIGIT THREE;Nd;0;EN;;3;3;3;N;;;;;
+0034;DIGIT FOUR;Nd;0;EN;;4;4;4;N;;;;;
+0035;DIGIT FIVE;Nd;0;EN;;5;5;5;N;;;;;
+0036;DIGIT SIX;Nd;0;EN;;6;6;6;N;;;;;
+0037;DIGIT SEVEN;Nd;0;EN;;7;7;7;N;;;;;
+0038;DIGIT EIGHT;Nd;0;EN;;8;8;8;N;;;;;
+0039;DIGIT NINE;Nd;0;EN;;9;9;9;N;;;;;
+003A;COLON;Po;0;CS;;;;;N;;;;;
+003B;SEMICOLON;Po;0;ON;;;;;N;;;;;
+003C;LESS-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
+003D;EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
+003E;GREATER-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
+003F;QUESTION MARK;Po;0;ON;;;;;N;;;;;
+0040;COMMERCIAL AT;Po;0;ON;;;;;N;;;;;
+0041;LATIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0061;
+0042;LATIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;0062;
+0043;LATIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;0063;
+0044;LATIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;0064;
+0045;LATIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;0065;
+0046;LATIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;0066;
+0047;LATIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;0067;
+0048;LATIN CAPITAL LETTER H;Lu;0;L;;;;;N;;;;0068;
+0049;LATIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;0069;
+004A;LATIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;006A;
+004B;LATIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;006B;
+004C;LATIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;006C;
+004D;LATIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;006D;
+004E;LATIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;006E;
+004F;LATIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;006F;
+0050;LATIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;0070;
+0051;LATIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;0071;
+0052;LATIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;0072;
+0053;LATIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;0073;
+0054;LATIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;0074;
+0055;LATIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0075;
+0056;LATIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;0076;
+0057;LATIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;0077;
+0058;LATIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;0078;
+0059;LATIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;0079;
+005A;LATIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;007A;
+005B;LEFT SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING SQUARE BRACKET;;;;
+005C;REVERSE SOLIDUS;Po;0;ON;;;;;N;BACKSLASH;;;;
+005D;RIGHT SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING SQUARE BRACKET;;;;
+005E;CIRCUMFLEX ACCENT;Sk;0;ON;;;;;N;SPACING CIRCUMFLEX;;;;
+005F;LOW LINE;Pc;0;ON;;;;;N;SPACING UNDERSCORE;;;;
+0060;GRAVE ACCENT;Sk;0;ON;;;;;N;SPACING GRAVE;;;;
+0061;LATIN SMALL LETTER A;Ll;0;L;;;;;N;;;0041;;0041
+0062;LATIN SMALL LETTER B;Ll;0;L;;;;;N;;;0042;;0042
+0063;LATIN SMALL LETTER C;Ll;0;L;;;;;N;;;0043;;0043
+0064;LATIN SMALL LETTER D;Ll;0;L;;;;;N;;;0044;;0044
+0065;LATIN SMALL LETTER E;Ll;0;L;;;;;N;;;0045;;0045
+0066;LATIN SMALL LETTER F;Ll;0;L;;;;;N;;;0046;;0046
+0067;LATIN SMALL LETTER G;Ll;0;L;;;;;N;;;0047;;0047
+0068;LATIN SMALL LETTER H;Ll;0;L;;;;;N;;;0048;;0048
+0069;LATIN SMALL LETTER I;Ll;0;L;;;;;N;;;0049;;0049
+006A;LATIN SMALL LETTER J;Ll;0;L;;;;;N;;;004A;;004A
+006B;LATIN SMALL LETTER K;Ll;0;L;;;;;N;;;004B;;004B
+006C;LATIN SMALL LETTER L;Ll;0;L;;;;;N;;;004C;;004C
+006D;LATIN SMALL LETTER M;Ll;0;L;;;;;N;;;004D;;004D
+006E;LATIN SMALL LETTER N;Ll;0;L;;;;;N;;;004E;;004E
+006F;LATIN SMALL LETTER O;Ll;0;L;;;;;N;;;004F;;004F
+0070;LATIN SMALL LETTER P;Ll;0;L;;;;;N;;;0050;;0050
+0071;LATIN SMALL LETTER Q;Ll;0;L;;;;;N;;;0051;;0051
+0072;LATIN SMALL LETTER R;Ll;0;L;;;;;N;;;0052;;0052
+0073;LATIN SMALL LETTER S;Ll;0;L;;;;;N;;;0053;;0053
+0074;LATIN SMALL LETTER T;Ll;0;L;;;;;N;;;0054;;0054
+0075;LATIN SMALL LETTER U;Ll;0;L;;;;;N;;;0055;;0055
+0076;LATIN SMALL LETTER V;Ll;0;L;;;;;N;;;0056;;0056
+0077;LATIN SMALL LETTER W;Ll;0;L;;;;;N;;;0057;;0057
+0078;LATIN SMALL LETTER X;Ll;0;L;;;;;N;;;0058;;0058
+0079;LATIN SMALL LETTER Y;Ll;0;L;;;;;N;;;0059;;0059
+007A;LATIN SMALL LETTER Z;Ll;0;L;;;;;N;;;005A;;005A
+007B;LEFT CURLY BRACKET;Ps;0;ON;;;;;Y;OPENING CURLY BRACKET;;;;
+007C;VERTICAL LINE;Sm;0;ON;;;;;N;VERTICAL BAR;;;;
+007D;RIGHT CURLY BRACKET;Pe;0;ON;;;;;Y;CLOSING CURLY BRACKET;;;;
+007E;TILDE;Sm;0;ON;;;;;N;;;;;
+007F;<control>;Cc;0;BN;;;;;N;DELETE;;;;
+0080;<control>;Cc;0;BN;;;;;N;;;;;
+0081;<control>;Cc;0;BN;;;;;N;;;;;
+0082;<control>;Cc;0;BN;;;;;N;BREAK PERMITTED HERE;;;;
+0083;<control>;Cc;0;BN;;;;;N;NO BREAK HERE;;;;
+0084;<control>;Cc;0;BN;;;;;N;;;;;
+0085;<control>;Cc;0;B;;;;;N;NEXT LINE (NEL);;;;
+0086;<control>;Cc;0;BN;;;;;N;START OF SELECTED AREA;;;;
+0087;<control>;Cc;0;BN;;;;;N;END OF SELECTED AREA;;;;
+0088;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION SET;;;;
+0089;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION WITH JUSTIFICATION;;;;
+008A;<control>;Cc;0;BN;;;;;N;LINE TABULATION SET;;;;
+008B;<control>;Cc;0;BN;;;;;N;PARTIAL LINE FORWARD;;;;
+008C;<control>;Cc;0;BN;;;;;N;PARTIAL LINE BACKWARD;;;;
+008D;<control>;Cc;0;BN;;;;;N;REVERSE LINE FEED;;;;
+008E;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT TWO;;;;
+008F;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT THREE;;;;
+0090;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL STRING;;;;
+0091;<control>;Cc;0;BN;;;;;N;PRIVATE USE ONE;;;;
+0092;<control>;Cc;0;BN;;;;;N;PRIVATE USE TWO;;;;
+0093;<control>;Cc;0;BN;;;;;N;SET TRANSMIT STATE;;;;
+0094;<control>;Cc;0;BN;;;;;N;CANCEL CHARACTER;;;;
+0095;<control>;Cc;0;BN;;;;;N;MESSAGE WAITING;;;;
+0096;<control>;Cc;0;BN;;;;;N;START OF GUARDED AREA;;;;
+0097;<control>;Cc;0;BN;;;;;N;END OF GUARDED AREA;;;;
+0098;<control>;Cc;0;BN;;;;;N;START OF STRING;;;;
+0099;<control>;Cc;0;BN;;;;;N;;;;;
+009A;<control>;Cc;0;BN;;;;;N;SINGLE CHARACTER INTRODUCER;;;;
+009B;<control>;Cc;0;BN;;;;;N;CONTROL SEQUENCE INTRODUCER;;;;
+009C;<control>;Cc;0;BN;;;;;N;STRING TERMINATOR;;;;
+009D;<control>;Cc;0;BN;;;;;N;OPERATING SYSTEM COMMAND;;;;
+009E;<control>;Cc;0;BN;;;;;N;PRIVACY MESSAGE;;;;
+009F;<control>;Cc;0;BN;;;;;N;APPLICATION PROGRAM COMMAND;;;;
+00A0;NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;NON-BREAKING SPACE;;;;
+00A1;INVERTED EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+00A2;CENT SIGN;Sc;0;ET;;;;;N;;;;;
+00A3;POUND SIGN;Sc;0;ET;;;;;N;;;;;
+00A4;CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
+00A5;YEN SIGN;Sc;0;ET;;;;;N;;;;;
+00A6;BROKEN BAR;So;0;ON;;;;;N;BROKEN VERTICAL BAR;;;;
+00A7;SECTION SIGN;Po;0;ON;;;;;N;;;;;
+00A8;DIAERESIS;Sk;0;ON;<compat> 0020 0308;;;;N;SPACING DIAERESIS;;;;
+00A9;COPYRIGHT SIGN;So;0;ON;;;;;N;;;;;
+00AA;FEMININE ORDINAL INDICATOR;Lo;0;L;<super> 0061;;;;N;;;;;
+00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;;;;
+00AC;NOT SIGN;Sm;0;ON;;;;;N;;;;;
+00AD;SOFT HYPHEN;Cf;0;BN;;;;;N;;;;;
+00AE;REGISTERED SIGN;So;0;ON;;;;;N;REGISTERED TRADE MARK SIGN;;;;
+00AF;MACRON;Sk;0;ON;<compat> 0020 0304;;;;N;SPACING MACRON;;;;
+00B0;DEGREE SIGN;So;0;ET;;;;;N;;;;;
+00B1;PLUS-MINUS SIGN;Sm;0;ET;;;;;N;PLUS-OR-MINUS SIGN;;;;
+00B2;SUPERSCRIPT TWO;No;0;EN;<super> 0032;;2;2;N;SUPERSCRIPT DIGIT TWO;;;;
+00B3;SUPERSCRIPT THREE;No;0;EN;<super> 0033;;3;3;N;SUPERSCRIPT DIGIT THREE;;;;
+00B4;ACUTE ACCENT;Sk;0;ON;<compat> 0020 0301;;;;N;SPACING ACUTE;;;;
+00B5;MICRO SIGN;Ll;0;L;<compat> 03BC;;;;N;;;039C;;039C
+00B6;PILCROW SIGN;Po;0;ON;;;;;N;PARAGRAPH SIGN;;;;
+00B7;MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+00B8;CEDILLA;Sk;0;ON;<compat> 0020 0327;;;;N;SPACING CEDILLA;;;;
+00B9;SUPERSCRIPT ONE;No;0;EN;<super> 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;;
+00BA;MASCULINE ORDINAL INDICATOR;Lo;0;L;<super> 006F;;;;N;;;;;
+00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;;;;
+00BC;VULGAR FRACTION ONE QUARTER;No;0;ON;<fraction> 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;;
+00BD;VULGAR FRACTION ONE HALF;No;0;ON;<fraction> 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;;
+00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON;<fraction> 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;;
+00BF;INVERTED QUESTION MARK;Po;0;ON;;;;;N;;;;;
+00C0;LATIN CAPITAL LETTER A WITH GRAVE;Lu;0;L;0041 0300;;;;N;LATIN CAPITAL LETTER A GRAVE;;;00E0;
+00C1;LATIN CAPITAL LETTER A WITH ACUTE;Lu;0;L;0041 0301;;;;N;LATIN CAPITAL LETTER A ACUTE;;;00E1;
+00C2;LATIN CAPITAL LETTER A WITH CIRCUMFLEX;Lu;0;L;0041 0302;;;;N;LATIN CAPITAL LETTER A CIRCUMFLEX;;;00E2;
+00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3;
+00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4;
+00C5;LATIN CAPITAL LETTER A WITH RING ABOVE;Lu;0;L;0041 030A;;;;N;LATIN CAPITAL LETTER A RING;;;00E5;
+00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;;;00E6;
+00C7;LATIN CAPITAL LETTER C WITH CEDILLA;Lu;0;L;0043 0327;;;;N;LATIN CAPITAL LETTER C CEDILLA;;;00E7;
+00C8;LATIN CAPITAL LETTER E WITH GRAVE;Lu;0;L;0045 0300;;;;N;LATIN CAPITAL LETTER E GRAVE;;;00E8;
+00C9;LATIN CAPITAL LETTER E WITH ACUTE;Lu;0;L;0045 0301;;;;N;LATIN CAPITAL LETTER E ACUTE;;;00E9;
+00CA;LATIN CAPITAL LETTER E WITH CIRCUMFLEX;Lu;0;L;0045 0302;;;;N;LATIN CAPITAL LETTER E CIRCUMFLEX;;;00EA;
+00CB;LATIN CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;0045 0308;;;;N;LATIN CAPITAL LETTER E DIAERESIS;;;00EB;
+00CC;LATIN CAPITAL LETTER I WITH GRAVE;Lu;0;L;0049 0300;;;;N;LATIN CAPITAL LETTER I GRAVE;;;00EC;
+00CD;LATIN CAPITAL LETTER I WITH ACUTE;Lu;0;L;0049 0301;;;;N;LATIN CAPITAL LETTER I ACUTE;;;00ED;
+00CE;LATIN CAPITAL LETTER I WITH CIRCUMFLEX;Lu;0;L;0049 0302;;;;N;LATIN CAPITAL LETTER I CIRCUMFLEX;;;00EE;
+00CF;LATIN CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0049 0308;;;;N;LATIN CAPITAL LETTER I DIAERESIS;;;00EF;
+00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;00F0;
+00D1;LATIN CAPITAL LETTER N WITH TILDE;Lu;0;L;004E 0303;;;;N;LATIN CAPITAL LETTER N TILDE;;;00F1;
+00D2;LATIN CAPITAL LETTER O WITH GRAVE;Lu;0;L;004F 0300;;;;N;LATIN CAPITAL LETTER O GRAVE;;;00F2;
+00D3;LATIN CAPITAL LETTER O WITH ACUTE;Lu;0;L;004F 0301;;;;N;LATIN CAPITAL LETTER O ACUTE;;;00F3;
+00D4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX;Lu;0;L;004F 0302;;;;N;LATIN CAPITAL LETTER O CIRCUMFLEX;;;00F4;
+00D5;LATIN CAPITAL LETTER O WITH TILDE;Lu;0;L;004F 0303;;;;N;LATIN CAPITAL LETTER O TILDE;;;00F5;
+00D6;LATIN CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;004F 0308;;;;N;LATIN CAPITAL LETTER O DIAERESIS;;;00F6;
+00D7;MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;;
+00D8;LATIN CAPITAL LETTER O WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O SLASH;;;00F8;
+00D9;LATIN CAPITAL LETTER U WITH GRAVE;Lu;0;L;0055 0300;;;;N;LATIN CAPITAL LETTER U GRAVE;;;00F9;
+00DA;LATIN CAPITAL LETTER U WITH ACUTE;Lu;0;L;0055 0301;;;;N;LATIN CAPITAL LETTER U ACUTE;;;00FA;
+00DB;LATIN CAPITAL LETTER U WITH CIRCUMFLEX;Lu;0;L;0055 0302;;;;N;LATIN CAPITAL LETTER U CIRCUMFLEX;;;00FB;
+00DC;LATIN CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0055 0308;;;;N;LATIN CAPITAL LETTER U DIAERESIS;;;00FC;
+00DD;LATIN CAPITAL LETTER Y WITH ACUTE;Lu;0;L;0059 0301;;;;N;LATIN CAPITAL LETTER Y ACUTE;;;00FD;
+00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;;;00FE;
+00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;;;;
+00E0;LATIN SMALL LETTER A WITH GRAVE;Ll;0;L;0061 0300;;;;N;LATIN SMALL LETTER A GRAVE;;00C0;;00C0
+00E1;LATIN SMALL LETTER A WITH ACUTE;Ll;0;L;0061 0301;;;;N;LATIN SMALL LETTER A ACUTE;;00C1;;00C1
+00E2;LATIN SMALL LETTER A WITH CIRCUMFLEX;Ll;0;L;0061 0302;;;;N;LATIN SMALL LETTER A CIRCUMFLEX;;00C2;;00C2
+00E3;LATIN SMALL LETTER A WITH TILDE;Ll;0;L;0061 0303;;;;N;LATIN SMALL LETTER A TILDE;;00C3;;00C3
+00E4;LATIN SMALL LETTER A WITH DIAERESIS;Ll;0;L;0061 0308;;;;N;LATIN SMALL LETTER A DIAERESIS;;00C4;;00C4
+00E5;LATIN SMALL LETTER A WITH RING ABOVE;Ll;0;L;0061 030A;;;;N;LATIN SMALL LETTER A RING;;00C5;;00C5
+00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;;00C6;;00C6
+00E7;LATIN SMALL LETTER C WITH CEDILLA;Ll;0;L;0063 0327;;;;N;LATIN SMALL LETTER C CEDILLA;;00C7;;00C7
+00E8;LATIN SMALL LETTER E WITH GRAVE;Ll;0;L;0065 0300;;;;N;LATIN SMALL LETTER E GRAVE;;00C8;;00C8
+00E9;LATIN SMALL LETTER E WITH ACUTE;Ll;0;L;0065 0301;;;;N;LATIN SMALL LETTER E ACUTE;;00C9;;00C9
+00EA;LATIN SMALL LETTER E WITH CIRCUMFLEX;Ll;0;L;0065 0302;;;;N;LATIN SMALL LETTER E CIRCUMFLEX;;00CA;;00CA
+00EB;LATIN SMALL LETTER E WITH DIAERESIS;Ll;0;L;0065 0308;;;;N;LATIN SMALL LETTER E DIAERESIS;;00CB;;00CB
+00EC;LATIN SMALL LETTER I WITH GRAVE;Ll;0;L;0069 0300;;;;N;LATIN SMALL LETTER I GRAVE;;00CC;;00CC
+00ED;LATIN SMALL LETTER I WITH ACUTE;Ll;0;L;0069 0301;;;;N;LATIN SMALL LETTER I ACUTE;;00CD;;00CD
+00EE;LATIN SMALL LETTER I WITH CIRCUMFLEX;Ll;0;L;0069 0302;;;;N;LATIN SMALL LETTER I CIRCUMFLEX;;00CE;;00CE
+00EF;LATIN SMALL LETTER I WITH DIAERESIS;Ll;0;L;0069 0308;;;;N;LATIN SMALL LETTER I DIAERESIS;;00CF;;00CF
+00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;;00D0;;00D0
+00F1;LATIN SMALL LETTER N WITH TILDE;Ll;0;L;006E 0303;;;;N;LATIN SMALL LETTER N TILDE;;00D1;;00D1
+00F2;LATIN SMALL LETTER O WITH GRAVE;Ll;0;L;006F 0300;;;;N;LATIN SMALL LETTER O GRAVE;;00D2;;00D2
+00F3;LATIN SMALL LETTER O WITH ACUTE;Ll;0;L;006F 0301;;;;N;LATIN SMALL LETTER O ACUTE;;00D3;;00D3
+00F4;LATIN SMALL LETTER O WITH CIRCUMFLEX;Ll;0;L;006F 0302;;;;N;LATIN SMALL LETTER O CIRCUMFLEX;;00D4;;00D4
+00F5;LATIN SMALL LETTER O WITH TILDE;Ll;0;L;006F 0303;;;;N;LATIN SMALL LETTER O TILDE;;00D5;;00D5
+00F6;LATIN SMALL LETTER O WITH DIAERESIS;Ll;0;L;006F 0308;;;;N;LATIN SMALL LETTER O DIAERESIS;;00D6;;00D6
+00F7;DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+00F8;LATIN SMALL LETTER O WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER O SLASH;;00D8;;00D8
+00F9;LATIN SMALL LETTER U WITH GRAVE;Ll;0;L;0075 0300;;;;N;LATIN SMALL LETTER U GRAVE;;00D9;;00D9
+00FA;LATIN SMALL LETTER U WITH ACUTE;Ll;0;L;0075 0301;;;;N;LATIN SMALL LETTER U ACUTE;;00DA;;00DA
+00FB;LATIN SMALL LETTER U WITH CIRCUMFLEX;Ll;0;L;0075 0302;;;;N;LATIN SMALL LETTER U CIRCUMFLEX;;00DB;;00DB
+00FC;LATIN SMALL LETTER U WITH DIAERESIS;Ll;0;L;0075 0308;;;;N;LATIN SMALL LETTER U DIAERESIS;;00DC;;00DC
+00FD;LATIN SMALL LETTER Y WITH ACUTE;Ll;0;L;0079 0301;;;;N;LATIN SMALL LETTER Y ACUTE;;00DD;;00DD
+00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;;00DE;;00DE
+00FF;LATIN SMALL LETTER Y WITH DIAERESIS;Ll;0;L;0079 0308;;;;N;LATIN SMALL LETTER Y DIAERESIS;;0178;;0178
+0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101;
+0101;LATIN SMALL LETTER A WITH MACRON;Ll;0;L;0061 0304;;;;N;LATIN SMALL LETTER A MACRON;;0100;;0100
+0102;LATIN CAPITAL LETTER A WITH BREVE;Lu;0;L;0041 0306;;;;N;LATIN CAPITAL LETTER A BREVE;;;0103;
+0103;LATIN SMALL LETTER A WITH BREVE;Ll;0;L;0061 0306;;;;N;LATIN SMALL LETTER A BREVE;;0102;;0102
+0104;LATIN CAPITAL LETTER A WITH OGONEK;Lu;0;L;0041 0328;;;;N;LATIN CAPITAL LETTER A OGONEK;;;0105;
+0105;LATIN SMALL LETTER A WITH OGONEK;Ll;0;L;0061 0328;;;;N;LATIN SMALL LETTER A OGONEK;;0104;;0104
+0106;LATIN CAPITAL LETTER C WITH ACUTE;Lu;0;L;0043 0301;;;;N;LATIN CAPITAL LETTER C ACUTE;;;0107;
+0107;LATIN SMALL LETTER C WITH ACUTE;Ll;0;L;0063 0301;;;;N;LATIN SMALL LETTER C ACUTE;;0106;;0106
+0108;LATIN CAPITAL LETTER C WITH CIRCUMFLEX;Lu;0;L;0043 0302;;;;N;LATIN CAPITAL LETTER C CIRCUMFLEX;;;0109;
+0109;LATIN SMALL LETTER C WITH CIRCUMFLEX;Ll;0;L;0063 0302;;;;N;LATIN SMALL LETTER C CIRCUMFLEX;;0108;;0108
+010A;LATIN CAPITAL LETTER C WITH DOT ABOVE;Lu;0;L;0043 0307;;;;N;LATIN CAPITAL LETTER C DOT;;;010B;
+010B;LATIN SMALL LETTER C WITH DOT ABOVE;Ll;0;L;0063 0307;;;;N;LATIN SMALL LETTER C DOT;;010A;;010A
+010C;LATIN CAPITAL LETTER C WITH CARON;Lu;0;L;0043 030C;;;;N;LATIN CAPITAL LETTER C HACEK;;;010D;
+010D;LATIN SMALL LETTER C WITH CARON;Ll;0;L;0063 030C;;;;N;LATIN SMALL LETTER C HACEK;;010C;;010C
+010E;LATIN CAPITAL LETTER D WITH CARON;Lu;0;L;0044 030C;;;;N;LATIN CAPITAL LETTER D HACEK;;;010F;
+010F;LATIN SMALL LETTER D WITH CARON;Ll;0;L;0064 030C;;;;N;LATIN SMALL LETTER D HACEK;;010E;;010E
+0110;LATIN CAPITAL LETTER D WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D BAR;;;0111;
+0111;LATIN SMALL LETTER D WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER D BAR;;0110;;0110
+0112;LATIN CAPITAL LETTER E WITH MACRON;Lu;0;L;0045 0304;;;;N;LATIN CAPITAL LETTER E MACRON;;;0113;
+0113;LATIN SMALL LETTER E WITH MACRON;Ll;0;L;0065 0304;;;;N;LATIN SMALL LETTER E MACRON;;0112;;0112
+0114;LATIN CAPITAL LETTER E WITH BREVE;Lu;0;L;0045 0306;;;;N;LATIN CAPITAL LETTER E BREVE;;;0115;
+0115;LATIN SMALL LETTER E WITH BREVE;Ll;0;L;0065 0306;;;;N;LATIN SMALL LETTER E BREVE;;0114;;0114
+0116;LATIN CAPITAL LETTER E WITH DOT ABOVE;Lu;0;L;0045 0307;;;;N;LATIN CAPITAL LETTER E DOT;;;0117;
+0117;LATIN SMALL LETTER E WITH DOT ABOVE;Ll;0;L;0065 0307;;;;N;LATIN SMALL LETTER E DOT;;0116;;0116
+0118;LATIN CAPITAL LETTER E WITH OGONEK;Lu;0;L;0045 0328;;;;N;LATIN CAPITAL LETTER E OGONEK;;;0119;
+0119;LATIN SMALL LETTER E WITH OGONEK;Ll;0;L;0065 0328;;;;N;LATIN SMALL LETTER E OGONEK;;0118;;0118
+011A;LATIN CAPITAL LETTER E WITH CARON;Lu;0;L;0045 030C;;;;N;LATIN CAPITAL LETTER E HACEK;;;011B;
+011B;LATIN SMALL LETTER E WITH CARON;Ll;0;L;0065 030C;;;;N;LATIN SMALL LETTER E HACEK;;011A;;011A
+011C;LATIN CAPITAL LETTER G WITH CIRCUMFLEX;Lu;0;L;0047 0302;;;;N;LATIN CAPITAL LETTER G CIRCUMFLEX;;;011D;
+011D;LATIN SMALL LETTER G WITH CIRCUMFLEX;Ll;0;L;0067 0302;;;;N;LATIN SMALL LETTER G CIRCUMFLEX;;011C;;011C
+011E;LATIN CAPITAL LETTER G WITH BREVE;Lu;0;L;0047 0306;;;;N;LATIN CAPITAL LETTER G BREVE;;;011F;
+011F;LATIN SMALL LETTER G WITH BREVE;Ll;0;L;0067 0306;;;;N;LATIN SMALL LETTER G BREVE;;011E;;011E
+0120;LATIN CAPITAL LETTER G WITH DOT ABOVE;Lu;0;L;0047 0307;;;;N;LATIN CAPITAL LETTER G DOT;;;0121;
+0121;LATIN SMALL LETTER G WITH DOT ABOVE;Ll;0;L;0067 0307;;;;N;LATIN SMALL LETTER G DOT;;0120;;0120
+0122;LATIN CAPITAL LETTER G WITH CEDILLA;Lu;0;L;0047 0327;;;;N;LATIN CAPITAL LETTER G CEDILLA;;;0123;
+0123;LATIN SMALL LETTER G WITH CEDILLA;Ll;0;L;0067 0327;;;;N;LATIN SMALL LETTER G CEDILLA;;0122;;0122
+0124;LATIN CAPITAL LETTER H WITH CIRCUMFLEX;Lu;0;L;0048 0302;;;;N;LATIN CAPITAL LETTER H CIRCUMFLEX;;;0125;
+0125;LATIN SMALL LETTER H WITH CIRCUMFLEX;Ll;0;L;0068 0302;;;;N;LATIN SMALL LETTER H CIRCUMFLEX;;0124;;0124
+0126;LATIN CAPITAL LETTER H WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER H BAR;;;0127;
+0127;LATIN SMALL LETTER H WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER H BAR;;0126;;0126
+0128;LATIN CAPITAL LETTER I WITH TILDE;Lu;0;L;0049 0303;;;;N;LATIN CAPITAL LETTER I TILDE;;;0129;
+0129;LATIN SMALL LETTER I WITH TILDE;Ll;0;L;0069 0303;;;;N;LATIN SMALL LETTER I TILDE;;0128;;0128
+012A;LATIN CAPITAL LETTER I WITH MACRON;Lu;0;L;0049 0304;;;;N;LATIN CAPITAL LETTER I MACRON;;;012B;
+012B;LATIN SMALL LETTER I WITH MACRON;Ll;0;L;0069 0304;;;;N;LATIN SMALL LETTER I MACRON;;012A;;012A
+012C;LATIN CAPITAL LETTER I WITH BREVE;Lu;0;L;0049 0306;;;;N;LATIN CAPITAL LETTER I BREVE;;;012D;
+012D;LATIN SMALL LETTER I WITH BREVE;Ll;0;L;0069 0306;;;;N;LATIN SMALL LETTER I BREVE;;012C;;012C
+012E;LATIN CAPITAL LETTER I WITH OGONEK;Lu;0;L;0049 0328;;;;N;LATIN CAPITAL LETTER I OGONEK;;;012F;
+012F;LATIN SMALL LETTER I WITH OGONEK;Ll;0;L;0069 0328;;;;N;LATIN SMALL LETTER I OGONEK;;012E;;012E
+0130;LATIN CAPITAL LETTER I WITH DOT ABOVE;Lu;0;L;0049 0307;;;;N;LATIN CAPITAL LETTER I DOT;;;0069;
+0131;LATIN SMALL LETTER DOTLESS I;Ll;0;L;;;;;N;;;0049;;0049
+0132;LATIN CAPITAL LIGATURE IJ;Lu;0;L;<compat> 0049 004A;;;;N;LATIN CAPITAL LETTER I J;;;0133;
+0133;LATIN SMALL LIGATURE IJ;Ll;0;L;<compat> 0069 006A;;;;N;LATIN SMALL LETTER I J;;0132;;0132
+0134;LATIN CAPITAL LETTER J WITH CIRCUMFLEX;Lu;0;L;004A 0302;;;;N;LATIN CAPITAL LETTER J CIRCUMFLEX;;;0135;
+0135;LATIN SMALL LETTER J WITH CIRCUMFLEX;Ll;0;L;006A 0302;;;;N;LATIN SMALL LETTER J CIRCUMFLEX;;0134;;0134
+0136;LATIN CAPITAL LETTER K WITH CEDILLA;Lu;0;L;004B 0327;;;;N;LATIN CAPITAL LETTER K CEDILLA;;;0137;
+0137;LATIN SMALL LETTER K WITH CEDILLA;Ll;0;L;006B 0327;;;;N;LATIN SMALL LETTER K CEDILLA;;0136;;0136
+0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;;;;
+0139;LATIN CAPITAL LETTER L WITH ACUTE;Lu;0;L;004C 0301;;;;N;LATIN CAPITAL LETTER L ACUTE;;;013A;
+013A;LATIN SMALL LETTER L WITH ACUTE;Ll;0;L;006C 0301;;;;N;LATIN SMALL LETTER L ACUTE;;0139;;0139
+013B;LATIN CAPITAL LETTER L WITH CEDILLA;Lu;0;L;004C 0327;;;;N;LATIN CAPITAL LETTER L CEDILLA;;;013C;
+013C;LATIN SMALL LETTER L WITH CEDILLA;Ll;0;L;006C 0327;;;;N;LATIN SMALL LETTER L CEDILLA;;013B;;013B
+013D;LATIN CAPITAL LETTER L WITH CARON;Lu;0;L;004C 030C;;;;N;LATIN CAPITAL LETTER L HACEK;;;013E;
+013E;LATIN SMALL LETTER L WITH CARON;Ll;0;L;006C 030C;;;;N;LATIN SMALL LETTER L HACEK;;013D;;013D
+013F;LATIN CAPITAL LETTER L WITH MIDDLE DOT;Lu;0;L;<compat> 004C 00B7;;;;N;;;;0140;
+0140;LATIN SMALL LETTER L WITH MIDDLE DOT;Ll;0;L;<compat> 006C 00B7;;;;N;;;013F;;013F
+0141;LATIN CAPITAL LETTER L WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER L SLASH;;;0142;
+0142;LATIN SMALL LETTER L WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER L SLASH;;0141;;0141
+0143;LATIN CAPITAL LETTER N WITH ACUTE;Lu;0;L;004E 0301;;;;N;LATIN CAPITAL LETTER N ACUTE;;;0144;
+0144;LATIN SMALL LETTER N WITH ACUTE;Ll;0;L;006E 0301;;;;N;LATIN SMALL LETTER N ACUTE;;0143;;0143
+0145;LATIN CAPITAL LETTER N WITH CEDILLA;Lu;0;L;004E 0327;;;;N;LATIN CAPITAL LETTER N CEDILLA;;;0146;
+0146;LATIN SMALL LETTER N WITH CEDILLA;Ll;0;L;006E 0327;;;;N;LATIN SMALL LETTER N CEDILLA;;0145;;0145
+0147;LATIN CAPITAL LETTER N WITH CARON;Lu;0;L;004E 030C;;;;N;LATIN CAPITAL LETTER N HACEK;;;0148;
+0148;LATIN SMALL LETTER N WITH CARON;Ll;0;L;006E 030C;;;;N;LATIN SMALL LETTER N HACEK;;0147;;0147
+0149;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE;Ll;0;L;<compat> 02BC 006E;;;;N;LATIN SMALL LETTER APOSTROPHE N;;;;
+014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;014B;
+014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;;014A;;014A
+014C;LATIN CAPITAL LETTER O WITH MACRON;Lu;0;L;004F 0304;;;;N;LATIN CAPITAL LETTER O MACRON;;;014D;
+014D;LATIN SMALL LETTER O WITH MACRON;Ll;0;L;006F 0304;;;;N;LATIN SMALL LETTER O MACRON;;014C;;014C
+014E;LATIN CAPITAL LETTER O WITH BREVE;Lu;0;L;004F 0306;;;;N;LATIN CAPITAL LETTER O BREVE;;;014F;
+014F;LATIN SMALL LETTER O WITH BREVE;Ll;0;L;006F 0306;;;;N;LATIN SMALL LETTER O BREVE;;014E;;014E
+0150;LATIN CAPITAL LETTER O WITH DOUBLE ACUTE;Lu;0;L;004F 030B;;;;N;LATIN CAPITAL LETTER O DOUBLE ACUTE;;;0151;
+0151;LATIN SMALL LETTER O WITH DOUBLE ACUTE;Ll;0;L;006F 030B;;;;N;LATIN SMALL LETTER O DOUBLE ACUTE;;0150;;0150
+0152;LATIN CAPITAL LIGATURE OE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O E;;;0153;
+0153;LATIN SMALL LIGATURE OE;Ll;0;L;;;;;N;LATIN SMALL LETTER O E;;0152;;0152
+0154;LATIN CAPITAL LETTER R WITH ACUTE;Lu;0;L;0052 0301;;;;N;LATIN CAPITAL LETTER R ACUTE;;;0155;
+0155;LATIN SMALL LETTER R WITH ACUTE;Ll;0;L;0072 0301;;;;N;LATIN SMALL LETTER R ACUTE;;0154;;0154
+0156;LATIN CAPITAL LETTER R WITH CEDILLA;Lu;0;L;0052 0327;;;;N;LATIN CAPITAL LETTER R CEDILLA;;;0157;
+0157;LATIN SMALL LETTER R WITH CEDILLA;Ll;0;L;0072 0327;;;;N;LATIN SMALL LETTER R CEDILLA;;0156;;0156
+0158;LATIN CAPITAL LETTER R WITH CARON;Lu;0;L;0052 030C;;;;N;LATIN CAPITAL LETTER R HACEK;;;0159;
+0159;LATIN SMALL LETTER R WITH CARON;Ll;0;L;0072 030C;;;;N;LATIN SMALL LETTER R HACEK;;0158;;0158
+015A;LATIN CAPITAL LETTER S WITH ACUTE;Lu;0;L;0053 0301;;;;N;LATIN CAPITAL LETTER S ACUTE;;;015B;
+015B;LATIN SMALL LETTER S WITH ACUTE;Ll;0;L;0073 0301;;;;N;LATIN SMALL LETTER S ACUTE;;015A;;015A
+015C;LATIN CAPITAL LETTER S WITH CIRCUMFLEX;Lu;0;L;0053 0302;;;;N;LATIN CAPITAL LETTER S CIRCUMFLEX;;;015D;
+015D;LATIN SMALL LETTER S WITH CIRCUMFLEX;Ll;0;L;0073 0302;;;;N;LATIN SMALL LETTER S CIRCUMFLEX;;015C;;015C
+015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;;;015F;
+015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;;015E;;015E
+0160;LATIN CAPITAL LETTER S WITH CARON;Lu;0;L;0053 030C;;;;N;LATIN CAPITAL LETTER S HACEK;;;0161;
+0161;LATIN SMALL LETTER S WITH CARON;Ll;0;L;0073 030C;;;;N;LATIN SMALL LETTER S HACEK;;0160;;0160
+0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;;;0163;
+0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;;0162;;0162
+0164;LATIN CAPITAL LETTER T WITH CARON;Lu;0;L;0054 030C;;;;N;LATIN CAPITAL LETTER T HACEK;;;0165;
+0165;LATIN SMALL LETTER T WITH CARON;Ll;0;L;0074 030C;;;;N;LATIN SMALL LETTER T HACEK;;0164;;0164
+0166;LATIN CAPITAL LETTER T WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T BAR;;;0167;
+0167;LATIN SMALL LETTER T WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER T BAR;;0166;;0166
+0168;LATIN CAPITAL LETTER U WITH TILDE;Lu;0;L;0055 0303;;;;N;LATIN CAPITAL LETTER U TILDE;;;0169;
+0169;LATIN SMALL LETTER U WITH TILDE;Ll;0;L;0075 0303;;;;N;LATIN SMALL LETTER U TILDE;;0168;;0168
+016A;LATIN CAPITAL LETTER U WITH MACRON;Lu;0;L;0055 0304;;;;N;LATIN CAPITAL LETTER U MACRON;;;016B;
+016B;LATIN SMALL LETTER U WITH MACRON;Ll;0;L;0075 0304;;;;N;LATIN SMALL LETTER U MACRON;;016A;;016A
+016C;LATIN CAPITAL LETTER U WITH BREVE;Lu;0;L;0055 0306;;;;N;LATIN CAPITAL LETTER U BREVE;;;016D;
+016D;LATIN SMALL LETTER U WITH BREVE;Ll;0;L;0075 0306;;;;N;LATIN SMALL LETTER U BREVE;;016C;;016C
+016E;LATIN CAPITAL LETTER U WITH RING ABOVE;Lu;0;L;0055 030A;;;;N;LATIN CAPITAL LETTER U RING;;;016F;
+016F;LATIN SMALL LETTER U WITH RING ABOVE;Ll;0;L;0075 030A;;;;N;LATIN SMALL LETTER U RING;;016E;;016E
+0170;LATIN CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0055 030B;;;;N;LATIN CAPITAL LETTER U DOUBLE ACUTE;;;0171;
+0171;LATIN SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0075 030B;;;;N;LATIN SMALL LETTER U DOUBLE ACUTE;;0170;;0170
+0172;LATIN CAPITAL LETTER U WITH OGONEK;Lu;0;L;0055 0328;;;;N;LATIN CAPITAL LETTER U OGONEK;;;0173;
+0173;LATIN SMALL LETTER U WITH OGONEK;Ll;0;L;0075 0328;;;;N;LATIN SMALL LETTER U OGONEK;;0172;;0172
+0174;LATIN CAPITAL LETTER W WITH CIRCUMFLEX;Lu;0;L;0057 0302;;;;N;LATIN CAPITAL LETTER W CIRCUMFLEX;;;0175;
+0175;LATIN SMALL LETTER W WITH CIRCUMFLEX;Ll;0;L;0077 0302;;;;N;LATIN SMALL LETTER W CIRCUMFLEX;;0174;;0174
+0176;LATIN CAPITAL LETTER Y WITH CIRCUMFLEX;Lu;0;L;0059 0302;;;;N;LATIN CAPITAL LETTER Y CIRCUMFLEX;;;0177;
+0177;LATIN SMALL LETTER Y WITH CIRCUMFLEX;Ll;0;L;0079 0302;;;;N;LATIN SMALL LETTER Y CIRCUMFLEX;;0176;;0176
+0178;LATIN CAPITAL LETTER Y WITH DIAERESIS;Lu;0;L;0059 0308;;;;N;LATIN CAPITAL LETTER Y DIAERESIS;;;00FF;
+0179;LATIN CAPITAL LETTER Z WITH ACUTE;Lu;0;L;005A 0301;;;;N;LATIN CAPITAL LETTER Z ACUTE;;;017A;
+017A;LATIN SMALL LETTER Z WITH ACUTE;Ll;0;L;007A 0301;;;;N;LATIN SMALL LETTER Z ACUTE;;0179;;0179
+017B;LATIN CAPITAL LETTER Z WITH DOT ABOVE;Lu;0;L;005A 0307;;;;N;LATIN CAPITAL LETTER Z DOT;;;017C;
+017C;LATIN SMALL LETTER Z WITH DOT ABOVE;Ll;0;L;007A 0307;;;;N;LATIN SMALL LETTER Z DOT;;017B;;017B
+017D;LATIN CAPITAL LETTER Z WITH CARON;Lu;0;L;005A 030C;;;;N;LATIN CAPITAL LETTER Z HACEK;;;017E;
+017E;LATIN SMALL LETTER Z WITH CARON;Ll;0;L;007A 030C;;;;N;LATIN SMALL LETTER Z HACEK;;017D;;017D
+017F;LATIN SMALL LETTER LONG S;Ll;0;L;<compat> 0073;;;;N;;;0053;;0053
+0180;LATIN SMALL LETTER B WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER B BAR;;0243;;0243
+0181;LATIN CAPITAL LETTER B WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B HOOK;;;0253;
+0182;LATIN CAPITAL LETTER B WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B TOPBAR;;;0183;
+0183;LATIN SMALL LETTER B WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER B TOPBAR;;0182;;0182
+0184;LATIN CAPITAL LETTER TONE SIX;Lu;0;L;;;;;N;;;;0185;
+0185;LATIN SMALL LETTER TONE SIX;Ll;0;L;;;;;N;;;0184;;0184
+0186;LATIN CAPITAL LETTER OPEN O;Lu;0;L;;;;;N;;;;0254;
+0187;LATIN CAPITAL LETTER C WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER C HOOK;;;0188;
+0188;LATIN SMALL LETTER C WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER C HOOK;;0187;;0187
+0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;;;0256;
+018A;LATIN CAPITAL LETTER D WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D HOOK;;;0257;
+018B;LATIN CAPITAL LETTER D WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D TOPBAR;;;018C;
+018C;LATIN SMALL LETTER D WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER D TOPBAR;;018B;;018B
+018D;LATIN SMALL LETTER TURNED DELTA;Ll;0;L;;;;;N;;;;;
+018E;LATIN CAPITAL LETTER REVERSED E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER TURNED E;;;01DD;
+018F;LATIN CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;0259;
+0190;LATIN CAPITAL LETTER OPEN E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER EPSILON;;;025B;
+0191;LATIN CAPITAL LETTER F WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER F HOOK;;;0192;
+0192;LATIN SMALL LETTER F WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT F;;0191;;0191
+0193;LATIN CAPITAL LETTER G WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G HOOK;;;0260;
+0194;LATIN CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;0263;
+0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;;01F6;;01F6
+0196;LATIN CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;0269;
+0197;LATIN CAPITAL LETTER I WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED I;;;0268;
+0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199;
+0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198
+019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D
+019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;;;
+019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F;
+019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272;
+019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220
+019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;;;0275;
+01A0;LATIN CAPITAL LETTER O WITH HORN;Lu;0;L;004F 031B;;;;N;LATIN CAPITAL LETTER O HORN;;;01A1;
+01A1;LATIN SMALL LETTER O WITH HORN;Ll;0;L;006F 031B;;;;N;LATIN SMALL LETTER O HORN;;01A0;;01A0
+01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;;;01A3;
+01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;;01A2;;01A2
+01A4;LATIN CAPITAL LETTER P WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER P HOOK;;;01A5;
+01A5;LATIN SMALL LETTER P WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER P HOOK;;01A4;;01A4
+01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;;;0280;
+01A7;LATIN CAPITAL LETTER TONE TWO;Lu;0;L;;;;;N;;;;01A8;
+01A8;LATIN SMALL LETTER TONE TWO;Ll;0;L;;;;;N;;;01A7;;01A7
+01A9;LATIN CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;0283;
+01AA;LATIN LETTER REVERSED ESH LOOP;Ll;0;L;;;;;N;;;;;
+01AB;LATIN SMALL LETTER T WITH PALATAL HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T PALATAL HOOK;;;;
+01AC;LATIN CAPITAL LETTER T WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T HOOK;;;01AD;
+01AD;LATIN SMALL LETTER T WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T HOOK;;01AC;;01AC
+01AE;LATIN CAPITAL LETTER T WITH RETROFLEX HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T RETROFLEX HOOK;;;0288;
+01AF;LATIN CAPITAL LETTER U WITH HORN;Lu;0;L;0055 031B;;;;N;LATIN CAPITAL LETTER U HORN;;;01B0;
+01B0;LATIN SMALL LETTER U WITH HORN;Ll;0;L;0075 031B;;;;N;LATIN SMALL LETTER U HORN;;01AF;;01AF
+01B1;LATIN CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;028A;
+01B2;LATIN CAPITAL LETTER V WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER SCRIPT V;;;028B;
+01B3;LATIN CAPITAL LETTER Y WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Y HOOK;;;01B4;
+01B4;LATIN SMALL LETTER Y WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Y HOOK;;01B3;;01B3
+01B5;LATIN CAPITAL LETTER Z WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Z BAR;;;01B6;
+01B6;LATIN SMALL LETTER Z WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER Z BAR;;01B5;;01B5
+01B7;LATIN CAPITAL LETTER EZH;Lu;0;L;;;;;N;LATIN CAPITAL LETTER YOGH;;;0292;
+01B8;LATIN CAPITAL LETTER EZH REVERSED;Lu;0;L;;;;;N;LATIN CAPITAL LETTER REVERSED YOGH;;;01B9;
+01B9;LATIN SMALL LETTER EZH REVERSED;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED YOGH;;01B8;;01B8
+01BA;LATIN SMALL LETTER EZH WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH WITH TAIL;;;;
+01BB;LATIN LETTER TWO WITH STROKE;Lo;0;L;;;;;N;LATIN LETTER TWO BAR;;;;
+01BC;LATIN CAPITAL LETTER TONE FIVE;Lu;0;L;;;;;N;;;;01BD;
+01BD;LATIN SMALL LETTER TONE FIVE;Ll;0;L;;;;;N;;;01BC;;01BC
+01BE;LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER INVERTED GLOTTAL STOP BAR;;;;
+01BF;LATIN LETTER WYNN;Ll;0;L;;;;;N;;;01F7;;01F7
+01C0;LATIN LETTER DENTAL CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE;;;;
+01C1;LATIN LETTER LATERAL CLICK;Lo;0;L;;;;;N;LATIN LETTER DOUBLE PIPE;;;;
+01C2;LATIN LETTER ALVEOLAR CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE DOUBLE BAR;;;;
+01C3;LATIN LETTER RETROFLEX CLICK;Lo;0;L;;;;;N;LATIN LETTER EXCLAMATION MARK;;;;
+01C4;LATIN CAPITAL LETTER DZ WITH CARON;Lu;0;L;<compat> 0044 017D;;;;N;LATIN CAPITAL LETTER D Z HACEK;;;01C6;01C5
+01C5;LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON;Lt;0;L;<compat> 0044 017E;;;;N;LATIN LETTER CAPITAL D SMALL Z HACEK;;01C4;01C6;01C5
+01C6;LATIN SMALL LETTER DZ WITH CARON;Ll;0;L;<compat> 0064 017E;;;;N;LATIN SMALL LETTER D Z HACEK;;01C4;;01C5
+01C7;LATIN CAPITAL LETTER LJ;Lu;0;L;<compat> 004C 004A;;;;N;LATIN CAPITAL LETTER L J;;;01C9;01C8
+01C8;LATIN CAPITAL LETTER L WITH SMALL LETTER J;Lt;0;L;<compat> 004C 006A;;;;N;LATIN LETTER CAPITAL L SMALL J;;01C7;01C9;01C8
+01C9;LATIN SMALL LETTER LJ;Ll;0;L;<compat> 006C 006A;;;;N;LATIN SMALL LETTER L J;;01C7;;01C8
+01CA;LATIN CAPITAL LETTER NJ;Lu;0;L;<compat> 004E 004A;;;;N;LATIN CAPITAL LETTER N J;;;01CC;01CB
+01CB;LATIN CAPITAL LETTER N WITH SMALL LETTER J;Lt;0;L;<compat> 004E 006A;;;;N;LATIN LETTER CAPITAL N SMALL J;;01CA;01CC;01CB
+01CC;LATIN SMALL LETTER NJ;Ll;0;L;<compat> 006E 006A;;;;N;LATIN SMALL LETTER N J;;01CA;;01CB
+01CD;LATIN CAPITAL LETTER A WITH CARON;Lu;0;L;0041 030C;;;;N;LATIN CAPITAL LETTER A HACEK;;;01CE;
+01CE;LATIN SMALL LETTER A WITH CARON;Ll;0;L;0061 030C;;;;N;LATIN SMALL LETTER A HACEK;;01CD;;01CD
+01CF;LATIN CAPITAL LETTER I WITH CARON;Lu;0;L;0049 030C;;;;N;LATIN CAPITAL LETTER I HACEK;;;01D0;
+01D0;LATIN SMALL LETTER I WITH CARON;Ll;0;L;0069 030C;;;;N;LATIN SMALL LETTER I HACEK;;01CF;;01CF
+01D1;LATIN CAPITAL LETTER O WITH CARON;Lu;0;L;004F 030C;;;;N;LATIN CAPITAL LETTER O HACEK;;;01D2;
+01D2;LATIN SMALL LETTER O WITH CARON;Ll;0;L;006F 030C;;;;N;LATIN SMALL LETTER O HACEK;;01D1;;01D1
+01D3;LATIN CAPITAL LETTER U WITH CARON;Lu;0;L;0055 030C;;;;N;LATIN CAPITAL LETTER U HACEK;;;01D4;
+01D4;LATIN SMALL LETTER U WITH CARON;Ll;0;L;0075 030C;;;;N;LATIN SMALL LETTER U HACEK;;01D3;;01D3
+01D5;LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON;Lu;0;L;00DC 0304;;;;N;LATIN CAPITAL LETTER U DIAERESIS MACRON;;;01D6;
+01D6;LATIN SMALL LETTER U WITH DIAERESIS AND MACRON;Ll;0;L;00FC 0304;;;;N;LATIN SMALL LETTER U DIAERESIS MACRON;;01D5;;01D5
+01D7;LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE;Lu;0;L;00DC 0301;;;;N;LATIN CAPITAL LETTER U DIAERESIS ACUTE;;;01D8;
+01D8;LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE;Ll;0;L;00FC 0301;;;;N;LATIN SMALL LETTER U DIAERESIS ACUTE;;01D7;;01D7
+01D9;LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON;Lu;0;L;00DC 030C;;;;N;LATIN CAPITAL LETTER U DIAERESIS HACEK;;;01DA;
+01DA;LATIN SMALL LETTER U WITH DIAERESIS AND CARON;Ll;0;L;00FC 030C;;;;N;LATIN SMALL LETTER U DIAERESIS HACEK;;01D9;;01D9
+01DB;LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE;Lu;0;L;00DC 0300;;;;N;LATIN CAPITAL LETTER U DIAERESIS GRAVE;;;01DC;
+01DC;LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE;Ll;0;L;00FC 0300;;;;N;LATIN SMALL LETTER U DIAERESIS GRAVE;;01DB;;01DB
+01DD;LATIN SMALL LETTER TURNED E;Ll;0;L;;;;;N;;;018E;;018E
+01DE;LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON;Lu;0;L;00C4 0304;;;;N;LATIN CAPITAL LETTER A DIAERESIS MACRON;;;01DF;
+01DF;LATIN SMALL LETTER A WITH DIAERESIS AND MACRON;Ll;0;L;00E4 0304;;;;N;LATIN SMALL LETTER A DIAERESIS MACRON;;01DE;;01DE
+01E0;LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON;Lu;0;L;0226 0304;;;;N;LATIN CAPITAL LETTER A DOT MACRON;;;01E1;
+01E1;LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON;Ll;0;L;0227 0304;;;;N;LATIN SMALL LETTER A DOT MACRON;;01E0;;01E0
+01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;;;01E3;
+01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;;01E2;;01E2
+01E4;LATIN CAPITAL LETTER G WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G BAR;;;01E5;
+01E5;LATIN SMALL LETTER G WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER G BAR;;01E4;;01E4
+01E6;LATIN CAPITAL LETTER G WITH CARON;Lu;0;L;0047 030C;;;;N;LATIN CAPITAL LETTER G HACEK;;;01E7;
+01E7;LATIN SMALL LETTER G WITH CARON;Ll;0;L;0067 030C;;;;N;LATIN SMALL LETTER G HACEK;;01E6;;01E6
+01E8;LATIN CAPITAL LETTER K WITH CARON;Lu;0;L;004B 030C;;;;N;LATIN CAPITAL LETTER K HACEK;;;01E9;
+01E9;LATIN SMALL LETTER K WITH CARON;Ll;0;L;006B 030C;;;;N;LATIN SMALL LETTER K HACEK;;01E8;;01E8
+01EA;LATIN CAPITAL LETTER O WITH OGONEK;Lu;0;L;004F 0328;;;;N;LATIN CAPITAL LETTER O OGONEK;;;01EB;
+01EB;LATIN SMALL LETTER O WITH OGONEK;Ll;0;L;006F 0328;;;;N;LATIN SMALL LETTER O OGONEK;;01EA;;01EA
+01EC;LATIN CAPITAL LETTER O WITH OGONEK AND MACRON;Lu;0;L;01EA 0304;;;;N;LATIN CAPITAL LETTER O OGONEK MACRON;;;01ED;
+01ED;LATIN SMALL LETTER O WITH OGONEK AND MACRON;Ll;0;L;01EB 0304;;;;N;LATIN SMALL LETTER O OGONEK MACRON;;01EC;;01EC
+01EE;LATIN CAPITAL LETTER EZH WITH CARON;Lu;0;L;01B7 030C;;;;N;LATIN CAPITAL LETTER YOGH HACEK;;;01EF;
+01EF;LATIN SMALL LETTER EZH WITH CARON;Ll;0;L;0292 030C;;;;N;LATIN SMALL LETTER YOGH HACEK;;01EE;;01EE
+01F0;LATIN SMALL LETTER J WITH CARON;Ll;0;L;006A 030C;;;;N;LATIN SMALL LETTER J HACEK;;;;
+01F1;LATIN CAPITAL LETTER DZ;Lu;0;L;<compat> 0044 005A;;;;N;;;;01F3;01F2
+01F2;LATIN CAPITAL LETTER D WITH SMALL LETTER Z;Lt;0;L;<compat> 0044 007A;;;;N;;;01F1;01F3;01F2
+01F3;LATIN SMALL LETTER DZ;Ll;0;L;<compat> 0064 007A;;;;N;;;01F1;;01F2
+01F4;LATIN CAPITAL LETTER G WITH ACUTE;Lu;0;L;0047 0301;;;;N;;;;01F5;
+01F5;LATIN SMALL LETTER G WITH ACUTE;Ll;0;L;0067 0301;;;;N;;;01F4;;01F4
+01F6;LATIN CAPITAL LETTER HWAIR;Lu;0;L;;;;;N;;;;0195;
+01F7;LATIN CAPITAL LETTER WYNN;Lu;0;L;;;;;N;;;;01BF;
+01F8;LATIN CAPITAL LETTER N WITH GRAVE;Lu;0;L;004E 0300;;;;N;;;;01F9;
+01F9;LATIN SMALL LETTER N WITH GRAVE;Ll;0;L;006E 0300;;;;N;;;01F8;;01F8
+01FA;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE;Lu;0;L;00C5 0301;;;;N;;;;01FB;
+01FB;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE;Ll;0;L;00E5 0301;;;;N;;;01FA;;01FA
+01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;;;01FD;
+01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;;01FC;;01FC
+01FE;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE;Lu;0;L;00D8 0301;;;;N;;;;01FF;
+01FF;LATIN SMALL LETTER O WITH STROKE AND ACUTE;Ll;0;L;00F8 0301;;;;N;;;01FE;;01FE
+0200;LATIN CAPITAL LETTER A WITH DOUBLE GRAVE;Lu;0;L;0041 030F;;;;N;;;;0201;
+0201;LATIN SMALL LETTER A WITH DOUBLE GRAVE;Ll;0;L;0061 030F;;;;N;;;0200;;0200
+0202;LATIN CAPITAL LETTER A WITH INVERTED BREVE;Lu;0;L;0041 0311;;;;N;;;;0203;
+0203;LATIN SMALL LETTER A WITH INVERTED BREVE;Ll;0;L;0061 0311;;;;N;;;0202;;0202
+0204;LATIN CAPITAL LETTER E WITH DOUBLE GRAVE;Lu;0;L;0045 030F;;;;N;;;;0205;
+0205;LATIN SMALL LETTER E WITH DOUBLE GRAVE;Ll;0;L;0065 030F;;;;N;;;0204;;0204
+0206;LATIN CAPITAL LETTER E WITH INVERTED BREVE;Lu;0;L;0045 0311;;;;N;;;;0207;
+0207;LATIN SMALL LETTER E WITH INVERTED BREVE;Ll;0;L;0065 0311;;;;N;;;0206;;0206
+0208;LATIN CAPITAL LETTER I WITH DOUBLE GRAVE;Lu;0;L;0049 030F;;;;N;;;;0209;
+0209;LATIN SMALL LETTER I WITH DOUBLE GRAVE;Ll;0;L;0069 030F;;;;N;;;0208;;0208
+020A;LATIN CAPITAL LETTER I WITH INVERTED BREVE;Lu;0;L;0049 0311;;;;N;;;;020B;
+020B;LATIN SMALL LETTER I WITH INVERTED BREVE;Ll;0;L;0069 0311;;;;N;;;020A;;020A
+020C;LATIN CAPITAL LETTER O WITH DOUBLE GRAVE;Lu;0;L;004F 030F;;;;N;;;;020D;
+020D;LATIN SMALL LETTER O WITH DOUBLE GRAVE;Ll;0;L;006F 030F;;;;N;;;020C;;020C
+020E;LATIN CAPITAL LETTER O WITH INVERTED BREVE;Lu;0;L;004F 0311;;;;N;;;;020F;
+020F;LATIN SMALL LETTER O WITH INVERTED BREVE;Ll;0;L;006F 0311;;;;N;;;020E;;020E
+0210;LATIN CAPITAL LETTER R WITH DOUBLE GRAVE;Lu;0;L;0052 030F;;;;N;;;;0211;
+0211;LATIN SMALL LETTER R WITH DOUBLE GRAVE;Ll;0;L;0072 030F;;;;N;;;0210;;0210
+0212;LATIN CAPITAL LETTER R WITH INVERTED BREVE;Lu;0;L;0052 0311;;;;N;;;;0213;
+0213;LATIN SMALL LETTER R WITH INVERTED BREVE;Ll;0;L;0072 0311;;;;N;;;0212;;0212
+0214;LATIN CAPITAL LETTER U WITH DOUBLE GRAVE;Lu;0;L;0055 030F;;;;N;;;;0215;
+0215;LATIN SMALL LETTER U WITH DOUBLE GRAVE;Ll;0;L;0075 030F;;;;N;;;0214;;0214
+0216;LATIN CAPITAL LETTER U WITH INVERTED BREVE;Lu;0;L;0055 0311;;;;N;;;;0217;
+0217;LATIN SMALL LETTER U WITH INVERTED BREVE;Ll;0;L;0075 0311;;;;N;;;0216;;0216
+0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;;;0219;
+0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;;0218;;0218
+021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;;;021B;
+021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;;021A;;021A
+021C;LATIN CAPITAL LETTER YOGH;Lu;0;L;;;;;N;;;;021D;
+021D;LATIN SMALL LETTER YOGH;Ll;0;L;;;;;N;;;021C;;021C
+021E;LATIN CAPITAL LETTER H WITH CARON;Lu;0;L;0048 030C;;;;N;;;;021F;
+021F;LATIN SMALL LETTER H WITH CARON;Ll;0;L;0068 030C;;;;N;;;021E;;021E
+0220;LATIN CAPITAL LETTER N WITH LONG RIGHT LEG;Lu;0;L;;;;;N;;;;019E;
+0221;LATIN SMALL LETTER D WITH CURL;Ll;0;L;;;;;N;;;;;
+0222;LATIN CAPITAL LETTER OU;Lu;0;L;;;;;N;;;;0223;
+0223;LATIN SMALL LETTER OU;Ll;0;L;;;;;N;;;0222;;0222
+0224;LATIN CAPITAL LETTER Z WITH HOOK;Lu;0;L;;;;;N;;;;0225;
+0225;LATIN SMALL LETTER Z WITH HOOK;Ll;0;L;;;;;N;;;0224;;0224
+0226;LATIN CAPITAL LETTER A WITH DOT ABOVE;Lu;0;L;0041 0307;;;;N;;;;0227;
+0227;LATIN SMALL LETTER A WITH DOT ABOVE;Ll;0;L;0061 0307;;;;N;;;0226;;0226
+0228;LATIN CAPITAL LETTER E WITH CEDILLA;Lu;0;L;0045 0327;;;;N;;;;0229;
+0229;LATIN SMALL LETTER E WITH CEDILLA;Ll;0;L;0065 0327;;;;N;;;0228;;0228
+022A;LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON;Lu;0;L;00D6 0304;;;;N;;;;022B;
+022B;LATIN SMALL LETTER O WITH DIAERESIS AND MACRON;Ll;0;L;00F6 0304;;;;N;;;022A;;022A
+022C;LATIN CAPITAL LETTER O WITH TILDE AND MACRON;Lu;0;L;00D5 0304;;;;N;;;;022D;
+022D;LATIN SMALL LETTER O WITH TILDE AND MACRON;Ll;0;L;00F5 0304;;;;N;;;022C;;022C
+022E;LATIN CAPITAL LETTER O WITH DOT ABOVE;Lu;0;L;004F 0307;;;;N;;;;022F;
+022F;LATIN SMALL LETTER O WITH DOT ABOVE;Ll;0;L;006F 0307;;;;N;;;022E;;022E
+0230;LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON;Lu;0;L;022E 0304;;;;N;;;;0231;
+0231;LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON;Ll;0;L;022F 0304;;;;N;;;0230;;0230
+0232;LATIN CAPITAL LETTER Y WITH MACRON;Lu;0;L;0059 0304;;;;N;;;;0233;
+0233;LATIN SMALL LETTER Y WITH MACRON;Ll;0;L;0079 0304;;;;N;;;0232;;0232
+0234;LATIN SMALL LETTER L WITH CURL;Ll;0;L;;;;;N;;;;;
+0235;LATIN SMALL LETTER N WITH CURL;Ll;0;L;;;;;N;;;;;
+0236;LATIN SMALL LETTER T WITH CURL;Ll;0;L;;;;;N;;;;;
+0237;LATIN SMALL LETTER DOTLESS J;Ll;0;L;;;;;N;;;;;
+0238;LATIN SMALL LETTER DB DIGRAPH;Ll;0;L;;;;;N;;;;;
+0239;LATIN SMALL LETTER QP DIGRAPH;Ll;0;L;;;;;N;;;;;
+023A;LATIN CAPITAL LETTER A WITH STROKE;Lu;0;L;;;;;N;;;;2C65;
+023B;LATIN CAPITAL LETTER C WITH STROKE;Lu;0;L;;;;;N;;;;023C;
+023C;LATIN SMALL LETTER C WITH STROKE;Ll;0;L;;;;;N;;;023B;;023B
+023D;LATIN CAPITAL LETTER L WITH BAR;Lu;0;L;;;;;N;;;;019A;
+023E;LATIN CAPITAL LETTER T WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;2C66;
+023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7E;;2C7E
+0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7F;;2C7F
+0241;LATIN CAPITAL LETTER GLOTTAL STOP;Lu;0;L;;;;;N;;;;0242;
+0242;LATIN SMALL LETTER GLOTTAL STOP;Ll;0;L;;;;;N;;;0241;;0241
+0243;LATIN CAPITAL LETTER B WITH STROKE;Lu;0;L;;;;;N;;;;0180;
+0244;LATIN CAPITAL LETTER U BAR;Lu;0;L;;;;;N;;;;0289;
+0245;LATIN CAPITAL LETTER TURNED V;Lu;0;L;;;;;N;;;;028C;
+0246;LATIN CAPITAL LETTER E WITH STROKE;Lu;0;L;;;;;N;;;;0247;
+0247;LATIN SMALL LETTER E WITH STROKE;Ll;0;L;;;;;N;;;0246;;0246
+0248;LATIN CAPITAL LETTER J WITH STROKE;Lu;0;L;;;;;N;;;;0249;
+0249;LATIN SMALL LETTER J WITH STROKE;Ll;0;L;;;;;N;;;0248;;0248
+024A;LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL;Lu;0;L;;;;;N;;;;024B;
+024B;LATIN SMALL LETTER Q WITH HOOK TAIL;Ll;0;L;;;;;N;;;024A;;024A
+024C;LATIN CAPITAL LETTER R WITH STROKE;Lu;0;L;;;;;N;;;;024D;
+024D;LATIN SMALL LETTER R WITH STROKE;Ll;0;L;;;;;N;;;024C;;024C
+024E;LATIN CAPITAL LETTER Y WITH STROKE;Lu;0;L;;;;;N;;;;024F;
+024F;LATIN SMALL LETTER Y WITH STROKE;Ll;0;L;;;;;N;;;024E;;024E
+0250;LATIN SMALL LETTER TURNED A;Ll;0;L;;;;;N;;;2C6F;;2C6F
+0251;LATIN SMALL LETTER ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT A;;2C6D;;2C6D
+0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;2C70;;2C70
+0253;LATIN SMALL LETTER B WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER B HOOK;;0181;;0181
+0254;LATIN SMALL LETTER OPEN O;Ll;0;L;;;;;N;;;0186;;0186
+0255;LATIN SMALL LETTER C WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER C CURL;;;;
+0256;LATIN SMALL LETTER D WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER D RETROFLEX HOOK;;0189;;0189
+0257;LATIN SMALL LETTER D WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER D HOOK;;018A;;018A
+0258;LATIN SMALL LETTER REVERSED E;Ll;0;L;;;;;N;;;;;
+0259;LATIN SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;018F;;018F
+025A;LATIN SMALL LETTER SCHWA WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCHWA HOOK;;;;
+025B;LATIN SMALL LETTER OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER EPSILON;;0190;;0190
+025C;LATIN SMALL LETTER REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON;;A7AB;;A7AB
+025D;LATIN SMALL LETTER REVERSED OPEN E WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON HOOK;;;;
+025E;LATIN SMALL LETTER CLOSED REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED REVERSED EPSILON;;;;
+025F;LATIN SMALL LETTER DOTLESS J WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR;;;;
+0260;LATIN SMALL LETTER G WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER G HOOK;;0193;;0193
+0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;A7AC;;A7AC
+0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;;
+0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194
+0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;;;
+0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;A78D;;A78D
+0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;A7AA;;A7AA
+0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;;
+0268;LATIN SMALL LETTER I WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED I;;0197;;0197
+0269;LATIN SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0196;;0196
+026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;A7AE;;A7AE
+026B;LATIN SMALL LETTER L WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;2C62;;2C62
+026C;LATIN SMALL LETTER L WITH BELT;Ll;0;L;;;;;N;LATIN SMALL LETTER L BELT;;A7AD;;A7AD
+026D;LATIN SMALL LETTER L WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER L RETROFLEX HOOK;;;;
+026E;LATIN SMALL LETTER LEZH;Ll;0;L;;;;;N;LATIN SMALL LETTER L YOGH;;;;
+026F;LATIN SMALL LETTER TURNED M;Ll;0;L;;;;;N;;;019C;;019C
+0270;LATIN SMALL LETTER TURNED M WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+0271;LATIN SMALL LETTER M WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER M HOOK;;2C6E;;2C6E
+0272;LATIN SMALL LETTER N WITH LEFT HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N HOOK;;019D;;019D
+0273;LATIN SMALL LETTER N WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N RETROFLEX HOOK;;;;
+0274;LATIN LETTER SMALL CAPITAL N;Ll;0;L;;;;;N;;;;;
+0275;LATIN SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;019F;;019F
+0276;LATIN LETTER SMALL CAPITAL OE;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL O E;;;;
+0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;;;
+0278;LATIN SMALL LETTER PHI;Ll;0;L;;;;;N;;;;;
+0279;LATIN SMALL LETTER TURNED R;Ll;0;L;;;;;N;;;;;
+027A;LATIN SMALL LETTER TURNED R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+027B;LATIN SMALL LETTER TURNED R WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED R HOOK;;;;
+027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64
+027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;;
+027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;;
+0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;;01A6;;01A6
+0281;LATIN LETTER SMALL CAPITAL INVERTED R;Ll;0;L;;;;;N;;;;;
+0282;LATIN SMALL LETTER S WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER S HOOK;;A7C5;;A7C5
+0283;LATIN SMALL LETTER ESH;Ll;0;L;;;;;N;;;01A9;;01A9
+0284;LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR HOOK;;;;
+0285;LATIN SMALL LETTER SQUAT REVERSED ESH;Ll;0;L;;;;;N;;;;;
+0286;LATIN SMALL LETTER ESH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER ESH CURL;;;;
+0287;LATIN SMALL LETTER TURNED T;Ll;0;L;;;;;N;;;A7B1;;A7B1
+0288;LATIN SMALL LETTER T WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T RETROFLEX HOOK;;01AE;;01AE
+0289;LATIN SMALL LETTER U BAR;Ll;0;L;;;;;N;;;0244;;0244
+028A;LATIN SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;01B1;;01B1
+028B;LATIN SMALL LETTER V WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT V;;01B2;;01B2
+028C;LATIN SMALL LETTER TURNED V;Ll;0;L;;;;;N;;;0245;;0245
+028D;LATIN SMALL LETTER TURNED W;Ll;0;L;;;;;N;;;;;
+028E;LATIN SMALL LETTER TURNED Y;Ll;0;L;;;;;N;;;;;
+028F;LATIN LETTER SMALL CAPITAL Y;Ll;0;L;;;;;N;;;;;
+0290;LATIN SMALL LETTER Z WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Z RETROFLEX HOOK;;;;
+0291;LATIN SMALL LETTER Z WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER Z CURL;;;;
+0292;LATIN SMALL LETTER EZH;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH;;01B7;;01B7
+0293;LATIN SMALL LETTER EZH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH CURL;;;;
+0294;LATIN LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;;
+0296;LATIN LETTER INVERTED GLOTTAL STOP;Ll;0;L;;;;;N;;;;;
+0297;LATIN LETTER STRETCHED C;Ll;0;L;;;;;N;;;;;
+0298;LATIN LETTER BILABIAL CLICK;Ll;0;L;;;;;N;LATIN LETTER BULLSEYE;;;;
+0299;LATIN LETTER SMALL CAPITAL B;Ll;0;L;;;;;N;;;;;
+029A;LATIN SMALL LETTER CLOSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED EPSILON;;;;
+029B;LATIN LETTER SMALL CAPITAL G WITH HOOK;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL G HOOK;;;;
+029C;LATIN LETTER SMALL CAPITAL H;Ll;0;L;;;;;N;;;;;
+029D;LATIN SMALL LETTER J WITH CROSSED-TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER CROSSED-TAIL J;;A7B2;;A7B2
+029E;LATIN SMALL LETTER TURNED K;Ll;0;L;;;;;N;;;A7B0;;A7B0
+029F;LATIN LETTER SMALL CAPITAL L;Ll;0;L;;;;;N;;;;;
+02A0;LATIN SMALL LETTER Q WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Q HOOK;;;;
+02A1;LATIN LETTER GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER GLOTTAL STOP BAR;;;;
+02A2;LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP BAR;;;;
+02A3;LATIN SMALL LETTER DZ DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z;;;;
+02A4;LATIN SMALL LETTER DEZH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D YOGH;;;;
+02A5;LATIN SMALL LETTER DZ DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z CURL;;;;
+02A6;LATIN SMALL LETTER TS DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T S;;;;
+02A7;LATIN SMALL LETTER TESH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T ESH;;;;
+02A8;LATIN SMALL LETTER TC DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER T C CURL;;;;
+02A9;LATIN SMALL LETTER FENG DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AA;LATIN SMALL LETTER LS DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AB;LATIN SMALL LETTER LZ DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AC;LATIN LETTER BILABIAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
+02AD;LATIN LETTER BIDENTAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
+02AE;LATIN SMALL LETTER TURNED H WITH FISHHOOK;Ll;0;L;;;;;N;;;;;
+02AF;LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL;Ll;0;L;;;;;N;;;;;
+02B0;MODIFIER LETTER SMALL H;Lm;0;L;<super> 0068;;;;N;;;;;
+02B1;MODIFIER LETTER SMALL H WITH HOOK;Lm;0;L;<super> 0266;;;;N;MODIFIER LETTER SMALL H HOOK;;;;
+02B2;MODIFIER LETTER SMALL J;Lm;0;L;<super> 006A;;;;N;;;;;
+02B3;MODIFIER LETTER SMALL R;Lm;0;L;<super> 0072;;;;N;;;;;
+02B4;MODIFIER LETTER SMALL TURNED R;Lm;0;L;<super> 0279;;;;N;;;;;
+02B5;MODIFIER LETTER SMALL TURNED R WITH HOOK;Lm;0;L;<super> 027B;;;;N;MODIFIER LETTER SMALL TURNED R HOOK;;;;
+02B6;MODIFIER LETTER SMALL CAPITAL INVERTED R;Lm;0;L;<super> 0281;;;;N;;;;;
+02B7;MODIFIER LETTER SMALL W;Lm;0;L;<super> 0077;;;;N;;;;;
+02B8;MODIFIER LETTER SMALL Y;Lm;0;L;<super> 0079;;;;N;;;;;
+02B9;MODIFIER LETTER PRIME;Lm;0;ON;;;;;N;;;;;
+02BA;MODIFIER LETTER DOUBLE PRIME;Lm;0;ON;;;;;N;;;;;
+02BB;MODIFIER LETTER TURNED COMMA;Lm;0;L;;;;;N;;;;;
+02BC;MODIFIER LETTER APOSTROPHE;Lm;0;L;;;;;N;;;;;
+02BD;MODIFIER LETTER REVERSED COMMA;Lm;0;L;;;;;N;;;;;
+02BE;MODIFIER LETTER RIGHT HALF RING;Lm;0;L;;;;;N;;;;;
+02BF;MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
+02C0;MODIFIER LETTER GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
+02C1;MODIFIER LETTER REVERSED GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
+02C2;MODIFIER LETTER LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C3;MODIFIER LETTER RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C4;MODIFIER LETTER UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C5;MODIFIER LETTER DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C6;MODIFIER LETTER CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER CIRCUMFLEX;;;;
+02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;;;;
+02C8;MODIFIER LETTER VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
+02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;;;;
+02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;;;;
+02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;;;;
+02CC;MODIFIER LETTER LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
+02CD;MODIFIER LETTER LOW MACRON;Lm;0;ON;;;;;N;;;;;
+02CE;MODIFIER LETTER LOW GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW GRAVE;;;;
+02CF;MODIFIER LETTER LOW ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW ACUTE;;;;
+02D0;MODIFIER LETTER TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
+02D1;MODIFIER LETTER HALF TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
+02D2;MODIFIER LETTER CENTRED RIGHT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED RIGHT HALF RING;;;;
+02D3;MODIFIER LETTER CENTRED LEFT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED LEFT HALF RING;;;;
+02D4;MODIFIER LETTER UP TACK;Sk;0;ON;;;;;N;;;;;
+02D5;MODIFIER LETTER DOWN TACK;Sk;0;ON;;;;;N;;;;;
+02D6;MODIFIER LETTER PLUS SIGN;Sk;0;ON;;;;;N;;;;;
+02D7;MODIFIER LETTER MINUS SIGN;Sk;0;ON;;;;;N;;;;;
+02D8;BREVE;Sk;0;ON;<compat> 0020 0306;;;;N;SPACING BREVE;;;;
+02D9;DOT ABOVE;Sk;0;ON;<compat> 0020 0307;;;;N;SPACING DOT ABOVE;;;;
+02DA;RING ABOVE;Sk;0;ON;<compat> 0020 030A;;;;N;SPACING RING ABOVE;;;;
+02DB;OGONEK;Sk;0;ON;<compat> 0020 0328;;;;N;SPACING OGONEK;;;;
+02DC;SMALL TILDE;Sk;0;ON;<compat> 0020 0303;;;;N;SPACING TILDE;;;;
+02DD;DOUBLE ACUTE ACCENT;Sk;0;ON;<compat> 0020 030B;;;;N;SPACING DOUBLE ACUTE;;;;
+02DE;MODIFIER LETTER RHOTIC HOOK;Sk;0;ON;;;;;N;;;;;
+02DF;MODIFIER LETTER CROSS ACCENT;Sk;0;ON;;;;;N;;;;;
+02E0;MODIFIER LETTER SMALL GAMMA;Lm;0;L;<super> 0263;;;;N;;;;;
+02E1;MODIFIER LETTER SMALL L;Lm;0;L;<super> 006C;;;;N;;;;;
+02E2;MODIFIER LETTER SMALL S;Lm;0;L;<super> 0073;;;;N;;;;;
+02E3;MODIFIER LETTER SMALL X;Lm;0;L;<super> 0078;;;;N;;;;;
+02E4;MODIFIER LETTER SMALL REVERSED GLOTTAL STOP;Lm;0;L;<super> 0295;;;;N;;;;;
+02E5;MODIFIER LETTER EXTRA-HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E6;MODIFIER LETTER HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E7;MODIFIER LETTER MID TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E8;MODIFIER LETTER LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E9;MODIFIER LETTER EXTRA-LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
+02EA;MODIFIER LETTER YIN DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
+02EB;MODIFIER LETTER YANG DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
+02EC;MODIFIER LETTER VOICING;Lm;0;ON;;;;;N;;;;;
+02ED;MODIFIER LETTER UNASPIRATED;Sk;0;ON;;;;;N;;;;;
+02EE;MODIFIER LETTER DOUBLE APOSTROPHE;Lm;0;L;;;;;N;;;;;
+02EF;MODIFIER LETTER LOW DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F0;MODIFIER LETTER LOW UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F1;MODIFIER LETTER LOW LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F2;MODIFIER LETTER LOW RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F3;MODIFIER LETTER LOW RING;Sk;0;ON;;;;;N;;;;;
+02F4;MODIFIER LETTER MIDDLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F5;MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F6;MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F7;MODIFIER LETTER LOW TILDE;Sk;0;ON;;;;;N;;;;;
+02F8;MODIFIER LETTER RAISED COLON;Sk;0;ON;;;;;N;;;;;
+02F9;MODIFIER LETTER BEGIN HIGH TONE;Sk;0;ON;;;;;N;;;;;
+02FA;MODIFIER LETTER END HIGH TONE;Sk;0;ON;;;;;N;;;;;
+02FB;MODIFIER LETTER BEGIN LOW TONE;Sk;0;ON;;;;;N;;;;;
+02FC;MODIFIER LETTER END LOW TONE;Sk;0;ON;;;;;N;;;;;
+02FD;MODIFIER LETTER SHELF;Sk;0;ON;;;;;N;;;;;
+02FE;MODIFIER LETTER OPEN SHELF;Sk;0;ON;;;;;N;;;;;
+02FF;MODIFIER LETTER LOW LEFT ARROW;Sk;0;ON;;;;;N;;;;;
+0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;;;;
+0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;;;;
+0302;COMBINING CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;NON-SPACING CIRCUMFLEX;;;;
+0303;COMBINING TILDE;Mn;230;NSM;;;;;N;NON-SPACING TILDE;;;;
+0304;COMBINING MACRON;Mn;230;NSM;;;;;N;NON-SPACING MACRON;;;;
+0305;COMBINING OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING OVERSCORE;;;;
+0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;;;;
+0307;COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOT ABOVE;;;;
+0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;;;;
+0309;COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;NON-SPACING HOOK ABOVE;;;;
+030A;COMBINING RING ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RING ABOVE;;;;
+030B;COMBINING DOUBLE ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE ACUTE;;;;
+030C;COMBINING CARON;Mn;230;NSM;;;;;N;NON-SPACING HACEK;;;;
+030D;COMBINING VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL LINE ABOVE;;;;
+030E;COMBINING DOUBLE VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE VERTICAL LINE ABOVE;;;;
+030F;COMBINING DOUBLE GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE GRAVE;;;;
+0310;COMBINING CANDRABINDU;Mn;230;NSM;;;;;N;NON-SPACING CANDRABINDU;;;;
+0311;COMBINING INVERTED BREVE;Mn;230;NSM;;;;;N;NON-SPACING INVERTED BREVE;;;;
+0312;COMBINING TURNED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING TURNED COMMA ABOVE;;;;
+0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;;;;
+0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;;;;
+0315;COMBINING COMMA ABOVE RIGHT;Mn;232;NSM;;;;;N;NON-SPACING COMMA ABOVE RIGHT;;;;
+0316;COMBINING GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING GRAVE BELOW;;;;
+0317;COMBINING ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING ACUTE BELOW;;;;
+0318;COMBINING LEFT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT TACK BELOW;;;;
+0319;COMBINING RIGHT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT TACK BELOW;;;;
+031A;COMBINING LEFT ANGLE ABOVE;Mn;232;NSM;;;;;N;NON-SPACING LEFT ANGLE ABOVE;;;;
+031B;COMBINING HORN;Mn;216;NSM;;;;;N;NON-SPACING HORN;;;;
+031C;COMBINING LEFT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT HALF RING BELOW;;;;
+031D;COMBINING UP TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING UP TACK BELOW;;;;
+031E;COMBINING DOWN TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOWN TACK BELOW;;;;
+031F;COMBINING PLUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING PLUS SIGN BELOW;;;;
+0320;COMBINING MINUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING MINUS SIGN BELOW;;;;
+0321;COMBINING PALATALIZED HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING PALATALIZED HOOK BELOW;;;;
+0322;COMBINING RETROFLEX HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING RETROFLEX HOOK BELOW;;;;
+0323;COMBINING DOT BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOT BELOW;;;;
+0324;COMBINING DIAERESIS BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE DOT BELOW;;;;
+0325;COMBINING RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RING BELOW;;;;
+0326;COMBINING COMMA BELOW;Mn;220;NSM;;;;;N;NON-SPACING COMMA BELOW;;;;
+0327;COMBINING CEDILLA;Mn;202;NSM;;;;;N;NON-SPACING CEDILLA;;;;
+0328;COMBINING OGONEK;Mn;202;NSM;;;;;N;NON-SPACING OGONEK;;;;
+0329;COMBINING VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;NON-SPACING VERTICAL LINE BELOW;;;;
+032A;COMBINING BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BRIDGE BELOW;;;;
+032B;COMBINING INVERTED DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED DOUBLE ARCH BELOW;;;;
+032C;COMBINING CARON BELOW;Mn;220;NSM;;;;;N;NON-SPACING HACEK BELOW;;;;
+032D;COMBINING CIRCUMFLEX ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING CIRCUMFLEX BELOW;;;;
+032E;COMBINING BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BREVE BELOW;;;;
+032F;COMBINING INVERTED BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BREVE BELOW;;;;
+0330;COMBINING TILDE BELOW;Mn;220;NSM;;;;;N;NON-SPACING TILDE BELOW;;;;
+0331;COMBINING MACRON BELOW;Mn;220;NSM;;;;;N;NON-SPACING MACRON BELOW;;;;
+0332;COMBINING LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING UNDERSCORE;;;;
+0333;COMBINING DOUBLE LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE UNDERSCORE;;;;
+0334;COMBINING TILDE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING TILDE OVERLAY;;;;
+0335;COMBINING SHORT STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT BAR OVERLAY;;;;
+0336;COMBINING LONG STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG BAR OVERLAY;;;;
+0337;COMBINING SHORT SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT SLASH OVERLAY;;;;
+0338;COMBINING LONG SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG SLASH OVERLAY;;;;
+0339;COMBINING RIGHT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT HALF RING BELOW;;;;
+033A;COMBINING INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BRIDGE BELOW;;;;
+033B;COMBINING SQUARE BELOW;Mn;220;NSM;;;;;N;NON-SPACING SQUARE BELOW;;;;
+033C;COMBINING SEAGULL BELOW;Mn;220;NSM;;;;;N;NON-SPACING SEAGULL BELOW;;;;
+033D;COMBINING X ABOVE;Mn;230;NSM;;;;;N;NON-SPACING X ABOVE;;;;
+033E;COMBINING VERTICAL TILDE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL TILDE;;;;
+033F;COMBINING DOUBLE OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE OVERSCORE;;;;
+0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;;;;
+0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;;;;
+0342;COMBINING GREEK PERISPOMENI;Mn;230;NSM;;;;;N;;;;;
+0343;COMBINING GREEK KORONIS;Mn;230;NSM;0313;;;;N;;;;;
+0344;COMBINING GREEK DIALYTIKA TONOS;Mn;230;NSM;0308 0301;;;;N;GREEK NON-SPACING DIAERESIS TONOS;;;;
+0345;COMBINING GREEK YPOGEGRAMMENI;Mn;240;NSM;;;;;N;GREEK NON-SPACING IOTA BELOW;;0399;;0399
+0346;COMBINING BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+0347;COMBINING EQUALS SIGN BELOW;Mn;220;NSM;;;;;N;;;;;
+0348;COMBINING DOUBLE VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+0349;COMBINING LEFT ANGLE BELOW;Mn;220;NSM;;;;;N;;;;;
+034A;COMBINING NOT TILDE ABOVE;Mn;230;NSM;;;;;N;;;;;
+034B;COMBINING HOMOTHETIC ABOVE;Mn;230;NSM;;;;;N;;;;;
+034C;COMBINING ALMOST EQUAL TO ABOVE;Mn;230;NSM;;;;;N;;;;;
+034D;COMBINING LEFT RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+034E;COMBINING UPWARDS ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+034F;COMBINING GRAPHEME JOINER;Mn;0;NSM;;;;;N;;;;;
+0350;COMBINING RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+0351;COMBINING LEFT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+0352;COMBINING FERMATA;Mn;230;NSM;;;;;N;;;;;
+0353;COMBINING X BELOW;Mn;220;NSM;;;;;N;;;;;
+0354;COMBINING LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0355;COMBINING RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0356;COMBINING RIGHT ARROWHEAD AND UP ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0357;COMBINING RIGHT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+0358;COMBINING DOT ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
+0359;COMBINING ASTERISK BELOW;Mn;220;NSM;;;;;N;;;;;
+035A;COMBINING DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
+035B;COMBINING ZIGZAG ABOVE;Mn;230;NSM;;;;;N;;;;;
+035C;COMBINING DOUBLE BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
+035D;COMBINING DOUBLE BREVE;Mn;234;NSM;;;;;N;;;;;
+035E;COMBINING DOUBLE MACRON;Mn;234;NSM;;;;;N;;;;;
+035F;COMBINING DOUBLE MACRON BELOW;Mn;233;NSM;;;;;N;;;;;
+0360;COMBINING DOUBLE TILDE;Mn;234;NSM;;;;;N;;;;;
+0361;COMBINING DOUBLE INVERTED BREVE;Mn;234;NSM;;;;;N;;;;;
+0362;COMBINING DOUBLE RIGHTWARDS ARROW BELOW;Mn;233;NSM;;;;;N;;;;;
+0363;COMBINING LATIN SMALL LETTER A;Mn;230;NSM;;;;;N;;;;;
+0364;COMBINING LATIN SMALL LETTER E;Mn;230;NSM;;;;;N;;;;;
+0365;COMBINING LATIN SMALL LETTER I;Mn;230;NSM;;;;;N;;;;;
+0366;COMBINING LATIN SMALL LETTER O;Mn;230;NSM;;;;;N;;;;;
+0367;COMBINING LATIN SMALL LETTER U;Mn;230;NSM;;;;;N;;;;;
+0368;COMBINING LATIN SMALL LETTER C;Mn;230;NSM;;;;;N;;;;;
+0369;COMBINING LATIN SMALL LETTER D;Mn;230;NSM;;;;;N;;;;;
+036A;COMBINING LATIN SMALL LETTER H;Mn;230;NSM;;;;;N;;;;;
+036B;COMBINING LATIN SMALL LETTER M;Mn;230;NSM;;;;;N;;;;;
+036C;COMBINING LATIN SMALL LETTER R;Mn;230;NSM;;;;;N;;;;;
+036D;COMBINING LATIN SMALL LETTER T;Mn;230;NSM;;;;;N;;;;;
+036E;COMBINING LATIN SMALL LETTER V;Mn;230;NSM;;;;;N;;;;;
+036F;COMBINING LATIN SMALL LETTER X;Mn;230;NSM;;;;;N;;;;;
+0370;GREEK CAPITAL LETTER HETA;Lu;0;L;;;;;N;;;;0371;
+0371;GREEK SMALL LETTER HETA;Ll;0;L;;;;;N;;;0370;;0370
+0372;GREEK CAPITAL LETTER ARCHAIC SAMPI;Lu;0;L;;;;;N;;;;0373;
+0373;GREEK SMALL LETTER ARCHAIC SAMPI;Ll;0;L;;;;;N;;;0372;;0372
+0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;;;;
+0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;;;;
+0376;GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA;Lu;0;L;;;;;N;;;;0377;
+0377;GREEK SMALL LETTER PAMPHYLIAN DIGAMMA;Ll;0;L;;;;;N;;;0376;;0376
+037A;GREEK YPOGEGRAMMENI;Lm;0;L;<compat> 0020 0345;;;;N;GREEK SPACING IOTA BELOW;;;;
+037B;GREEK SMALL REVERSED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FD;;03FD
+037C;GREEK SMALL DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FE;;03FE
+037D;GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FF;;03FF
+037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;;;;
+037F;GREEK CAPITAL LETTER YOT;Lu;0;L;;;;;N;;;;03F3;
+0384;GREEK TONOS;Sk;0;ON;<compat> 0020 0301;;;;N;GREEK SPACING TONOS;;;;
+0385;GREEK DIALYTIKA TONOS;Sk;0;ON;00A8 0301;;;;N;GREEK SPACING DIAERESIS TONOS;;;;
+0386;GREEK CAPITAL LETTER ALPHA WITH TONOS;Lu;0;L;0391 0301;;;;N;GREEK CAPITAL LETTER ALPHA TONOS;;;03AC;
+0387;GREEK ANO TELEIA;Po;0;ON;00B7;;;;N;;;;;
+0388;GREEK CAPITAL LETTER EPSILON WITH TONOS;Lu;0;L;0395 0301;;;;N;GREEK CAPITAL LETTER EPSILON TONOS;;;03AD;
+0389;GREEK CAPITAL LETTER ETA WITH TONOS;Lu;0;L;0397 0301;;;;N;GREEK CAPITAL LETTER ETA TONOS;;;03AE;
+038A;GREEK CAPITAL LETTER IOTA WITH TONOS;Lu;0;L;0399 0301;;;;N;GREEK CAPITAL LETTER IOTA TONOS;;;03AF;
+038C;GREEK CAPITAL LETTER OMICRON WITH TONOS;Lu;0;L;039F 0301;;;;N;GREEK CAPITAL LETTER OMICRON TONOS;;;03CC;
+038E;GREEK CAPITAL LETTER UPSILON WITH TONOS;Lu;0;L;03A5 0301;;;;N;GREEK CAPITAL LETTER UPSILON TONOS;;;03CD;
+038F;GREEK CAPITAL LETTER OMEGA WITH TONOS;Lu;0;L;03A9 0301;;;;N;GREEK CAPITAL LETTER OMEGA TONOS;;;03CE;
+0390;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS;Ll;0;L;03CA 0301;;;;N;GREEK SMALL LETTER IOTA DIAERESIS TONOS;;;;
+0391;GREEK CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;03B1;
+0392;GREEK CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;03B2;
+0393;GREEK CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;03B3;
+0394;GREEK CAPITAL LETTER DELTA;Lu;0;L;;;;;N;;;;03B4;
+0395;GREEK CAPITAL LETTER EPSILON;Lu;0;L;;;;;N;;;;03B5;
+0396;GREEK CAPITAL LETTER ZETA;Lu;0;L;;;;;N;;;;03B6;
+0397;GREEK CAPITAL LETTER ETA;Lu;0;L;;;;;N;;;;03B7;
+0398;GREEK CAPITAL LETTER THETA;Lu;0;L;;;;;N;;;;03B8;
+0399;GREEK CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;03B9;
+039A;GREEK CAPITAL LETTER KAPPA;Lu;0;L;;;;;N;;;;03BA;
+039B;GREEK CAPITAL LETTER LAMDA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER LAMBDA;;;03BB;
+039C;GREEK CAPITAL LETTER MU;Lu;0;L;;;;;N;;;;03BC;
+039D;GREEK CAPITAL LETTER NU;Lu;0;L;;;;;N;;;;03BD;
+039E;GREEK CAPITAL LETTER XI;Lu;0;L;;;;;N;;;;03BE;
+039F;GREEK CAPITAL LETTER OMICRON;Lu;0;L;;;;;N;;;;03BF;
+03A0;GREEK CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;03C0;
+03A1;GREEK CAPITAL LETTER RHO;Lu;0;L;;;;;N;;;;03C1;
+03A3;GREEK CAPITAL LETTER SIGMA;Lu;0;L;;;;;N;;;;03C3;
+03A4;GREEK CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;03C4;
+03A5;GREEK CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;03C5;
+03A6;GREEK CAPITAL LETTER PHI;Lu;0;L;;;;;N;;;;03C6;
+03A7;GREEK CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;03C7;
+03A8;GREEK CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;03C8;
+03A9;GREEK CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;03C9;
+03AA;GREEK CAPITAL LETTER IOTA WITH DIALYTIKA;Lu;0;L;0399 0308;;;;N;GREEK CAPITAL LETTER IOTA DIAERESIS;;;03CA;
+03AB;GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA;Lu;0;L;03A5 0308;;;;N;GREEK CAPITAL LETTER UPSILON DIAERESIS;;;03CB;
+03AC;GREEK SMALL LETTER ALPHA WITH TONOS;Ll;0;L;03B1 0301;;;;N;GREEK SMALL LETTER ALPHA TONOS;;0386;;0386
+03AD;GREEK SMALL LETTER EPSILON WITH TONOS;Ll;0;L;03B5 0301;;;;N;GREEK SMALL LETTER EPSILON TONOS;;0388;;0388
+03AE;GREEK SMALL LETTER ETA WITH TONOS;Ll;0;L;03B7 0301;;;;N;GREEK SMALL LETTER ETA TONOS;;0389;;0389
+03AF;GREEK SMALL LETTER IOTA WITH TONOS;Ll;0;L;03B9 0301;;;;N;GREEK SMALL LETTER IOTA TONOS;;038A;;038A
+03B0;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS;Ll;0;L;03CB 0301;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS TONOS;;;;
+03B1;GREEK SMALL LETTER ALPHA;Ll;0;L;;;;;N;;;0391;;0391
+03B2;GREEK SMALL LETTER BETA;Ll;0;L;;;;;N;;;0392;;0392
+03B3;GREEK SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0393;;0393
+03B4;GREEK SMALL LETTER DELTA;Ll;0;L;;;;;N;;;0394;;0394
+03B5;GREEK SMALL LETTER EPSILON;Ll;0;L;;;;;N;;;0395;;0395
+03B6;GREEK SMALL LETTER ZETA;Ll;0;L;;;;;N;;;0396;;0396
+03B7;GREEK SMALL LETTER ETA;Ll;0;L;;;;;N;;;0397;;0397
+03B8;GREEK SMALL LETTER THETA;Ll;0;L;;;;;N;;;0398;;0398
+03B9;GREEK SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0399;;0399
+03BA;GREEK SMALL LETTER KAPPA;Ll;0;L;;;;;N;;;039A;;039A
+03BB;GREEK SMALL LETTER LAMDA;Ll;0;L;;;;;N;GREEK SMALL LETTER LAMBDA;;039B;;039B
+03BC;GREEK SMALL LETTER MU;Ll;0;L;;;;;N;;;039C;;039C
+03BD;GREEK SMALL LETTER NU;Ll;0;L;;;;;N;;;039D;;039D
+03BE;GREEK SMALL LETTER XI;Ll;0;L;;;;;N;;;039E;;039E
+03BF;GREEK SMALL LETTER OMICRON;Ll;0;L;;;;;N;;;039F;;039F
+03C0;GREEK SMALL LETTER PI;Ll;0;L;;;;;N;;;03A0;;03A0
+03C1;GREEK SMALL LETTER RHO;Ll;0;L;;;;;N;;;03A1;;03A1
+03C2;GREEK SMALL LETTER FINAL SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
+03C3;GREEK SMALL LETTER SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
+03C4;GREEK SMALL LETTER TAU;Ll;0;L;;;;;N;;;03A4;;03A4
+03C5;GREEK SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;03A5;;03A5
+03C6;GREEK SMALL LETTER PHI;Ll;0;L;;;;;N;;;03A6;;03A6
+03C7;GREEK SMALL LETTER CHI;Ll;0;L;;;;;N;;;03A7;;03A7
+03C8;GREEK SMALL LETTER PSI;Ll;0;L;;;;;N;;;03A8;;03A8
+03C9;GREEK SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;03A9;;03A9
+03CA;GREEK SMALL LETTER IOTA WITH DIALYTIKA;Ll;0;L;03B9 0308;;;;N;GREEK SMALL LETTER IOTA DIAERESIS;;03AA;;03AA
+03CB;GREEK SMALL LETTER UPSILON WITH DIALYTIKA;Ll;0;L;03C5 0308;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS;;03AB;;03AB
+03CC;GREEK SMALL LETTER OMICRON WITH TONOS;Ll;0;L;03BF 0301;;;;N;GREEK SMALL LETTER OMICRON TONOS;;038C;;038C
+03CD;GREEK SMALL LETTER UPSILON WITH TONOS;Ll;0;L;03C5 0301;;;;N;GREEK SMALL LETTER UPSILON TONOS;;038E;;038E
+03CE;GREEK SMALL LETTER OMEGA WITH TONOS;Ll;0;L;03C9 0301;;;;N;GREEK SMALL LETTER OMEGA TONOS;;038F;;038F
+03CF;GREEK CAPITAL KAI SYMBOL;Lu;0;L;;;;;N;;;;03D7;
+03D0;GREEK BETA SYMBOL;Ll;0;L;<compat> 03B2;;;;N;GREEK SMALL LETTER CURLED BETA;;0392;;0392
+03D1;GREEK THETA SYMBOL;Ll;0;L;<compat> 03B8;;;;N;GREEK SMALL LETTER SCRIPT THETA;;0398;;0398
+03D2;GREEK UPSILON WITH HOOK SYMBOL;Lu;0;L;<compat> 03A5;;;;N;GREEK CAPITAL LETTER UPSILON HOOK;;;;
+03D3;GREEK UPSILON WITH ACUTE AND HOOK SYMBOL;Lu;0;L;03D2 0301;;;;N;GREEK CAPITAL LETTER UPSILON HOOK TONOS;;;;
+03D4;GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL;Lu;0;L;03D2 0308;;;;N;GREEK CAPITAL LETTER UPSILON HOOK DIAERESIS;;;;
+03D5;GREEK PHI SYMBOL;Ll;0;L;<compat> 03C6;;;;N;GREEK SMALL LETTER SCRIPT PHI;;03A6;;03A6
+03D6;GREEK PI SYMBOL;Ll;0;L;<compat> 03C0;;;;N;GREEK SMALL LETTER OMEGA PI;;03A0;;03A0
+03D7;GREEK KAI SYMBOL;Ll;0;L;;;;;N;;;03CF;;03CF
+03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;;;03D9;
+03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;;03D8;;03D8
+03DA;GREEK LETTER STIGMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER STIGMA;;;03DB;
+03DB;GREEK SMALL LETTER STIGMA;Ll;0;L;;;;;N;;;03DA;;03DA
+03DC;GREEK LETTER DIGAMMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DIGAMMA;;;03DD;
+03DD;GREEK SMALL LETTER DIGAMMA;Ll;0;L;;;;;N;;;03DC;;03DC
+03DE;GREEK LETTER KOPPA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KOPPA;;;03DF;
+03DF;GREEK SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;03DE;;03DE
+03E0;GREEK LETTER SAMPI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SAMPI;;;03E1;
+03E1;GREEK SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;03E0;;03E0
+03E2;COPTIC CAPITAL LETTER SHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHEI;;;03E3;
+03E3;COPTIC SMALL LETTER SHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER SHEI;;03E2;;03E2
+03E4;COPTIC CAPITAL LETTER FEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER FEI;;;03E5;
+03E5;COPTIC SMALL LETTER FEI;Ll;0;L;;;;;N;GREEK SMALL LETTER FEI;;03E4;;03E4
+03E6;COPTIC CAPITAL LETTER KHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KHEI;;;03E7;
+03E7;COPTIC SMALL LETTER KHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER KHEI;;03E6;;03E6
+03E8;COPTIC CAPITAL LETTER HORI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER HORI;;;03E9;
+03E9;COPTIC SMALL LETTER HORI;Ll;0;L;;;;;N;GREEK SMALL LETTER HORI;;03E8;;03E8
+03EA;COPTIC CAPITAL LETTER GANGIA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER GANGIA;;;03EB;
+03EB;COPTIC SMALL LETTER GANGIA;Ll;0;L;;;;;N;GREEK SMALL LETTER GANGIA;;03EA;;03EA
+03EC;COPTIC CAPITAL LETTER SHIMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHIMA;;;03ED;
+03ED;COPTIC SMALL LETTER SHIMA;Ll;0;L;;;;;N;GREEK SMALL LETTER SHIMA;;03EC;;03EC
+03EE;COPTIC CAPITAL LETTER DEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DEI;;;03EF;
+03EF;COPTIC SMALL LETTER DEI;Ll;0;L;;;;;N;GREEK SMALL LETTER DEI;;03EE;;03EE
+03F0;GREEK KAPPA SYMBOL;Ll;0;L;<compat> 03BA;;;;N;GREEK SMALL LETTER SCRIPT KAPPA;;039A;;039A
+03F1;GREEK RHO SYMBOL;Ll;0;L;<compat> 03C1;;;;N;GREEK SMALL LETTER TAILED RHO;;03A1;;03A1
+03F2;GREEK LUNATE SIGMA SYMBOL;Ll;0;L;<compat> 03C2;;;;N;GREEK SMALL LETTER LUNATE SIGMA;;03F9;;03F9
+03F3;GREEK LETTER YOT;Ll;0;L;;;;;N;;;037F;;037F
+03F4;GREEK CAPITAL THETA SYMBOL;Lu;0;L;<compat> 0398;;;;N;;;;03B8;
+03F5;GREEK LUNATE EPSILON SYMBOL;Ll;0;L;<compat> 03B5;;;;N;;;0395;;0395
+03F6;GREEK REVERSED LUNATE EPSILON SYMBOL;Sm;0;ON;;;;;N;;;;;
+03F7;GREEK CAPITAL LETTER SHO;Lu;0;L;;;;;N;;;;03F8;
+03F8;GREEK SMALL LETTER SHO;Ll;0;L;;;;;N;;;03F7;;03F7
+03F9;GREEK CAPITAL LUNATE SIGMA SYMBOL;Lu;0;L;<compat> 03A3;;;;N;;;;03F2;
+03FA;GREEK CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;03FB;
+03FB;GREEK SMALL LETTER SAN;Ll;0;L;;;;;N;;;03FA;;03FA
+03FC;GREEK RHO WITH STROKE SYMBOL;Ll;0;L;;;;;N;;;;;
+03FD;GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037B;
+03FE;GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037C;
+03FF;GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037D;
+0400;CYRILLIC CAPITAL LETTER IE WITH GRAVE;Lu;0;L;0415 0300;;;;N;;;;0450;
+0401;CYRILLIC CAPITAL LETTER IO;Lu;0;L;0415 0308;;;;N;;;;0451;
+0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;;;0452;
+0403;CYRILLIC CAPITAL LETTER GJE;Lu;0;L;0413 0301;;;;N;;;;0453;
+0404;CYRILLIC CAPITAL LETTER UKRAINIAN IE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER E;;;0454;
+0405;CYRILLIC CAPITAL LETTER DZE;Lu;0;L;;;;;N;;;;0455;
+0406;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER I;;;0456;
+0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;;;0457;
+0408;CYRILLIC CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;0458;
+0409;CYRILLIC CAPITAL LETTER LJE;Lu;0;L;;;;;N;;;;0459;
+040A;CYRILLIC CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;045A;
+040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;;;045B;
+040C;CYRILLIC CAPITAL LETTER KJE;Lu;0;L;041A 0301;;;;N;;;;045C;
+040D;CYRILLIC CAPITAL LETTER I WITH GRAVE;Lu;0;L;0418 0300;;;;N;;;;045D;
+040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;;;045E;
+040F;CYRILLIC CAPITAL LETTER DZHE;Lu;0;L;;;;;N;;;;045F;
+0410;CYRILLIC CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0430;
+0411;CYRILLIC CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;0431;
+0412;CYRILLIC CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;0432;
+0413;CYRILLIC CAPITAL LETTER GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE;;;0433;
+0414;CYRILLIC CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;0434;
+0415;CYRILLIC CAPITAL LETTER IE;Lu;0;L;;;;;N;;;;0435;
+0416;CYRILLIC CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;0436;
+0417;CYRILLIC CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;0437;
+0418;CYRILLIC CAPITAL LETTER I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER II;;;0438;
+0419;CYRILLIC CAPITAL LETTER SHORT I;Lu;0;L;0418 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT II;;;0439;
+041A;CYRILLIC CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;043A;
+041B;CYRILLIC CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;043B;
+041C;CYRILLIC CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;043C;
+041D;CYRILLIC CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;043D;
+041E;CYRILLIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;043E;
+041F;CYRILLIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;043F;
+0420;CYRILLIC CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;0440;
+0421;CYRILLIC CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;0441;
+0422;CYRILLIC CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;0442;
+0423;CYRILLIC CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0443;
+0424;CYRILLIC CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;0444;
+0425;CYRILLIC CAPITAL LETTER HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA;;;0445;
+0426;CYRILLIC CAPITAL LETTER TSE;Lu;0;L;;;;;N;;;;0446;
+0427;CYRILLIC CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;0447;
+0428;CYRILLIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0448;
+0429;CYRILLIC CAPITAL LETTER SHCHA;Lu;0;L;;;;;N;;;;0449;
+042A;CYRILLIC CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;044A;
+042B;CYRILLIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER YERI;;;044B;
+042C;CYRILLIC CAPITAL LETTER SOFT SIGN;Lu;0;L;;;;;N;;;;044C;
+042D;CYRILLIC CAPITAL LETTER E;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED E;;;044D;
+042E;CYRILLIC CAPITAL LETTER YU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IU;;;044E;
+042F;CYRILLIC CAPITAL LETTER YA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IA;;;044F;
+0430;CYRILLIC SMALL LETTER A;Ll;0;L;;;;;N;;;0410;;0410
+0431;CYRILLIC SMALL LETTER BE;Ll;0;L;;;;;N;;;0411;;0411
+0432;CYRILLIC SMALL LETTER VE;Ll;0;L;;;;;N;;;0412;;0412
+0433;CYRILLIC SMALL LETTER GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE;;0413;;0413
+0434;CYRILLIC SMALL LETTER DE;Ll;0;L;;;;;N;;;0414;;0414
+0435;CYRILLIC SMALL LETTER IE;Ll;0;L;;;;;N;;;0415;;0415
+0436;CYRILLIC SMALL LETTER ZHE;Ll;0;L;;;;;N;;;0416;;0416
+0437;CYRILLIC SMALL LETTER ZE;Ll;0;L;;;;;N;;;0417;;0417
+0438;CYRILLIC SMALL LETTER I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER II;;0418;;0418
+0439;CYRILLIC SMALL LETTER SHORT I;Ll;0;L;0438 0306;;;;N;CYRILLIC SMALL LETTER SHORT II;;0419;;0419
+043A;CYRILLIC SMALL LETTER KA;Ll;0;L;;;;;N;;;041A;;041A
+043B;CYRILLIC SMALL LETTER EL;Ll;0;L;;;;;N;;;041B;;041B
+043C;CYRILLIC SMALL LETTER EM;Ll;0;L;;;;;N;;;041C;;041C
+043D;CYRILLIC SMALL LETTER EN;Ll;0;L;;;;;N;;;041D;;041D
+043E;CYRILLIC SMALL LETTER O;Ll;0;L;;;;;N;;;041E;;041E
+043F;CYRILLIC SMALL LETTER PE;Ll;0;L;;;;;N;;;041F;;041F
+0440;CYRILLIC SMALL LETTER ER;Ll;0;L;;;;;N;;;0420;;0420
+0441;CYRILLIC SMALL LETTER ES;Ll;0;L;;;;;N;;;0421;;0421
+0442;CYRILLIC SMALL LETTER TE;Ll;0;L;;;;;N;;;0422;;0422
+0443;CYRILLIC SMALL LETTER U;Ll;0;L;;;;;N;;;0423;;0423
+0444;CYRILLIC SMALL LETTER EF;Ll;0;L;;;;;N;;;0424;;0424
+0445;CYRILLIC SMALL LETTER HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA;;0425;;0425
+0446;CYRILLIC SMALL LETTER TSE;Ll;0;L;;;;;N;;;0426;;0426
+0447;CYRILLIC SMALL LETTER CHE;Ll;0;L;;;;;N;;;0427;;0427
+0448;CYRILLIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;0428;;0428
+0449;CYRILLIC SMALL LETTER SHCHA;Ll;0;L;;;;;N;;;0429;;0429
+044A;CYRILLIC SMALL LETTER HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
+044B;CYRILLIC SMALL LETTER YERU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER YERI;;042B;;042B
+044C;CYRILLIC SMALL LETTER SOFT SIGN;Ll;0;L;;;;;N;;;042C;;042C
+044D;CYRILLIC SMALL LETTER E;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED E;;042D;;042D
+044E;CYRILLIC SMALL LETTER YU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IU;;042E;;042E
+044F;CYRILLIC SMALL LETTER YA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IA;;042F;;042F
+0450;CYRILLIC SMALL LETTER IE WITH GRAVE;Ll;0;L;0435 0300;;;;N;;;0400;;0400
+0451;CYRILLIC SMALL LETTER IO;Ll;0;L;0435 0308;;;;N;;;0401;;0401
+0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;;0402;;0402
+0453;CYRILLIC SMALL LETTER GJE;Ll;0;L;0433 0301;;;;N;;;0403;;0403
+0454;CYRILLIC SMALL LETTER UKRAINIAN IE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER E;;0404;;0404
+0455;CYRILLIC SMALL LETTER DZE;Ll;0;L;;;;;N;;;0405;;0405
+0456;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER I;;0406;;0406
+0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;;0407;;0407
+0458;CYRILLIC SMALL LETTER JE;Ll;0;L;;;;;N;;;0408;;0408
+0459;CYRILLIC SMALL LETTER LJE;Ll;0;L;;;;;N;;;0409;;0409
+045A;CYRILLIC SMALL LETTER NJE;Ll;0;L;;;;;N;;;040A;;040A
+045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;;040B;;040B
+045C;CYRILLIC SMALL LETTER KJE;Ll;0;L;043A 0301;;;;N;;;040C;;040C
+045D;CYRILLIC SMALL LETTER I WITH GRAVE;Ll;0;L;0438 0300;;;;N;;;040D;;040D
+045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;;040E;;040E
+045F;CYRILLIC SMALL LETTER DZHE;Ll;0;L;;;;;N;;;040F;;040F
+0460;CYRILLIC CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;0461;
+0461;CYRILLIC SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;0460;;0460
+0462;CYRILLIC CAPITAL LETTER YAT;Lu;0;L;;;;;N;;;;0463;
+0463;CYRILLIC SMALL LETTER YAT;Ll;0;L;;;;;N;;;0462;;0462
+0464;CYRILLIC CAPITAL LETTER IOTIFIED E;Lu;0;L;;;;;N;;;;0465;
+0465;CYRILLIC SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;0464;;0464
+0466;CYRILLIC CAPITAL LETTER LITTLE YUS;Lu;0;L;;;;;N;;;;0467;
+0467;CYRILLIC SMALL LETTER LITTLE YUS;Ll;0;L;;;;;N;;;0466;;0466
+0468;CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS;Lu;0;L;;;;;N;;;;0469;
+0469;CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS;Ll;0;L;;;;;N;;;0468;;0468
+046A;CYRILLIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;046B;
+046B;CYRILLIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;046A;;046A
+046C;CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS;Lu;0;L;;;;;N;;;;046D;
+046D;CYRILLIC SMALL LETTER IOTIFIED BIG YUS;Ll;0;L;;;;;N;;;046C;;046C
+046E;CYRILLIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;046F;
+046F;CYRILLIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;046E;;046E
+0470;CYRILLIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;0471;
+0471;CYRILLIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;0470;;0470
+0472;CYRILLIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;0473;
+0473;CYRILLIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;0472;;0472
+0474;CYRILLIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;0475;
+0475;CYRILLIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;0474;;0474
+0476;CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Lu;0;L;0474 030F;;;;N;CYRILLIC CAPITAL LETTER IZHITSA DOUBLE GRAVE;;;0477;
+0477;CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Ll;0;L;0475 030F;;;;N;CYRILLIC SMALL LETTER IZHITSA DOUBLE GRAVE;;0476;;0476
+0478;CYRILLIC CAPITAL LETTER UK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER UK DIGRAPH;;;0479;
+0479;CYRILLIC SMALL LETTER UK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER UK DIGRAPH;;0478;;0478
+047A;CYRILLIC CAPITAL LETTER ROUND OMEGA;Lu;0;L;;;;;N;;;;047B;
+047B;CYRILLIC SMALL LETTER ROUND OMEGA;Ll;0;L;;;;;N;;;047A;;047A
+047C;CYRILLIC CAPITAL LETTER OMEGA WITH TITLO;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER OMEGA TITLO;;;047D;
+047D;CYRILLIC SMALL LETTER OMEGA WITH TITLO;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER OMEGA TITLO;;047C;;047C
+047E;CYRILLIC CAPITAL LETTER OT;Lu;0;L;;;;;N;;;;047F;
+047F;CYRILLIC SMALL LETTER OT;Ll;0;L;;;;;N;;;047E;;047E
+0480;CYRILLIC CAPITAL LETTER KOPPA;Lu;0;L;;;;;N;;;;0481;
+0481;CYRILLIC SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;0480;;0480
+0482;CYRILLIC THOUSANDS SIGN;So;0;L;;;;;N;;;;;
+0483;COMBINING CYRILLIC TITLO;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING TITLO;;;;
+0484;COMBINING CYRILLIC PALATALIZATION;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PALATALIZATION;;;;
+0485;COMBINING CYRILLIC DASIA PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING DASIA PNEUMATA;;;;
+0486;COMBINING CYRILLIC PSILI PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PSILI PNEUMATA;;;;
+0487;COMBINING CYRILLIC POKRYTIE;Mn;230;NSM;;;;;N;;;;;
+0488;COMBINING CYRILLIC HUNDRED THOUSANDS SIGN;Me;0;NSM;;;;;N;;;;;
+0489;COMBINING CYRILLIC MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+048A;CYRILLIC CAPITAL LETTER SHORT I WITH TAIL;Lu;0;L;;;;;N;;;;048B;
+048B;CYRILLIC SMALL LETTER SHORT I WITH TAIL;Ll;0;L;;;;;N;;;048A;;048A
+048C;CYRILLIC CAPITAL LETTER SEMISOFT SIGN;Lu;0;L;;;;;N;;;;048D;
+048D;CYRILLIC SMALL LETTER SEMISOFT SIGN;Ll;0;L;;;;;N;;;048C;;048C
+048E;CYRILLIC CAPITAL LETTER ER WITH TICK;Lu;0;L;;;;;N;;;;048F;
+048F;CYRILLIC SMALL LETTER ER WITH TICK;Ll;0;L;;;;;N;;;048E;;048E
+0490;CYRILLIC CAPITAL LETTER GHE WITH UPTURN;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE WITH UPTURN;;;0491;
+0491;CYRILLIC SMALL LETTER GHE WITH UPTURN;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE WITH UPTURN;;0490;;0490
+0492;CYRILLIC CAPITAL LETTER GHE WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE BAR;;;0493;
+0493;CYRILLIC SMALL LETTER GHE WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE BAR;;0492;;0492
+0494;CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE HOOK;;;0495;
+0495;CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE HOOK;;0494;;0494
+0496;CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZHE WITH RIGHT DESCENDER;;;0497;
+0497;CYRILLIC SMALL LETTER ZHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZHE WITH RIGHT DESCENDER;;0496;;0496
+0498;CYRILLIC CAPITAL LETTER ZE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZE CEDILLA;;;0499;
+0499;CYRILLIC SMALL LETTER ZE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZE CEDILLA;;0498;;0498
+049A;CYRILLIC CAPITAL LETTER KA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA WITH RIGHT DESCENDER;;;049B;
+049B;CYRILLIC SMALL LETTER KA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA WITH RIGHT DESCENDER;;049A;;049A
+049C;CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA VERTICAL BAR;;;049D;
+049D;CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA VERTICAL BAR;;049C;;049C
+049E;CYRILLIC CAPITAL LETTER KA WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA BAR;;;049F;
+049F;CYRILLIC SMALL LETTER KA WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA BAR;;049E;;049E
+04A0;CYRILLIC CAPITAL LETTER BASHKIR KA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED GE KA;;;04A1;
+04A1;CYRILLIC SMALL LETTER BASHKIR KA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED GE KA;;04A0;;04A0
+04A2;CYRILLIC CAPITAL LETTER EN WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN WITH RIGHT DESCENDER;;;04A3;
+04A3;CYRILLIC SMALL LETTER EN WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN WITH RIGHT DESCENDER;;04A2;;04A2
+04A4;CYRILLIC CAPITAL LIGATURE EN GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN GE;;;04A5;
+04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4
+04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;;;04A7;
+04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;;04A6;;04A6
+04A8;CYRILLIC CAPITAL LETTER ABKHASIAN HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER O HOOK;;;04A9;
+04A9;CYRILLIC SMALL LETTER ABKHASIAN HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER O HOOK;;04A8;;04A8
+04AA;CYRILLIC CAPITAL LETTER ES WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ES CEDILLA;;;04AB;
+04AB;CYRILLIC SMALL LETTER ES WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ES CEDILLA;;04AA;;04AA
+04AC;CYRILLIC CAPITAL LETTER TE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE WITH RIGHT DESCENDER;;;04AD;
+04AD;CYRILLIC SMALL LETTER TE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE WITH RIGHT DESCENDER;;04AC;;04AC
+04AE;CYRILLIC CAPITAL LETTER STRAIGHT U;Lu;0;L;;;;;N;;;;04AF;
+04AF;CYRILLIC SMALL LETTER STRAIGHT U;Ll;0;L;;;;;N;;;04AE;;04AE
+04B0;CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER STRAIGHT U BAR;;;04B1;
+04B1;CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER STRAIGHT U BAR;;04B0;;04B0
+04B2;CYRILLIC CAPITAL LETTER HA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA WITH RIGHT DESCENDER;;;04B3;
+04B3;CYRILLIC SMALL LETTER HA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA WITH RIGHT DESCENDER;;04B2;;04B2
+04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;;;04B5;
+04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;;04B4;;04B4
+04B6;CYRILLIC CAPITAL LETTER CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH RIGHT DESCENDER;;;04B7;
+04B7;CYRILLIC SMALL LETTER CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH RIGHT DESCENDER;;04B6;;04B6
+04B8;CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE VERTICAL BAR;;;04B9;
+04B9;CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE VERTICAL BAR;;04B8;;04B8
+04BA;CYRILLIC CAPITAL LETTER SHHA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER H;;;04BB;
+04BB;CYRILLIC SMALL LETTER SHHA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER H;;04BA;;04BA
+04BC;CYRILLIC CAPITAL LETTER ABKHASIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK;;;04BD;
+04BD;CYRILLIC SMALL LETTER ABKHASIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK;;04BC;;04BC
+04BE;CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK OGONEK;;;04BF;
+04BF;CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK OGONEK;;04BE;;04BE
+04C0;CYRILLIC LETTER PALOCHKA;Lu;0;L;;;;;N;CYRILLIC LETTER I;;;04CF;
+04C1;CYRILLIC CAPITAL LETTER ZHE WITH BREVE;Lu;0;L;0416 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT ZHE;;;04C2;
+04C2;CYRILLIC SMALL LETTER ZHE WITH BREVE;Ll;0;L;0436 0306;;;;N;CYRILLIC SMALL LETTER SHORT ZHE;;04C1;;04C1
+04C3;CYRILLIC CAPITAL LETTER KA WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA HOOK;;;04C4;
+04C4;CYRILLIC SMALL LETTER KA WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA HOOK;;04C3;;04C3
+04C5;CYRILLIC CAPITAL LETTER EL WITH TAIL;Lu;0;L;;;;;N;;;;04C6;
+04C6;CYRILLIC SMALL LETTER EL WITH TAIL;Ll;0;L;;;;;N;;;04C5;;04C5
+04C7;CYRILLIC CAPITAL LETTER EN WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN HOOK;;;04C8;
+04C8;CYRILLIC SMALL LETTER EN WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN HOOK;;04C7;;04C7
+04C9;CYRILLIC CAPITAL LETTER EN WITH TAIL;Lu;0;L;;;;;N;;;;04CA;
+04CA;CYRILLIC SMALL LETTER EN WITH TAIL;Ll;0;L;;;;;N;;;04C9;;04C9
+04CB;CYRILLIC CAPITAL LETTER KHAKASSIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH LEFT DESCENDER;;;04CC;
+04CC;CYRILLIC SMALL LETTER KHAKASSIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH LEFT DESCENDER;;04CB;;04CB
+04CD;CYRILLIC CAPITAL LETTER EM WITH TAIL;Lu;0;L;;;;;N;;;;04CE;
+04CE;CYRILLIC SMALL LETTER EM WITH TAIL;Ll;0;L;;;;;N;;;04CD;;04CD
+04CF;CYRILLIC SMALL LETTER PALOCHKA;Ll;0;L;;;;;N;;;04C0;;04C0
+04D0;CYRILLIC CAPITAL LETTER A WITH BREVE;Lu;0;L;0410 0306;;;;N;;;;04D1;
+04D1;CYRILLIC SMALL LETTER A WITH BREVE;Ll;0;L;0430 0306;;;;N;;;04D0;;04D0
+04D2;CYRILLIC CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0410 0308;;;;N;;;;04D3;
+04D3;CYRILLIC SMALL LETTER A WITH DIAERESIS;Ll;0;L;0430 0308;;;;N;;;04D2;;04D2
+04D4;CYRILLIC CAPITAL LIGATURE A IE;Lu;0;L;;;;;N;;;;04D5;
+04D5;CYRILLIC SMALL LIGATURE A IE;Ll;0;L;;;;;N;;;04D4;;04D4
+04D6;CYRILLIC CAPITAL LETTER IE WITH BREVE;Lu;0;L;0415 0306;;;;N;;;;04D7;
+04D7;CYRILLIC SMALL LETTER IE WITH BREVE;Ll;0;L;0435 0306;;;;N;;;04D6;;04D6
+04D8;CYRILLIC CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;04D9;
+04D9;CYRILLIC SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;04D8;;04D8
+04DA;CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS;Lu;0;L;04D8 0308;;;;N;;;;04DB;
+04DB;CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS;Ll;0;L;04D9 0308;;;;N;;;04DA;;04DA
+04DC;CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS;Lu;0;L;0416 0308;;;;N;;;;04DD;
+04DD;CYRILLIC SMALL LETTER ZHE WITH DIAERESIS;Ll;0;L;0436 0308;;;;N;;;04DC;;04DC
+04DE;CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS;Lu;0;L;0417 0308;;;;N;;;;04DF;
+04DF;CYRILLIC SMALL LETTER ZE WITH DIAERESIS;Ll;0;L;0437 0308;;;;N;;;04DE;;04DE
+04E0;CYRILLIC CAPITAL LETTER ABKHASIAN DZE;Lu;0;L;;;;;N;;;;04E1;
+04E1;CYRILLIC SMALL LETTER ABKHASIAN DZE;Ll;0;L;;;;;N;;;04E0;;04E0
+04E2;CYRILLIC CAPITAL LETTER I WITH MACRON;Lu;0;L;0418 0304;;;;N;;;;04E3;
+04E3;CYRILLIC SMALL LETTER I WITH MACRON;Ll;0;L;0438 0304;;;;N;;;04E2;;04E2
+04E4;CYRILLIC CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0418 0308;;;;N;;;;04E5;
+04E5;CYRILLIC SMALL LETTER I WITH DIAERESIS;Ll;0;L;0438 0308;;;;N;;;04E4;;04E4
+04E6;CYRILLIC CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;041E 0308;;;;N;;;;04E7;
+04E7;CYRILLIC SMALL LETTER O WITH DIAERESIS;Ll;0;L;043E 0308;;;;N;;;04E6;;04E6
+04E8;CYRILLIC CAPITAL LETTER BARRED O;Lu;0;L;;;;;N;;;;04E9;
+04E9;CYRILLIC SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;04E8;;04E8
+04EA;CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS;Lu;0;L;04E8 0308;;;;N;;;;04EB;
+04EB;CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS;Ll;0;L;04E9 0308;;;;N;;;04EA;;04EA
+04EC;CYRILLIC CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;042D 0308;;;;N;;;;04ED;
+04ED;CYRILLIC SMALL LETTER E WITH DIAERESIS;Ll;0;L;044D 0308;;;;N;;;04EC;;04EC
+04EE;CYRILLIC CAPITAL LETTER U WITH MACRON;Lu;0;L;0423 0304;;;;N;;;;04EF;
+04EF;CYRILLIC SMALL LETTER U WITH MACRON;Ll;0;L;0443 0304;;;;N;;;04EE;;04EE
+04F0;CYRILLIC CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0423 0308;;;;N;;;;04F1;
+04F1;CYRILLIC SMALL LETTER U WITH DIAERESIS;Ll;0;L;0443 0308;;;;N;;;04F0;;04F0
+04F2;CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0423 030B;;;;N;;;;04F3;
+04F3;CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0443 030B;;;;N;;;04F2;;04F2
+04F4;CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS;Lu;0;L;0427 0308;;;;N;;;;04F5;
+04F5;CYRILLIC SMALL LETTER CHE WITH DIAERESIS;Ll;0;L;0447 0308;;;;N;;;04F4;;04F4
+04F6;CYRILLIC CAPITAL LETTER GHE WITH DESCENDER;Lu;0;L;;;;;N;;;;04F7;
+04F7;CYRILLIC SMALL LETTER GHE WITH DESCENDER;Ll;0;L;;;;;N;;;04F6;;04F6
+04F8;CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS;Lu;0;L;042B 0308;;;;N;;;;04F9;
+04F9;CYRILLIC SMALL LETTER YERU WITH DIAERESIS;Ll;0;L;044B 0308;;;;N;;;04F8;;04F8
+04FA;CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK;Lu;0;L;;;;;N;;;;04FB;
+04FB;CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK;Ll;0;L;;;;;N;;;04FA;;04FA
+04FC;CYRILLIC CAPITAL LETTER HA WITH HOOK;Lu;0;L;;;;;N;;;;04FD;
+04FD;CYRILLIC SMALL LETTER HA WITH HOOK;Ll;0;L;;;;;N;;;04FC;;04FC
+04FE;CYRILLIC CAPITAL LETTER HA WITH STROKE;Lu;0;L;;;;;N;;;;04FF;
+04FF;CYRILLIC SMALL LETTER HA WITH STROKE;Ll;0;L;;;;;N;;;04FE;;04FE
+0500;CYRILLIC CAPITAL LETTER KOMI DE;Lu;0;L;;;;;N;;;;0501;
+0501;CYRILLIC SMALL LETTER KOMI DE;Ll;0;L;;;;;N;;;0500;;0500
+0502;CYRILLIC CAPITAL LETTER KOMI DJE;Lu;0;L;;;;;N;;;;0503;
+0503;CYRILLIC SMALL LETTER KOMI DJE;Ll;0;L;;;;;N;;;0502;;0502
+0504;CYRILLIC CAPITAL LETTER KOMI ZJE;Lu;0;L;;;;;N;;;;0505;
+0505;CYRILLIC SMALL LETTER KOMI ZJE;Ll;0;L;;;;;N;;;0504;;0504
+0506;CYRILLIC CAPITAL LETTER KOMI DZJE;Lu;0;L;;;;;N;;;;0507;
+0507;CYRILLIC SMALL LETTER KOMI DZJE;Ll;0;L;;;;;N;;;0506;;0506
+0508;CYRILLIC CAPITAL LETTER KOMI LJE;Lu;0;L;;;;;N;;;;0509;
+0509;CYRILLIC SMALL LETTER KOMI LJE;Ll;0;L;;;;;N;;;0508;;0508
+050A;CYRILLIC CAPITAL LETTER KOMI NJE;Lu;0;L;;;;;N;;;;050B;
+050B;CYRILLIC SMALL LETTER KOMI NJE;Ll;0;L;;;;;N;;;050A;;050A
+050C;CYRILLIC CAPITAL LETTER KOMI SJE;Lu;0;L;;;;;N;;;;050D;
+050D;CYRILLIC SMALL LETTER KOMI SJE;Ll;0;L;;;;;N;;;050C;;050C
+050E;CYRILLIC CAPITAL LETTER KOMI TJE;Lu;0;L;;;;;N;;;;050F;
+050F;CYRILLIC SMALL LETTER KOMI TJE;Ll;0;L;;;;;N;;;050E;;050E
+0510;CYRILLIC CAPITAL LETTER REVERSED ZE;Lu;0;L;;;;;N;;;;0511;
+0511;CYRILLIC SMALL LETTER REVERSED ZE;Ll;0;L;;;;;N;;;0510;;0510
+0512;CYRILLIC CAPITAL LETTER EL WITH HOOK;Lu;0;L;;;;;N;;;;0513;
+0513;CYRILLIC SMALL LETTER EL WITH HOOK;Ll;0;L;;;;;N;;;0512;;0512
+0514;CYRILLIC CAPITAL LETTER LHA;Lu;0;L;;;;;N;;;;0515;
+0515;CYRILLIC SMALL LETTER LHA;Ll;0;L;;;;;N;;;0514;;0514
+0516;CYRILLIC CAPITAL LETTER RHA;Lu;0;L;;;;;N;;;;0517;
+0517;CYRILLIC SMALL LETTER RHA;Ll;0;L;;;;;N;;;0516;;0516
+0518;CYRILLIC CAPITAL LETTER YAE;Lu;0;L;;;;;N;;;;0519;
+0519;CYRILLIC SMALL LETTER YAE;Ll;0;L;;;;;N;;;0518;;0518
+051A;CYRILLIC CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;051B;
+051B;CYRILLIC SMALL LETTER QA;Ll;0;L;;;;;N;;;051A;;051A
+051C;CYRILLIC CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;051D;
+051D;CYRILLIC SMALL LETTER WE;Ll;0;L;;;;;N;;;051C;;051C
+051E;CYRILLIC CAPITAL LETTER ALEUT KA;Lu;0;L;;;;;N;;;;051F;
+051F;CYRILLIC SMALL LETTER ALEUT KA;Ll;0;L;;;;;N;;;051E;;051E
+0520;CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0521;
+0521;CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0520;;0520
+0522;CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0523;
+0523;CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0522;;0522
+0524;CYRILLIC CAPITAL LETTER PE WITH DESCENDER;Lu;0;L;;;;;N;;;;0525;
+0525;CYRILLIC SMALL LETTER PE WITH DESCENDER;Ll;0;L;;;;;N;;;0524;;0524
+0526;CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER;Lu;0;L;;;;;N;;;;0527;
+0527;CYRILLIC SMALL LETTER SHHA WITH DESCENDER;Ll;0;L;;;;;N;;;0526;;0526
+0528;CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK;Lu;0;L;;;;;N;;;;0529;
+0529;CYRILLIC SMALL LETTER EN WITH LEFT HOOK;Ll;0;L;;;;;N;;;0528;;0528
+052A;CYRILLIC CAPITAL LETTER DZZHE;Lu;0;L;;;;;N;;;;052B;
+052B;CYRILLIC SMALL LETTER DZZHE;Ll;0;L;;;;;N;;;052A;;052A
+052C;CYRILLIC CAPITAL LETTER DCHE;Lu;0;L;;;;;N;;;;052D;
+052D;CYRILLIC SMALL LETTER DCHE;Ll;0;L;;;;;N;;;052C;;052C
+052E;CYRILLIC CAPITAL LETTER EL WITH DESCENDER;Lu;0;L;;;;;N;;;;052F;
+052F;CYRILLIC SMALL LETTER EL WITH DESCENDER;Ll;0;L;;;;;N;;;052E;;052E
+0531;ARMENIAN CAPITAL LETTER AYB;Lu;0;L;;;;;N;;;;0561;
+0532;ARMENIAN CAPITAL LETTER BEN;Lu;0;L;;;;;N;;;;0562;
+0533;ARMENIAN CAPITAL LETTER GIM;Lu;0;L;;;;;N;;;;0563;
+0534;ARMENIAN CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;0564;
+0535;ARMENIAN CAPITAL LETTER ECH;Lu;0;L;;;;;N;;;;0565;
+0536;ARMENIAN CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;0566;
+0537;ARMENIAN CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;0567;
+0538;ARMENIAN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;0568;
+0539;ARMENIAN CAPITAL LETTER TO;Lu;0;L;;;;;N;;;;0569;
+053A;ARMENIAN CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;056A;
+053B;ARMENIAN CAPITAL LETTER INI;Lu;0;L;;;;;N;;;;056B;
+053C;ARMENIAN CAPITAL LETTER LIWN;Lu;0;L;;;;;N;;;;056C;
+053D;ARMENIAN CAPITAL LETTER XEH;Lu;0;L;;;;;N;;;;056D;
+053E;ARMENIAN CAPITAL LETTER CA;Lu;0;L;;;;;N;;;;056E;
+053F;ARMENIAN CAPITAL LETTER KEN;Lu;0;L;;;;;N;;;;056F;
+0540;ARMENIAN CAPITAL LETTER HO;Lu;0;L;;;;;N;;;;0570;
+0541;ARMENIAN CAPITAL LETTER JA;Lu;0;L;;;;;N;;;;0571;
+0542;ARMENIAN CAPITAL LETTER GHAD;Lu;0;L;;;;;N;ARMENIAN CAPITAL LETTER LAD;;;0572;
+0543;ARMENIAN CAPITAL LETTER CHEH;Lu;0;L;;;;;N;;;;0573;
+0544;ARMENIAN CAPITAL LETTER MEN;Lu;0;L;;;;;N;;;;0574;
+0545;ARMENIAN CAPITAL LETTER YI;Lu;0;L;;;;;N;;;;0575;
+0546;ARMENIAN CAPITAL LETTER NOW;Lu;0;L;;;;;N;;;;0576;
+0547;ARMENIAN CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0577;
+0548;ARMENIAN CAPITAL LETTER VO;Lu;0;L;;;;;N;;;;0578;
+0549;ARMENIAN CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;0579;
+054A;ARMENIAN CAPITAL LETTER PEH;Lu;0;L;;;;;N;;;;057A;
+054B;ARMENIAN CAPITAL LETTER JHEH;Lu;0;L;;;;;N;;;;057B;
+054C;ARMENIAN CAPITAL LETTER RA;Lu;0;L;;;;;N;;;;057C;
+054D;ARMENIAN CAPITAL LETTER SEH;Lu;0;L;;;;;N;;;;057D;
+054E;ARMENIAN CAPITAL LETTER VEW;Lu;0;L;;;;;N;;;;057E;
+054F;ARMENIAN CAPITAL LETTER TIWN;Lu;0;L;;;;;N;;;;057F;
+0550;ARMENIAN CAPITAL LETTER REH;Lu;0;L;;;;;N;;;;0580;
+0551;ARMENIAN CAPITAL LETTER CO;Lu;0;L;;;;;N;;;;0581;
+0552;ARMENIAN CAPITAL LETTER YIWN;Lu;0;L;;;;;N;;;;0582;
+0553;ARMENIAN CAPITAL LETTER PIWR;Lu;0;L;;;;;N;;;;0583;
+0554;ARMENIAN CAPITAL LETTER KEH;Lu;0;L;;;;;N;;;;0584;
+0555;ARMENIAN CAPITAL LETTER OH;Lu;0;L;;;;;N;;;;0585;
+0556;ARMENIAN CAPITAL LETTER FEH;Lu;0;L;;;;;N;;;;0586;
+0559;ARMENIAN MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
+055A;ARMENIAN APOSTROPHE;Po;0;L;;;;;N;ARMENIAN MODIFIER LETTER RIGHT HALF RING;;;;
+055B;ARMENIAN EMPHASIS MARK;Po;0;L;;;;;N;;;;;
+055C;ARMENIAN EXCLAMATION MARK;Po;0;L;;;;;N;;;;;
+055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;;
+055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;;
+055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;;
+0560;ARMENIAN SMALL LETTER TURNED AYB;Ll;0;L;;;;;N;;;;;
+0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531
+0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532
+0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533
+0564;ARMENIAN SMALL LETTER DA;Ll;0;L;;;;;N;;;0534;;0534
+0565;ARMENIAN SMALL LETTER ECH;Ll;0;L;;;;;N;;;0535;;0535
+0566;ARMENIAN SMALL LETTER ZA;Ll;0;L;;;;;N;;;0536;;0536
+0567;ARMENIAN SMALL LETTER EH;Ll;0;L;;;;;N;;;0537;;0537
+0568;ARMENIAN SMALL LETTER ET;Ll;0;L;;;;;N;;;0538;;0538
+0569;ARMENIAN SMALL LETTER TO;Ll;0;L;;;;;N;;;0539;;0539
+056A;ARMENIAN SMALL LETTER ZHE;Ll;0;L;;;;;N;;;053A;;053A
+056B;ARMENIAN SMALL LETTER INI;Ll;0;L;;;;;N;;;053B;;053B
+056C;ARMENIAN SMALL LETTER LIWN;Ll;0;L;;;;;N;;;053C;;053C
+056D;ARMENIAN SMALL LETTER XEH;Ll;0;L;;;;;N;;;053D;;053D
+056E;ARMENIAN SMALL LETTER CA;Ll;0;L;;;;;N;;;053E;;053E
+056F;ARMENIAN SMALL LETTER KEN;Ll;0;L;;;;;N;;;053F;;053F
+0570;ARMENIAN SMALL LETTER HO;Ll;0;L;;;;;N;;;0540;;0540
+0571;ARMENIAN SMALL LETTER JA;Ll;0;L;;;;;N;;;0541;;0541
+0572;ARMENIAN SMALL LETTER GHAD;Ll;0;L;;;;;N;ARMENIAN SMALL LETTER LAD;;0542;;0542
+0573;ARMENIAN SMALL LETTER CHEH;Ll;0;L;;;;;N;;;0543;;0543
+0574;ARMENIAN SMALL LETTER MEN;Ll;0;L;;;;;N;;;0544;;0544
+0575;ARMENIAN SMALL LETTER YI;Ll;0;L;;;;;N;;;0545;;0545
+0576;ARMENIAN SMALL LETTER NOW;Ll;0;L;;;;;N;;;0546;;0546
+0577;ARMENIAN SMALL LETTER SHA;Ll;0;L;;;;;N;;;0547;;0547
+0578;ARMENIAN SMALL LETTER VO;Ll;0;L;;;;;N;;;0548;;0548
+0579;ARMENIAN SMALL LETTER CHA;Ll;0;L;;;;;N;;;0549;;0549
+057A;ARMENIAN SMALL LETTER PEH;Ll;0;L;;;;;N;;;054A;;054A
+057B;ARMENIAN SMALL LETTER JHEH;Ll;0;L;;;;;N;;;054B;;054B
+057C;ARMENIAN SMALL LETTER RA;Ll;0;L;;;;;N;;;054C;;054C
+057D;ARMENIAN SMALL LETTER SEH;Ll;0;L;;;;;N;;;054D;;054D
+057E;ARMENIAN SMALL LETTER VEW;Ll;0;L;;;;;N;;;054E;;054E
+057F;ARMENIAN SMALL LETTER TIWN;Ll;0;L;;;;;N;;;054F;;054F
+0580;ARMENIAN SMALL LETTER REH;Ll;0;L;;;;;N;;;0550;;0550
+0581;ARMENIAN SMALL LETTER CO;Ll;0;L;;;;;N;;;0551;;0551
+0582;ARMENIAN SMALL LETTER YIWN;Ll;0;L;;;;;N;;;0552;;0552
+0583;ARMENIAN SMALL LETTER PIWR;Ll;0;L;;;;;N;;;0553;;0553
+0584;ARMENIAN SMALL LETTER KEH;Ll;0;L;;;;;N;;;0554;;0554
+0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555
+0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556
+0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L;<compat> 0565 0582;;;;N;;;;;
+0588;ARMENIAN SMALL LETTER YI WITH STROKE;Ll;0;L;;;;;N;;;;;
+0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;;
+058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;;
+058D;RIGHT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;;
+058E;LEFT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;;
+058F;ARMENIAN DRAM SIGN;Sc;0;ET;;;;;N;;;;;
+0591;HEBREW ACCENT ETNAHTA;Mn;220;NSM;;;;;N;;;;;
+0592;HEBREW ACCENT SEGOL;Mn;230;NSM;;;;;N;;;;;
+0593;HEBREW ACCENT SHALSHELET;Mn;230;NSM;;;;;N;;;;;
+0594;HEBREW ACCENT ZAQEF QATAN;Mn;230;NSM;;;;;N;;;;;
+0595;HEBREW ACCENT ZAQEF GADOL;Mn;230;NSM;;;;;N;;;;;
+0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;;;;
+0597;HEBREW ACCENT REVIA;Mn;230;NSM;;;;;N;;;;;
+0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;;;;
+0599;HEBREW ACCENT PASHTA;Mn;230;NSM;;;;;N;;;;;
+059A;HEBREW ACCENT YETIV;Mn;222;NSM;;;;;N;;;;;
+059B;HEBREW ACCENT TEVIR;Mn;220;NSM;;;;;N;;;;;
+059C;HEBREW ACCENT GERESH;Mn;230;NSM;;;;;N;;;;;
+059D;HEBREW ACCENT GERESH MUQDAM;Mn;230;NSM;;;;;N;;;;;
+059E;HEBREW ACCENT GERSHAYIM;Mn;230;NSM;;;;;N;;;;;
+059F;HEBREW ACCENT QARNEY PARA;Mn;230;NSM;;;;;N;;;;;
+05A0;HEBREW ACCENT TELISHA GEDOLA;Mn;230;NSM;;;;;N;;;;;
+05A1;HEBREW ACCENT PAZER;Mn;230;NSM;;;;;N;;;;;
+05A2;HEBREW ACCENT ATNAH HAFUKH;Mn;220;NSM;;;;;N;;;;;
+05A3;HEBREW ACCENT MUNAH;Mn;220;NSM;;;;;N;;;;;
+05A4;HEBREW ACCENT MAHAPAKH;Mn;220;NSM;;;;;N;;;;;
+05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;;;;
+05A6;HEBREW ACCENT MERKHA KEFULA;Mn;220;NSM;;;;;N;;;;;
+05A7;HEBREW ACCENT DARGA;Mn;220;NSM;;;;;N;;;;;
+05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;;;;
+05A9;HEBREW ACCENT TELISHA QETANA;Mn;230;NSM;;;;;N;;;;;
+05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;;;;
+05AB;HEBREW ACCENT OLE;Mn;230;NSM;;;;;N;;;;;
+05AC;HEBREW ACCENT ILUY;Mn;230;NSM;;;;;N;;;;;
+05AD;HEBREW ACCENT DEHI;Mn;222;NSM;;;;;N;;;;;
+05AE;HEBREW ACCENT ZINOR;Mn;228;NSM;;;;;N;;;;;
+05AF;HEBREW MARK MASORA CIRCLE;Mn;230;NSM;;;;;N;;;;;
+05B0;HEBREW POINT SHEVA;Mn;10;NSM;;;;;N;;;;;
+05B1;HEBREW POINT HATAF SEGOL;Mn;11;NSM;;;;;N;;;;;
+05B2;HEBREW POINT HATAF PATAH;Mn;12;NSM;;;;;N;;;;;
+05B3;HEBREW POINT HATAF QAMATS;Mn;13;NSM;;;;;N;;;;;
+05B4;HEBREW POINT HIRIQ;Mn;14;NSM;;;;;N;;;;;
+05B5;HEBREW POINT TSERE;Mn;15;NSM;;;;;N;;;;;
+05B6;HEBREW POINT SEGOL;Mn;16;NSM;;;;;N;;;;;
+05B7;HEBREW POINT PATAH;Mn;17;NSM;;;;;N;;;;;
+05B8;HEBREW POINT QAMATS;Mn;18;NSM;;;;;N;;;;;
+05B9;HEBREW POINT HOLAM;Mn;19;NSM;;;;;N;;;;;
+05BA;HEBREW POINT HOLAM HASER FOR VAV;Mn;19;NSM;;;;;N;;;;;
+05BB;HEBREW POINT QUBUTS;Mn;20;NSM;;;;;N;;;;;
+05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;;;;
+05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;;;;
+05BE;HEBREW PUNCTUATION MAQAF;Pd;0;R;;;;;N;;;;;
+05BF;HEBREW POINT RAFE;Mn;23;NSM;;;;;N;;;;;
+05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;;;;
+05C1;HEBREW POINT SHIN DOT;Mn;24;NSM;;;;;N;;;;;
+05C2;HEBREW POINT SIN DOT;Mn;25;NSM;;;;;N;;;;;
+05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;;;;
+05C4;HEBREW MARK UPPER DOT;Mn;230;NSM;;;;;N;;;;;
+05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;;
+05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;;
+05C7;HEBREW POINT QAMATS QATAN;Mn;18;NSM;;;;;N;;;;;
+05D0;HEBREW LETTER ALEF;Lo;0;R;;;;;N;;;;;
+05D1;HEBREW LETTER BET;Lo;0;R;;;;;N;;;;;
+05D2;HEBREW LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+05D3;HEBREW LETTER DALET;Lo;0;R;;;;;N;;;;;
+05D4;HEBREW LETTER HE;Lo;0;R;;;;;N;;;;;
+05D5;HEBREW LETTER VAV;Lo;0;R;;;;;N;;;;;
+05D6;HEBREW LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+05D7;HEBREW LETTER HET;Lo;0;R;;;;;N;;;;;
+05D8;HEBREW LETTER TET;Lo;0;R;;;;;N;;;;;
+05D9;HEBREW LETTER YOD;Lo;0;R;;;;;N;;;;;
+05DA;HEBREW LETTER FINAL KAF;Lo;0;R;;;;;N;;;;;
+05DB;HEBREW LETTER KAF;Lo;0;R;;;;;N;;;;;
+05DC;HEBREW LETTER LAMED;Lo;0;R;;;;;N;;;;;
+05DD;HEBREW LETTER FINAL MEM;Lo;0;R;;;;;N;;;;;
+05DE;HEBREW LETTER MEM;Lo;0;R;;;;;N;;;;;
+05DF;HEBREW LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+05E0;HEBREW LETTER NUN;Lo;0;R;;;;;N;;;;;
+05E1;HEBREW LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+05E2;HEBREW LETTER AYIN;Lo;0;R;;;;;N;;;;;
+05E3;HEBREW LETTER FINAL PE;Lo;0;R;;;;;N;;;;;
+05E4;HEBREW LETTER PE;Lo;0;R;;;;;N;;;;;
+05E5;HEBREW LETTER FINAL TSADI;Lo;0;R;;;;;N;;;;;
+05E6;HEBREW LETTER TSADI;Lo;0;R;;;;;N;;;;;
+05E7;HEBREW LETTER QOF;Lo;0;R;;;;;N;;;;;
+05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;;
+05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;;
+05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;;
+05EF;HEBREW YOD TRIANGLE;Lo;0;R;;;;;N;;;;;
+05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
+05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
+05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
+05F3;HEBREW PUNCTUATION GERESH;Po;0;R;;;;;N;;;;;
+05F4;HEBREW PUNCTUATION GERSHAYIM;Po;0;R;;;;;N;;;;;
+0600;ARABIC NUMBER SIGN;Cf;0;AN;;;;;N;;;;;
+0601;ARABIC SIGN SANAH;Cf;0;AN;;;;;N;;;;;
+0602;ARABIC FOOTNOTE MARKER;Cf;0;AN;;;;;N;;;;;
+0603;ARABIC SIGN SAFHA;Cf;0;AN;;;;;N;;;;;
+0604;ARABIC SIGN SAMVAT;Cf;0;AN;;;;;N;;;;;
+0605;ARABIC NUMBER MARK ABOVE;Cf;0;AN;;;;;N;;;;;
+0606;ARABIC-INDIC CUBE ROOT;Sm;0;ON;;;;;N;;;;;
+0607;ARABIC-INDIC FOURTH ROOT;Sm;0;ON;;;;;N;;;;;
+0608;ARABIC RAY;Sm;0;AL;;;;;N;;;;;
+0609;ARABIC-INDIC PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
+060A;ARABIC-INDIC PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
+060B;AFGHANI SIGN;Sc;0;AL;;;;;N;;;;;
+060C;ARABIC COMMA;Po;0;CS;;;;;N;;;;;
+060D;ARABIC DATE SEPARATOR;Po;0;AL;;;;;N;;;;;
+060E;ARABIC POETIC VERSE SIGN;So;0;ON;;;;;N;;;;;
+060F;ARABIC SIGN MISRA;So;0;ON;;;;;N;;;;;
+0610;ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM;Mn;230;NSM;;;;;N;;;;;
+0611;ARABIC SIGN ALAYHE ASSALLAM;Mn;230;NSM;;;;;N;;;;;
+0612;ARABIC SIGN RAHMATULLAH ALAYHE;Mn;230;NSM;;;;;N;;;;;
+0613;ARABIC SIGN RADI ALLAHOU ANHU;Mn;230;NSM;;;;;N;;;;;
+0614;ARABIC SIGN TAKHALLUS;Mn;230;NSM;;;;;N;;;;;
+0615;ARABIC SMALL HIGH TAH;Mn;230;NSM;;;;;N;;;;;
+0616;ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH;Mn;230;NSM;;;;;N;;;;;
+0617;ARABIC SMALL HIGH ZAIN;Mn;230;NSM;;;;;N;;;;;
+0618;ARABIC SMALL FATHA;Mn;30;NSM;;;;;N;;;;;
+0619;ARABIC SMALL DAMMA;Mn;31;NSM;;;;;N;;;;;
+061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;;
+061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;;
+061C;ARABIC LETTER MARK;Cf;0;AL;;;;;N;;;;;
+061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;;
+061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;;
+0620;ARABIC LETTER KASHMIRI YEH;Lo;0;AL;;;;;N;;;;;
+0621;ARABIC LETTER HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH;;;;
+0622;ARABIC LETTER ALEF WITH MADDA ABOVE;Lo;0;AL;0627 0653;;;;N;ARABIC LETTER MADDAH ON ALEF;;;;
+0623;ARABIC LETTER ALEF WITH HAMZA ABOVE;Lo;0;AL;0627 0654;;;;N;ARABIC LETTER HAMZAH ON ALEF;;;;
+0624;ARABIC LETTER WAW WITH HAMZA ABOVE;Lo;0;AL;0648 0654;;;;N;ARABIC LETTER HAMZAH ON WAW;;;;
+0625;ARABIC LETTER ALEF WITH HAMZA BELOW;Lo;0;AL;0627 0655;;;;N;ARABIC LETTER HAMZAH UNDER ALEF;;;;
+0626;ARABIC LETTER YEH WITH HAMZA ABOVE;Lo;0;AL;064A 0654;;;;N;ARABIC LETTER HAMZAH ON YA;;;;
+0627;ARABIC LETTER ALEF;Lo;0;AL;;;;;N;;;;;
+0628;ARABIC LETTER BEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA;;;;
+0629;ARABIC LETTER TEH MARBUTA;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH;;;;
+062A;ARABIC LETTER TEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA;;;;
+062B;ARABIC LETTER THEH;Lo;0;AL;;;;;N;ARABIC LETTER THAA;;;;
+062C;ARABIC LETTER JEEM;Lo;0;AL;;;;;N;;;;;
+062D;ARABIC LETTER HAH;Lo;0;AL;;;;;N;ARABIC LETTER HAA;;;;
+062E;ARABIC LETTER KHAH;Lo;0;AL;;;;;N;ARABIC LETTER KHAA;;;;
+062F;ARABIC LETTER DAL;Lo;0;AL;;;;;N;;;;;
+0630;ARABIC LETTER THAL;Lo;0;AL;;;;;N;;;;;
+0631;ARABIC LETTER REH;Lo;0;AL;;;;;N;ARABIC LETTER RA;;;;
+0632;ARABIC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
+0633;ARABIC LETTER SEEN;Lo;0;AL;;;;;N;;;;;
+0634;ARABIC LETTER SHEEN;Lo;0;AL;;;;;N;;;;;
+0635;ARABIC LETTER SAD;Lo;0;AL;;;;;N;;;;;
+0636;ARABIC LETTER DAD;Lo;0;AL;;;;;N;;;;;
+0637;ARABIC LETTER TAH;Lo;0;AL;;;;;N;;;;;
+0638;ARABIC LETTER ZAH;Lo;0;AL;;;;;N;ARABIC LETTER DHAH;;;;
+0639;ARABIC LETTER AIN;Lo;0;AL;;;;;N;;;;;
+063A;ARABIC LETTER GHAIN;Lo;0;AL;;;;;N;;;;;
+063B;ARABIC LETTER KEHEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+063C;ARABIC LETTER KEHEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+063D;ARABIC LETTER FARSI YEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+063E;ARABIC LETTER FARSI YEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+063F;ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0640;ARABIC TATWEEL;Lm;0;AL;;;;;N;;;;;
+0641;ARABIC LETTER FEH;Lo;0;AL;;;;;N;ARABIC LETTER FA;;;;
+0642;ARABIC LETTER QAF;Lo;0;AL;;;;;N;;;;;
+0643;ARABIC LETTER KAF;Lo;0;AL;;;;;N;ARABIC LETTER CAF;;;;
+0644;ARABIC LETTER LAM;Lo;0;AL;;;;;N;;;;;
+0645;ARABIC LETTER MEEM;Lo;0;AL;;;;;N;;;;;
+0646;ARABIC LETTER NOON;Lo;0;AL;;;;;N;;;;;
+0647;ARABIC LETTER HEH;Lo;0;AL;;;;;N;ARABIC LETTER HA;;;;
+0648;ARABIC LETTER WAW;Lo;0;AL;;;;;N;;;;;
+0649;ARABIC LETTER ALEF MAKSURA;Lo;0;AL;;;;;N;ARABIC LETTER ALEF MAQSURAH;;;;
+064A;ARABIC LETTER YEH;Lo;0;AL;;;;;N;ARABIC LETTER YA;;;;
+064B;ARABIC FATHATAN;Mn;27;NSM;;;;;N;;;;;
+064C;ARABIC DAMMATAN;Mn;28;NSM;;;;;N;;;;;
+064D;ARABIC KASRATAN;Mn;29;NSM;;;;;N;;;;;
+064E;ARABIC FATHA;Mn;30;NSM;;;;;N;ARABIC FATHAH;;;;
+064F;ARABIC DAMMA;Mn;31;NSM;;;;;N;ARABIC DAMMAH;;;;
+0650;ARABIC KASRA;Mn;32;NSM;;;;;N;ARABIC KASRAH;;;;
+0651;ARABIC SHADDA;Mn;33;NSM;;;;;N;ARABIC SHADDAH;;;;
+0652;ARABIC SUKUN;Mn;34;NSM;;;;;N;;;;;
+0653;ARABIC MADDAH ABOVE;Mn;230;NSM;;;;;N;;;;;
+0654;ARABIC HAMZA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0655;ARABIC HAMZA BELOW;Mn;220;NSM;;;;;N;;;;;
+0656;ARABIC SUBSCRIPT ALEF;Mn;220;NSM;;;;;N;;;;;
+0657;ARABIC INVERTED DAMMA;Mn;230;NSM;;;;;N;;;;;
+0658;ARABIC MARK NOON GHUNNA;Mn;230;NSM;;;;;N;;;;;
+0659;ARABIC ZWARAKAY;Mn;230;NSM;;;;;N;;;;;
+065A;ARABIC VOWEL SIGN SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
+065B;ARABIC VOWEL SIGN INVERTED SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
+065C;ARABIC VOWEL SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+065D;ARABIC REVERSED DAMMA;Mn;230;NSM;;;;;N;;;;;
+065E;ARABIC FATHA WITH TWO DOTS;Mn;230;NSM;;;;;N;;;;;
+065F;ARABIC WAVY HAMZA BELOW;Mn;220;NSM;;;;;N;;;;;
+0660;ARABIC-INDIC DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+0661;ARABIC-INDIC DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
+0662;ARABIC-INDIC DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
+0663;ARABIC-INDIC DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
+0664;ARABIC-INDIC DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
+0665;ARABIC-INDIC DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
+0666;ARABIC-INDIC DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
+0667;ARABIC-INDIC DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
+0668;ARABIC-INDIC DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
+0669;ARABIC-INDIC DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
+066A;ARABIC PERCENT SIGN;Po;0;ET;;;;;N;;;;;
+066B;ARABIC DECIMAL SEPARATOR;Po;0;AN;;;;;N;;;;;
+066C;ARABIC THOUSANDS SEPARATOR;Po;0;AN;;;;;N;;;;;
+066D;ARABIC FIVE POINTED STAR;Po;0;AL;;;;;N;;;;;
+066E;ARABIC LETTER DOTLESS BEH;Lo;0;AL;;;;;N;;;;;
+066F;ARABIC LETTER DOTLESS QAF;Lo;0;AL;;;;;N;;;;;
+0670;ARABIC LETTER SUPERSCRIPT ALEF;Mn;35;NSM;;;;;N;ARABIC ALEF ABOVE;;;;
+0671;ARABIC LETTER ALEF WASLA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAT WASL ON ALEF;;;;
+0672;ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH ON ALEF;;;;
+0673;ARABIC LETTER ALEF WITH WAVY HAMZA BELOW;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH UNDER ALEF;;;;
+0674;ARABIC LETTER HIGH HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HIGH HAMZAH;;;;
+0675;ARABIC LETTER HIGH HAMZA ALEF;Lo;0;AL;<compat> 0627 0674;;;;N;ARABIC LETTER HIGH HAMZAH ALEF;;;;
+0676;ARABIC LETTER HIGH HAMZA WAW;Lo;0;AL;<compat> 0648 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW;;;;
+0677;ARABIC LETTER U WITH HAMZA ABOVE;Lo;0;AL;<compat> 06C7 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW WITH DAMMAH;;;;
+0678;ARABIC LETTER HIGH HAMZA YEH;Lo;0;AL;<compat> 064A 0674;;;;N;ARABIC LETTER HIGH HAMZAH YA;;;;
+0679;ARABIC LETTER TTEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH SMALL TAH;;;;
+067A;ARABIC LETTER TTEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH TWO DOTS VERTICAL ABOVE;;;;
+067B;ARABIC LETTER BEEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH TWO DOTS VERTICAL BELOW;;;;
+067C;ARABIC LETTER TEH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH RING;;;;
+067D;ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS ABOVE DOWNWARD;;;;
+067E;ARABIC LETTER PEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS BELOW;;;;
+067F;ARABIC LETTER TEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH FOUR DOTS ABOVE;;;;
+0680;ARABIC LETTER BEHEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH FOUR DOTS BELOW;;;;
+0681;ARABIC LETTER HAH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH ON HAA;;;;
+0682;ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH TWO DOTS VERTICAL ABOVE;;;;
+0683;ARABIC LETTER NYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS;;;;
+0684;ARABIC LETTER DYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS VERTICAL;;;;
+0685;ARABIC LETTER HAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH THREE DOTS ABOVE;;;;
+0686;ARABIC LETTER TCHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE THREE DOTS DOWNWARD;;;;
+0687;ARABIC LETTER TCHEHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE FOUR DOTS;;;;
+0688;ARABIC LETTER DDAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH SMALL TAH;;;;
+0689;ARABIC LETTER DAL WITH RING;Lo;0;AL;;;;;N;;;;;
+068A;ARABIC LETTER DAL WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+068B;ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
+068C;ARABIC LETTER DAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS ABOVE;;;;
+068D;ARABIC LETTER DDAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS BELOW;;;;
+068E;ARABIC LETTER DUL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE;;;;
+068F;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARD;;;;
+0690;ARABIC LETTER DAL WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0691;ARABIC LETTER RREH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL TAH;;;;
+0692;ARABIC LETTER REH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V;;;;
+0693;ARABIC LETTER REH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH RING;;;;
+0694;ARABIC LETTER REH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW;;;;
+0695;ARABIC LETTER REH WITH SMALL V BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V BELOW;;;;
+0696;ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW AND DOT ABOVE;;;;
+0697;ARABIC LETTER REH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH TWO DOTS ABOVE;;;;
+0698;ARABIC LETTER JEH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH THREE DOTS ABOVE;;;;
+0699;ARABIC LETTER REH WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH FOUR DOTS ABOVE;;;;
+069A;ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+069B;ARABIC LETTER SEEN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+069C;ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+069D;ARABIC LETTER SAD WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+069E;ARABIC LETTER SAD WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+069F;ARABIC LETTER TAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A0;ARABIC LETTER AIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A1;ARABIC LETTER DOTLESS FEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS FA;;;;
+06A2;ARABIC LETTER FEH WITH DOT MOVED BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT MOVED BELOW;;;;
+06A3;ARABIC LETTER FEH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT BELOW;;;;
+06A4;ARABIC LETTER VEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS ABOVE;;;;
+06A5;ARABIC LETTER FEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS BELOW;;;;
+06A6;ARABIC LETTER PEHEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH FOUR DOTS ABOVE;;;;
+06A7;ARABIC LETTER QAF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06A8;ARABIC LETTER QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A9;ARABIC LETTER KEHEH;Lo;0;AL;;;;;N;ARABIC LETTER OPEN CAF;;;;
+06AA;ARABIC LETTER SWASH KAF;Lo;0;AL;;;;;N;ARABIC LETTER SWASH CAF;;;;
+06AB;ARABIC LETTER KAF WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH RING;;;;
+06AC;ARABIC LETTER KAF WITH DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH DOT ABOVE;;;;
+06AD;ARABIC LETTER NG;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS ABOVE;;;;
+06AE;ARABIC LETTER KAF WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS BELOW;;;;
+06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;;;;
+06B0;ARABIC LETTER GAF WITH RING;Lo;0;AL;;;;;N;;;;;
+06B1;ARABIC LETTER NGOEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS ABOVE;;;;
+06B2;ARABIC LETTER GAF WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+06B3;ARABIC LETTER GUEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS VERTICAL BELOW;;;;
+06B4;ARABIC LETTER GAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06B5;ARABIC LETTER LAM WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+06B6;ARABIC LETTER LAM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06B7;ARABIC LETTER LAM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06B8;ARABIC LETTER LAM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+06B9;ARABIC LETTER NOON WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06BA;ARABIC LETTER NOON GHUNNA;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON;;;;
+06BB;ARABIC LETTER RNOON;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON WITH SMALL TAH;;;;
+06BC;ARABIC LETTER NOON WITH RING;Lo;0;AL;;;;;N;;;;;
+06BD;ARABIC LETTER NOON WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06BE;ARABIC LETTER HEH DOACHASHMEE;Lo;0;AL;;;;;N;ARABIC LETTER KNOTTED HA;;;;
+06BF;ARABIC LETTER TCHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06C0;ARABIC LETTER HEH WITH YEH ABOVE;Lo;0;AL;06D5 0654;;;;N;ARABIC LETTER HAMZAH ON HA;;;;
+06C1;ARABIC LETTER HEH GOAL;Lo;0;AL;;;;;N;ARABIC LETTER HA GOAL;;;;
+06C2;ARABIC LETTER HEH GOAL WITH HAMZA ABOVE;Lo;0;AL;06C1 0654;;;;N;ARABIC LETTER HAMZAH ON HA GOAL;;;;
+06C3;ARABIC LETTER TEH MARBUTA GOAL;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH GOAL;;;;
+06C4;ARABIC LETTER WAW WITH RING;Lo;0;AL;;;;;N;;;;;
+06C5;ARABIC LETTER KIRGHIZ OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH BAR;;;;
+06C6;ARABIC LETTER OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH SMALL V;;;;
+06C7;ARABIC LETTER U;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH DAMMAH;;;;
+06C8;ARABIC LETTER YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH ALEF ABOVE;;;;
+06C9;ARABIC LETTER KIRGHIZ YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH INVERTED SMALL V;;;;
+06CA;ARABIC LETTER WAW WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06CB;ARABIC LETTER VE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH THREE DOTS ABOVE;;;;
+06CC;ARABIC LETTER FARSI YEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS YA;;;;
+06CD;ARABIC LETTER YEH WITH TAIL;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TAIL;;;;
+06CE;ARABIC LETTER YEH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH SMALL V;;;;
+06CF;ARABIC LETTER WAW WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;;;;
+06D1;ARABIC LETTER YEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH THREE DOTS BELOW;;;;
+06D2;ARABIC LETTER YEH BARREE;Lo;0;AL;;;;;N;ARABIC LETTER YA BARREE;;;;
+06D3;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE;Lo;0;AL;06D2 0654;;;;N;ARABIC LETTER HAMZAH ON YA BARREE;;;;
+06D4;ARABIC FULL STOP;Po;0;AL;;;;;N;ARABIC PERIOD;;;;
+06D5;ARABIC LETTER AE;Lo;0;AL;;;;;N;;;;;
+06D6;ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
+06D7;ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
+06D8;ARABIC SMALL HIGH MEEM INITIAL FORM;Mn;230;NSM;;;;;N;;;;;
+06D9;ARABIC SMALL HIGH LAM ALEF;Mn;230;NSM;;;;;N;;;;;
+06DA;ARABIC SMALL HIGH JEEM;Mn;230;NSM;;;;;N;;;;;
+06DB;ARABIC SMALL HIGH THREE DOTS;Mn;230;NSM;;;;;N;;;;;
+06DC;ARABIC SMALL HIGH SEEN;Mn;230;NSM;;;;;N;;;;;
+06DD;ARABIC END OF AYAH;Cf;0;AN;;;;;N;;;;;
+06DE;ARABIC START OF RUB EL HIZB;So;0;ON;;;;;N;;;;;
+06DF;ARABIC SMALL HIGH ROUNDED ZERO;Mn;230;NSM;;;;;N;;;;;
+06E0;ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO;Mn;230;NSM;;;;;N;;;;;
+06E1;ARABIC SMALL HIGH DOTLESS HEAD OF KHAH;Mn;230;NSM;;;;;N;;;;;
+06E2;ARABIC SMALL HIGH MEEM ISOLATED FORM;Mn;230;NSM;;;;;N;;;;;
+06E3;ARABIC SMALL LOW SEEN;Mn;220;NSM;;;;;N;;;;;
+06E4;ARABIC SMALL HIGH MADDA;Mn;230;NSM;;;;;N;;;;;
+06E5;ARABIC SMALL WAW;Lm;0;AL;;;;;N;;;;;
+06E6;ARABIC SMALL YEH;Lm;0;AL;;;;;N;;;;;
+06E7;ARABIC SMALL HIGH YEH;Mn;230;NSM;;;;;N;;;;;
+06E8;ARABIC SMALL HIGH NOON;Mn;230;NSM;;;;;N;;;;;
+06E9;ARABIC PLACE OF SAJDAH;So;0;ON;;;;;N;;;;;
+06EA;ARABIC EMPTY CENTRE LOW STOP;Mn;220;NSM;;;;;N;;;;;
+06EB;ARABIC EMPTY CENTRE HIGH STOP;Mn;230;NSM;;;;;N;;;;;
+06EC;ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE;Mn;230;NSM;;;;;N;;;;;
+06ED;ARABIC SMALL LOW MEEM;Mn;220;NSM;;;;;N;;;;;
+06EE;ARABIC LETTER DAL WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+06EF;ARABIC LETTER REH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+06F0;EXTENDED ARABIC-INDIC DIGIT ZERO;Nd;0;EN;;0;0;0;N;EASTERN ARABIC-INDIC DIGIT ZERO;;;;
+06F1;EXTENDED ARABIC-INDIC DIGIT ONE;Nd;0;EN;;1;1;1;N;EASTERN ARABIC-INDIC DIGIT ONE;;;;
+06F2;EXTENDED ARABIC-INDIC DIGIT TWO;Nd;0;EN;;2;2;2;N;EASTERN ARABIC-INDIC DIGIT TWO;;;;
+06F3;EXTENDED ARABIC-INDIC DIGIT THREE;Nd;0;EN;;3;3;3;N;EASTERN ARABIC-INDIC DIGIT THREE;;;;
+06F4;EXTENDED ARABIC-INDIC DIGIT FOUR;Nd;0;EN;;4;4;4;N;EASTERN ARABIC-INDIC DIGIT FOUR;;;;
+06F5;EXTENDED ARABIC-INDIC DIGIT FIVE;Nd;0;EN;;5;5;5;N;EASTERN ARABIC-INDIC DIGIT FIVE;;;;
+06F6;EXTENDED ARABIC-INDIC DIGIT SIX;Nd;0;EN;;6;6;6;N;EASTERN ARABIC-INDIC DIGIT SIX;;;;
+06F7;EXTENDED ARABIC-INDIC DIGIT SEVEN;Nd;0;EN;;7;7;7;N;EASTERN ARABIC-INDIC DIGIT SEVEN;;;;
+06F8;EXTENDED ARABIC-INDIC DIGIT EIGHT;Nd;0;EN;;8;8;8;N;EASTERN ARABIC-INDIC DIGIT EIGHT;;;;
+06F9;EXTENDED ARABIC-INDIC DIGIT NINE;Nd;0;EN;;9;9;9;N;EASTERN ARABIC-INDIC DIGIT NINE;;;;
+06FA;ARABIC LETTER SHEEN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FB;ARABIC LETTER DAD WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FC;ARABIC LETTER GHAIN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FD;ARABIC SIGN SINDHI AMPERSAND;So;0;AL;;;;;N;;;;;
+06FE;ARABIC SIGN SINDHI POSTPOSITION MEN;So;0;AL;;;;;N;;;;;
+06FF;ARABIC LETTER HEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+0700;SYRIAC END OF PARAGRAPH;Po;0;AL;;;;;N;;;;;
+0701;SYRIAC SUPRALINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
+0702;SYRIAC SUBLINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
+0703;SYRIAC SUPRALINEAR COLON;Po;0;AL;;;;;N;;;;;
+0704;SYRIAC SUBLINEAR COLON;Po;0;AL;;;;;N;;;;;
+0705;SYRIAC HORIZONTAL COLON;Po;0;AL;;;;;N;;;;;
+0706;SYRIAC COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
+0707;SYRIAC COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
+0708;SYRIAC SUPRALINEAR COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
+0709;SYRIAC SUBLINEAR COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
+070A;SYRIAC CONTRACTION;Po;0;AL;;;;;N;;;;;
+070B;SYRIAC HARKLEAN OBELUS;Po;0;AL;;;;;N;;;;;
+070C;SYRIAC HARKLEAN METOBELUS;Po;0;AL;;;;;N;;;;;
+070D;SYRIAC HARKLEAN ASTERISCUS;Po;0;AL;;;;;N;;;;;
+070F;SYRIAC ABBREVIATION MARK;Cf;0;AL;;;;;N;;;;;
+0710;SYRIAC LETTER ALAPH;Lo;0;AL;;;;;N;;;;;
+0711;SYRIAC LETTER SUPERSCRIPT ALAPH;Mn;36;NSM;;;;;N;;;;;
+0712;SYRIAC LETTER BETH;Lo;0;AL;;;;;N;;;;;
+0713;SYRIAC LETTER GAMAL;Lo;0;AL;;;;;N;;;;;
+0714;SYRIAC LETTER GAMAL GARSHUNI;Lo;0;AL;;;;;N;;;;;
+0715;SYRIAC LETTER DALATH;Lo;0;AL;;;;;N;;;;;
+0716;SYRIAC LETTER DOTLESS DALATH RISH;Lo;0;AL;;;;;N;;;;;
+0717;SYRIAC LETTER HE;Lo;0;AL;;;;;N;;;;;
+0718;SYRIAC LETTER WAW;Lo;0;AL;;;;;N;;;;;
+0719;SYRIAC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
+071A;SYRIAC LETTER HETH;Lo;0;AL;;;;;N;;;;;
+071B;SYRIAC LETTER TETH;Lo;0;AL;;;;;N;;;;;
+071C;SYRIAC LETTER TETH GARSHUNI;Lo;0;AL;;;;;N;;;;;
+071D;SYRIAC LETTER YUDH;Lo;0;AL;;;;;N;;;;;
+071E;SYRIAC LETTER YUDH HE;Lo;0;AL;;;;;N;;;;;
+071F;SYRIAC LETTER KAPH;Lo;0;AL;;;;;N;;;;;
+0720;SYRIAC LETTER LAMADH;Lo;0;AL;;;;;N;;;;;
+0721;SYRIAC LETTER MIM;Lo;0;AL;;;;;N;;;;;
+0722;SYRIAC LETTER NUN;Lo;0;AL;;;;;N;;;;;
+0723;SYRIAC LETTER SEMKATH;Lo;0;AL;;;;;N;;;;;
+0724;SYRIAC LETTER FINAL SEMKATH;Lo;0;AL;;;;;N;;;;;
+0725;SYRIAC LETTER E;Lo;0;AL;;;;;N;;;;;
+0726;SYRIAC LETTER PE;Lo;0;AL;;;;;N;;;;;
+0727;SYRIAC LETTER REVERSED PE;Lo;0;AL;;;;;N;;;;;
+0728;SYRIAC LETTER SADHE;Lo;0;AL;;;;;N;;;;;
+0729;SYRIAC LETTER QAPH;Lo;0;AL;;;;;N;;;;;
+072A;SYRIAC LETTER RISH;Lo;0;AL;;;;;N;;;;;
+072B;SYRIAC LETTER SHIN;Lo;0;AL;;;;;N;;;;;
+072C;SYRIAC LETTER TAW;Lo;0;AL;;;;;N;;;;;
+072D;SYRIAC LETTER PERSIAN BHETH;Lo;0;AL;;;;;N;;;;;
+072E;SYRIAC LETTER PERSIAN GHAMAL;Lo;0;AL;;;;;N;;;;;
+072F;SYRIAC LETTER PERSIAN DHALATH;Lo;0;AL;;;;;N;;;;;
+0730;SYRIAC PTHAHA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0731;SYRIAC PTHAHA BELOW;Mn;220;NSM;;;;;N;;;;;
+0732;SYRIAC PTHAHA DOTTED;Mn;230;NSM;;;;;N;;;;;
+0733;SYRIAC ZQAPHA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0734;SYRIAC ZQAPHA BELOW;Mn;220;NSM;;;;;N;;;;;
+0735;SYRIAC ZQAPHA DOTTED;Mn;230;NSM;;;;;N;;;;;
+0736;SYRIAC RBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0737;SYRIAC RBASA BELOW;Mn;220;NSM;;;;;N;;;;;
+0738;SYRIAC DOTTED ZLAMA HORIZONTAL;Mn;220;NSM;;;;;N;;;;;
+0739;SYRIAC DOTTED ZLAMA ANGULAR;Mn;220;NSM;;;;;N;;;;;
+073A;SYRIAC HBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+073B;SYRIAC HBASA BELOW;Mn;220;NSM;;;;;N;;;;;
+073C;SYRIAC HBASA-ESASA DOTTED;Mn;220;NSM;;;;;N;;;;;
+073D;SYRIAC ESASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+073E;SYRIAC ESASA BELOW;Mn;220;NSM;;;;;N;;;;;
+073F;SYRIAC RWAHA;Mn;230;NSM;;;;;N;;;;;
+0740;SYRIAC FEMININE DOT;Mn;230;NSM;;;;;N;;;;;
+0741;SYRIAC QUSHSHAYA;Mn;230;NSM;;;;;N;;;;;
+0742;SYRIAC RUKKAKHA;Mn;220;NSM;;;;;N;;;;;
+0743;SYRIAC TWO VERTICAL DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+0744;SYRIAC TWO VERTICAL DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+0745;SYRIAC THREE DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+0746;SYRIAC THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+0747;SYRIAC OBLIQUE LINE ABOVE;Mn;230;NSM;;;;;N;;;;;
+0748;SYRIAC OBLIQUE LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+0749;SYRIAC MUSIC;Mn;230;NSM;;;;;N;;;;;
+074A;SYRIAC BARREKH;Mn;230;NSM;;;;;N;;;;;
+074D;SYRIAC LETTER SOGDIAN ZHAIN;Lo;0;AL;;;;;N;;;;;
+074E;SYRIAC LETTER SOGDIAN KHAPH;Lo;0;AL;;;;;N;;;;;
+074F;SYRIAC LETTER SOGDIAN FE;Lo;0;AL;;;;;N;;;;;
+0750;ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW;Lo;0;AL;;;;;N;;;;;
+0751;ARABIC LETTER BEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0752;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0753;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW AND TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0754;ARABIC LETTER BEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0755;ARABIC LETTER BEH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+0756;ARABIC LETTER BEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+0757;ARABIC LETTER HAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0758;ARABIC LETTER HAH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0759;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
+075A;ARABIC LETTER DAL WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+075B;ARABIC LETTER REH WITH STROKE;Lo;0;AL;;;;;N;;;;;
+075C;ARABIC LETTER SEEN WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+075D;ARABIC LETTER AIN WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+075E;ARABIC LETTER AIN WITH THREE DOTS POINTING DOWNWARDS ABOVE;Lo;0;AL;;;;;N;;;;;
+075F;ARABIC LETTER AIN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+0760;ARABIC LETTER FEH WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0761;ARABIC LETTER FEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0762;ARABIC LETTER KEHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0763;ARABIC LETTER KEHEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0764;ARABIC LETTER KEHEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0765;ARABIC LETTER MEEM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0766;ARABIC LETTER MEEM WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+0767;ARABIC LETTER NOON WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0768;ARABIC LETTER NOON WITH SMALL TAH;Lo;0;AL;;;;;N;;;;;
+0769;ARABIC LETTER NOON WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+076A;ARABIC LETTER LAM WITH BAR;Lo;0;AL;;;;;N;;;;;
+076B;ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+076C;ARABIC LETTER REH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+076D;ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+076E;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW;Lo;0;AL;;;;;N;;;;;
+076F;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0770;ARABIC LETTER SEEN WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0771;ARABIC LETTER REH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0772;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;;
+0773;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0774;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+0775;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0776;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+0777;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
+0778;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0779;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+077A;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+077B;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+077C;ARABIC LETTER HAH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
+077D;ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE;Lo;0;AL;;;;;N;;;;;
+077E;ARABIC LETTER SEEN WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+077F;ARABIC LETTER KAF WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0780;THAANA LETTER HAA;Lo;0;AL;;;;;N;;;;;
+0781;THAANA LETTER SHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0782;THAANA LETTER NOONU;Lo;0;AL;;;;;N;;;;;
+0783;THAANA LETTER RAA;Lo;0;AL;;;;;N;;;;;
+0784;THAANA LETTER BAA;Lo;0;AL;;;;;N;;;;;
+0785;THAANA LETTER LHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0786;THAANA LETTER KAAFU;Lo;0;AL;;;;;N;;;;;
+0787;THAANA LETTER ALIFU;Lo;0;AL;;;;;N;;;;;
+0788;THAANA LETTER VAAVU;Lo;0;AL;;;;;N;;;;;
+0789;THAANA LETTER MEEMU;Lo;0;AL;;;;;N;;;;;
+078A;THAANA LETTER FAAFU;Lo;0;AL;;;;;N;;;;;
+078B;THAANA LETTER DHAALU;Lo;0;AL;;;;;N;;;;;
+078C;THAANA LETTER THAA;Lo;0;AL;;;;;N;;;;;
+078D;THAANA LETTER LAAMU;Lo;0;AL;;;;;N;;;;;
+078E;THAANA LETTER GAAFU;Lo;0;AL;;;;;N;;;;;
+078F;THAANA LETTER GNAVIYANI;Lo;0;AL;;;;;N;;;;;
+0790;THAANA LETTER SEENU;Lo;0;AL;;;;;N;;;;;
+0791;THAANA LETTER DAVIYANI;Lo;0;AL;;;;;N;;;;;
+0792;THAANA LETTER ZAVIYANI;Lo;0;AL;;;;;N;;;;;
+0793;THAANA LETTER TAVIYANI;Lo;0;AL;;;;;N;;;;;
+0794;THAANA LETTER YAA;Lo;0;AL;;;;;N;;;;;
+0795;THAANA LETTER PAVIYANI;Lo;0;AL;;;;;N;;;;;
+0796;THAANA LETTER JAVIYANI;Lo;0;AL;;;;;N;;;;;
+0797;THAANA LETTER CHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0798;THAANA LETTER TTAA;Lo;0;AL;;;;;N;;;;;
+0799;THAANA LETTER HHAA;Lo;0;AL;;;;;N;;;;;
+079A;THAANA LETTER KHAA;Lo;0;AL;;;;;N;;;;;
+079B;THAANA LETTER THAALU;Lo;0;AL;;;;;N;;;;;
+079C;THAANA LETTER ZAA;Lo;0;AL;;;;;N;;;;;
+079D;THAANA LETTER SHEENU;Lo;0;AL;;;;;N;;;;;
+079E;THAANA LETTER SAADHU;Lo;0;AL;;;;;N;;;;;
+079F;THAANA LETTER DAADHU;Lo;0;AL;;;;;N;;;;;
+07A0;THAANA LETTER TO;Lo;0;AL;;;;;N;;;;;
+07A1;THAANA LETTER ZO;Lo;0;AL;;;;;N;;;;;
+07A2;THAANA LETTER AINU;Lo;0;AL;;;;;N;;;;;
+07A3;THAANA LETTER GHAINU;Lo;0;AL;;;;;N;;;;;
+07A4;THAANA LETTER QAAFU;Lo;0;AL;;;;;N;;;;;
+07A5;THAANA LETTER WAAVU;Lo;0;AL;;;;;N;;;;;
+07A6;THAANA ABAFILI;Mn;0;NSM;;;;;N;;;;;
+07A7;THAANA AABAAFILI;Mn;0;NSM;;;;;N;;;;;
+07A8;THAANA IBIFILI;Mn;0;NSM;;;;;N;;;;;
+07A9;THAANA EEBEEFILI;Mn;0;NSM;;;;;N;;;;;
+07AA;THAANA UBUFILI;Mn;0;NSM;;;;;N;;;;;
+07AB;THAANA OOBOOFILI;Mn;0;NSM;;;;;N;;;;;
+07AC;THAANA EBEFILI;Mn;0;NSM;;;;;N;;;;;
+07AD;THAANA EYBEYFILI;Mn;0;NSM;;;;;N;;;;;
+07AE;THAANA OBOFILI;Mn;0;NSM;;;;;N;;;;;
+07AF;THAANA OABOAFILI;Mn;0;NSM;;;;;N;;;;;
+07B0;THAANA SUKUN;Mn;0;NSM;;;;;N;;;;;
+07B1;THAANA LETTER NAA;Lo;0;AL;;;;;N;;;;;
+07C0;NKO DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
+07C1;NKO DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
+07C2;NKO DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
+07C3;NKO DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
+07C4;NKO DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
+07C5;NKO DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
+07C6;NKO DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
+07C7;NKO DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
+07C8;NKO DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
+07C9;NKO DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
+07CA;NKO LETTER A;Lo;0;R;;;;;N;;;;;
+07CB;NKO LETTER EE;Lo;0;R;;;;;N;;;;;
+07CC;NKO LETTER I;Lo;0;R;;;;;N;;;;;
+07CD;NKO LETTER E;Lo;0;R;;;;;N;;;;;
+07CE;NKO LETTER U;Lo;0;R;;;;;N;;;;;
+07CF;NKO LETTER OO;Lo;0;R;;;;;N;;;;;
+07D0;NKO LETTER O;Lo;0;R;;;;;N;;;;;
+07D1;NKO LETTER DAGBASINNA;Lo;0;R;;;;;N;;;;;
+07D2;NKO LETTER N;Lo;0;R;;;;;N;;;;;
+07D3;NKO LETTER BA;Lo;0;R;;;;;N;;;;;
+07D4;NKO LETTER PA;Lo;0;R;;;;;N;;;;;
+07D5;NKO LETTER TA;Lo;0;R;;;;;N;;;;;
+07D6;NKO LETTER JA;Lo;0;R;;;;;N;;;;;
+07D7;NKO LETTER CHA;Lo;0;R;;;;;N;;;;;
+07D8;NKO LETTER DA;Lo;0;R;;;;;N;;;;;
+07D9;NKO LETTER RA;Lo;0;R;;;;;N;;;;;
+07DA;NKO LETTER RRA;Lo;0;R;;;;;N;;;;;
+07DB;NKO LETTER SA;Lo;0;R;;;;;N;;;;;
+07DC;NKO LETTER GBA;Lo;0;R;;;;;N;;;;;
+07DD;NKO LETTER FA;Lo;0;R;;;;;N;;;;;
+07DE;NKO LETTER KA;Lo;0;R;;;;;N;;;;;
+07DF;NKO LETTER LA;Lo;0;R;;;;;N;;;;;
+07E0;NKO LETTER NA WOLOSO;Lo;0;R;;;;;N;;;;;
+07E1;NKO LETTER MA;Lo;0;R;;;;;N;;;;;
+07E2;NKO LETTER NYA;Lo;0;R;;;;;N;;;;;
+07E3;NKO LETTER NA;Lo;0;R;;;;;N;;;;;
+07E4;NKO LETTER HA;Lo;0;R;;;;;N;;;;;
+07E5;NKO LETTER WA;Lo;0;R;;;;;N;;;;;
+07E6;NKO LETTER YA;Lo;0;R;;;;;N;;;;;
+07E7;NKO LETTER NYA WOLOSO;Lo;0;R;;;;;N;;;;;
+07E8;NKO LETTER JONA JA;Lo;0;R;;;;;N;;;;;
+07E9;NKO LETTER JONA CHA;Lo;0;R;;;;;N;;;;;
+07EA;NKO LETTER JONA RA;Lo;0;R;;;;;N;;;;;
+07EB;NKO COMBINING SHORT HIGH TONE;Mn;230;NSM;;;;;N;;;;;
+07EC;NKO COMBINING SHORT LOW TONE;Mn;230;NSM;;;;;N;;;;;
+07ED;NKO COMBINING SHORT RISING TONE;Mn;230;NSM;;;;;N;;;;;
+07EE;NKO COMBINING LONG DESCENDING TONE;Mn;230;NSM;;;;;N;;;;;
+07EF;NKO COMBINING LONG HIGH TONE;Mn;230;NSM;;;;;N;;;;;
+07F0;NKO COMBINING LONG LOW TONE;Mn;230;NSM;;;;;N;;;;;
+07F1;NKO COMBINING LONG RISING TONE;Mn;230;NSM;;;;;N;;;;;
+07F2;NKO COMBINING NASALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
+07F3;NKO COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+07F4;NKO HIGH TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
+07F5;NKO LOW TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
+07F6;NKO SYMBOL OO DENNEN;So;0;ON;;;;;N;;;;;
+07F7;NKO SYMBOL GBAKURUNEN;Po;0;ON;;;;;N;;;;;
+07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
+07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
+07FD;NKO DANTAYALAN;Mn;220;NSM;;;;;N;;;;;
+07FE;NKO DOROME SIGN;Sc;0;R;;;;;N;;;;;
+07FF;NKO TAMAN SIGN;Sc;0;R;;;;;N;;;;;
+0800;SAMARITAN LETTER ALAF;Lo;0;R;;;;;N;;;;;
+0801;SAMARITAN LETTER BIT;Lo;0;R;;;;;N;;;;;
+0802;SAMARITAN LETTER GAMAN;Lo;0;R;;;;;N;;;;;
+0803;SAMARITAN LETTER DALAT;Lo;0;R;;;;;N;;;;;
+0804;SAMARITAN LETTER IY;Lo;0;R;;;;;N;;;;;
+0805;SAMARITAN LETTER BAA;Lo;0;R;;;;;N;;;;;
+0806;SAMARITAN LETTER ZEN;Lo;0;R;;;;;N;;;;;
+0807;SAMARITAN LETTER IT;Lo;0;R;;;;;N;;;;;
+0808;SAMARITAN LETTER TIT;Lo;0;R;;;;;N;;;;;
+0809;SAMARITAN LETTER YUT;Lo;0;R;;;;;N;;;;;
+080A;SAMARITAN LETTER KAAF;Lo;0;R;;;;;N;;;;;
+080B;SAMARITAN LETTER LABAT;Lo;0;R;;;;;N;;;;;
+080C;SAMARITAN LETTER MIM;Lo;0;R;;;;;N;;;;;
+080D;SAMARITAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+080E;SAMARITAN LETTER SINGAAT;Lo;0;R;;;;;N;;;;;
+080F;SAMARITAN LETTER IN;Lo;0;R;;;;;N;;;;;
+0810;SAMARITAN LETTER FI;Lo;0;R;;;;;N;;;;;
+0811;SAMARITAN LETTER TSAADIY;Lo;0;R;;;;;N;;;;;
+0812;SAMARITAN LETTER QUF;Lo;0;R;;;;;N;;;;;
+0813;SAMARITAN LETTER RISH;Lo;0;R;;;;;N;;;;;
+0814;SAMARITAN LETTER SHAN;Lo;0;R;;;;;N;;;;;
+0815;SAMARITAN LETTER TAAF;Lo;0;R;;;;;N;;;;;
+0816;SAMARITAN MARK IN;Mn;230;NSM;;;;;N;;;;;
+0817;SAMARITAN MARK IN-ALAF;Mn;230;NSM;;;;;N;;;;;
+0818;SAMARITAN MARK OCCLUSION;Mn;230;NSM;;;;;N;;;;;
+0819;SAMARITAN MARK DAGESH;Mn;230;NSM;;;;;N;;;;;
+081A;SAMARITAN MODIFIER LETTER EPENTHETIC YUT;Lm;0;R;;;;;N;;;;;
+081B;SAMARITAN MARK EPENTHETIC YUT;Mn;230;NSM;;;;;N;;;;;
+081C;SAMARITAN VOWEL SIGN LONG E;Mn;230;NSM;;;;;N;;;;;
+081D;SAMARITAN VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;;
+081E;SAMARITAN VOWEL SIGN OVERLONG AA;Mn;230;NSM;;;;;N;;;;;
+081F;SAMARITAN VOWEL SIGN LONG AA;Mn;230;NSM;;;;;N;;;;;
+0820;SAMARITAN VOWEL SIGN AA;Mn;230;NSM;;;;;N;;;;;
+0821;SAMARITAN VOWEL SIGN OVERLONG A;Mn;230;NSM;;;;;N;;;;;
+0822;SAMARITAN VOWEL SIGN LONG A;Mn;230;NSM;;;;;N;;;;;
+0823;SAMARITAN VOWEL SIGN A;Mn;230;NSM;;;;;N;;;;;
+0824;SAMARITAN MODIFIER LETTER SHORT A;Lm;0;R;;;;;N;;;;;
+0825;SAMARITAN VOWEL SIGN SHORT A;Mn;230;NSM;;;;;N;;;;;
+0826;SAMARITAN VOWEL SIGN LONG U;Mn;230;NSM;;;;;N;;;;;
+0827;SAMARITAN VOWEL SIGN U;Mn;230;NSM;;;;;N;;;;;
+0828;SAMARITAN MODIFIER LETTER I;Lm;0;R;;;;;N;;;;;
+0829;SAMARITAN VOWEL SIGN LONG I;Mn;230;NSM;;;;;N;;;;;
+082A;SAMARITAN VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
+082B;SAMARITAN VOWEL SIGN O;Mn;230;NSM;;;;;N;;;;;
+082C;SAMARITAN VOWEL SIGN SUKUN;Mn;230;NSM;;;;;N;;;;;
+082D;SAMARITAN MARK NEQUDAA;Mn;230;NSM;;;;;N;;;;;
+0830;SAMARITAN PUNCTUATION NEQUDAA;Po;0;R;;;;;N;;;;;
+0831;SAMARITAN PUNCTUATION AFSAAQ;Po;0;R;;;;;N;;;;;
+0832;SAMARITAN PUNCTUATION ANGED;Po;0;R;;;;;N;;;;;
+0833;SAMARITAN PUNCTUATION BAU;Po;0;R;;;;;N;;;;;
+0834;SAMARITAN PUNCTUATION ATMAAU;Po;0;R;;;;;N;;;;;
+0835;SAMARITAN PUNCTUATION SHIYYAALAA;Po;0;R;;;;;N;;;;;
+0836;SAMARITAN ABBREVIATION MARK;Po;0;R;;;;;N;;;;;
+0837;SAMARITAN PUNCTUATION MELODIC QITSA;Po;0;R;;;;;N;;;;;
+0838;SAMARITAN PUNCTUATION ZIQAA;Po;0;R;;;;;N;;;;;
+0839;SAMARITAN PUNCTUATION QITSA;Po;0;R;;;;;N;;;;;
+083A;SAMARITAN PUNCTUATION ZAEF;Po;0;R;;;;;N;;;;;
+083B;SAMARITAN PUNCTUATION TURU;Po;0;R;;;;;N;;;;;
+083C;SAMARITAN PUNCTUATION ARKAANU;Po;0;R;;;;;N;;;;;
+083D;SAMARITAN PUNCTUATION SOF MASHFAAT;Po;0;R;;;;;N;;;;;
+083E;SAMARITAN PUNCTUATION ANNAAU;Po;0;R;;;;;N;;;;;
+0840;MANDAIC LETTER HALQA;Lo;0;R;;;;;N;;;;;
+0841;MANDAIC LETTER AB;Lo;0;R;;;;;N;;;;;
+0842;MANDAIC LETTER AG;Lo;0;R;;;;;N;;;;;
+0843;MANDAIC LETTER AD;Lo;0;R;;;;;N;;;;;
+0844;MANDAIC LETTER AH;Lo;0;R;;;;;N;;;;;
+0845;MANDAIC LETTER USHENNA;Lo;0;R;;;;;N;;;;;
+0846;MANDAIC LETTER AZ;Lo;0;R;;;;;N;;;;;
+0847;MANDAIC LETTER IT;Lo;0;R;;;;;N;;;;;
+0848;MANDAIC LETTER ATT;Lo;0;R;;;;;N;;;;;
+0849;MANDAIC LETTER AKSA;Lo;0;R;;;;;N;;;;;
+084A;MANDAIC LETTER AK;Lo;0;R;;;;;N;;;;;
+084B;MANDAIC LETTER AL;Lo;0;R;;;;;N;;;;;
+084C;MANDAIC LETTER AM;Lo;0;R;;;;;N;;;;;
+084D;MANDAIC LETTER AN;Lo;0;R;;;;;N;;;;;
+084E;MANDAIC LETTER AS;Lo;0;R;;;;;N;;;;;
+084F;MANDAIC LETTER IN;Lo;0;R;;;;;N;;;;;
+0850;MANDAIC LETTER AP;Lo;0;R;;;;;N;;;;;
+0851;MANDAIC LETTER ASZ;Lo;0;R;;;;;N;;;;;
+0852;MANDAIC LETTER AQ;Lo;0;R;;;;;N;;;;;
+0853;MANDAIC LETTER AR;Lo;0;R;;;;;N;;;;;
+0854;MANDAIC LETTER ASH;Lo;0;R;;;;;N;;;;;
+0855;MANDAIC LETTER AT;Lo;0;R;;;;;N;;;;;
+0856;MANDAIC LETTER DUSHENNA;Lo;0;R;;;;;N;;;;;
+0857;MANDAIC LETTER KAD;Lo;0;R;;;;;N;;;;;
+0858;MANDAIC LETTER AIN;Lo;0;R;;;;;N;;;;;
+0859;MANDAIC AFFRICATION MARK;Mn;220;NSM;;;;;N;;;;;
+085A;MANDAIC VOCALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
+085B;MANDAIC GEMINATION MARK;Mn;220;NSM;;;;;N;;;;;
+085E;MANDAIC PUNCTUATION;Po;0;R;;;;;N;;;;;
+0860;SYRIAC LETTER MALAYALAM NGA;Lo;0;AL;;;;;N;;;;;
+0861;SYRIAC LETTER MALAYALAM JA;Lo;0;AL;;;;;N;;;;;
+0862;SYRIAC LETTER MALAYALAM NYA;Lo;0;AL;;;;;N;;;;;
+0863;SYRIAC LETTER MALAYALAM TTA;Lo;0;AL;;;;;N;;;;;
+0864;SYRIAC LETTER MALAYALAM NNA;Lo;0;AL;;;;;N;;;;;
+0865;SYRIAC LETTER MALAYALAM NNNA;Lo;0;AL;;;;;N;;;;;
+0866;SYRIAC LETTER MALAYALAM BHA;Lo;0;AL;;;;;N;;;;;
+0867;SYRIAC LETTER MALAYALAM RA;Lo;0;AL;;;;;N;;;;;
+0868;SYRIAC LETTER MALAYALAM LLA;Lo;0;AL;;;;;N;;;;;
+0869;SYRIAC LETTER MALAYALAM LLLA;Lo;0;AL;;;;;N;;;;;
+086A;SYRIAC LETTER MALAYALAM SSA;Lo;0;AL;;;;;N;;;;;
+08A0;ARABIC LETTER BEH WITH SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+08A1;ARABIC LETTER BEH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+08A2;ARABIC LETTER JEEM WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A3;ARABIC LETTER TAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A4;ARABIC LETTER FEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A5;ARABIC LETTER QAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+08A6;ARABIC LETTER LAM WITH DOUBLE BAR;Lo;0;AL;;;;;N;;;;;
+08A7;ARABIC LETTER MEEM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A8;ARABIC LETTER YEH WITH TWO DOTS BELOW AND HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+08A9;ARABIC LETTER YEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+08AA;ARABIC LETTER REH WITH LOOP;Lo;0;AL;;;;;N;;;;;
+08AB;ARABIC LETTER WAW WITH DOT WITHIN;Lo;0;AL;;;;;N;;;;;
+08AC;ARABIC LETTER ROHINGYA YEH;Lo;0;AL;;;;;N;;;;;
+08AD;ARABIC LETTER LOW ALEF;Lo;0;AL;;;;;N;;;;;
+08AE;ARABIC LETTER DAL WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08AF;ARABIC LETTER SAD WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08B0;ARABIC LETTER GAF WITH INVERTED STROKE;Lo;0;AL;;;;;N;;;;;
+08B1;ARABIC LETTER STRAIGHT WAW;Lo;0;AL;;;;;N;;;;;
+08B2;ARABIC LETTER ZAIN WITH INVERTED V ABOVE;Lo;0;AL;;;;;N;;;;;
+08B3;ARABIC LETTER AIN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08B4;ARABIC LETTER KAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+08B6;ARABIC LETTER BEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;;
+08B7;ARABIC LETTER PEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;;
+08B8;ARABIC LETTER TEH WITH SMALL TEH ABOVE;Lo;0;AL;;;;;N;;;;;
+08B9;ARABIC LETTER REH WITH SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;;
+08BA;ARABIC LETTER YEH WITH TWO DOTS BELOW AND SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;;
+08BB;ARABIC LETTER AFRICAN FEH;Lo;0;AL;;;;;N;;;;;
+08BC;ARABIC LETTER AFRICAN QAF;Lo;0;AL;;;;;N;;;;;
+08BD;ARABIC LETTER AFRICAN NOON;Lo;0;AL;;;;;N;;;;;
+08BE;ARABIC LETTER PEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+08BF;ARABIC LETTER TEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+08C0;ARABIC LETTER TTEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+08C1;ARABIC LETTER TCHEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+08C2;ARABIC LETTER KEHEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+08C3;ARABIC LETTER GHAIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08C4;ARABIC LETTER AFRICAN QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08C5;ARABIC LETTER JEEM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08C6;ARABIC LETTER JEEM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08C7;ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;;
+08D3;ARABIC SMALL LOW WAW;Mn;220;NSM;;;;;N;;;;;
+08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;;
+08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;;
+08D6;ARABIC SMALL HIGH AIN;Mn;230;NSM;;;;;N;;;;;
+08D7;ARABIC SMALL HIGH QAF;Mn;230;NSM;;;;;N;;;;;
+08D8;ARABIC SMALL HIGH NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;;
+08D9;ARABIC SMALL LOW NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;;
+08DA;ARABIC SMALL HIGH WORD ATH-THALATHA;Mn;230;NSM;;;;;N;;;;;
+08DB;ARABIC SMALL HIGH WORD AS-SAJDA;Mn;230;NSM;;;;;N;;;;;
+08DC;ARABIC SMALL HIGH WORD AN-NISF;Mn;230;NSM;;;;;N;;;;;
+08DD;ARABIC SMALL HIGH WORD SAKTA;Mn;230;NSM;;;;;N;;;;;
+08DE;ARABIC SMALL HIGH WORD QIF;Mn;230;NSM;;;;;N;;;;;
+08DF;ARABIC SMALL HIGH WORD WAQFA;Mn;230;NSM;;;;;N;;;;;
+08E0;ARABIC SMALL HIGH FOOTNOTE MARKER;Mn;230;NSM;;;;;N;;;;;
+08E1;ARABIC SMALL HIGH SIGN SAFHA;Mn;230;NSM;;;;;N;;;;;
+08E2;ARABIC DISPUTED END OF AYAH;Cf;0;AN;;;;;N;;;;;
+08E3;ARABIC TURNED DAMMA BELOW;Mn;220;NSM;;;;;N;;;;;
+08E4;ARABIC CURLY FATHA;Mn;230;NSM;;;;;N;;;;;
+08E5;ARABIC CURLY DAMMA;Mn;230;NSM;;;;;N;;;;;
+08E6;ARABIC CURLY KASRA;Mn;220;NSM;;;;;N;;;;;
+08E7;ARABIC CURLY FATHATAN;Mn;230;NSM;;;;;N;;;;;
+08E8;ARABIC CURLY DAMMATAN;Mn;230;NSM;;;;;N;;;;;
+08E9;ARABIC CURLY KASRATAN;Mn;220;NSM;;;;;N;;;;;
+08EA;ARABIC TONE ONE DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+08EB;ARABIC TONE TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+08EC;ARABIC TONE LOOP ABOVE;Mn;230;NSM;;;;;N;;;;;
+08ED;ARABIC TONE ONE DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+08EE;ARABIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+08EF;ARABIC TONE LOOP BELOW;Mn;220;NSM;;;;;N;;;;;
+08F0;ARABIC OPEN FATHATAN;Mn;27;NSM;;;;;N;;;;;
+08F1;ARABIC OPEN DAMMATAN;Mn;28;NSM;;;;;N;;;;;
+08F2;ARABIC OPEN KASRATAN;Mn;29;NSM;;;;;N;;;;;
+08F3;ARABIC SMALL HIGH WAW;Mn;230;NSM;;;;;N;;;;;
+08F4;ARABIC FATHA WITH RING;Mn;230;NSM;;;;;N;;;;;
+08F5;ARABIC FATHA WITH DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+08F6;ARABIC KASRA WITH DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+08F7;ARABIC LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+08F8;ARABIC RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+08F9;ARABIC LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+08FA;ARABIC RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+08FB;ARABIC DOUBLE RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+08FC;ARABIC DOUBLE RIGHT ARROWHEAD ABOVE WITH DOT;Mn;230;NSM;;;;;N;;;;;
+08FD;ARABIC RIGHT ARROWHEAD ABOVE WITH DOT;Mn;230;NSM;;;;;N;;;;;
+08FE;ARABIC DAMMA WITH DOT;Mn;230;NSM;;;;;N;;;;;
+08FF;ARABIC MARK SIDEWAYS NOON GHUNNA;Mn;230;NSM;;;;;N;;;;;
+0900;DEVANAGARI SIGN INVERTED CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0901;DEVANAGARI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0902;DEVANAGARI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0903;DEVANAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0904;DEVANAGARI LETTER SHORT A;Lo;0;L;;;;;N;;;;;
+0905;DEVANAGARI LETTER A;Lo;0;L;;;;;N;;;;;
+0906;DEVANAGARI LETTER AA;Lo;0;L;;;;;N;;;;;
+0907;DEVANAGARI LETTER I;Lo;0;L;;;;;N;;;;;
+0908;DEVANAGARI LETTER II;Lo;0;L;;;;;N;;;;;
+0909;DEVANAGARI LETTER U;Lo;0;L;;;;;N;;;;;
+090A;DEVANAGARI LETTER UU;Lo;0;L;;;;;N;;;;;
+090B;DEVANAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+090C;DEVANAGARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+090D;DEVANAGARI LETTER CANDRA E;Lo;0;L;;;;;N;;;;;
+090E;DEVANAGARI LETTER SHORT E;Lo;0;L;;;;;N;;;;;
+090F;DEVANAGARI LETTER E;Lo;0;L;;;;;N;;;;;
+0910;DEVANAGARI LETTER AI;Lo;0;L;;;;;N;;;;;
+0911;DEVANAGARI LETTER CANDRA O;Lo;0;L;;;;;N;;;;;
+0912;DEVANAGARI LETTER SHORT O;Lo;0;L;;;;;N;;;;;
+0913;DEVANAGARI LETTER O;Lo;0;L;;;;;N;;;;;
+0914;DEVANAGARI LETTER AU;Lo;0;L;;;;;N;;;;;
+0915;DEVANAGARI LETTER KA;Lo;0;L;;;;;N;;;;;
+0916;DEVANAGARI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0917;DEVANAGARI LETTER GA;Lo;0;L;;;;;N;;;;;
+0918;DEVANAGARI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0919;DEVANAGARI LETTER NGA;Lo;0;L;;;;;N;;;;;
+091A;DEVANAGARI LETTER CA;Lo;0;L;;;;;N;;;;;
+091B;DEVANAGARI LETTER CHA;Lo;0;L;;;;;N;;;;;
+091C;DEVANAGARI LETTER JA;Lo;0;L;;;;;N;;;;;
+091D;DEVANAGARI LETTER JHA;Lo;0;L;;;;;N;;;;;
+091E;DEVANAGARI LETTER NYA;Lo;0;L;;;;;N;;;;;
+091F;DEVANAGARI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0920;DEVANAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0921;DEVANAGARI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0922;DEVANAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0923;DEVANAGARI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0924;DEVANAGARI LETTER TA;Lo;0;L;;;;;N;;;;;
+0925;DEVANAGARI LETTER THA;Lo;0;L;;;;;N;;;;;
+0926;DEVANAGARI LETTER DA;Lo;0;L;;;;;N;;;;;
+0927;DEVANAGARI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0928;DEVANAGARI LETTER NA;Lo;0;L;;;;;N;;;;;
+0929;DEVANAGARI LETTER NNNA;Lo;0;L;0928 093C;;;;N;;;;;
+092A;DEVANAGARI LETTER PA;Lo;0;L;;;;;N;;;;;
+092B;DEVANAGARI LETTER PHA;Lo;0;L;;;;;N;;;;;
+092C;DEVANAGARI LETTER BA;Lo;0;L;;;;;N;;;;;
+092D;DEVANAGARI LETTER BHA;Lo;0;L;;;;;N;;;;;
+092E;DEVANAGARI LETTER MA;Lo;0;L;;;;;N;;;;;
+092F;DEVANAGARI LETTER YA;Lo;0;L;;;;;N;;;;;
+0930;DEVANAGARI LETTER RA;Lo;0;L;;;;;N;;;;;
+0931;DEVANAGARI LETTER RRA;Lo;0;L;0930 093C;;;;N;;;;;
+0932;DEVANAGARI LETTER LA;Lo;0;L;;;;;N;;;;;
+0933;DEVANAGARI LETTER LLA;Lo;0;L;;;;;N;;;;;
+0934;DEVANAGARI LETTER LLLA;Lo;0;L;0933 093C;;;;N;;;;;
+0935;DEVANAGARI LETTER VA;Lo;0;L;;;;;N;;;;;
+0936;DEVANAGARI LETTER SHA;Lo;0;L;;;;;N;;;;;
+0937;DEVANAGARI LETTER SSA;Lo;0;L;;;;;N;;;;;
+0938;DEVANAGARI LETTER SA;Lo;0;L;;;;;N;;;;;
+0939;DEVANAGARI LETTER HA;Lo;0;L;;;;;N;;;;;
+093A;DEVANAGARI VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+093B;DEVANAGARI VOWEL SIGN OOE;Mc;0;L;;;;;N;;;;;
+093C;DEVANAGARI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+093D;DEVANAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+093E;DEVANAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+093F;DEVANAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0940;DEVANAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0941;DEVANAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0942;DEVANAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0943;DEVANAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0944;DEVANAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0945;DEVANAGARI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+0946;DEVANAGARI VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
+0947;DEVANAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0948;DEVANAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0949;DEVANAGARI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
+094A;DEVANAGARI VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
+094B;DEVANAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+094C;DEVANAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+094D;DEVANAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+094E;DEVANAGARI VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;;
+094F;DEVANAGARI VOWEL SIGN AW;Mc;0;L;;;;;N;;;;;
+0950;DEVANAGARI OM;Lo;0;L;;;;;N;;;;;
+0951;DEVANAGARI STRESS SIGN UDATTA;Mn;230;NSM;;;;;N;;;;;
+0952;DEVANAGARI STRESS SIGN ANUDATTA;Mn;220;NSM;;;;;N;;;;;
+0953;DEVANAGARI GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0954;DEVANAGARI ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0955;DEVANAGARI VOWEL SIGN CANDRA LONG E;Mn;0;NSM;;;;;N;;;;;
+0956;DEVANAGARI VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+0957;DEVANAGARI VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;;
+0958;DEVANAGARI LETTER QA;Lo;0;L;0915 093C;;;;N;;;;;
+0959;DEVANAGARI LETTER KHHA;Lo;0;L;0916 093C;;;;N;;;;;
+095A;DEVANAGARI LETTER GHHA;Lo;0;L;0917 093C;;;;N;;;;;
+095B;DEVANAGARI LETTER ZA;Lo;0;L;091C 093C;;;;N;;;;;
+095C;DEVANAGARI LETTER DDDHA;Lo;0;L;0921 093C;;;;N;;;;;
+095D;DEVANAGARI LETTER RHA;Lo;0;L;0922 093C;;;;N;;;;;
+095E;DEVANAGARI LETTER FA;Lo;0;L;092B 093C;;;;N;;;;;
+095F;DEVANAGARI LETTER YYA;Lo;0;L;092F 093C;;;;N;;;;;
+0960;DEVANAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0961;DEVANAGARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0962;DEVANAGARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0963;DEVANAGARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0964;DEVANAGARI DANDA;Po;0;L;;;;;N;;;;;
+0965;DEVANAGARI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+0966;DEVANAGARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0967;DEVANAGARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0968;DEVANAGARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0969;DEVANAGARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+096A;DEVANAGARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+096B;DEVANAGARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+096C;DEVANAGARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+096D;DEVANAGARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+096E;DEVANAGARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+096F;DEVANAGARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0970;DEVANAGARI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+0971;DEVANAGARI SIGN HIGH SPACING DOT;Lm;0;L;;;;;N;;;;;
+0972;DEVANAGARI LETTER CANDRA A;Lo;0;L;;;;;N;;;;;
+0973;DEVANAGARI LETTER OE;Lo;0;L;;;;;N;;;;;
+0974;DEVANAGARI LETTER OOE;Lo;0;L;;;;;N;;;;;
+0975;DEVANAGARI LETTER AW;Lo;0;L;;;;;N;;;;;
+0976;DEVANAGARI LETTER UE;Lo;0;L;;;;;N;;;;;
+0977;DEVANAGARI LETTER UUE;Lo;0;L;;;;;N;;;;;
+0978;DEVANAGARI LETTER MARWARI DDA;Lo;0;L;;;;;N;;;;;
+0979;DEVANAGARI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+097A;DEVANAGARI LETTER HEAVY YA;Lo;0;L;;;;;N;;;;;
+097B;DEVANAGARI LETTER GGA;Lo;0;L;;;;;N;;;;;
+097C;DEVANAGARI LETTER JJA;Lo;0;L;;;;;N;;;;;
+097D;DEVANAGARI LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+097E;DEVANAGARI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+097F;DEVANAGARI LETTER BBA;Lo;0;L;;;;;N;;;;;
+0980;BENGALI ANJI;Lo;0;L;;;;;N;;;;;
+0981;BENGALI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0982;BENGALI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0983;BENGALI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0985;BENGALI LETTER A;Lo;0;L;;;;;N;;;;;
+0986;BENGALI LETTER AA;Lo;0;L;;;;;N;;;;;
+0987;BENGALI LETTER I;Lo;0;L;;;;;N;;;;;
+0988;BENGALI LETTER II;Lo;0;L;;;;;N;;;;;
+0989;BENGALI LETTER U;Lo;0;L;;;;;N;;;;;
+098A;BENGALI LETTER UU;Lo;0;L;;;;;N;;;;;
+098B;BENGALI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+098C;BENGALI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+098F;BENGALI LETTER E;Lo;0;L;;;;;N;;;;;
+0990;BENGALI LETTER AI;Lo;0;L;;;;;N;;;;;
+0993;BENGALI LETTER O;Lo;0;L;;;;;N;;;;;
+0994;BENGALI LETTER AU;Lo;0;L;;;;;N;;;;;
+0995;BENGALI LETTER KA;Lo;0;L;;;;;N;;;;;
+0996;BENGALI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0997;BENGALI LETTER GA;Lo;0;L;;;;;N;;;;;
+0998;BENGALI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0999;BENGALI LETTER NGA;Lo;0;L;;;;;N;;;;;
+099A;BENGALI LETTER CA;Lo;0;L;;;;;N;;;;;
+099B;BENGALI LETTER CHA;Lo;0;L;;;;;N;;;;;
+099C;BENGALI LETTER JA;Lo;0;L;;;;;N;;;;;
+099D;BENGALI LETTER JHA;Lo;0;L;;;;;N;;;;;
+099E;BENGALI LETTER NYA;Lo;0;L;;;;;N;;;;;
+099F;BENGALI LETTER TTA;Lo;0;L;;;;;N;;;;;
+09A0;BENGALI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+09A1;BENGALI LETTER DDA;Lo;0;L;;;;;N;;;;;
+09A2;BENGALI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+09A3;BENGALI LETTER NNA;Lo;0;L;;;;;N;;;;;
+09A4;BENGALI LETTER TA;Lo;0;L;;;;;N;;;;;
+09A5;BENGALI LETTER THA;Lo;0;L;;;;;N;;;;;
+09A6;BENGALI LETTER DA;Lo;0;L;;;;;N;;;;;
+09A7;BENGALI LETTER DHA;Lo;0;L;;;;;N;;;;;
+09A8;BENGALI LETTER NA;Lo;0;L;;;;;N;;;;;
+09AA;BENGALI LETTER PA;Lo;0;L;;;;;N;;;;;
+09AB;BENGALI LETTER PHA;Lo;0;L;;;;;N;;;;;
+09AC;BENGALI LETTER BA;Lo;0;L;;;;;N;;;;;
+09AD;BENGALI LETTER BHA;Lo;0;L;;;;;N;;;;;
+09AE;BENGALI LETTER MA;Lo;0;L;;;;;N;;;;;
+09AF;BENGALI LETTER YA;Lo;0;L;;;;;N;;;;;
+09B0;BENGALI LETTER RA;Lo;0;L;;;;;N;;;;;
+09B2;BENGALI LETTER LA;Lo;0;L;;;;;N;;;;;
+09B6;BENGALI LETTER SHA;Lo;0;L;;;;;N;;;;;
+09B7;BENGALI LETTER SSA;Lo;0;L;;;;;N;;;;;
+09B8;BENGALI LETTER SA;Lo;0;L;;;;;N;;;;;
+09B9;BENGALI LETTER HA;Lo;0;L;;;;;N;;;;;
+09BC;BENGALI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+09BD;BENGALI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+09BE;BENGALI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+09BF;BENGALI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+09C0;BENGALI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+09C1;BENGALI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+09C2;BENGALI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+09C3;BENGALI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+09C4;BENGALI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+09C7;BENGALI VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+09C8;BENGALI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+09CB;BENGALI VOWEL SIGN O;Mc;0;L;09C7 09BE;;;;N;;;;;
+09CC;BENGALI VOWEL SIGN AU;Mc;0;L;09C7 09D7;;;;N;;;;;
+09CD;BENGALI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+09CE;BENGALI LETTER KHANDA TA;Lo;0;L;;;;;N;;;;;
+09D7;BENGALI AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+09DC;BENGALI LETTER RRA;Lo;0;L;09A1 09BC;;;;N;;;;;
+09DD;BENGALI LETTER RHA;Lo;0;L;09A2 09BC;;;;N;;;;;
+09DF;BENGALI LETTER YYA;Lo;0;L;09AF 09BC;;;;N;;;;;
+09E0;BENGALI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+09E1;BENGALI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+09E2;BENGALI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+09E3;BENGALI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+09E6;BENGALI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+09E7;BENGALI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+09E8;BENGALI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+09E9;BENGALI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+09EA;BENGALI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+09EB;BENGALI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+09EC;BENGALI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+09ED;BENGALI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+09EE;BENGALI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+09EF;BENGALI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;;;;
+09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;;;;
+09F2;BENGALI RUPEE MARK;Sc;0;ET;;;;;N;;;;;
+09F3;BENGALI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1/16;N;;;;;
+09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;1/8;N;;;;;
+09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3/16;N;;;;;
+09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;1/4;N;;;;;
+09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;3/4;N;;;;;
+09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
+09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
+09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
+09FC;BENGALI LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+09FD;BENGALI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+09FE;BENGALI SANDHI MARK;Mn;230;NSM;;;;;N;;;;;
+0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
+0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
+0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0A05;GURMUKHI LETTER A;Lo;0;L;;;;;N;;;;;
+0A06;GURMUKHI LETTER AA;Lo;0;L;;;;;N;;;;;
+0A07;GURMUKHI LETTER I;Lo;0;L;;;;;N;;;;;
+0A08;GURMUKHI LETTER II;Lo;0;L;;;;;N;;;;;
+0A09;GURMUKHI LETTER U;Lo;0;L;;;;;N;;;;;
+0A0A;GURMUKHI LETTER UU;Lo;0;L;;;;;N;;;;;
+0A0F;GURMUKHI LETTER EE;Lo;0;L;;;;;N;;;;;
+0A10;GURMUKHI LETTER AI;Lo;0;L;;;;;N;;;;;
+0A13;GURMUKHI LETTER OO;Lo;0;L;;;;;N;;;;;
+0A14;GURMUKHI LETTER AU;Lo;0;L;;;;;N;;;;;
+0A15;GURMUKHI LETTER KA;Lo;0;L;;;;;N;;;;;
+0A16;GURMUKHI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0A17;GURMUKHI LETTER GA;Lo;0;L;;;;;N;;;;;
+0A18;GURMUKHI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0A19;GURMUKHI LETTER NGA;Lo;0;L;;;;;N;;;;;
+0A1A;GURMUKHI LETTER CA;Lo;0;L;;;;;N;;;;;
+0A1B;GURMUKHI LETTER CHA;Lo;0;L;;;;;N;;;;;
+0A1C;GURMUKHI LETTER JA;Lo;0;L;;;;;N;;;;;
+0A1D;GURMUKHI LETTER JHA;Lo;0;L;;;;;N;;;;;
+0A1E;GURMUKHI LETTER NYA;Lo;0;L;;;;;N;;;;;
+0A1F;GURMUKHI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0A20;GURMUKHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0A21;GURMUKHI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0A22;GURMUKHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0A23;GURMUKHI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0A24;GURMUKHI LETTER TA;Lo;0;L;;;;;N;;;;;
+0A25;GURMUKHI LETTER THA;Lo;0;L;;;;;N;;;;;
+0A26;GURMUKHI LETTER DA;Lo;0;L;;;;;N;;;;;
+0A27;GURMUKHI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0A28;GURMUKHI LETTER NA;Lo;0;L;;;;;N;;;;;
+0A2A;GURMUKHI LETTER PA;Lo;0;L;;;;;N;;;;;
+0A2B;GURMUKHI LETTER PHA;Lo;0;L;;;;;N;;;;;
+0A2C;GURMUKHI LETTER BA;Lo;0;L;;;;;N;;;;;
+0A2D;GURMUKHI LETTER BHA;Lo;0;L;;;;;N;;;;;
+0A2E;GURMUKHI LETTER MA;Lo;0;L;;;;;N;;;;;
+0A2F;GURMUKHI LETTER YA;Lo;0;L;;;;;N;;;;;
+0A30;GURMUKHI LETTER RA;Lo;0;L;;;;;N;;;;;
+0A32;GURMUKHI LETTER LA;Lo;0;L;;;;;N;;;;;
+0A33;GURMUKHI LETTER LLA;Lo;0;L;0A32 0A3C;;;;N;;;;;
+0A35;GURMUKHI LETTER VA;Lo;0;L;;;;;N;;;;;
+0A36;GURMUKHI LETTER SHA;Lo;0;L;0A38 0A3C;;;;N;;;;;
+0A38;GURMUKHI LETTER SA;Lo;0;L;;;;;N;;;;;
+0A39;GURMUKHI LETTER HA;Lo;0;L;;;;;N;;;;;
+0A3C;GURMUKHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0A3E;GURMUKHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0A3F;GURMUKHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0A40;GURMUKHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0A41;GURMUKHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0A42;GURMUKHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0A47;GURMUKHI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+0A48;GURMUKHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0A4B;GURMUKHI VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
+0A4C;GURMUKHI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0A4D;GURMUKHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0A51;GURMUKHI SIGN UDAAT;Mn;0;NSM;;;;;N;;;;;
+0A59;GURMUKHI LETTER KHHA;Lo;0;L;0A16 0A3C;;;;N;;;;;
+0A5A;GURMUKHI LETTER GHHA;Lo;0;L;0A17 0A3C;;;;N;;;;;
+0A5B;GURMUKHI LETTER ZA;Lo;0;L;0A1C 0A3C;;;;N;;;;;
+0A5C;GURMUKHI LETTER RRA;Lo;0;L;;;;;N;;;;;
+0A5E;GURMUKHI LETTER FA;Lo;0;L;0A2B 0A3C;;;;N;;;;;
+0A66;GURMUKHI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0A67;GURMUKHI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0A68;GURMUKHI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0A69;GURMUKHI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0A6A;GURMUKHI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0A6B;GURMUKHI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0A6C;GURMUKHI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0A6D;GURMUKHI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0A6E;GURMUKHI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0A6F;GURMUKHI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0A70;GURMUKHI TIPPI;Mn;0;NSM;;;;;N;;;;;
+0A71;GURMUKHI ADDAK;Mn;0;NSM;;;;;N;;;;;
+0A72;GURMUKHI IRI;Lo;0;L;;;;;N;;;;;
+0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;;
+0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;;
+0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;;
+0A76;GURMUKHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0A85;GUJARATI LETTER A;Lo;0;L;;;;;N;;;;;
+0A86;GUJARATI LETTER AA;Lo;0;L;;;;;N;;;;;
+0A87;GUJARATI LETTER I;Lo;0;L;;;;;N;;;;;
+0A88;GUJARATI LETTER II;Lo;0;L;;;;;N;;;;;
+0A89;GUJARATI LETTER U;Lo;0;L;;;;;N;;;;;
+0A8A;GUJARATI LETTER UU;Lo;0;L;;;;;N;;;;;
+0A8B;GUJARATI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0A8C;GUJARATI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0A8D;GUJARATI VOWEL CANDRA E;Lo;0;L;;;;;N;;;;;
+0A8F;GUJARATI LETTER E;Lo;0;L;;;;;N;;;;;
+0A90;GUJARATI LETTER AI;Lo;0;L;;;;;N;;;;;
+0A91;GUJARATI VOWEL CANDRA O;Lo;0;L;;;;;N;;;;;
+0A93;GUJARATI LETTER O;Lo;0;L;;;;;N;;;;;
+0A94;GUJARATI LETTER AU;Lo;0;L;;;;;N;;;;;
+0A95;GUJARATI LETTER KA;Lo;0;L;;;;;N;;;;;
+0A96;GUJARATI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0A97;GUJARATI LETTER GA;Lo;0;L;;;;;N;;;;;
+0A98;GUJARATI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0A99;GUJARATI LETTER NGA;Lo;0;L;;;;;N;;;;;
+0A9A;GUJARATI LETTER CA;Lo;0;L;;;;;N;;;;;
+0A9B;GUJARATI LETTER CHA;Lo;0;L;;;;;N;;;;;
+0A9C;GUJARATI LETTER JA;Lo;0;L;;;;;N;;;;;
+0A9D;GUJARATI LETTER JHA;Lo;0;L;;;;;N;;;;;
+0A9E;GUJARATI LETTER NYA;Lo;0;L;;;;;N;;;;;
+0A9F;GUJARATI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0AA0;GUJARATI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0AA1;GUJARATI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0AA2;GUJARATI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0AA3;GUJARATI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0AA4;GUJARATI LETTER TA;Lo;0;L;;;;;N;;;;;
+0AA5;GUJARATI LETTER THA;Lo;0;L;;;;;N;;;;;
+0AA6;GUJARATI LETTER DA;Lo;0;L;;;;;N;;;;;
+0AA7;GUJARATI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0AA8;GUJARATI LETTER NA;Lo;0;L;;;;;N;;;;;
+0AAA;GUJARATI LETTER PA;Lo;0;L;;;;;N;;;;;
+0AAB;GUJARATI LETTER PHA;Lo;0;L;;;;;N;;;;;
+0AAC;GUJARATI LETTER BA;Lo;0;L;;;;;N;;;;;
+0AAD;GUJARATI LETTER BHA;Lo;0;L;;;;;N;;;;;
+0AAE;GUJARATI LETTER MA;Lo;0;L;;;;;N;;;;;
+0AAF;GUJARATI LETTER YA;Lo;0;L;;;;;N;;;;;
+0AB0;GUJARATI LETTER RA;Lo;0;L;;;;;N;;;;;
+0AB2;GUJARATI LETTER LA;Lo;0;L;;;;;N;;;;;
+0AB3;GUJARATI LETTER LLA;Lo;0;L;;;;;N;;;;;
+0AB5;GUJARATI LETTER VA;Lo;0;L;;;;;N;;;;;
+0AB6;GUJARATI LETTER SHA;Lo;0;L;;;;;N;;;;;
+0AB7;GUJARATI LETTER SSA;Lo;0;L;;;;;N;;;;;
+0AB8;GUJARATI LETTER SA;Lo;0;L;;;;;N;;;;;
+0AB9;GUJARATI LETTER HA;Lo;0;L;;;;;N;;;;;
+0ABC;GUJARATI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0ABD;GUJARATI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0ABE;GUJARATI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0ABF;GUJARATI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0AC0;GUJARATI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0AC1;GUJARATI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0AC2;GUJARATI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0AC3;GUJARATI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0AC4;GUJARATI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0AC5;GUJARATI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+0AC7;GUJARATI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0AC8;GUJARATI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0AC9;GUJARATI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
+0ACB;GUJARATI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+0ACC;GUJARATI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+0ACD;GUJARATI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0AD0;GUJARATI OM;Lo;0;L;;;;;N;;;;;
+0AE0;GUJARATI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0AE1;GUJARATI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0AE2;GUJARATI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0AE3;GUJARATI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0AE6;GUJARATI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0AE7;GUJARATI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0AE8;GUJARATI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0AE9;GUJARATI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0AEA;GUJARATI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0AEB;GUJARATI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0AEC;GUJARATI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0AED;GUJARATI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0AEE;GUJARATI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0AEF;GUJARATI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0AF0;GUJARATI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+0AF9;GUJARATI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0AFA;GUJARATI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
+0AFB;GUJARATI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;;
+0AFC;GUJARATI SIGN MADDAH;Mn;0;NSM;;;;;N;;;;;
+0AFD;GUJARATI SIGN THREE-DOT NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0AFE;GUJARATI SIGN CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0AFF;GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0B05;ORIYA LETTER A;Lo;0;L;;;;;N;;;;;
+0B06;ORIYA LETTER AA;Lo;0;L;;;;;N;;;;;
+0B07;ORIYA LETTER I;Lo;0;L;;;;;N;;;;;
+0B08;ORIYA LETTER II;Lo;0;L;;;;;N;;;;;
+0B09;ORIYA LETTER U;Lo;0;L;;;;;N;;;;;
+0B0A;ORIYA LETTER UU;Lo;0;L;;;;;N;;;;;
+0B0B;ORIYA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0B0C;ORIYA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0B0F;ORIYA LETTER E;Lo;0;L;;;;;N;;;;;
+0B10;ORIYA LETTER AI;Lo;0;L;;;;;N;;;;;
+0B13;ORIYA LETTER O;Lo;0;L;;;;;N;;;;;
+0B14;ORIYA LETTER AU;Lo;0;L;;;;;N;;;;;
+0B15;ORIYA LETTER KA;Lo;0;L;;;;;N;;;;;
+0B16;ORIYA LETTER KHA;Lo;0;L;;;;;N;;;;;
+0B17;ORIYA LETTER GA;Lo;0;L;;;;;N;;;;;
+0B18;ORIYA LETTER GHA;Lo;0;L;;;;;N;;;;;
+0B19;ORIYA LETTER NGA;Lo;0;L;;;;;N;;;;;
+0B1A;ORIYA LETTER CA;Lo;0;L;;;;;N;;;;;
+0B1B;ORIYA LETTER CHA;Lo;0;L;;;;;N;;;;;
+0B1C;ORIYA LETTER JA;Lo;0;L;;;;;N;;;;;
+0B1D;ORIYA LETTER JHA;Lo;0;L;;;;;N;;;;;
+0B1E;ORIYA LETTER NYA;Lo;0;L;;;;;N;;;;;
+0B1F;ORIYA LETTER TTA;Lo;0;L;;;;;N;;;;;
+0B20;ORIYA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0B21;ORIYA LETTER DDA;Lo;0;L;;;;;N;;;;;
+0B22;ORIYA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0B23;ORIYA LETTER NNA;Lo;0;L;;;;;N;;;;;
+0B24;ORIYA LETTER TA;Lo;0;L;;;;;N;;;;;
+0B25;ORIYA LETTER THA;Lo;0;L;;;;;N;;;;;
+0B26;ORIYA LETTER DA;Lo;0;L;;;;;N;;;;;
+0B27;ORIYA LETTER DHA;Lo;0;L;;;;;N;;;;;
+0B28;ORIYA LETTER NA;Lo;0;L;;;;;N;;;;;
+0B2A;ORIYA LETTER PA;Lo;0;L;;;;;N;;;;;
+0B2B;ORIYA LETTER PHA;Lo;0;L;;;;;N;;;;;
+0B2C;ORIYA LETTER BA;Lo;0;L;;;;;N;;;;;
+0B2D;ORIYA LETTER BHA;Lo;0;L;;;;;N;;;;;
+0B2E;ORIYA LETTER MA;Lo;0;L;;;;;N;;;;;
+0B2F;ORIYA LETTER YA;Lo;0;L;;;;;N;;;;;
+0B30;ORIYA LETTER RA;Lo;0;L;;;;;N;;;;;
+0B32;ORIYA LETTER LA;Lo;0;L;;;;;N;;;;;
+0B33;ORIYA LETTER LLA;Lo;0;L;;;;;N;;;;;
+0B35;ORIYA LETTER VA;Lo;0;L;;;;;N;;;;;
+0B36;ORIYA LETTER SHA;Lo;0;L;;;;;N;;;;;
+0B37;ORIYA LETTER SSA;Lo;0;L;;;;;N;;;;;
+0B38;ORIYA LETTER SA;Lo;0;L;;;;;N;;;;;
+0B39;ORIYA LETTER HA;Lo;0;L;;;;;N;;;;;
+0B3C;ORIYA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0B3D;ORIYA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0B3E;ORIYA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0B3F;ORIYA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0B40;ORIYA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0B41;ORIYA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0B42;ORIYA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0B43;ORIYA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0B44;ORIYA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0B47;ORIYA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0B48;ORIYA VOWEL SIGN AI;Mc;0;L;0B47 0B56;;;;N;;;;;
+0B4B;ORIYA VOWEL SIGN O;Mc;0;L;0B47 0B3E;;;;N;;;;;
+0B4C;ORIYA VOWEL SIGN AU;Mc;0;L;0B47 0B57;;;;N;;;;;
+0B4D;ORIYA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0B55;ORIYA SIGN OVERLINE;Mn;0;NSM;;;;;N;;;;;
+0B56;ORIYA AI LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+0B57;ORIYA AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0B5C;ORIYA LETTER RRA;Lo;0;L;0B21 0B3C;;;;N;;;;;
+0B5D;ORIYA LETTER RHA;Lo;0;L;0B22 0B3C;;;;N;;;;;
+0B5F;ORIYA LETTER YYA;Lo;0;L;;;;;N;;;;;
+0B60;ORIYA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0B61;ORIYA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0B62;ORIYA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0B63;ORIYA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0B66;ORIYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0B67;ORIYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0B68;ORIYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0B69;ORIYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0B6A;ORIYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0B6B;ORIYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0B6C;ORIYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0B6D;ORIYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0B6E;ORIYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0B6F;ORIYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0B70;ORIYA ISSHAR;So;0;L;;;;;N;;;;;
+0B71;ORIYA LETTER WA;Lo;0;L;;;;;N;;;;;
+0B72;ORIYA FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+0B73;ORIYA FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+0B74;ORIYA FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+0B75;ORIYA FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+0B76;ORIYA FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+0B77;ORIYA FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+0B82;TAMIL SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0B83;TAMIL SIGN VISARGA;Lo;0;L;;;;;N;;;;;
+0B85;TAMIL LETTER A;Lo;0;L;;;;;N;;;;;
+0B86;TAMIL LETTER AA;Lo;0;L;;;;;N;;;;;
+0B87;TAMIL LETTER I;Lo;0;L;;;;;N;;;;;
+0B88;TAMIL LETTER II;Lo;0;L;;;;;N;;;;;
+0B89;TAMIL LETTER U;Lo;0;L;;;;;N;;;;;
+0B8A;TAMIL LETTER UU;Lo;0;L;;;;;N;;;;;
+0B8E;TAMIL LETTER E;Lo;0;L;;;;;N;;;;;
+0B8F;TAMIL LETTER EE;Lo;0;L;;;;;N;;;;;
+0B90;TAMIL LETTER AI;Lo;0;L;;;;;N;;;;;
+0B92;TAMIL LETTER O;Lo;0;L;;;;;N;;;;;
+0B93;TAMIL LETTER OO;Lo;0;L;;;;;N;;;;;
+0B94;TAMIL LETTER AU;Lo;0;L;0B92 0BD7;;;;N;;;;;
+0B95;TAMIL LETTER KA;Lo;0;L;;;;;N;;;;;
+0B99;TAMIL LETTER NGA;Lo;0;L;;;;;N;;;;;
+0B9A;TAMIL LETTER CA;Lo;0;L;;;;;N;;;;;
+0B9C;TAMIL LETTER JA;Lo;0;L;;;;;N;;;;;
+0B9E;TAMIL LETTER NYA;Lo;0;L;;;;;N;;;;;
+0B9F;TAMIL LETTER TTA;Lo;0;L;;;;;N;;;;;
+0BA3;TAMIL LETTER NNA;Lo;0;L;;;;;N;;;;;
+0BA4;TAMIL LETTER TA;Lo;0;L;;;;;N;;;;;
+0BA8;TAMIL LETTER NA;Lo;0;L;;;;;N;;;;;
+0BA9;TAMIL LETTER NNNA;Lo;0;L;;;;;N;;;;;
+0BAA;TAMIL LETTER PA;Lo;0;L;;;;;N;;;;;
+0BAE;TAMIL LETTER MA;Lo;0;L;;;;;N;;;;;
+0BAF;TAMIL LETTER YA;Lo;0;L;;;;;N;;;;;
+0BB0;TAMIL LETTER RA;Lo;0;L;;;;;N;;;;;
+0BB1;TAMIL LETTER RRA;Lo;0;L;;;;;N;;;;;
+0BB2;TAMIL LETTER LA;Lo;0;L;;;;;N;;;;;
+0BB3;TAMIL LETTER LLA;Lo;0;L;;;;;N;;;;;
+0BB4;TAMIL LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0BB5;TAMIL LETTER VA;Lo;0;L;;;;;N;;;;;
+0BB6;TAMIL LETTER SHA;Lo;0;L;;;;;N;;;;;
+0BB7;TAMIL LETTER SSA;Lo;0;L;;;;;N;;;;;
+0BB8;TAMIL LETTER SA;Lo;0;L;;;;;N;;;;;
+0BB9;TAMIL LETTER HA;Lo;0;L;;;;;N;;;;;
+0BBE;TAMIL VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0BBF;TAMIL VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0BC0;TAMIL VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0BC1;TAMIL VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0BC2;TAMIL VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0BC6;TAMIL VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0BC7;TAMIL VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+0BC8;TAMIL VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+0BCA;TAMIL VOWEL SIGN O;Mc;0;L;0BC6 0BBE;;;;N;;;;;
+0BCB;TAMIL VOWEL SIGN OO;Mc;0;L;0BC7 0BBE;;;;N;;;;;
+0BCC;TAMIL VOWEL SIGN AU;Mc;0;L;0BC6 0BD7;;;;N;;;;;
+0BCD;TAMIL SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0BD0;TAMIL OM;Lo;0;L;;;;;N;;;;;
+0BD7;TAMIL AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0BE6;TAMIL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0BE7;TAMIL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0BE8;TAMIL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0BE9;TAMIL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0BEA;TAMIL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0BEB;TAMIL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0BEC;TAMIL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0BED;TAMIL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0BEE;TAMIL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0BEF;TAMIL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0BF0;TAMIL NUMBER TEN;No;0;L;;;;10;N;;;;;
+0BF1;TAMIL NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+0BF2;TAMIL NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;;;;
+0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;;;;
+0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;;;;
+0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;;;;
+0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;;;;
+0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;;;;
+0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;;;;
+0C00;TELUGU SIGN COMBINING CANDRABINDU ABOVE;Mn;0;NSM;;;;;N;;;;;
+0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
+0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C04;TELUGU SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;;
+0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;;
+0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;;
+0C08;TELUGU LETTER II;Lo;0;L;;;;;N;;;;;
+0C09;TELUGU LETTER U;Lo;0;L;;;;;N;;;;;
+0C0A;TELUGU LETTER UU;Lo;0;L;;;;;N;;;;;
+0C0B;TELUGU LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0C0C;TELUGU LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0C0E;TELUGU LETTER E;Lo;0;L;;;;;N;;;;;
+0C0F;TELUGU LETTER EE;Lo;0;L;;;;;N;;;;;
+0C10;TELUGU LETTER AI;Lo;0;L;;;;;N;;;;;
+0C12;TELUGU LETTER O;Lo;0;L;;;;;N;;;;;
+0C13;TELUGU LETTER OO;Lo;0;L;;;;;N;;;;;
+0C14;TELUGU LETTER AU;Lo;0;L;;;;;N;;;;;
+0C15;TELUGU LETTER KA;Lo;0;L;;;;;N;;;;;
+0C16;TELUGU LETTER KHA;Lo;0;L;;;;;N;;;;;
+0C17;TELUGU LETTER GA;Lo;0;L;;;;;N;;;;;
+0C18;TELUGU LETTER GHA;Lo;0;L;;;;;N;;;;;
+0C19;TELUGU LETTER NGA;Lo;0;L;;;;;N;;;;;
+0C1A;TELUGU LETTER CA;Lo;0;L;;;;;N;;;;;
+0C1B;TELUGU LETTER CHA;Lo;0;L;;;;;N;;;;;
+0C1C;TELUGU LETTER JA;Lo;0;L;;;;;N;;;;;
+0C1D;TELUGU LETTER JHA;Lo;0;L;;;;;N;;;;;
+0C1E;TELUGU LETTER NYA;Lo;0;L;;;;;N;;;;;
+0C1F;TELUGU LETTER TTA;Lo;0;L;;;;;N;;;;;
+0C20;TELUGU LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0C21;TELUGU LETTER DDA;Lo;0;L;;;;;N;;;;;
+0C22;TELUGU LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0C23;TELUGU LETTER NNA;Lo;0;L;;;;;N;;;;;
+0C24;TELUGU LETTER TA;Lo;0;L;;;;;N;;;;;
+0C25;TELUGU LETTER THA;Lo;0;L;;;;;N;;;;;
+0C26;TELUGU LETTER DA;Lo;0;L;;;;;N;;;;;
+0C27;TELUGU LETTER DHA;Lo;0;L;;;;;N;;;;;
+0C28;TELUGU LETTER NA;Lo;0;L;;;;;N;;;;;
+0C2A;TELUGU LETTER PA;Lo;0;L;;;;;N;;;;;
+0C2B;TELUGU LETTER PHA;Lo;0;L;;;;;N;;;;;
+0C2C;TELUGU LETTER BA;Lo;0;L;;;;;N;;;;;
+0C2D;TELUGU LETTER BHA;Lo;0;L;;;;;N;;;;;
+0C2E;TELUGU LETTER MA;Lo;0;L;;;;;N;;;;;
+0C2F;TELUGU LETTER YA;Lo;0;L;;;;;N;;;;;
+0C30;TELUGU LETTER RA;Lo;0;L;;;;;N;;;;;
+0C31;TELUGU LETTER RRA;Lo;0;L;;;;;N;;;;;
+0C32;TELUGU LETTER LA;Lo;0;L;;;;;N;;;;;
+0C33;TELUGU LETTER LLA;Lo;0;L;;;;;N;;;;;
+0C34;TELUGU LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0C35;TELUGU LETTER VA;Lo;0;L;;;;;N;;;;;
+0C36;TELUGU LETTER SHA;Lo;0;L;;;;;N;;;;;
+0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;;
+0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;;
+0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;;
+0C3D;TELUGU SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0C3E;TELUGU VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+0C3F;TELUGU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0C40;TELUGU VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0C41;TELUGU VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0C42;TELUGU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0C43;TELUGU VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+0C44;TELUGU VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+0C46;TELUGU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0C47;TELUGU VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+0C48;TELUGU VOWEL SIGN AI;Mn;0;NSM;0C46 0C56;;;;N;;;;;
+0C4A;TELUGU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+0C4B;TELUGU VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
+0C4C;TELUGU VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0C4D;TELUGU SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0C55;TELUGU LENGTH MARK;Mn;84;NSM;;;;;N;;;;;
+0C56;TELUGU AI LENGTH MARK;Mn;91;NSM;;;;;N;;;;;
+0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;;
+0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;;
+0C5A;TELUGU LETTER RRRA;Lo;0;L;;;;;N;;;;;
+0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0C62;TELUGU VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0C63;TELUGU VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0C66;TELUGU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0C67;TELUGU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0C68;TELUGU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0C69;TELUGU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0C6A;TELUGU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0C6B;TELUGU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0C6C;TELUGU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0C6D;TELUGU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0C6E;TELUGU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0C6F;TELUGU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0C77;TELUGU SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+0C78;TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR;No;0;ON;;;;0;N;;;;;
+0C79;TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
+0C7A;TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
+0C7B;TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
+0C7C;TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
+0C7D;TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
+0C7E;TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
+0C7F;TELUGU SIGN TUUMU;So;0;L;;;;;N;;;;;
+0C80;KANNADA SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;;
+0C81;KANNADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C84;KANNADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;;
+0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;;
+0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;;
+0C88;KANNADA LETTER II;Lo;0;L;;;;;N;;;;;
+0C89;KANNADA LETTER U;Lo;0;L;;;;;N;;;;;
+0C8A;KANNADA LETTER UU;Lo;0;L;;;;;N;;;;;
+0C8B;KANNADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0C8C;KANNADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0C8E;KANNADA LETTER E;Lo;0;L;;;;;N;;;;;
+0C8F;KANNADA LETTER EE;Lo;0;L;;;;;N;;;;;
+0C90;KANNADA LETTER AI;Lo;0;L;;;;;N;;;;;
+0C92;KANNADA LETTER O;Lo;0;L;;;;;N;;;;;
+0C93;KANNADA LETTER OO;Lo;0;L;;;;;N;;;;;
+0C94;KANNADA LETTER AU;Lo;0;L;;;;;N;;;;;
+0C95;KANNADA LETTER KA;Lo;0;L;;;;;N;;;;;
+0C96;KANNADA LETTER KHA;Lo;0;L;;;;;N;;;;;
+0C97;KANNADA LETTER GA;Lo;0;L;;;;;N;;;;;
+0C98;KANNADA LETTER GHA;Lo;0;L;;;;;N;;;;;
+0C99;KANNADA LETTER NGA;Lo;0;L;;;;;N;;;;;
+0C9A;KANNADA LETTER CA;Lo;0;L;;;;;N;;;;;
+0C9B;KANNADA LETTER CHA;Lo;0;L;;;;;N;;;;;
+0C9C;KANNADA LETTER JA;Lo;0;L;;;;;N;;;;;
+0C9D;KANNADA LETTER JHA;Lo;0;L;;;;;N;;;;;
+0C9E;KANNADA LETTER NYA;Lo;0;L;;;;;N;;;;;
+0C9F;KANNADA LETTER TTA;Lo;0;L;;;;;N;;;;;
+0CA0;KANNADA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0CA1;KANNADA LETTER DDA;Lo;0;L;;;;;N;;;;;
+0CA2;KANNADA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0CA3;KANNADA LETTER NNA;Lo;0;L;;;;;N;;;;;
+0CA4;KANNADA LETTER TA;Lo;0;L;;;;;N;;;;;
+0CA5;KANNADA LETTER THA;Lo;0;L;;;;;N;;;;;
+0CA6;KANNADA LETTER DA;Lo;0;L;;;;;N;;;;;
+0CA7;KANNADA LETTER DHA;Lo;0;L;;;;;N;;;;;
+0CA8;KANNADA LETTER NA;Lo;0;L;;;;;N;;;;;
+0CAA;KANNADA LETTER PA;Lo;0;L;;;;;N;;;;;
+0CAB;KANNADA LETTER PHA;Lo;0;L;;;;;N;;;;;
+0CAC;KANNADA LETTER BA;Lo;0;L;;;;;N;;;;;
+0CAD;KANNADA LETTER BHA;Lo;0;L;;;;;N;;;;;
+0CAE;KANNADA LETTER MA;Lo;0;L;;;;;N;;;;;
+0CAF;KANNADA LETTER YA;Lo;0;L;;;;;N;;;;;
+0CB0;KANNADA LETTER RA;Lo;0;L;;;;;N;;;;;
+0CB1;KANNADA LETTER RRA;Lo;0;L;;;;;N;;;;;
+0CB2;KANNADA LETTER LA;Lo;0;L;;;;;N;;;;;
+0CB3;KANNADA LETTER LLA;Lo;0;L;;;;;N;;;;;
+0CB5;KANNADA LETTER VA;Lo;0;L;;;;;N;;;;;
+0CB6;KANNADA LETTER SHA;Lo;0;L;;;;;N;;;;;
+0CB7;KANNADA LETTER SSA;Lo;0;L;;;;;N;;;;;
+0CB8;KANNADA LETTER SA;Lo;0;L;;;;;N;;;;;
+0CB9;KANNADA LETTER HA;Lo;0;L;;;;;N;;;;;
+0CBC;KANNADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0CBD;KANNADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0CBE;KANNADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0CBF;KANNADA VOWEL SIGN I;Mn;0;L;;;;;N;;;;;
+0CC0;KANNADA VOWEL SIGN II;Mc;0;L;0CBF 0CD5;;;;N;;;;;
+0CC1;KANNADA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0CC2;KANNADA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0CC3;KANNADA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+0CC4;KANNADA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+0CC6;KANNADA VOWEL SIGN E;Mn;0;L;;;;;N;;;;;
+0CC7;KANNADA VOWEL SIGN EE;Mc;0;L;0CC6 0CD5;;;;N;;;;;
+0CC8;KANNADA VOWEL SIGN AI;Mc;0;L;0CC6 0CD6;;;;N;;;;;
+0CCA;KANNADA VOWEL SIGN O;Mc;0;L;0CC6 0CC2;;;;N;;;;;
+0CCB;KANNADA VOWEL SIGN OO;Mc;0;L;0CCA 0CD5;;;;N;;;;;
+0CCC;KANNADA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;;
+0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0CE1;KANNADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0CE2;KANNADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0CE3;KANNADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0CE6;KANNADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0CE7;KANNADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0CE8;KANNADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0CE9;KANNADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0CEA;KANNADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0CEB;KANNADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0CEC;KANNADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0CED;KANNADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0CEE;KANNADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0CF1;KANNADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+0CF2;KANNADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+0D00;MALAYALAM SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0D01;MALAYALAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0D04;MALAYALAM LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+0D05;MALAYALAM LETTER A;Lo;0;L;;;;;N;;;;;
+0D06;MALAYALAM LETTER AA;Lo;0;L;;;;;N;;;;;
+0D07;MALAYALAM LETTER I;Lo;0;L;;;;;N;;;;;
+0D08;MALAYALAM LETTER II;Lo;0;L;;;;;N;;;;;
+0D09;MALAYALAM LETTER U;Lo;0;L;;;;;N;;;;;
+0D0A;MALAYALAM LETTER UU;Lo;0;L;;;;;N;;;;;
+0D0B;MALAYALAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0D0C;MALAYALAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0D0E;MALAYALAM LETTER E;Lo;0;L;;;;;N;;;;;
+0D0F;MALAYALAM LETTER EE;Lo;0;L;;;;;N;;;;;
+0D10;MALAYALAM LETTER AI;Lo;0;L;;;;;N;;;;;
+0D12;MALAYALAM LETTER O;Lo;0;L;;;;;N;;;;;
+0D13;MALAYALAM LETTER OO;Lo;0;L;;;;;N;;;;;
+0D14;MALAYALAM LETTER AU;Lo;0;L;;;;;N;;;;;
+0D15;MALAYALAM LETTER KA;Lo;0;L;;;;;N;;;;;
+0D16;MALAYALAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+0D17;MALAYALAM LETTER GA;Lo;0;L;;;;;N;;;;;
+0D18;MALAYALAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+0D19;MALAYALAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+0D1A;MALAYALAM LETTER CA;Lo;0;L;;;;;N;;;;;
+0D1B;MALAYALAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+0D1C;MALAYALAM LETTER JA;Lo;0;L;;;;;N;;;;;
+0D1D;MALAYALAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+0D1E;MALAYALAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+0D1F;MALAYALAM LETTER TTA;Lo;0;L;;;;;N;;;;;
+0D20;MALAYALAM LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0D21;MALAYALAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+0D22;MALAYALAM LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0D23;MALAYALAM LETTER NNA;Lo;0;L;;;;;N;;;;;
+0D24;MALAYALAM LETTER TA;Lo;0;L;;;;;N;;;;;
+0D25;MALAYALAM LETTER THA;Lo;0;L;;;;;N;;;;;
+0D26;MALAYALAM LETTER DA;Lo;0;L;;;;;N;;;;;
+0D27;MALAYALAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+0D28;MALAYALAM LETTER NA;Lo;0;L;;;;;N;;;;;
+0D29;MALAYALAM LETTER NNNA;Lo;0;L;;;;;N;;;;;
+0D2A;MALAYALAM LETTER PA;Lo;0;L;;;;;N;;;;;
+0D2B;MALAYALAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+0D2C;MALAYALAM LETTER BA;Lo;0;L;;;;;N;;;;;
+0D2D;MALAYALAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+0D2E;MALAYALAM LETTER MA;Lo;0;L;;;;;N;;;;;
+0D2F;MALAYALAM LETTER YA;Lo;0;L;;;;;N;;;;;
+0D30;MALAYALAM LETTER RA;Lo;0;L;;;;;N;;;;;
+0D31;MALAYALAM LETTER RRA;Lo;0;L;;;;;N;;;;;
+0D32;MALAYALAM LETTER LA;Lo;0;L;;;;;N;;;;;
+0D33;MALAYALAM LETTER LLA;Lo;0;L;;;;;N;;;;;
+0D34;MALAYALAM LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0D35;MALAYALAM LETTER VA;Lo;0;L;;;;;N;;;;;
+0D36;MALAYALAM LETTER SHA;Lo;0;L;;;;;N;;;;;
+0D37;MALAYALAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;;
+0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;;
+0D3A;MALAYALAM LETTER TTTA;Lo;0;L;;;;;N;;;;;
+0D3B;MALAYALAM SIGN VERTICAL BAR VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D3C;MALAYALAM SIGN CIRCULAR VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0D40;MALAYALAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0D41;MALAYALAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0D42;MALAYALAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0D43;MALAYALAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0D44;MALAYALAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0D46;MALAYALAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0D47;MALAYALAM VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+0D48;MALAYALAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+0D4A;MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;;
+0D4B;MALAYALAM VOWEL SIGN OO;Mc;0;L;0D47 0D3E;;;;N;;;;;
+0D4C;MALAYALAM VOWEL SIGN AU;Mc;0;L;0D46 0D57;;;;N;;;;;
+0D4D;MALAYALAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D4E;MALAYALAM LETTER DOT REPH;Lo;0;L;;;;;N;;;;;
+0D4F;MALAYALAM SIGN PARA;So;0;L;;;;;N;;;;;
+0D54;MALAYALAM LETTER CHILLU M;Lo;0;L;;;;;N;;;;;
+0D55;MALAYALAM LETTER CHILLU Y;Lo;0;L;;;;;N;;;;;
+0D56;MALAYALAM LETTER CHILLU LLL;Lo;0;L;;;;;N;;;;;
+0D57;MALAYALAM AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0D58;MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;;
+0D59;MALAYALAM FRACTION ONE FORTIETH;No;0;L;;;;1/40;N;;;;;
+0D5A;MALAYALAM FRACTION THREE EIGHTIETHS;No;0;L;;;;3/80;N;;;;;
+0D5B;MALAYALAM FRACTION ONE TWENTIETH;No;0;L;;;;1/20;N;;;;;
+0D5C;MALAYALAM FRACTION ONE TENTH;No;0;L;;;;1/10;N;;;;;
+0D5D;MALAYALAM FRACTION THREE TWENTIETHS;No;0;L;;;;3/20;N;;;;;
+0D5E;MALAYALAM FRACTION ONE FIFTH;No;0;L;;;;1/5;N;;;;;
+0D5F;MALAYALAM LETTER ARCHAIC II;Lo;0;L;;;;;N;;;;;
+0D60;MALAYALAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0D61;MALAYALAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0D62;MALAYALAM VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0D63;MALAYALAM VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0D66;MALAYALAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0D67;MALAYALAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0D68;MALAYALAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0D69;MALAYALAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0D6A;MALAYALAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0D6B;MALAYALAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0D6C;MALAYALAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0D6D;MALAYALAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0D6E;MALAYALAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0D6F;MALAYALAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0D70;MALAYALAM NUMBER TEN;No;0;L;;;;10;N;;;;;
+0D71;MALAYALAM NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+0D72;MALAYALAM NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+0D73;MALAYALAM FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+0D74;MALAYALAM FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+0D75;MALAYALAM FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+0D76;MALAYALAM FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+0D77;MALAYALAM FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+0D78;MALAYALAM FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+0D79;MALAYALAM DATE MARK;So;0;L;;;;;N;;;;;
+0D7A;MALAYALAM LETTER CHILLU NN;Lo;0;L;;;;;N;;;;;
+0D7B;MALAYALAM LETTER CHILLU N;Lo;0;L;;;;;N;;;;;
+0D7C;MALAYALAM LETTER CHILLU RR;Lo;0;L;;;;;N;;;;;
+0D7D;MALAYALAM LETTER CHILLU L;Lo;0;L;;;;;N;;;;;
+0D7E;MALAYALAM LETTER CHILLU LL;Lo;0;L;;;;;N;;;;;
+0D7F;MALAYALAM LETTER CHILLU K;Lo;0;L;;;;;N;;;;;
+0D81;SINHALA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0D82;SINHALA SIGN ANUSVARAYA;Mc;0;L;;;;;N;;;;;
+0D83;SINHALA SIGN VISARGAYA;Mc;0;L;;;;;N;;;;;
+0D85;SINHALA LETTER AYANNA;Lo;0;L;;;;;N;;;;;
+0D86;SINHALA LETTER AAYANNA;Lo;0;L;;;;;N;;;;;
+0D87;SINHALA LETTER AEYANNA;Lo;0;L;;;;;N;;;;;
+0D88;SINHALA LETTER AEEYANNA;Lo;0;L;;;;;N;;;;;
+0D89;SINHALA LETTER IYANNA;Lo;0;L;;;;;N;;;;;
+0D8A;SINHALA LETTER IIYANNA;Lo;0;L;;;;;N;;;;;
+0D8B;SINHALA LETTER UYANNA;Lo;0;L;;;;;N;;;;;
+0D8C;SINHALA LETTER UUYANNA;Lo;0;L;;;;;N;;;;;
+0D8D;SINHALA LETTER IRUYANNA;Lo;0;L;;;;;N;;;;;
+0D8E;SINHALA LETTER IRUUYANNA;Lo;0;L;;;;;N;;;;;
+0D8F;SINHALA LETTER ILUYANNA;Lo;0;L;;;;;N;;;;;
+0D90;SINHALA LETTER ILUUYANNA;Lo;0;L;;;;;N;;;;;
+0D91;SINHALA LETTER EYANNA;Lo;0;L;;;;;N;;;;;
+0D92;SINHALA LETTER EEYANNA;Lo;0;L;;;;;N;;;;;
+0D93;SINHALA LETTER AIYANNA;Lo;0;L;;;;;N;;;;;
+0D94;SINHALA LETTER OYANNA;Lo;0;L;;;;;N;;;;;
+0D95;SINHALA LETTER OOYANNA;Lo;0;L;;;;;N;;;;;
+0D96;SINHALA LETTER AUYANNA;Lo;0;L;;;;;N;;;;;
+0D9A;SINHALA LETTER ALPAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
+0D9B;SINHALA LETTER MAHAAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
+0D9C;SINHALA LETTER ALPAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
+0D9D;SINHALA LETTER MAHAAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
+0D9E;SINHALA LETTER KANTAJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
+0D9F;SINHALA LETTER SANYAKA GAYANNA;Lo;0;L;;;;;N;;;;;
+0DA0;SINHALA LETTER ALPAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
+0DA1;SINHALA LETTER MAHAAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
+0DA2;SINHALA LETTER ALPAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA3;SINHALA LETTER MAHAAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA4;SINHALA LETTER TAALUJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
+0DA5;SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA;Lo;0;L;;;;;N;;;;;
+0DA6;SINHALA LETTER SANYAKA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA7;SINHALA LETTER ALPAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
+0DA8;SINHALA LETTER MAHAAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
+0DA9;SINHALA LETTER ALPAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAA;SINHALA LETTER MAHAAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAB;SINHALA LETTER MUURDHAJA NAYANNA;Lo;0;L;;;;;N;;;;;
+0DAC;SINHALA LETTER SANYAKA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAD;SINHALA LETTER ALPAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
+0DAE;SINHALA LETTER MAHAAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
+0DAF;SINHALA LETTER ALPAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB0;SINHALA LETTER MAHAAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB1;SINHALA LETTER DANTAJA NAYANNA;Lo;0;L;;;;;N;;;;;
+0DB3;SINHALA LETTER SANYAKA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB4;SINHALA LETTER ALPAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
+0DB5;SINHALA LETTER MAHAAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
+0DB6;SINHALA LETTER ALPAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DB7;SINHALA LETTER MAHAAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DB8;SINHALA LETTER MAYANNA;Lo;0;L;;;;;N;;;;;
+0DB9;SINHALA LETTER AMBA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DBA;SINHALA LETTER YAYANNA;Lo;0;L;;;;;N;;;;;
+0DBB;SINHALA LETTER RAYANNA;Lo;0;L;;;;;N;;;;;
+0DBD;SINHALA LETTER DANTAJA LAYANNA;Lo;0;L;;;;;N;;;;;
+0DC0;SINHALA LETTER VAYANNA;Lo;0;L;;;;;N;;;;;
+0DC1;SINHALA LETTER TAALUJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC2;SINHALA LETTER MUURDHAJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC3;SINHALA LETTER DANTAJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC4;SINHALA LETTER HAYANNA;Lo;0;L;;;;;N;;;;;
+0DC5;SINHALA LETTER MUURDHAJA LAYANNA;Lo;0;L;;;;;N;;;;;
+0DC6;SINHALA LETTER FAYANNA;Lo;0;L;;;;;N;;;;;
+0DCA;SINHALA SIGN AL-LAKUNA;Mn;9;NSM;;;;;N;;;;;
+0DCF;SINHALA VOWEL SIGN AELA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD0;SINHALA VOWEL SIGN KETTI AEDA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD1;SINHALA VOWEL SIGN DIGA AEDA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD2;SINHALA VOWEL SIGN KETTI IS-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD3;SINHALA VOWEL SIGN DIGA IS-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD4;SINHALA VOWEL SIGN KETTI PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD6;SINHALA VOWEL SIGN DIGA PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD8;SINHALA VOWEL SIGN GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD9;SINHALA VOWEL SIGN KOMBUVA;Mc;0;L;;;;;N;;;;;
+0DDA;SINHALA VOWEL SIGN DIGA KOMBUVA;Mc;0;L;0DD9 0DCA;;;;N;;;;;
+0DDB;SINHALA VOWEL SIGN KOMBU DEKA;Mc;0;L;;;;;N;;;;;
+0DDC;SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA;Mc;0;L;0DD9 0DCF;;;;N;;;;;
+0DDD;SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA;Mc;0;L;0DDC 0DCA;;;;N;;;;;
+0DDE;SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA;Mc;0;L;0DD9 0DDF;;;;N;;;;;
+0DDF;SINHALA VOWEL SIGN GAYANUKITTA;Mc;0;L;;;;;N;;;;;
+0DE6;SINHALA LITH DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0DE7;SINHALA LITH DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0DE8;SINHALA LITH DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0DE9;SINHALA LITH DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0DEA;SINHALA LITH DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0DEB;SINHALA LITH DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0DEC;SINHALA LITH DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0DED;SINHALA LITH DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0DEE;SINHALA LITH DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0DEF;SINHALA LITH DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0DF2;SINHALA VOWEL SIGN DIGA GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
+0DF3;SINHALA VOWEL SIGN DIGA GAYANUKITTA;Mc;0;L;;;;;N;;;;;
+0DF4;SINHALA PUNCTUATION KUNDDALIYA;Po;0;L;;;;;N;;;;;
+0E01;THAI CHARACTER KO KAI;Lo;0;L;;;;;N;THAI LETTER KO KAI;;;;
+0E02;THAI CHARACTER KHO KHAI;Lo;0;L;;;;;N;THAI LETTER KHO KHAI;;;;
+0E03;THAI CHARACTER KHO KHUAT;Lo;0;L;;;;;N;THAI LETTER KHO KHUAT;;;;
+0E04;THAI CHARACTER KHO KHWAI;Lo;0;L;;;;;N;THAI LETTER KHO KHWAI;;;;
+0E05;THAI CHARACTER KHO KHON;Lo;0;L;;;;;N;THAI LETTER KHO KHON;;;;
+0E06;THAI CHARACTER KHO RAKHANG;Lo;0;L;;;;;N;THAI LETTER KHO RAKHANG;;;;
+0E07;THAI CHARACTER NGO NGU;Lo;0;L;;;;;N;THAI LETTER NGO NGU;;;;
+0E08;THAI CHARACTER CHO CHAN;Lo;0;L;;;;;N;THAI LETTER CHO CHAN;;;;
+0E09;THAI CHARACTER CHO CHING;Lo;0;L;;;;;N;THAI LETTER CHO CHING;;;;
+0E0A;THAI CHARACTER CHO CHANG;Lo;0;L;;;;;N;THAI LETTER CHO CHANG;;;;
+0E0B;THAI CHARACTER SO SO;Lo;0;L;;;;;N;THAI LETTER SO SO;;;;
+0E0C;THAI CHARACTER CHO CHOE;Lo;0;L;;;;;N;THAI LETTER CHO CHOE;;;;
+0E0D;THAI CHARACTER YO YING;Lo;0;L;;;;;N;THAI LETTER YO YING;;;;
+0E0E;THAI CHARACTER DO CHADA;Lo;0;L;;;;;N;THAI LETTER DO CHADA;;;;
+0E0F;THAI CHARACTER TO PATAK;Lo;0;L;;;;;N;THAI LETTER TO PATAK;;;;
+0E10;THAI CHARACTER THO THAN;Lo;0;L;;;;;N;THAI LETTER THO THAN;;;;
+0E11;THAI CHARACTER THO NANGMONTHO;Lo;0;L;;;;;N;THAI LETTER THO NANGMONTHO;;;;
+0E12;THAI CHARACTER THO PHUTHAO;Lo;0;L;;;;;N;THAI LETTER THO PHUTHAO;;;;
+0E13;THAI CHARACTER NO NEN;Lo;0;L;;;;;N;THAI LETTER NO NEN;;;;
+0E14;THAI CHARACTER DO DEK;Lo;0;L;;;;;N;THAI LETTER DO DEK;;;;
+0E15;THAI CHARACTER TO TAO;Lo;0;L;;;;;N;THAI LETTER TO TAO;;;;
+0E16;THAI CHARACTER THO THUNG;Lo;0;L;;;;;N;THAI LETTER THO THUNG;;;;
+0E17;THAI CHARACTER THO THAHAN;Lo;0;L;;;;;N;THAI LETTER THO THAHAN;;;;
+0E18;THAI CHARACTER THO THONG;Lo;0;L;;;;;N;THAI LETTER THO THONG;;;;
+0E19;THAI CHARACTER NO NU;Lo;0;L;;;;;N;THAI LETTER NO NU;;;;
+0E1A;THAI CHARACTER BO BAIMAI;Lo;0;L;;;;;N;THAI LETTER BO BAIMAI;;;;
+0E1B;THAI CHARACTER PO PLA;Lo;0;L;;;;;N;THAI LETTER PO PLA;;;;
+0E1C;THAI CHARACTER PHO PHUNG;Lo;0;L;;;;;N;THAI LETTER PHO PHUNG;;;;
+0E1D;THAI CHARACTER FO FA;Lo;0;L;;;;;N;THAI LETTER FO FA;;;;
+0E1E;THAI CHARACTER PHO PHAN;Lo;0;L;;;;;N;THAI LETTER PHO PHAN;;;;
+0E1F;THAI CHARACTER FO FAN;Lo;0;L;;;;;N;THAI LETTER FO FAN;;;;
+0E20;THAI CHARACTER PHO SAMPHAO;Lo;0;L;;;;;N;THAI LETTER PHO SAMPHAO;;;;
+0E21;THAI CHARACTER MO MA;Lo;0;L;;;;;N;THAI LETTER MO MA;;;;
+0E22;THAI CHARACTER YO YAK;Lo;0;L;;;;;N;THAI LETTER YO YAK;;;;
+0E23;THAI CHARACTER RO RUA;Lo;0;L;;;;;N;THAI LETTER RO RUA;;;;
+0E24;THAI CHARACTER RU;Lo;0;L;;;;;N;THAI LETTER RU;;;;
+0E25;THAI CHARACTER LO LING;Lo;0;L;;;;;N;THAI LETTER LO LING;;;;
+0E26;THAI CHARACTER LU;Lo;0;L;;;;;N;THAI LETTER LU;;;;
+0E27;THAI CHARACTER WO WAEN;Lo;0;L;;;;;N;THAI LETTER WO WAEN;;;;
+0E28;THAI CHARACTER SO SALA;Lo;0;L;;;;;N;THAI LETTER SO SALA;;;;
+0E29;THAI CHARACTER SO RUSI;Lo;0;L;;;;;N;THAI LETTER SO RUSI;;;;
+0E2A;THAI CHARACTER SO SUA;Lo;0;L;;;;;N;THAI LETTER SO SUA;;;;
+0E2B;THAI CHARACTER HO HIP;Lo;0;L;;;;;N;THAI LETTER HO HIP;;;;
+0E2C;THAI CHARACTER LO CHULA;Lo;0;L;;;;;N;THAI LETTER LO CHULA;;;;
+0E2D;THAI CHARACTER O ANG;Lo;0;L;;;;;N;THAI LETTER O ANG;;;;
+0E2E;THAI CHARACTER HO NOKHUK;Lo;0;L;;;;;N;THAI LETTER HO NOK HUK;;;;
+0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;;;;
+0E30;THAI CHARACTER SARA A;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA A;;;;
+0E31;THAI CHARACTER MAI HAN-AKAT;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI HAN-AKAT;;;;
+0E32;THAI CHARACTER SARA AA;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AA;;;;
+0E33;THAI CHARACTER SARA AM;Lo;0;L;<compat> 0E4D 0E32;;;;N;THAI VOWEL SIGN SARA AM;;;;
+0E34;THAI CHARACTER SARA I;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA I;;;;
+0E35;THAI CHARACTER SARA II;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA II;;;;
+0E36;THAI CHARACTER SARA UE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UE;;;;
+0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;;;;
+0E38;THAI CHARACTER SARA U;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA U;;;;
+0E39;THAI CHARACTER SARA UU;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA UU;;;;
+0E3A;THAI CHARACTER PHINTHU;Mn;9;NSM;;;;;N;THAI VOWEL SIGN PHINTHU;;;;
+0E3F;THAI CURRENCY SYMBOL BAHT;Sc;0;ET;;;;;N;THAI BAHT SIGN;;;;
+0E40;THAI CHARACTER SARA E;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA E;;;;
+0E41;THAI CHARACTER SARA AE;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AE;;;;
+0E42;THAI CHARACTER SARA O;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA O;;;;
+0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;;;;
+0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;;;;
+0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;;;;
+0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;;;;
+0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;;;;
+0E48;THAI CHARACTER MAI EK;Mn;107;NSM;;;;;N;THAI TONE MAI EK;;;;
+0E49;THAI CHARACTER MAI THO;Mn;107;NSM;;;;;N;THAI TONE MAI THO;;;;
+0E4A;THAI CHARACTER MAI TRI;Mn;107;NSM;;;;;N;THAI TONE MAI TRI;;;;
+0E4B;THAI CHARACTER MAI CHATTAWA;Mn;107;NSM;;;;;N;THAI TONE MAI CHATTAWA;;;;
+0E4C;THAI CHARACTER THANTHAKHAT;Mn;0;NSM;;;;;N;THAI THANTHAKHAT;;;;
+0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;;;;
+0E4E;THAI CHARACTER YAMAKKAN;Mn;0;NSM;;;;;N;THAI YAMAKKAN;;;;
+0E4F;THAI CHARACTER FONGMAN;Po;0;L;;;;;N;THAI FONGMAN;;;;
+0E50;THAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0E51;THAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0E52;THAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0E53;THAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0E54;THAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0E55;THAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0E56;THAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0E57;THAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0E58;THAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0E59;THAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0E5A;THAI CHARACTER ANGKHANKHU;Po;0;L;;;;;N;THAI ANGKHANKHU;;;;
+0E5B;THAI CHARACTER KHOMUT;Po;0;L;;;;;N;THAI KHOMUT;;;;
+0E81;LAO LETTER KO;Lo;0;L;;;;;N;;;;;
+0E82;LAO LETTER KHO SUNG;Lo;0;L;;;;;N;;;;;
+0E84;LAO LETTER KHO TAM;Lo;0;L;;;;;N;;;;;
+0E86;LAO LETTER PALI GHA;Lo;0;L;;;;;N;;;;;
+0E87;LAO LETTER NGO;Lo;0;L;;;;;N;;;;;
+0E88;LAO LETTER CO;Lo;0;L;;;;;N;;;;;
+0E89;LAO LETTER PALI CHA;Lo;0;L;;;;;N;;;;;
+0E8A;LAO LETTER SO TAM;Lo;0;L;;;;;N;;;;;
+0E8C;LAO LETTER PALI JHA;Lo;0;L;;;;;N;;;;;
+0E8D;LAO LETTER NYO;Lo;0;L;;;;;N;;;;;
+0E8E;LAO LETTER PALI NYA;Lo;0;L;;;;;N;;;;;
+0E8F;LAO LETTER PALI TTA;Lo;0;L;;;;;N;;;;;
+0E90;LAO LETTER PALI TTHA;Lo;0;L;;;;;N;;;;;
+0E91;LAO LETTER PALI DDA;Lo;0;L;;;;;N;;;;;
+0E92;LAO LETTER PALI DDHA;Lo;0;L;;;;;N;;;;;
+0E93;LAO LETTER PALI NNA;Lo;0;L;;;;;N;;;;;
+0E94;LAO LETTER DO;Lo;0;L;;;;;N;;;;;
+0E95;LAO LETTER TO;Lo;0;L;;;;;N;;;;;
+0E96;LAO LETTER THO SUNG;Lo;0;L;;;;;N;;;;;
+0E97;LAO LETTER THO TAM;Lo;0;L;;;;;N;;;;;
+0E98;LAO LETTER PALI DHA;Lo;0;L;;;;;N;;;;;
+0E99;LAO LETTER NO;Lo;0;L;;;;;N;;;;;
+0E9A;LAO LETTER BO;Lo;0;L;;;;;N;;;;;
+0E9B;LAO LETTER PO;Lo;0;L;;;;;N;;;;;
+0E9C;LAO LETTER PHO SUNG;Lo;0;L;;;;;N;;;;;
+0E9D;LAO LETTER FO TAM;Lo;0;L;;;;;N;;;;;
+0E9E;LAO LETTER PHO TAM;Lo;0;L;;;;;N;;;;;
+0E9F;LAO LETTER FO SUNG;Lo;0;L;;;;;N;;;;;
+0EA0;LAO LETTER PALI BHA;Lo;0;L;;;;;N;;;;;
+0EA1;LAO LETTER MO;Lo;0;L;;;;;N;;;;;
+0EA2;LAO LETTER YO;Lo;0;L;;;;;N;;;;;
+0EA3;LAO LETTER LO LING;Lo;0;L;;;;;N;;;;;
+0EA5;LAO LETTER LO LOOT;Lo;0;L;;;;;N;;;;;
+0EA7;LAO LETTER WO;Lo;0;L;;;;;N;;;;;
+0EA8;LAO LETTER SANSKRIT SHA;Lo;0;L;;;;;N;;;;;
+0EA9;LAO LETTER SANSKRIT SSA;Lo;0;L;;;;;N;;;;;
+0EAA;LAO LETTER SO SUNG;Lo;0;L;;;;;N;;;;;
+0EAB;LAO LETTER HO SUNG;Lo;0;L;;;;;N;;;;;
+0EAC;LAO LETTER PALI LLA;Lo;0;L;;;;;N;;;;;
+0EAD;LAO LETTER O;Lo;0;L;;;;;N;;;;;
+0EAE;LAO LETTER HO TAM;Lo;0;L;;;;;N;;;;;
+0EAF;LAO ELLIPSIS;Lo;0;L;;;;;N;;;;;
+0EB0;LAO VOWEL SIGN A;Lo;0;L;;;;;N;;;;;
+0EB1;LAO VOWEL SIGN MAI KAN;Mn;0;NSM;;;;;N;;;;;
+0EB2;LAO VOWEL SIGN AA;Lo;0;L;;;;;N;;;;;
+0EB3;LAO VOWEL SIGN AM;Lo;0;L;<compat> 0ECD 0EB2;;;;N;;;;;
+0EB4;LAO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0EB5;LAO VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0EB6;LAO VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
+0EB7;LAO VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
+0EB8;LAO VOWEL SIGN U;Mn;118;NSM;;;;;N;;;;;
+0EB9;LAO VOWEL SIGN UU;Mn;118;NSM;;;;;N;;;;;
+0EBA;LAO SIGN PALI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0EBB;LAO VOWEL SIGN MAI KON;Mn;0;NSM;;;;;N;;;;;
+0EBC;LAO SEMIVOWEL SIGN LO;Mn;0;NSM;;;;;N;;;;;
+0EBD;LAO SEMIVOWEL SIGN NYO;Lo;0;L;;;;;N;;;;;
+0EC0;LAO VOWEL SIGN E;Lo;0;L;;;;;N;;;;;
+0EC1;LAO VOWEL SIGN EI;Lo;0;L;;;;;N;;;;;
+0EC2;LAO VOWEL SIGN O;Lo;0;L;;;;;N;;;;;
+0EC3;LAO VOWEL SIGN AY;Lo;0;L;;;;;N;;;;;
+0EC4;LAO VOWEL SIGN AI;Lo;0;L;;;;;N;;;;;
+0EC6;LAO KO LA;Lm;0;L;;;;;N;;;;;
+0EC8;LAO TONE MAI EK;Mn;122;NSM;;;;;N;;;;;
+0EC9;LAO TONE MAI THO;Mn;122;NSM;;;;;N;;;;;
+0ECA;LAO TONE MAI TI;Mn;122;NSM;;;;;N;;;;;
+0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;;
+0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;;
+0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;;
+0ED0;LAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0ED1;LAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0ED2;LAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0ED3;LAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0ED4;LAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0ED5;LAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0ED6;LAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0ED7;LAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0ED8;LAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0ED9;LAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0EDC;LAO HO NO;Lo;0;L;<compat> 0EAB 0E99;;;;N;;;;;
+0EDD;LAO HO MO;Lo;0;L;<compat> 0EAB 0EA1;;;;N;;;;;
+0EDE;LAO LETTER KHMU GO;Lo;0;L;;;;;N;;;;;
+0EDF;LAO LETTER KHMU NYO;Lo;0;L;;;;;N;;;;;
+0F00;TIBETAN SYLLABLE OM;Lo;0;L;;;;;N;;;;;
+0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;;;;
+0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;;;;
+0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;;;;
+0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;;;;
+0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;;
+0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;;;;
+0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;;;;
+0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;;;;
+0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;;;;
+0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;;;;
+0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;;;;
+0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L;<noBreak> 0F0B;;;;N;;;;;
+0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;;;;
+0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;;;;
+0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;;;;
+0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;;;;
+0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;;;;
+0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;;;;
+0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;;;;
+0F14;TIBETAN MARK GTER TSHEG;Po;0;L;;;;;N;TIBETAN COMMA;;;;
+0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;;;;
+0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;;;;
+0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;;;;
+0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;;;;
+0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;;;;
+0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;;;;
+0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;;;;
+0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;;;;
+0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;;;;
+0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;;;;
+0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;;;;
+0F20;TIBETAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0F21;TIBETAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0F22;TIBETAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0F23;TIBETAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0F24;TIBETAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0F25;TIBETAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0F26;TIBETAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0F27;TIBETAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0F28;TIBETAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0F29;TIBETAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0F2A;TIBETAN DIGIT HALF ONE;No;0;L;;;;1/2;N;;;;;
+0F2B;TIBETAN DIGIT HALF TWO;No;0;L;;;;3/2;N;;;;;
+0F2C;TIBETAN DIGIT HALF THREE;No;0;L;;;;5/2;N;;;;;
+0F2D;TIBETAN DIGIT HALF FOUR;No;0;L;;;;7/2;N;;;;;
+0F2E;TIBETAN DIGIT HALF FIVE;No;0;L;;;;9/2;N;;;;;
+0F2F;TIBETAN DIGIT HALF SIX;No;0;L;;;;11/2;N;;;;;
+0F30;TIBETAN DIGIT HALF SEVEN;No;0;L;;;;13/2;N;;;;;
+0F31;TIBETAN DIGIT HALF EIGHT;No;0;L;;;;15/2;N;;;;;
+0F32;TIBETAN DIGIT HALF NINE;No;0;L;;;;17/2;N;;;;;
+0F33;TIBETAN DIGIT HALF ZERO;No;0;L;;;;-1/2;N;;;;;
+0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;;;;
+0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;;;;
+0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;;;;
+0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;;;;
+0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;;;;
+0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;;;;
+0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;;;;
+0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;;;;
+0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;;;;
+0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;;;;
+0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;;;;
+0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;;;;
+0F40;TIBETAN LETTER KA;Lo;0;L;;;;;N;;;;;
+0F41;TIBETAN LETTER KHA;Lo;0;L;;;;;N;;;;;
+0F42;TIBETAN LETTER GA;Lo;0;L;;;;;N;;;;;
+0F43;TIBETAN LETTER GHA;Lo;0;L;0F42 0FB7;;;;N;;;;;
+0F44;TIBETAN LETTER NGA;Lo;0;L;;;;;N;;;;;
+0F45;TIBETAN LETTER CA;Lo;0;L;;;;;N;;;;;
+0F46;TIBETAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+0F47;TIBETAN LETTER JA;Lo;0;L;;;;;N;;;;;
+0F49;TIBETAN LETTER NYA;Lo;0;L;;;;;N;;;;;
+0F4A;TIBETAN LETTER TTA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED TA;;;;
+0F4B;TIBETAN LETTER TTHA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED THA;;;;
+0F4C;TIBETAN LETTER DDA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED DA;;;;
+0F4D;TIBETAN LETTER DDHA;Lo;0;L;0F4C 0FB7;;;;N;;;;;
+0F4E;TIBETAN LETTER NNA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED NA;;;;
+0F4F;TIBETAN LETTER TA;Lo;0;L;;;;;N;;;;;
+0F50;TIBETAN LETTER THA;Lo;0;L;;;;;N;;;;;
+0F51;TIBETAN LETTER DA;Lo;0;L;;;;;N;;;;;
+0F52;TIBETAN LETTER DHA;Lo;0;L;0F51 0FB7;;;;N;;;;;
+0F53;TIBETAN LETTER NA;Lo;0;L;;;;;N;;;;;
+0F54;TIBETAN LETTER PA;Lo;0;L;;;;;N;;;;;
+0F55;TIBETAN LETTER PHA;Lo;0;L;;;;;N;;;;;
+0F56;TIBETAN LETTER BA;Lo;0;L;;;;;N;;;;;
+0F57;TIBETAN LETTER BHA;Lo;0;L;0F56 0FB7;;;;N;;;;;
+0F58;TIBETAN LETTER MA;Lo;0;L;;;;;N;;;;;
+0F59;TIBETAN LETTER TSA;Lo;0;L;;;;;N;;;;;
+0F5A;TIBETAN LETTER TSHA;Lo;0;L;;;;;N;;;;;
+0F5B;TIBETAN LETTER DZA;Lo;0;L;;;;;N;;;;;
+0F5C;TIBETAN LETTER DZHA;Lo;0;L;0F5B 0FB7;;;;N;;;;;
+0F5D;TIBETAN LETTER WA;Lo;0;L;;;;;N;;;;;
+0F5E;TIBETAN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0F5F;TIBETAN LETTER ZA;Lo;0;L;;;;;N;;;;;
+0F60;TIBETAN LETTER -A;Lo;0;L;;;;;N;TIBETAN LETTER AA;;;;
+0F61;TIBETAN LETTER YA;Lo;0;L;;;;;N;;;;;
+0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;;;;
+0F63;TIBETAN LETTER LA;Lo;0;L;;;;;N;;;;;
+0F64;TIBETAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+0F65;TIBETAN LETTER SSA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED SHA;;;;
+0F66;TIBETAN LETTER SA;Lo;0;L;;;;;N;;;;;
+0F67;TIBETAN LETTER HA;Lo;0;L;;;;;N;;;;;
+0F68;TIBETAN LETTER A;Lo;0;L;;;;;N;;;;;
+0F69;TIBETAN LETTER KSSA;Lo;0;L;0F40 0FB5;;;;N;;;;;
+0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;;;;
+0F6B;TIBETAN LETTER KKA;Lo;0;L;;;;;N;;;;;
+0F6C;TIBETAN LETTER RRA;Lo;0;L;;;;;N;;;;;
+0F71;TIBETAN VOWEL SIGN AA;Mn;129;NSM;;;;;N;;;;;
+0F72;TIBETAN VOWEL SIGN I;Mn;130;NSM;;;;;N;;;;;
+0F73;TIBETAN VOWEL SIGN II;Mn;0;NSM;0F71 0F72;;;;N;;;;;
+0F74;TIBETAN VOWEL SIGN U;Mn;132;NSM;;;;;N;;;;;
+0F75;TIBETAN VOWEL SIGN UU;Mn;0;NSM;0F71 0F74;;;;N;;;;;
+0F76;TIBETAN VOWEL SIGN VOCALIC R;Mn;0;NSM;0FB2 0F80;;;;N;;;;;
+0F77;TIBETAN VOWEL SIGN VOCALIC RR;Mn;0;NSM;<compat> 0FB2 0F81;;;;N;;;;;
+0F78;TIBETAN VOWEL SIGN VOCALIC L;Mn;0;NSM;0FB3 0F80;;;;N;;;;;
+0F79;TIBETAN VOWEL SIGN VOCALIC LL;Mn;0;NSM;<compat> 0FB3 0F81;;;;N;;;;;
+0F7A;TIBETAN VOWEL SIGN E;Mn;130;NSM;;;;;N;;;;;
+0F7B;TIBETAN VOWEL SIGN EE;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AI;;;;
+0F7C;TIBETAN VOWEL SIGN O;Mn;130;NSM;;;;;N;;;;;
+0F7D;TIBETAN VOWEL SIGN OO;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AU;;;;
+0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;;;;
+0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;;;;
+0F80;TIBETAN VOWEL SIGN REVERSED I;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN SHORT I;;;;
+0F81;TIBETAN VOWEL SIGN REVERSED II;Mn;0;NSM;0F71 0F80;;;;N;;;;;
+0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;;;;
+0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;;;;
+0F84;TIBETAN MARK HALANTA;Mn;9;NSM;;;;;N;TIBETAN VIRAMA;;;;
+0F85;TIBETAN MARK PALUTA;Po;0;L;;;;;N;TIBETAN CHUCHENYIGE;;;;
+0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;;;;
+0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;;;;
+0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;;;;
+0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;;;;
+0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;;;;
+0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;;;;
+0F8C;TIBETAN SIGN INVERTED MCHU CAN;Lo;0;L;;;;;N;;;;;
+0F8D;TIBETAN SUBJOINED SIGN LCE TSA CAN;Mn;0;NSM;;;;;N;;;;;
+0F8E;TIBETAN SUBJOINED SIGN MCHU CAN;Mn;0;NSM;;;;;N;;;;;
+0F8F;TIBETAN SUBJOINED SIGN INVERTED MCHU CAN;Mn;0;NSM;;;;;N;;;;;
+0F90;TIBETAN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
+0F91;TIBETAN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
+0F92;TIBETAN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
+0F93;TIBETAN SUBJOINED LETTER GHA;Mn;0;NSM;0F92 0FB7;;;;N;;;;;
+0F94;TIBETAN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
+0F95;TIBETAN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
+0F96;TIBETAN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
+0F97;TIBETAN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
+0F99;TIBETAN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
+0F9A;TIBETAN SUBJOINED LETTER TTA;Mn;0;NSM;;;;;N;;;;;
+0F9B;TIBETAN SUBJOINED LETTER TTHA;Mn;0;NSM;;;;;N;;;;;
+0F9C;TIBETAN SUBJOINED LETTER DDA;Mn;0;NSM;;;;;N;;;;;
+0F9D;TIBETAN SUBJOINED LETTER DDHA;Mn;0;NSM;0F9C 0FB7;;;;N;;;;;
+0F9E;TIBETAN SUBJOINED LETTER NNA;Mn;0;NSM;;;;;N;;;;;
+0F9F;TIBETAN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
+0FA0;TIBETAN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
+0FA1;TIBETAN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
+0FA2;TIBETAN SUBJOINED LETTER DHA;Mn;0;NSM;0FA1 0FB7;;;;N;;;;;
+0FA3;TIBETAN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
+0FA4;TIBETAN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
+0FA5;TIBETAN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
+0FA6;TIBETAN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
+0FA7;TIBETAN SUBJOINED LETTER BHA;Mn;0;NSM;0FA6 0FB7;;;;N;;;;;
+0FA8;TIBETAN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
+0FA9;TIBETAN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
+0FAA;TIBETAN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
+0FAB;TIBETAN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
+0FAC;TIBETAN SUBJOINED LETTER DZHA;Mn;0;NSM;0FAB 0FB7;;;;N;;;;;
+0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;;
+0FAE;TIBETAN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
+0FAF;TIBETAN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
+0FB0;TIBETAN SUBJOINED LETTER -A;Mn;0;NSM;;;;;N;;;;;
+0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;;;;
+0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;;
+0FB3;TIBETAN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
+0FB4;TIBETAN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
+0FB5;TIBETAN SUBJOINED LETTER SSA;Mn;0;NSM;;;;;N;;;;;
+0FB6;TIBETAN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
+0FB7;TIBETAN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
+0FB8;TIBETAN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
+0FB9;TIBETAN SUBJOINED LETTER KSSA;Mn;0;NSM;0F90 0FB5;;;;N;;;;;
+0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;;;;
+0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;;;;
+0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;;;;
+0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;;;;
+0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;;;;
+0FC0;TIBETAN CANTILLATION SIGN HEAVY BEAT;So;0;L;;;;;N;;;;;
+0FC1;TIBETAN CANTILLATION SIGN LIGHT BEAT;So;0;L;;;;;N;;;;;
+0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;;;;
+0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;;;;
+0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;;;;
+0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;;;;
+0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;;;;
+0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;;;;
+0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;;;;
+0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;;;;
+0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;;;;
+0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;;;;
+0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;;;;
+0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;;;;
+0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;;;;
+0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;;;;
+0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;;;;
+0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;;;;
+0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;;;;
+0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;;
+0FD5;RIGHT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;;
+0FD6;LEFT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;;
+0FD7;RIGHT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;;
+0FD8;LEFT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;;
+0FD9;TIBETAN MARK LEADING MCHAN RTAGS;Po;0;L;;;;;N;;;;;
+0FDA;TIBETAN MARK TRAILING MCHAN RTAGS;Po;0;L;;;;;N;;;;;
+1000;MYANMAR LETTER KA;Lo;0;L;;;;;N;;;;;
+1001;MYANMAR LETTER KHA;Lo;0;L;;;;;N;;;;;
+1002;MYANMAR LETTER GA;Lo;0;L;;;;;N;;;;;
+1003;MYANMAR LETTER GHA;Lo;0;L;;;;;N;;;;;
+1004;MYANMAR LETTER NGA;Lo;0;L;;;;;N;;;;;
+1005;MYANMAR LETTER CA;Lo;0;L;;;;;N;;;;;
+1006;MYANMAR LETTER CHA;Lo;0;L;;;;;N;;;;;
+1007;MYANMAR LETTER JA;Lo;0;L;;;;;N;;;;;
+1008;MYANMAR LETTER JHA;Lo;0;L;;;;;N;;;;;
+1009;MYANMAR LETTER NYA;Lo;0;L;;;;;N;;;;;
+100A;MYANMAR LETTER NNYA;Lo;0;L;;;;;N;;;;;
+100B;MYANMAR LETTER TTA;Lo;0;L;;;;;N;;;;;
+100C;MYANMAR LETTER TTHA;Lo;0;L;;;;;N;;;;;
+100D;MYANMAR LETTER DDA;Lo;0;L;;;;;N;;;;;
+100E;MYANMAR LETTER DDHA;Lo;0;L;;;;;N;;;;;
+100F;MYANMAR LETTER NNA;Lo;0;L;;;;;N;;;;;
+1010;MYANMAR LETTER TA;Lo;0;L;;;;;N;;;;;
+1011;MYANMAR LETTER THA;Lo;0;L;;;;;N;;;;;
+1012;MYANMAR LETTER DA;Lo;0;L;;;;;N;;;;;
+1013;MYANMAR LETTER DHA;Lo;0;L;;;;;N;;;;;
+1014;MYANMAR LETTER NA;Lo;0;L;;;;;N;;;;;
+1015;MYANMAR LETTER PA;Lo;0;L;;;;;N;;;;;
+1016;MYANMAR LETTER PHA;Lo;0;L;;;;;N;;;;;
+1017;MYANMAR LETTER BA;Lo;0;L;;;;;N;;;;;
+1018;MYANMAR LETTER BHA;Lo;0;L;;;;;N;;;;;
+1019;MYANMAR LETTER MA;Lo;0;L;;;;;N;;;;;
+101A;MYANMAR LETTER YA;Lo;0;L;;;;;N;;;;;
+101B;MYANMAR LETTER RA;Lo;0;L;;;;;N;;;;;
+101C;MYANMAR LETTER LA;Lo;0;L;;;;;N;;;;;
+101D;MYANMAR LETTER WA;Lo;0;L;;;;;N;;;;;
+101E;MYANMAR LETTER SA;Lo;0;L;;;;;N;;;;;
+101F;MYANMAR LETTER HA;Lo;0;L;;;;;N;;;;;
+1020;MYANMAR LETTER LLA;Lo;0;L;;;;;N;;;;;
+1021;MYANMAR LETTER A;Lo;0;L;;;;;N;;;;;
+1022;MYANMAR LETTER SHAN A;Lo;0;L;;;;;N;;;;;
+1023;MYANMAR LETTER I;Lo;0;L;;;;;N;;;;;
+1024;MYANMAR LETTER II;Lo;0;L;;;;;N;;;;;
+1025;MYANMAR LETTER U;Lo;0;L;;;;;N;;;;;
+1026;MYANMAR LETTER UU;Lo;0;L;1025 102E;;;;N;;;;;
+1027;MYANMAR LETTER E;Lo;0;L;;;;;N;;;;;
+1028;MYANMAR LETTER MON E;Lo;0;L;;;;;N;;;;;
+1029;MYANMAR LETTER O;Lo;0;L;;;;;N;;;;;
+102A;MYANMAR LETTER AU;Lo;0;L;;;;;N;;;;;
+102B;MYANMAR VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
+102C;MYANMAR VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+102D;MYANMAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+102E;MYANMAR VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+102F;MYANMAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1030;MYANMAR VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1031;MYANMAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1032;MYANMAR VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1033;MYANMAR VOWEL SIGN MON II;Mn;0;NSM;;;;;N;;;;;
+1034;MYANMAR VOWEL SIGN MON O;Mn;0;NSM;;;;;N;;;;;
+1035;MYANMAR VOWEL SIGN E ABOVE;Mn;0;NSM;;;;;N;;;;;
+1036;MYANMAR SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1037;MYANMAR SIGN DOT BELOW;Mn;7;NSM;;;;;N;;;;;
+1038;MYANMAR SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+1039;MYANMAR SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+103A;MYANMAR SIGN ASAT;Mn;9;NSM;;;;;N;;;;;
+103B;MYANMAR CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;;
+103C;MYANMAR CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
+103D;MYANMAR CONSONANT SIGN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
+103E;MYANMAR CONSONANT SIGN MEDIAL HA;Mn;0;NSM;;;;;N;;;;;
+103F;MYANMAR LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
+1040;MYANMAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1041;MYANMAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1042;MYANMAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1043;MYANMAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1044;MYANMAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1045;MYANMAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1046;MYANMAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1047;MYANMAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1048;MYANMAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1049;MYANMAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+104A;MYANMAR SIGN LITTLE SECTION;Po;0;L;;;;;N;;;;;
+104B;MYANMAR SIGN SECTION;Po;0;L;;;;;N;;;;;
+104C;MYANMAR SYMBOL LOCATIVE;Po;0;L;;;;;N;;;;;
+104D;MYANMAR SYMBOL COMPLETED;Po;0;L;;;;;N;;;;;
+104E;MYANMAR SYMBOL AFOREMENTIONED;Po;0;L;;;;;N;;;;;
+104F;MYANMAR SYMBOL GENITIVE;Po;0;L;;;;;N;;;;;
+1050;MYANMAR LETTER SHA;Lo;0;L;;;;;N;;;;;
+1051;MYANMAR LETTER SSA;Lo;0;L;;;;;N;;;;;
+1052;MYANMAR LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1053;MYANMAR LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1054;MYANMAR LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1055;MYANMAR LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1056;MYANMAR VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+1057;MYANMAR VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+1058;MYANMAR VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+1059;MYANMAR VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+105A;MYANMAR LETTER MON NGA;Lo;0;L;;;;;N;;;;;
+105B;MYANMAR LETTER MON JHA;Lo;0;L;;;;;N;;;;;
+105C;MYANMAR LETTER MON BBA;Lo;0;L;;;;;N;;;;;
+105D;MYANMAR LETTER MON BBE;Lo;0;L;;;;;N;;;;;
+105E;MYANMAR CONSONANT SIGN MON MEDIAL NA;Mn;0;NSM;;;;;N;;;;;
+105F;MYANMAR CONSONANT SIGN MON MEDIAL MA;Mn;0;NSM;;;;;N;;;;;
+1060;MYANMAR CONSONANT SIGN MON MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1061;MYANMAR LETTER SGAW KAREN SHA;Lo;0;L;;;;;N;;;;;
+1062;MYANMAR VOWEL SIGN SGAW KAREN EU;Mc;0;L;;;;;N;;;;;
+1063;MYANMAR TONE MARK SGAW KAREN HATHI;Mc;0;L;;;;;N;;;;;
+1064;MYANMAR TONE MARK SGAW KAREN KE PHO;Mc;0;L;;;;;N;;;;;
+1065;MYANMAR LETTER WESTERN PWO KAREN THA;Lo;0;L;;;;;N;;;;;
+1066;MYANMAR LETTER WESTERN PWO KAREN PWA;Lo;0;L;;;;;N;;;;;
+1067;MYANMAR VOWEL SIGN WESTERN PWO KAREN EU;Mc;0;L;;;;;N;;;;;
+1068;MYANMAR VOWEL SIGN WESTERN PWO KAREN UE;Mc;0;L;;;;;N;;;;;
+1069;MYANMAR SIGN WESTERN PWO KAREN TONE-1;Mc;0;L;;;;;N;;;;;
+106A;MYANMAR SIGN WESTERN PWO KAREN TONE-2;Mc;0;L;;;;;N;;;;;
+106B;MYANMAR SIGN WESTERN PWO KAREN TONE-3;Mc;0;L;;;;;N;;;;;
+106C;MYANMAR SIGN WESTERN PWO KAREN TONE-4;Mc;0;L;;;;;N;;;;;
+106D;MYANMAR SIGN WESTERN PWO KAREN TONE-5;Mc;0;L;;;;;N;;;;;
+106E;MYANMAR LETTER EASTERN PWO KAREN NNA;Lo;0;L;;;;;N;;;;;
+106F;MYANMAR LETTER EASTERN PWO KAREN YWA;Lo;0;L;;;;;N;;;;;
+1070;MYANMAR LETTER EASTERN PWO KAREN GHWA;Lo;0;L;;;;;N;;;;;
+1071;MYANMAR VOWEL SIGN GEBA KAREN I;Mn;0;NSM;;;;;N;;;;;
+1072;MYANMAR VOWEL SIGN KAYAH OE;Mn;0;NSM;;;;;N;;;;;
+1073;MYANMAR VOWEL SIGN KAYAH U;Mn;0;NSM;;;;;N;;;;;
+1074;MYANMAR VOWEL SIGN KAYAH EE;Mn;0;NSM;;;;;N;;;;;
+1075;MYANMAR LETTER SHAN KA;Lo;0;L;;;;;N;;;;;
+1076;MYANMAR LETTER SHAN KHA;Lo;0;L;;;;;N;;;;;
+1077;MYANMAR LETTER SHAN GA;Lo;0;L;;;;;N;;;;;
+1078;MYANMAR LETTER SHAN CA;Lo;0;L;;;;;N;;;;;
+1079;MYANMAR LETTER SHAN ZA;Lo;0;L;;;;;N;;;;;
+107A;MYANMAR LETTER SHAN NYA;Lo;0;L;;;;;N;;;;;
+107B;MYANMAR LETTER SHAN DA;Lo;0;L;;;;;N;;;;;
+107C;MYANMAR LETTER SHAN NA;Lo;0;L;;;;;N;;;;;
+107D;MYANMAR LETTER SHAN PHA;Lo;0;L;;;;;N;;;;;
+107E;MYANMAR LETTER SHAN FA;Lo;0;L;;;;;N;;;;;
+107F;MYANMAR LETTER SHAN BA;Lo;0;L;;;;;N;;;;;
+1080;MYANMAR LETTER SHAN THA;Lo;0;L;;;;;N;;;;;
+1081;MYANMAR LETTER SHAN HA;Lo;0;L;;;;;N;;;;;
+1082;MYANMAR CONSONANT SIGN SHAN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
+1083;MYANMAR VOWEL SIGN SHAN AA;Mc;0;L;;;;;N;;;;;
+1084;MYANMAR VOWEL SIGN SHAN E;Mc;0;L;;;;;N;;;;;
+1085;MYANMAR VOWEL SIGN SHAN E ABOVE;Mn;0;NSM;;;;;N;;;;;
+1086;MYANMAR VOWEL SIGN SHAN FINAL Y;Mn;0;NSM;;;;;N;;;;;
+1087;MYANMAR SIGN SHAN TONE-2;Mc;0;L;;;;;N;;;;;
+1088;MYANMAR SIGN SHAN TONE-3;Mc;0;L;;;;;N;;;;;
+1089;MYANMAR SIGN SHAN TONE-5;Mc;0;L;;;;;N;;;;;
+108A;MYANMAR SIGN SHAN TONE-6;Mc;0;L;;;;;N;;;;;
+108B;MYANMAR SIGN SHAN COUNCIL TONE-2;Mc;0;L;;;;;N;;;;;
+108C;MYANMAR SIGN SHAN COUNCIL TONE-3;Mc;0;L;;;;;N;;;;;
+108D;MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE;Mn;220;NSM;;;;;N;;;;;
+108E;MYANMAR LETTER RUMAI PALAUNG FA;Lo;0;L;;;;;N;;;;;
+108F;MYANMAR SIGN RUMAI PALAUNG TONE-5;Mc;0;L;;;;;N;;;;;
+1090;MYANMAR SHAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1091;MYANMAR SHAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1092;MYANMAR SHAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1093;MYANMAR SHAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1094;MYANMAR SHAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1095;MYANMAR SHAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1096;MYANMAR SHAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1097;MYANMAR SHAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1098;MYANMAR SHAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1099;MYANMAR SHAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+109A;MYANMAR SIGN KHAMTI TONE-1;Mc;0;L;;;;;N;;;;;
+109B;MYANMAR SIGN KHAMTI TONE-3;Mc;0;L;;;;;N;;;;;
+109C;MYANMAR VOWEL SIGN AITON A;Mc;0;L;;;;;N;;;;;
+109D;MYANMAR VOWEL SIGN AITON AI;Mn;0;NSM;;;;;N;;;;;
+109E;MYANMAR SYMBOL SHAN ONE;So;0;L;;;;;N;;;;;
+109F;MYANMAR SYMBOL SHAN EXCLAMATION;So;0;L;;;;;N;;;;;
+10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;2D00;
+10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;2D01;
+10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;2D02;
+10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;2D03;
+10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;2D04;
+10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;2D05;
+10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;2D06;
+10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;2D07;
+10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;2D08;
+10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;2D09;
+10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;2D0A;
+10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;2D0B;
+10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;2D0C;
+10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;2D0D;
+10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;2D0E;
+10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;2D0F;
+10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;2D10;
+10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;2D11;
+10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;2D12;
+10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;2D13;
+10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;2D14;
+10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;2D15;
+10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;2D16;
+10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;2D17;
+10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;2D18;
+10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;2D19;
+10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;2D1A;
+10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;2D1B;
+10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;2D1C;
+10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;2D1D;
+10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;2D1E;
+10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;2D1F;
+10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;2D20;
+10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;2D21;
+10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;2D22;
+10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;2D23;
+10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;2D24;
+10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;2D25;
+10C7;GEORGIAN CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;2D27;
+10CD;GEORGIAN CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;2D2D;
+10D0;GEORGIAN LETTER AN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;1C90;;10D0
+10D1;GEORGIAN LETTER BAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;1C91;;10D1
+10D2;GEORGIAN LETTER GAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;1C92;;10D2
+10D3;GEORGIAN LETTER DON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;1C93;;10D3
+10D4;GEORGIAN LETTER EN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;1C94;;10D4
+10D5;GEORGIAN LETTER VIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;1C95;;10D5
+10D6;GEORGIAN LETTER ZEN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;1C96;;10D6
+10D7;GEORGIAN LETTER TAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;1C97;;10D7
+10D8;GEORGIAN LETTER IN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;1C98;;10D8
+10D9;GEORGIAN LETTER KAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;1C99;;10D9
+10DA;GEORGIAN LETTER LAS;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;1C9A;;10DA
+10DB;GEORGIAN LETTER MAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;1C9B;;10DB
+10DC;GEORGIAN LETTER NAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;1C9C;;10DC
+10DD;GEORGIAN LETTER ON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;1C9D;;10DD
+10DE;GEORGIAN LETTER PAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;1C9E;;10DE
+10DF;GEORGIAN LETTER ZHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;1C9F;;10DF
+10E0;GEORGIAN LETTER RAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;1CA0;;10E0
+10E1;GEORGIAN LETTER SAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;1CA1;;10E1
+10E2;GEORGIAN LETTER TAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;1CA2;;10E2
+10E3;GEORGIAN LETTER UN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;1CA3;;10E3
+10E4;GEORGIAN LETTER PHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;1CA4;;10E4
+10E5;GEORGIAN LETTER KHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;1CA5;;10E5
+10E6;GEORGIAN LETTER GHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;1CA6;;10E6
+10E7;GEORGIAN LETTER QAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;1CA7;;10E7
+10E8;GEORGIAN LETTER SHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;1CA8;;10E8
+10E9;GEORGIAN LETTER CHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;1CA9;;10E9
+10EA;GEORGIAN LETTER CAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;1CAA;;10EA
+10EB;GEORGIAN LETTER JIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;1CAB;;10EB
+10EC;GEORGIAN LETTER CIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;1CAC;;10EC
+10ED;GEORGIAN LETTER CHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;1CAD;;10ED
+10EE;GEORGIAN LETTER XAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;1CAE;;10EE
+10EF;GEORGIAN LETTER JHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;1CAF;;10EF
+10F0;GEORGIAN LETTER HAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;1CB0;;10F0
+10F1;GEORGIAN LETTER HE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;1CB1;;10F1
+10F2;GEORGIAN LETTER HIE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;1CB2;;10F2
+10F3;GEORGIAN LETTER WE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;1CB3;;10F3
+10F4;GEORGIAN LETTER HAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;1CB4;;10F4
+10F5;GEORGIAN LETTER HOE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;1CB5;;10F5
+10F6;GEORGIAN LETTER FI;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;1CB6;;10F6
+10F7;GEORGIAN LETTER YN;Ll;0;L;;;;;N;;;1CB7;;10F7
+10F8;GEORGIAN LETTER ELIFI;Ll;0;L;;;;;N;;;1CB8;;10F8
+10F9;GEORGIAN LETTER TURNED GAN;Ll;0;L;;;;;N;;;1CB9;;10F9
+10FA;GEORGIAN LETTER AIN;Ll;0;L;;;;;N;;;1CBA;;10FA
+10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
+10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L;<super> 10DC;;;;N;;;;;
+10FD;GEORGIAN LETTER AEN;Ll;0;L;;;;;N;;;1CBD;;10FD
+10FE;GEORGIAN LETTER HARD SIGN;Ll;0;L;;;;;N;;;1CBE;;10FE
+10FF;GEORGIAN LETTER LABIAL SIGN;Ll;0;L;;;;;N;;;1CBF;;10FF
+1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
+1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;;;;
+1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;;;;
+1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;;;;
+1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;;;;
+1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;;;;
+1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;;;;
+110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;;
+110B;HANGUL CHOSEONG IEUNG;Lo;0;L;;;;;N;;;;;
+110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;;;;
+110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;;
+110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;;;;
+110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;;;;
+1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;;;;
+1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;;;;
+1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;;;;
+1113;HANGUL CHOSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
+1114;HANGUL CHOSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+1115;HANGUL CHOSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
+1116;HANGUL CHOSEONG NIEUN-PIEUP;Lo;0;L;;;;;N;;;;;
+1117;HANGUL CHOSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
+1118;HANGUL CHOSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
+1119;HANGUL CHOSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
+111A;HANGUL CHOSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
+111B;HANGUL CHOSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
+111C;HANGUL CHOSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
+111D;HANGUL CHOSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
+111E;HANGUL CHOSEONG PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
+111F;HANGUL CHOSEONG PIEUP-NIEUN;Lo;0;L;;;;;N;;;;;
+1120;HANGUL CHOSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+1121;HANGUL CHOSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+1122;HANGUL CHOSEONG PIEUP-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+1123;HANGUL CHOSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+1124;HANGUL CHOSEONG PIEUP-SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+1125;HANGUL CHOSEONG PIEUP-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+1126;HANGUL CHOSEONG PIEUP-SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+1127;HANGUL CHOSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
+1128;HANGUL CHOSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
+1129;HANGUL CHOSEONG PIEUP-THIEUTH;Lo;0;L;;;;;N;;;;;
+112A;HANGUL CHOSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+112B;HANGUL CHOSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+112C;HANGUL CHOSEONG KAPYEOUNSSANGPIEUP;Lo;0;L;;;;;N;;;;;
+112D;HANGUL CHOSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+112E;HANGUL CHOSEONG SIOS-NIEUN;Lo;0;L;;;;;N;;;;;
+112F;HANGUL CHOSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+1130;HANGUL CHOSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
+1131;HANGUL CHOSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
+1132;HANGUL CHOSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+1133;HANGUL CHOSEONG SIOS-PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
+1134;HANGUL CHOSEONG SIOS-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+1135;HANGUL CHOSEONG SIOS-IEUNG;Lo;0;L;;;;;N;;;;;
+1136;HANGUL CHOSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+1137;HANGUL CHOSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
+1138;HANGUL CHOSEONG SIOS-KHIEUKH;Lo;0;L;;;;;N;;;;;
+1139;HANGUL CHOSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+113A;HANGUL CHOSEONG SIOS-PHIEUPH;Lo;0;L;;;;;N;;;;;
+113B;HANGUL CHOSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
+113C;HANGUL CHOSEONG CHITUEUMSIOS;Lo;0;L;;;;;N;;;;;
+113D;HANGUL CHOSEONG CHITUEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
+113E;HANGUL CHOSEONG CEONGCHIEUMSIOS;Lo;0;L;;;;;N;;;;;
+113F;HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
+1140;HANGUL CHOSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
+1141;HANGUL CHOSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
+1142;HANGUL CHOSEONG IEUNG-TIKEUT;Lo;0;L;;;;;N;;;;;
+1143;HANGUL CHOSEONG IEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
+1144;HANGUL CHOSEONG IEUNG-PIEUP;Lo;0;L;;;;;N;;;;;
+1145;HANGUL CHOSEONG IEUNG-SIOS;Lo;0;L;;;;;N;;;;;
+1146;HANGUL CHOSEONG IEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
+1147;HANGUL CHOSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
+1148;HANGUL CHOSEONG IEUNG-CIEUC;Lo;0;L;;;;;N;;;;;
+1149;HANGUL CHOSEONG IEUNG-CHIEUCH;Lo;0;L;;;;;N;;;;;
+114A;HANGUL CHOSEONG IEUNG-THIEUTH;Lo;0;L;;;;;N;;;;;
+114B;HANGUL CHOSEONG IEUNG-PHIEUPH;Lo;0;L;;;;;N;;;;;
+114C;HANGUL CHOSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
+114D;HANGUL CHOSEONG CIEUC-IEUNG;Lo;0;L;;;;;N;;;;;
+114E;HANGUL CHOSEONG CHITUEUMCIEUC;Lo;0;L;;;;;N;;;;;
+114F;HANGUL CHOSEONG CHITUEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
+1150;HANGUL CHOSEONG CEONGCHIEUMCIEUC;Lo;0;L;;;;;N;;;;;
+1151;HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
+1152;HANGUL CHOSEONG CHIEUCH-KHIEUKH;Lo;0;L;;;;;N;;;;;
+1153;HANGUL CHOSEONG CHIEUCH-HIEUH;Lo;0;L;;;;;N;;;;;
+1154;HANGUL CHOSEONG CHITUEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
+1155;HANGUL CHOSEONG CEONGCHIEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
+1156;HANGUL CHOSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
+1157;HANGUL CHOSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
+1158;HANGUL CHOSEONG SSANGHIEUH;Lo;0;L;;;;;N;;;;;
+1159;HANGUL CHOSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+115A;HANGUL CHOSEONG KIYEOK-TIKEUT;Lo;0;L;;;;;N;;;;;
+115B;HANGUL CHOSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
+115C;HANGUL CHOSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;;
+115D;HANGUL CHOSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;;
+115E;HANGUL CHOSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
+115F;HANGUL CHOSEONG FILLER;Lo;0;L;;;;;N;;;;;
+1160;HANGUL JUNGSEONG FILLER;Lo;0;L;;;;;N;;;;;
+1161;HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;;
+1162;HANGUL JUNGSEONG AE;Lo;0;L;;;;;N;;;;;
+1163;HANGUL JUNGSEONG YA;Lo;0;L;;;;;N;;;;;
+1164;HANGUL JUNGSEONG YAE;Lo;0;L;;;;;N;;;;;
+1165;HANGUL JUNGSEONG EO;Lo;0;L;;;;;N;;;;;
+1166;HANGUL JUNGSEONG E;Lo;0;L;;;;;N;;;;;
+1167;HANGUL JUNGSEONG YEO;Lo;0;L;;;;;N;;;;;
+1168;HANGUL JUNGSEONG YE;Lo;0;L;;;;;N;;;;;
+1169;HANGUL JUNGSEONG O;Lo;0;L;;;;;N;;;;;
+116A;HANGUL JUNGSEONG WA;Lo;0;L;;;;;N;;;;;
+116B;HANGUL JUNGSEONG WAE;Lo;0;L;;;;;N;;;;;
+116C;HANGUL JUNGSEONG OE;Lo;0;L;;;;;N;;;;;
+116D;HANGUL JUNGSEONG YO;Lo;0;L;;;;;N;;;;;
+116E;HANGUL JUNGSEONG U;Lo;0;L;;;;;N;;;;;
+116F;HANGUL JUNGSEONG WEO;Lo;0;L;;;;;N;;;;;
+1170;HANGUL JUNGSEONG WE;Lo;0;L;;;;;N;;;;;
+1171;HANGUL JUNGSEONG WI;Lo;0;L;;;;;N;;;;;
+1172;HANGUL JUNGSEONG YU;Lo;0;L;;;;;N;;;;;
+1173;HANGUL JUNGSEONG EU;Lo;0;L;;;;;N;;;;;
+1174;HANGUL JUNGSEONG YI;Lo;0;L;;;;;N;;;;;
+1175;HANGUL JUNGSEONG I;Lo;0;L;;;;;N;;;;;
+1176;HANGUL JUNGSEONG A-O;Lo;0;L;;;;;N;;;;;
+1177;HANGUL JUNGSEONG A-U;Lo;0;L;;;;;N;;;;;
+1178;HANGUL JUNGSEONG YA-O;Lo;0;L;;;;;N;;;;;
+1179;HANGUL JUNGSEONG YA-YO;Lo;0;L;;;;;N;;;;;
+117A;HANGUL JUNGSEONG EO-O;Lo;0;L;;;;;N;;;;;
+117B;HANGUL JUNGSEONG EO-U;Lo;0;L;;;;;N;;;;;
+117C;HANGUL JUNGSEONG EO-EU;Lo;0;L;;;;;N;;;;;
+117D;HANGUL JUNGSEONG YEO-O;Lo;0;L;;;;;N;;;;;
+117E;HANGUL JUNGSEONG YEO-U;Lo;0;L;;;;;N;;;;;
+117F;HANGUL JUNGSEONG O-EO;Lo;0;L;;;;;N;;;;;
+1180;HANGUL JUNGSEONG O-E;Lo;0;L;;;;;N;;;;;
+1181;HANGUL JUNGSEONG O-YE;Lo;0;L;;;;;N;;;;;
+1182;HANGUL JUNGSEONG O-O;Lo;0;L;;;;;N;;;;;
+1183;HANGUL JUNGSEONG O-U;Lo;0;L;;;;;N;;;;;
+1184;HANGUL JUNGSEONG YO-YA;Lo;0;L;;;;;N;;;;;
+1185;HANGUL JUNGSEONG YO-YAE;Lo;0;L;;;;;N;;;;;
+1186;HANGUL JUNGSEONG YO-YEO;Lo;0;L;;;;;N;;;;;
+1187;HANGUL JUNGSEONG YO-O;Lo;0;L;;;;;N;;;;;
+1188;HANGUL JUNGSEONG YO-I;Lo;0;L;;;;;N;;;;;
+1189;HANGUL JUNGSEONG U-A;Lo;0;L;;;;;N;;;;;
+118A;HANGUL JUNGSEONG U-AE;Lo;0;L;;;;;N;;;;;
+118B;HANGUL JUNGSEONG U-EO-EU;Lo;0;L;;;;;N;;;;;
+118C;HANGUL JUNGSEONG U-YE;Lo;0;L;;;;;N;;;;;
+118D;HANGUL JUNGSEONG U-U;Lo;0;L;;;;;N;;;;;
+118E;HANGUL JUNGSEONG YU-A;Lo;0;L;;;;;N;;;;;
+118F;HANGUL JUNGSEONG YU-EO;Lo;0;L;;;;;N;;;;;
+1190;HANGUL JUNGSEONG YU-E;Lo;0;L;;;;;N;;;;;
+1191;HANGUL JUNGSEONG YU-YEO;Lo;0;L;;;;;N;;;;;
+1192;HANGUL JUNGSEONG YU-YE;Lo;0;L;;;;;N;;;;;
+1193;HANGUL JUNGSEONG YU-U;Lo;0;L;;;;;N;;;;;
+1194;HANGUL JUNGSEONG YU-I;Lo;0;L;;;;;N;;;;;
+1195;HANGUL JUNGSEONG EU-U;Lo;0;L;;;;;N;;;;;
+1196;HANGUL JUNGSEONG EU-EU;Lo;0;L;;;;;N;;;;;
+1197;HANGUL JUNGSEONG YI-U;Lo;0;L;;;;;N;;;;;
+1198;HANGUL JUNGSEONG I-A;Lo;0;L;;;;;N;;;;;
+1199;HANGUL JUNGSEONG I-YA;Lo;0;L;;;;;N;;;;;
+119A;HANGUL JUNGSEONG I-O;Lo;0;L;;;;;N;;;;;
+119B;HANGUL JUNGSEONG I-U;Lo;0;L;;;;;N;;;;;
+119C;HANGUL JUNGSEONG I-EU;Lo;0;L;;;;;N;;;;;
+119D;HANGUL JUNGSEONG I-ARAEA;Lo;0;L;;;;;N;;;;;
+119E;HANGUL JUNGSEONG ARAEA;Lo;0;L;;;;;N;;;;;
+119F;HANGUL JUNGSEONG ARAEA-EO;Lo;0;L;;;;;N;;;;;
+11A0;HANGUL JUNGSEONG ARAEA-U;Lo;0;L;;;;;N;;;;;
+11A1;HANGUL JUNGSEONG ARAEA-I;Lo;0;L;;;;;N;;;;;
+11A2;HANGUL JUNGSEONG SSANGARAEA;Lo;0;L;;;;;N;;;;;
+11A3;HANGUL JUNGSEONG A-EU;Lo;0;L;;;;;N;;;;;
+11A4;HANGUL JUNGSEONG YA-U;Lo;0;L;;;;;N;;;;;
+11A5;HANGUL JUNGSEONG YEO-YA;Lo;0;L;;;;;N;;;;;
+11A6;HANGUL JUNGSEONG O-YA;Lo;0;L;;;;;N;;;;;
+11A7;HANGUL JUNGSEONG O-YAE;Lo;0;L;;;;;N;;;;;
+11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
+11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
+11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;;;;
+11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;;
+11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;;
+11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;;;;
+11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;;;;
+11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;;
+11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;;
+11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;;
+11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;;
+11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;;;;
+11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;;
+11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
+11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;;;;
+11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;;;;
+11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;;;;
+11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;;;;
+11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;;;;
+11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;;;;
+11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;;;;
+11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;;;;
+11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;;;;
+11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;;;;
+11C3;HANGUL JONGSEONG KIYEOK-RIEUL;Lo;0;L;;;;;N;;;;;
+11C4;HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+11C5;HANGUL JONGSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
+11C6;HANGUL JONGSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
+11C7;HANGUL JONGSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
+11C8;HANGUL JONGSEONG NIEUN-PANSIOS;Lo;0;L;;;;;N;;;;;
+11C9;HANGUL JONGSEONG NIEUN-THIEUTH;Lo;0;L;;;;;N;;;;;
+11CA;HANGUL JONGSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
+11CB;HANGUL JONGSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
+11CC;HANGUL JONGSEONG RIEUL-KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
+11CD;HANGUL JONGSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
+11CE;HANGUL JONGSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
+11CF;HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH;Lo;0;L;;;;;N;;;;;
+11D0;HANGUL JONGSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
+11D1;HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+11D2;HANGUL JONGSEONG RIEUL-MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+11D3;HANGUL JONGSEONG RIEUL-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+11D4;HANGUL JONGSEONG RIEUL-PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+11D5;HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+11D6;HANGUL JONGSEONG RIEUL-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11D7;HANGUL JONGSEONG RIEUL-PANSIOS;Lo;0;L;;;;;N;;;;;
+11D8;HANGUL JONGSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11D9;HANGUL JONGSEONG RIEUL-YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+11DA;HANGUL JONGSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+11DB;HANGUL JONGSEONG MIEUM-RIEUL;Lo;0;L;;;;;N;;;;;
+11DC;HANGUL JONGSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
+11DD;HANGUL JONGSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+11DE;HANGUL JONGSEONG MIEUM-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11DF;HANGUL JONGSEONG MIEUM-PANSIOS;Lo;0;L;;;;;N;;;;;
+11E0;HANGUL JONGSEONG MIEUM-CHIEUCH;Lo;0;L;;;;;N;;;;;
+11E1;HANGUL JONGSEONG MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
+11E2;HANGUL JONGSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
+11E3;HANGUL JONGSEONG PIEUP-RIEUL;Lo;0;L;;;;;N;;;;;
+11E4;HANGUL JONGSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+11E5;HANGUL JONGSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+11E6;HANGUL JONGSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+11E7;HANGUL JONGSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+11E8;HANGUL JONGSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+11E9;HANGUL JONGSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
+11EA;HANGUL JONGSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+11EB;HANGUL JONGSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
+11EC;HANGUL JONGSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
+11ED;HANGUL JONGSEONG IEUNG-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+11EE;HANGUL JONGSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
+11EF;HANGUL JONGSEONG IEUNG-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11F0;HANGUL JONGSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
+11F1;HANGUL JONGSEONG YESIEUNG-SIOS;Lo;0;L;;;;;N;;;;;
+11F2;HANGUL JONGSEONG YESIEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
+11F3;HANGUL JONGSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
+11F4;HANGUL JONGSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
+11F5;HANGUL JONGSEONG HIEUH-NIEUN;Lo;0;L;;;;;N;;;;;
+11F6;HANGUL JONGSEONG HIEUH-RIEUL;Lo;0;L;;;;;N;;;;;
+11F7;HANGUL JONGSEONG HIEUH-MIEUM;Lo;0;L;;;;;N;;;;;
+11F8;HANGUL JONGSEONG HIEUH-PIEUP;Lo;0;L;;;;;N;;;;;
+11F9;HANGUL JONGSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+11FA;HANGUL JONGSEONG KIYEOK-NIEUN;Lo;0;L;;;;;N;;;;;
+11FB;HANGUL JONGSEONG KIYEOK-PIEUP;Lo;0;L;;;;;N;;;;;
+11FC;HANGUL JONGSEONG KIYEOK-CHIEUCH;Lo;0;L;;;;;N;;;;;
+11FD;HANGUL JONGSEONG KIYEOK-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11FE;HANGUL JONGSEONG KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;;
+11FF;HANGUL JONGSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+1200;ETHIOPIC SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+1201;ETHIOPIC SYLLABLE HU;Lo;0;L;;;;;N;;;;;
+1202;ETHIOPIC SYLLABLE HI;Lo;0;L;;;;;N;;;;;
+1203;ETHIOPIC SYLLABLE HAA;Lo;0;L;;;;;N;;;;;
+1204;ETHIOPIC SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
+1205;ETHIOPIC SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+1206;ETHIOPIC SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+1207;ETHIOPIC SYLLABLE HOA;Lo;0;L;;;;;N;;;;;
+1208;ETHIOPIC SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+1209;ETHIOPIC SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+120A;ETHIOPIC SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+120B;ETHIOPIC SYLLABLE LAA;Lo;0;L;;;;;N;;;;;
+120C;ETHIOPIC SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
+120D;ETHIOPIC SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+120E;ETHIOPIC SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+120F;ETHIOPIC SYLLABLE LWA;Lo;0;L;;;;;N;;;;;
+1210;ETHIOPIC SYLLABLE HHA;Lo;0;L;;;;;N;;;;;
+1211;ETHIOPIC SYLLABLE HHU;Lo;0;L;;;;;N;;;;;
+1212;ETHIOPIC SYLLABLE HHI;Lo;0;L;;;;;N;;;;;
+1213;ETHIOPIC SYLLABLE HHAA;Lo;0;L;;;;;N;;;;;
+1214;ETHIOPIC SYLLABLE HHEE;Lo;0;L;;;;;N;;;;;
+1215;ETHIOPIC SYLLABLE HHE;Lo;0;L;;;;;N;;;;;
+1216;ETHIOPIC SYLLABLE HHO;Lo;0;L;;;;;N;;;;;
+1217;ETHIOPIC SYLLABLE HHWA;Lo;0;L;;;;;N;;;;;
+1218;ETHIOPIC SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+1219;ETHIOPIC SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+121A;ETHIOPIC SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+121B;ETHIOPIC SYLLABLE MAA;Lo;0;L;;;;;N;;;;;
+121C;ETHIOPIC SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
+121D;ETHIOPIC SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+121E;ETHIOPIC SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+121F;ETHIOPIC SYLLABLE MWA;Lo;0;L;;;;;N;;;;;
+1220;ETHIOPIC SYLLABLE SZA;Lo;0;L;;;;;N;;;;;
+1221;ETHIOPIC SYLLABLE SZU;Lo;0;L;;;;;N;;;;;
+1222;ETHIOPIC SYLLABLE SZI;Lo;0;L;;;;;N;;;;;
+1223;ETHIOPIC SYLLABLE SZAA;Lo;0;L;;;;;N;;;;;
+1224;ETHIOPIC SYLLABLE SZEE;Lo;0;L;;;;;N;;;;;
+1225;ETHIOPIC SYLLABLE SZE;Lo;0;L;;;;;N;;;;;
+1226;ETHIOPIC SYLLABLE SZO;Lo;0;L;;;;;N;;;;;
+1227;ETHIOPIC SYLLABLE SZWA;Lo;0;L;;;;;N;;;;;
+1228;ETHIOPIC SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+1229;ETHIOPIC SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+122A;ETHIOPIC SYLLABLE RI;Lo;0;L;;;;;N;;;;;
+122B;ETHIOPIC SYLLABLE RAA;Lo;0;L;;;;;N;;;;;
+122C;ETHIOPIC SYLLABLE REE;Lo;0;L;;;;;N;;;;;
+122D;ETHIOPIC SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+122E;ETHIOPIC SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+122F;ETHIOPIC SYLLABLE RWA;Lo;0;L;;;;;N;;;;;
+1230;ETHIOPIC SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+1231;ETHIOPIC SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+1232;ETHIOPIC SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+1233;ETHIOPIC SYLLABLE SAA;Lo;0;L;;;;;N;;;;;
+1234;ETHIOPIC SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
+1235;ETHIOPIC SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+1236;ETHIOPIC SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+1237;ETHIOPIC SYLLABLE SWA;Lo;0;L;;;;;N;;;;;
+1238;ETHIOPIC SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+1239;ETHIOPIC SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+123A;ETHIOPIC SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
+123B;ETHIOPIC SYLLABLE SHAA;Lo;0;L;;;;;N;;;;;
+123C;ETHIOPIC SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
+123D;ETHIOPIC SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+123E;ETHIOPIC SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+123F;ETHIOPIC SYLLABLE SHWA;Lo;0;L;;;;;N;;;;;
+1240;ETHIOPIC SYLLABLE QA;Lo;0;L;;;;;N;;;;;
+1241;ETHIOPIC SYLLABLE QU;Lo;0;L;;;;;N;;;;;
+1242;ETHIOPIC SYLLABLE QI;Lo;0;L;;;;;N;;;;;
+1243;ETHIOPIC SYLLABLE QAA;Lo;0;L;;;;;N;;;;;
+1244;ETHIOPIC SYLLABLE QEE;Lo;0;L;;;;;N;;;;;
+1245;ETHIOPIC SYLLABLE QE;Lo;0;L;;;;;N;;;;;
+1246;ETHIOPIC SYLLABLE QO;Lo;0;L;;;;;N;;;;;
+1247;ETHIOPIC SYLLABLE QOA;Lo;0;L;;;;;N;;;;;
+1248;ETHIOPIC SYLLABLE QWA;Lo;0;L;;;;;N;;;;;
+124A;ETHIOPIC SYLLABLE QWI;Lo;0;L;;;;;N;;;;;
+124B;ETHIOPIC SYLLABLE QWAA;Lo;0;L;;;;;N;;;;;
+124C;ETHIOPIC SYLLABLE QWEE;Lo;0;L;;;;;N;;;;;
+124D;ETHIOPIC SYLLABLE QWE;Lo;0;L;;;;;N;;;;;
+1250;ETHIOPIC SYLLABLE QHA;Lo;0;L;;;;;N;;;;;
+1251;ETHIOPIC SYLLABLE QHU;Lo;0;L;;;;;N;;;;;
+1252;ETHIOPIC SYLLABLE QHI;Lo;0;L;;;;;N;;;;;
+1253;ETHIOPIC SYLLABLE QHAA;Lo;0;L;;;;;N;;;;;
+1254;ETHIOPIC SYLLABLE QHEE;Lo;0;L;;;;;N;;;;;
+1255;ETHIOPIC SYLLABLE QHE;Lo;0;L;;;;;N;;;;;
+1256;ETHIOPIC SYLLABLE QHO;Lo;0;L;;;;;N;;;;;
+1258;ETHIOPIC SYLLABLE QHWA;Lo;0;L;;;;;N;;;;;
+125A;ETHIOPIC SYLLABLE QHWI;Lo;0;L;;;;;N;;;;;
+125B;ETHIOPIC SYLLABLE QHWAA;Lo;0;L;;;;;N;;;;;
+125C;ETHIOPIC SYLLABLE QHWEE;Lo;0;L;;;;;N;;;;;
+125D;ETHIOPIC SYLLABLE QHWE;Lo;0;L;;;;;N;;;;;
+1260;ETHIOPIC SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+1261;ETHIOPIC SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+1262;ETHIOPIC SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+1263;ETHIOPIC SYLLABLE BAA;Lo;0;L;;;;;N;;;;;
+1264;ETHIOPIC SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
+1265;ETHIOPIC SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+1266;ETHIOPIC SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+1267;ETHIOPIC SYLLABLE BWA;Lo;0;L;;;;;N;;;;;
+1268;ETHIOPIC SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+1269;ETHIOPIC SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+126A;ETHIOPIC SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+126B;ETHIOPIC SYLLABLE VAA;Lo;0;L;;;;;N;;;;;
+126C;ETHIOPIC SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
+126D;ETHIOPIC SYLLABLE VE;Lo;0;L;;;;;N;;;;;
+126E;ETHIOPIC SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+126F;ETHIOPIC SYLLABLE VWA;Lo;0;L;;;;;N;;;;;
+1270;ETHIOPIC SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+1271;ETHIOPIC SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+1272;ETHIOPIC SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+1273;ETHIOPIC SYLLABLE TAA;Lo;0;L;;;;;N;;;;;
+1274;ETHIOPIC SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
+1275;ETHIOPIC SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+1276;ETHIOPIC SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+1277;ETHIOPIC SYLLABLE TWA;Lo;0;L;;;;;N;;;;;
+1278;ETHIOPIC SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+1279;ETHIOPIC SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+127A;ETHIOPIC SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+127B;ETHIOPIC SYLLABLE CAA;Lo;0;L;;;;;N;;;;;
+127C;ETHIOPIC SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
+127D;ETHIOPIC SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+127E;ETHIOPIC SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+127F;ETHIOPIC SYLLABLE CWA;Lo;0;L;;;;;N;;;;;
+1280;ETHIOPIC SYLLABLE XA;Lo;0;L;;;;;N;;;;;
+1281;ETHIOPIC SYLLABLE XU;Lo;0;L;;;;;N;;;;;
+1282;ETHIOPIC SYLLABLE XI;Lo;0;L;;;;;N;;;;;
+1283;ETHIOPIC SYLLABLE XAA;Lo;0;L;;;;;N;;;;;
+1284;ETHIOPIC SYLLABLE XEE;Lo;0;L;;;;;N;;;;;
+1285;ETHIOPIC SYLLABLE XE;Lo;0;L;;;;;N;;;;;
+1286;ETHIOPIC SYLLABLE XO;Lo;0;L;;;;;N;;;;;
+1287;ETHIOPIC SYLLABLE XOA;Lo;0;L;;;;;N;;;;;
+1288;ETHIOPIC SYLLABLE XWA;Lo;0;L;;;;;N;;;;;
+128A;ETHIOPIC SYLLABLE XWI;Lo;0;L;;;;;N;;;;;
+128B;ETHIOPIC SYLLABLE XWAA;Lo;0;L;;;;;N;;;;;
+128C;ETHIOPIC SYLLABLE XWEE;Lo;0;L;;;;;N;;;;;
+128D;ETHIOPIC SYLLABLE XWE;Lo;0;L;;;;;N;;;;;
+1290;ETHIOPIC SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+1291;ETHIOPIC SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+1292;ETHIOPIC SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+1293;ETHIOPIC SYLLABLE NAA;Lo;0;L;;;;;N;;;;;
+1294;ETHIOPIC SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
+1295;ETHIOPIC SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+1296;ETHIOPIC SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+1297;ETHIOPIC SYLLABLE NWA;Lo;0;L;;;;;N;;;;;
+1298;ETHIOPIC SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
+1299;ETHIOPIC SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+129A;ETHIOPIC SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+129B;ETHIOPIC SYLLABLE NYAA;Lo;0;L;;;;;N;;;;;
+129C;ETHIOPIC SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
+129D;ETHIOPIC SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
+129E;ETHIOPIC SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+129F;ETHIOPIC SYLLABLE NYWA;Lo;0;L;;;;;N;;;;;
+12A0;ETHIOPIC SYLLABLE GLOTTAL A;Lo;0;L;;;;;N;;;;;
+12A1;ETHIOPIC SYLLABLE GLOTTAL U;Lo;0;L;;;;;N;;;;;
+12A2;ETHIOPIC SYLLABLE GLOTTAL I;Lo;0;L;;;;;N;;;;;
+12A3;ETHIOPIC SYLLABLE GLOTTAL AA;Lo;0;L;;;;;N;;;;;
+12A4;ETHIOPIC SYLLABLE GLOTTAL EE;Lo;0;L;;;;;N;;;;;
+12A5;ETHIOPIC SYLLABLE GLOTTAL E;Lo;0;L;;;;;N;;;;;
+12A6;ETHIOPIC SYLLABLE GLOTTAL O;Lo;0;L;;;;;N;;;;;
+12A7;ETHIOPIC SYLLABLE GLOTTAL WA;Lo;0;L;;;;;N;;;;;
+12A8;ETHIOPIC SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+12A9;ETHIOPIC SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+12AA;ETHIOPIC SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+12AB;ETHIOPIC SYLLABLE KAA;Lo;0;L;;;;;N;;;;;
+12AC;ETHIOPIC SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
+12AD;ETHIOPIC SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+12AE;ETHIOPIC SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+12AF;ETHIOPIC SYLLABLE KOA;Lo;0;L;;;;;N;;;;;
+12B0;ETHIOPIC SYLLABLE KWA;Lo;0;L;;;;;N;;;;;
+12B2;ETHIOPIC SYLLABLE KWI;Lo;0;L;;;;;N;;;;;
+12B3;ETHIOPIC SYLLABLE KWAA;Lo;0;L;;;;;N;;;;;
+12B4;ETHIOPIC SYLLABLE KWEE;Lo;0;L;;;;;N;;;;;
+12B5;ETHIOPIC SYLLABLE KWE;Lo;0;L;;;;;N;;;;;
+12B8;ETHIOPIC SYLLABLE KXA;Lo;0;L;;;;;N;;;;;
+12B9;ETHIOPIC SYLLABLE KXU;Lo;0;L;;;;;N;;;;;
+12BA;ETHIOPIC SYLLABLE KXI;Lo;0;L;;;;;N;;;;;
+12BB;ETHIOPIC SYLLABLE KXAA;Lo;0;L;;;;;N;;;;;
+12BC;ETHIOPIC SYLLABLE KXEE;Lo;0;L;;;;;N;;;;;
+12BD;ETHIOPIC SYLLABLE KXE;Lo;0;L;;;;;N;;;;;
+12BE;ETHIOPIC SYLLABLE KXO;Lo;0;L;;;;;N;;;;;
+12C0;ETHIOPIC SYLLABLE KXWA;Lo;0;L;;;;;N;;;;;
+12C2;ETHIOPIC SYLLABLE KXWI;Lo;0;L;;;;;N;;;;;
+12C3;ETHIOPIC SYLLABLE KXWAA;Lo;0;L;;;;;N;;;;;
+12C4;ETHIOPIC SYLLABLE KXWEE;Lo;0;L;;;;;N;;;;;
+12C5;ETHIOPIC SYLLABLE KXWE;Lo;0;L;;;;;N;;;;;
+12C8;ETHIOPIC SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+12C9;ETHIOPIC SYLLABLE WU;Lo;0;L;;;;;N;;;;;
+12CA;ETHIOPIC SYLLABLE WI;Lo;0;L;;;;;N;;;;;
+12CB;ETHIOPIC SYLLABLE WAA;Lo;0;L;;;;;N;;;;;
+12CC;ETHIOPIC SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
+12CD;ETHIOPIC SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+12CE;ETHIOPIC SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+12CF;ETHIOPIC SYLLABLE WOA;Lo;0;L;;;;;N;;;;;
+12D0;ETHIOPIC SYLLABLE PHARYNGEAL A;Lo;0;L;;;;;N;;;;;
+12D1;ETHIOPIC SYLLABLE PHARYNGEAL U;Lo;0;L;;;;;N;;;;;
+12D2;ETHIOPIC SYLLABLE PHARYNGEAL I;Lo;0;L;;;;;N;;;;;
+12D3;ETHIOPIC SYLLABLE PHARYNGEAL AA;Lo;0;L;;;;;N;;;;;
+12D4;ETHIOPIC SYLLABLE PHARYNGEAL EE;Lo;0;L;;;;;N;;;;;
+12D5;ETHIOPIC SYLLABLE PHARYNGEAL E;Lo;0;L;;;;;N;;;;;
+12D6;ETHIOPIC SYLLABLE PHARYNGEAL O;Lo;0;L;;;;;N;;;;;
+12D8;ETHIOPIC SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+12D9;ETHIOPIC SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+12DA;ETHIOPIC SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+12DB;ETHIOPIC SYLLABLE ZAA;Lo;0;L;;;;;N;;;;;
+12DC;ETHIOPIC SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
+12DD;ETHIOPIC SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+12DE;ETHIOPIC SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+12DF;ETHIOPIC SYLLABLE ZWA;Lo;0;L;;;;;N;;;;;
+12E0;ETHIOPIC SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+12E1;ETHIOPIC SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+12E2;ETHIOPIC SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
+12E3;ETHIOPIC SYLLABLE ZHAA;Lo;0;L;;;;;N;;;;;
+12E4;ETHIOPIC SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
+12E5;ETHIOPIC SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+12E6;ETHIOPIC SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+12E7;ETHIOPIC SYLLABLE ZHWA;Lo;0;L;;;;;N;;;;;
+12E8;ETHIOPIC SYLLABLE YA;Lo;0;L;;;;;N;;;;;
+12E9;ETHIOPIC SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+12EA;ETHIOPIC SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+12EB;ETHIOPIC SYLLABLE YAA;Lo;0;L;;;;;N;;;;;
+12EC;ETHIOPIC SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
+12ED;ETHIOPIC SYLLABLE YE;Lo;0;L;;;;;N;;;;;
+12EE;ETHIOPIC SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+12EF;ETHIOPIC SYLLABLE YOA;Lo;0;L;;;;;N;;;;;
+12F0;ETHIOPIC SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+12F1;ETHIOPIC SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+12F2;ETHIOPIC SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+12F3;ETHIOPIC SYLLABLE DAA;Lo;0;L;;;;;N;;;;;
+12F4;ETHIOPIC SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
+12F5;ETHIOPIC SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+12F6;ETHIOPIC SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+12F7;ETHIOPIC SYLLABLE DWA;Lo;0;L;;;;;N;;;;;
+12F8;ETHIOPIC SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
+12F9;ETHIOPIC SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
+12FA;ETHIOPIC SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
+12FB;ETHIOPIC SYLLABLE DDAA;Lo;0;L;;;;;N;;;;;
+12FC;ETHIOPIC SYLLABLE DDEE;Lo;0;L;;;;;N;;;;;
+12FD;ETHIOPIC SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
+12FE;ETHIOPIC SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
+12FF;ETHIOPIC SYLLABLE DDWA;Lo;0;L;;;;;N;;;;;
+1300;ETHIOPIC SYLLABLE JA;Lo;0;L;;;;;N;;;;;
+1301;ETHIOPIC SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+1302;ETHIOPIC SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+1303;ETHIOPIC SYLLABLE JAA;Lo;0;L;;;;;N;;;;;
+1304;ETHIOPIC SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
+1305;ETHIOPIC SYLLABLE JE;Lo;0;L;;;;;N;;;;;
+1306;ETHIOPIC SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+1307;ETHIOPIC SYLLABLE JWA;Lo;0;L;;;;;N;;;;;
+1308;ETHIOPIC SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+1309;ETHIOPIC SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+130A;ETHIOPIC SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+130B;ETHIOPIC SYLLABLE GAA;Lo;0;L;;;;;N;;;;;
+130C;ETHIOPIC SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
+130D;ETHIOPIC SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+130E;ETHIOPIC SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+130F;ETHIOPIC SYLLABLE GOA;Lo;0;L;;;;;N;;;;;
+1310;ETHIOPIC SYLLABLE GWA;Lo;0;L;;;;;N;;;;;
+1312;ETHIOPIC SYLLABLE GWI;Lo;0;L;;;;;N;;;;;
+1313;ETHIOPIC SYLLABLE GWAA;Lo;0;L;;;;;N;;;;;
+1314;ETHIOPIC SYLLABLE GWEE;Lo;0;L;;;;;N;;;;;
+1315;ETHIOPIC SYLLABLE GWE;Lo;0;L;;;;;N;;;;;
+1318;ETHIOPIC SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
+1319;ETHIOPIC SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
+131A;ETHIOPIC SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
+131B;ETHIOPIC SYLLABLE GGAA;Lo;0;L;;;;;N;;;;;
+131C;ETHIOPIC SYLLABLE GGEE;Lo;0;L;;;;;N;;;;;
+131D;ETHIOPIC SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
+131E;ETHIOPIC SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
+131F;ETHIOPIC SYLLABLE GGWAA;Lo;0;L;;;;;N;;;;;
+1320;ETHIOPIC SYLLABLE THA;Lo;0;L;;;;;N;;;;;
+1321;ETHIOPIC SYLLABLE THU;Lo;0;L;;;;;N;;;;;
+1322;ETHIOPIC SYLLABLE THI;Lo;0;L;;;;;N;;;;;
+1323;ETHIOPIC SYLLABLE THAA;Lo;0;L;;;;;N;;;;;
+1324;ETHIOPIC SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
+1325;ETHIOPIC SYLLABLE THE;Lo;0;L;;;;;N;;;;;
+1326;ETHIOPIC SYLLABLE THO;Lo;0;L;;;;;N;;;;;
+1327;ETHIOPIC SYLLABLE THWA;Lo;0;L;;;;;N;;;;;
+1328;ETHIOPIC SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
+1329;ETHIOPIC SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
+132A;ETHIOPIC SYLLABLE CHI;Lo;0;L;;;;;N;;;;;
+132B;ETHIOPIC SYLLABLE CHAA;Lo;0;L;;;;;N;;;;;
+132C;ETHIOPIC SYLLABLE CHEE;Lo;0;L;;;;;N;;;;;
+132D;ETHIOPIC SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
+132E;ETHIOPIC SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
+132F;ETHIOPIC SYLLABLE CHWA;Lo;0;L;;;;;N;;;;;
+1330;ETHIOPIC SYLLABLE PHA;Lo;0;L;;;;;N;;;;;
+1331;ETHIOPIC SYLLABLE PHU;Lo;0;L;;;;;N;;;;;
+1332;ETHIOPIC SYLLABLE PHI;Lo;0;L;;;;;N;;;;;
+1333;ETHIOPIC SYLLABLE PHAA;Lo;0;L;;;;;N;;;;;
+1334;ETHIOPIC SYLLABLE PHEE;Lo;0;L;;;;;N;;;;;
+1335;ETHIOPIC SYLLABLE PHE;Lo;0;L;;;;;N;;;;;
+1336;ETHIOPIC SYLLABLE PHO;Lo;0;L;;;;;N;;;;;
+1337;ETHIOPIC SYLLABLE PHWA;Lo;0;L;;;;;N;;;;;
+1338;ETHIOPIC SYLLABLE TSA;Lo;0;L;;;;;N;;;;;
+1339;ETHIOPIC SYLLABLE TSU;Lo;0;L;;;;;N;;;;;
+133A;ETHIOPIC SYLLABLE TSI;Lo;0;L;;;;;N;;;;;
+133B;ETHIOPIC SYLLABLE TSAA;Lo;0;L;;;;;N;;;;;
+133C;ETHIOPIC SYLLABLE TSEE;Lo;0;L;;;;;N;;;;;
+133D;ETHIOPIC SYLLABLE TSE;Lo;0;L;;;;;N;;;;;
+133E;ETHIOPIC SYLLABLE TSO;Lo;0;L;;;;;N;;;;;
+133F;ETHIOPIC SYLLABLE TSWA;Lo;0;L;;;;;N;;;;;
+1340;ETHIOPIC SYLLABLE TZA;Lo;0;L;;;;;N;;;;;
+1341;ETHIOPIC SYLLABLE TZU;Lo;0;L;;;;;N;;;;;
+1342;ETHIOPIC SYLLABLE TZI;Lo;0;L;;;;;N;;;;;
+1343;ETHIOPIC SYLLABLE TZAA;Lo;0;L;;;;;N;;;;;
+1344;ETHIOPIC SYLLABLE TZEE;Lo;0;L;;;;;N;;;;;
+1345;ETHIOPIC SYLLABLE TZE;Lo;0;L;;;;;N;;;;;
+1346;ETHIOPIC SYLLABLE TZO;Lo;0;L;;;;;N;;;;;
+1347;ETHIOPIC SYLLABLE TZOA;Lo;0;L;;;;;N;;;;;
+1348;ETHIOPIC SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+1349;ETHIOPIC SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+134A;ETHIOPIC SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+134B;ETHIOPIC SYLLABLE FAA;Lo;0;L;;;;;N;;;;;
+134C;ETHIOPIC SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
+134D;ETHIOPIC SYLLABLE FE;Lo;0;L;;;;;N;;;;;
+134E;ETHIOPIC SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+134F;ETHIOPIC SYLLABLE FWA;Lo;0;L;;;;;N;;;;;
+1350;ETHIOPIC SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+1351;ETHIOPIC SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+1352;ETHIOPIC SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+1353;ETHIOPIC SYLLABLE PAA;Lo;0;L;;;;;N;;;;;
+1354;ETHIOPIC SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
+1355;ETHIOPIC SYLLABLE PE;Lo;0;L;;;;;N;;;;;
+1356;ETHIOPIC SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+1357;ETHIOPIC SYLLABLE PWA;Lo;0;L;;;;;N;;;;;
+1358;ETHIOPIC SYLLABLE RYA;Lo;0;L;;;;;N;;;;;
+1359;ETHIOPIC SYLLABLE MYA;Lo;0;L;;;;;N;;;;;
+135A;ETHIOPIC SYLLABLE FYA;Lo;0;L;;;;;N;;;;;
+135D;ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK;Mn;230;NSM;;;;;N;;;;;
+135E;ETHIOPIC COMBINING VOWEL LENGTH MARK;Mn;230;NSM;;;;;N;;;;;
+135F;ETHIOPIC COMBINING GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
+1360;ETHIOPIC SECTION MARK;Po;0;L;;;;;N;;;;;
+1361;ETHIOPIC WORDSPACE;Po;0;L;;;;;N;;;;;
+1362;ETHIOPIC FULL STOP;Po;0;L;;;;;N;;;;;
+1363;ETHIOPIC COMMA;Po;0;L;;;;;N;;;;;
+1364;ETHIOPIC SEMICOLON;Po;0;L;;;;;N;;;;;
+1365;ETHIOPIC COLON;Po;0;L;;;;;N;;;;;
+1366;ETHIOPIC PREFACE COLON;Po;0;L;;;;;N;;;;;
+1367;ETHIOPIC QUESTION MARK;Po;0;L;;;;;N;;;;;
+1368;ETHIOPIC PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
+1369;ETHIOPIC DIGIT ONE;No;0;L;;;1;1;N;;;;;
+136A;ETHIOPIC DIGIT TWO;No;0;L;;;2;2;N;;;;;
+136B;ETHIOPIC DIGIT THREE;No;0;L;;;3;3;N;;;;;
+136C;ETHIOPIC DIGIT FOUR;No;0;L;;;4;4;N;;;;;
+136D;ETHIOPIC DIGIT FIVE;No;0;L;;;5;5;N;;;;;
+136E;ETHIOPIC DIGIT SIX;No;0;L;;;6;6;N;;;;;
+136F;ETHIOPIC DIGIT SEVEN;No;0;L;;;7;7;N;;;;;
+1370;ETHIOPIC DIGIT EIGHT;No;0;L;;;8;8;N;;;;;
+1371;ETHIOPIC DIGIT NINE;No;0;L;;;9;9;N;;;;;
+1372;ETHIOPIC NUMBER TEN;No;0;L;;;;10;N;;;;;
+1373;ETHIOPIC NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+1374;ETHIOPIC NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+1375;ETHIOPIC NUMBER FORTY;No;0;L;;;;40;N;;;;;
+1376;ETHIOPIC NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+1377;ETHIOPIC NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+1378;ETHIOPIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+1379;ETHIOPIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+137A;ETHIOPIC NUMBER NINETY;No;0;L;;;;90;N;;;;;
+137B;ETHIOPIC NUMBER HUNDRED;No;0;L;;;;100;N;;;;;
+137C;ETHIOPIC NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
+1380;ETHIOPIC SYLLABLE SEBATBEIT MWA;Lo;0;L;;;;;N;;;;;
+1381;ETHIOPIC SYLLABLE MWI;Lo;0;L;;;;;N;;;;;
+1382;ETHIOPIC SYLLABLE MWEE;Lo;0;L;;;;;N;;;;;
+1383;ETHIOPIC SYLLABLE MWE;Lo;0;L;;;;;N;;;;;
+1384;ETHIOPIC SYLLABLE SEBATBEIT BWA;Lo;0;L;;;;;N;;;;;
+1385;ETHIOPIC SYLLABLE BWI;Lo;0;L;;;;;N;;;;;
+1386;ETHIOPIC SYLLABLE BWEE;Lo;0;L;;;;;N;;;;;
+1387;ETHIOPIC SYLLABLE BWE;Lo;0;L;;;;;N;;;;;
+1388;ETHIOPIC SYLLABLE SEBATBEIT FWA;Lo;0;L;;;;;N;;;;;
+1389;ETHIOPIC SYLLABLE FWI;Lo;0;L;;;;;N;;;;;
+138A;ETHIOPIC SYLLABLE FWEE;Lo;0;L;;;;;N;;;;;
+138B;ETHIOPIC SYLLABLE FWE;Lo;0;L;;;;;N;;;;;
+138C;ETHIOPIC SYLLABLE SEBATBEIT PWA;Lo;0;L;;;;;N;;;;;
+138D;ETHIOPIC SYLLABLE PWI;Lo;0;L;;;;;N;;;;;
+138E;ETHIOPIC SYLLABLE PWEE;Lo;0;L;;;;;N;;;;;
+138F;ETHIOPIC SYLLABLE PWE;Lo;0;L;;;;;N;;;;;
+1390;ETHIOPIC TONAL MARK YIZET;So;0;ON;;;;;N;;;;;
+1391;ETHIOPIC TONAL MARK DERET;So;0;ON;;;;;N;;;;;
+1392;ETHIOPIC TONAL MARK RIKRIK;So;0;ON;;;;;N;;;;;
+1393;ETHIOPIC TONAL MARK SHORT RIKRIK;So;0;ON;;;;;N;;;;;
+1394;ETHIOPIC TONAL MARK DIFAT;So;0;ON;;;;;N;;;;;
+1395;ETHIOPIC TONAL MARK KENAT;So;0;ON;;;;;N;;;;;
+1396;ETHIOPIC TONAL MARK CHIRET;So;0;ON;;;;;N;;;;;
+1397;ETHIOPIC TONAL MARK HIDET;So;0;ON;;;;;N;;;;;
+1398;ETHIOPIC TONAL MARK DERET-HIDET;So;0;ON;;;;;N;;;;;
+1399;ETHIOPIC TONAL MARK KURT;So;0;ON;;;;;N;;;;;
+13A0;CHEROKEE LETTER A;Lu;0;L;;;;;N;;;;AB70;
+13A1;CHEROKEE LETTER E;Lu;0;L;;;;;N;;;;AB71;
+13A2;CHEROKEE LETTER I;Lu;0;L;;;;;N;;;;AB72;
+13A3;CHEROKEE LETTER O;Lu;0;L;;;;;N;;;;AB73;
+13A4;CHEROKEE LETTER U;Lu;0;L;;;;;N;;;;AB74;
+13A5;CHEROKEE LETTER V;Lu;0;L;;;;;N;;;;AB75;
+13A6;CHEROKEE LETTER GA;Lu;0;L;;;;;N;;;;AB76;
+13A7;CHEROKEE LETTER KA;Lu;0;L;;;;;N;;;;AB77;
+13A8;CHEROKEE LETTER GE;Lu;0;L;;;;;N;;;;AB78;
+13A9;CHEROKEE LETTER GI;Lu;0;L;;;;;N;;;;AB79;
+13AA;CHEROKEE LETTER GO;Lu;0;L;;;;;N;;;;AB7A;
+13AB;CHEROKEE LETTER GU;Lu;0;L;;;;;N;;;;AB7B;
+13AC;CHEROKEE LETTER GV;Lu;0;L;;;;;N;;;;AB7C;
+13AD;CHEROKEE LETTER HA;Lu;0;L;;;;;N;;;;AB7D;
+13AE;CHEROKEE LETTER HE;Lu;0;L;;;;;N;;;;AB7E;
+13AF;CHEROKEE LETTER HI;Lu;0;L;;;;;N;;;;AB7F;
+13B0;CHEROKEE LETTER HO;Lu;0;L;;;;;N;;;;AB80;
+13B1;CHEROKEE LETTER HU;Lu;0;L;;;;;N;;;;AB81;
+13B2;CHEROKEE LETTER HV;Lu;0;L;;;;;N;;;;AB82;
+13B3;CHEROKEE LETTER LA;Lu;0;L;;;;;N;;;;AB83;
+13B4;CHEROKEE LETTER LE;Lu;0;L;;;;;N;;;;AB84;
+13B5;CHEROKEE LETTER LI;Lu;0;L;;;;;N;;;;AB85;
+13B6;CHEROKEE LETTER LO;Lu;0;L;;;;;N;;;;AB86;
+13B7;CHEROKEE LETTER LU;Lu;0;L;;;;;N;;;;AB87;
+13B8;CHEROKEE LETTER LV;Lu;0;L;;;;;N;;;;AB88;
+13B9;CHEROKEE LETTER MA;Lu;0;L;;;;;N;;;;AB89;
+13BA;CHEROKEE LETTER ME;Lu;0;L;;;;;N;;;;AB8A;
+13BB;CHEROKEE LETTER MI;Lu;0;L;;;;;N;;;;AB8B;
+13BC;CHEROKEE LETTER MO;Lu;0;L;;;;;N;;;;AB8C;
+13BD;CHEROKEE LETTER MU;Lu;0;L;;;;;N;;;;AB8D;
+13BE;CHEROKEE LETTER NA;Lu;0;L;;;;;N;;;;AB8E;
+13BF;CHEROKEE LETTER HNA;Lu;0;L;;;;;N;;;;AB8F;
+13C0;CHEROKEE LETTER NAH;Lu;0;L;;;;;N;;;;AB90;
+13C1;CHEROKEE LETTER NE;Lu;0;L;;;;;N;;;;AB91;
+13C2;CHEROKEE LETTER NI;Lu;0;L;;;;;N;;;;AB92;
+13C3;CHEROKEE LETTER NO;Lu;0;L;;;;;N;;;;AB93;
+13C4;CHEROKEE LETTER NU;Lu;0;L;;;;;N;;;;AB94;
+13C5;CHEROKEE LETTER NV;Lu;0;L;;;;;N;;;;AB95;
+13C6;CHEROKEE LETTER QUA;Lu;0;L;;;;;N;;;;AB96;
+13C7;CHEROKEE LETTER QUE;Lu;0;L;;;;;N;;;;AB97;
+13C8;CHEROKEE LETTER QUI;Lu;0;L;;;;;N;;;;AB98;
+13C9;CHEROKEE LETTER QUO;Lu;0;L;;;;;N;;;;AB99;
+13CA;CHEROKEE LETTER QUU;Lu;0;L;;;;;N;;;;AB9A;
+13CB;CHEROKEE LETTER QUV;Lu;0;L;;;;;N;;;;AB9B;
+13CC;CHEROKEE LETTER SA;Lu;0;L;;;;;N;;;;AB9C;
+13CD;CHEROKEE LETTER S;Lu;0;L;;;;;N;;;;AB9D;
+13CE;CHEROKEE LETTER SE;Lu;0;L;;;;;N;;;;AB9E;
+13CF;CHEROKEE LETTER SI;Lu;0;L;;;;;N;;;;AB9F;
+13D0;CHEROKEE LETTER SO;Lu;0;L;;;;;N;;;;ABA0;
+13D1;CHEROKEE LETTER SU;Lu;0;L;;;;;N;;;;ABA1;
+13D2;CHEROKEE LETTER SV;Lu;0;L;;;;;N;;;;ABA2;
+13D3;CHEROKEE LETTER DA;Lu;0;L;;;;;N;;;;ABA3;
+13D4;CHEROKEE LETTER TA;Lu;0;L;;;;;N;;;;ABA4;
+13D5;CHEROKEE LETTER DE;Lu;0;L;;;;;N;;;;ABA5;
+13D6;CHEROKEE LETTER TE;Lu;0;L;;;;;N;;;;ABA6;
+13D7;CHEROKEE LETTER DI;Lu;0;L;;;;;N;;;;ABA7;
+13D8;CHEROKEE LETTER TI;Lu;0;L;;;;;N;;;;ABA8;
+13D9;CHEROKEE LETTER DO;Lu;0;L;;;;;N;;;;ABA9;
+13DA;CHEROKEE LETTER DU;Lu;0;L;;;;;N;;;;ABAA;
+13DB;CHEROKEE LETTER DV;Lu;0;L;;;;;N;;;;ABAB;
+13DC;CHEROKEE LETTER DLA;Lu;0;L;;;;;N;;;;ABAC;
+13DD;CHEROKEE LETTER TLA;Lu;0;L;;;;;N;;;;ABAD;
+13DE;CHEROKEE LETTER TLE;Lu;0;L;;;;;N;;;;ABAE;
+13DF;CHEROKEE LETTER TLI;Lu;0;L;;;;;N;;;;ABAF;
+13E0;CHEROKEE LETTER TLO;Lu;0;L;;;;;N;;;;ABB0;
+13E1;CHEROKEE LETTER TLU;Lu;0;L;;;;;N;;;;ABB1;
+13E2;CHEROKEE LETTER TLV;Lu;0;L;;;;;N;;;;ABB2;
+13E3;CHEROKEE LETTER TSA;Lu;0;L;;;;;N;;;;ABB3;
+13E4;CHEROKEE LETTER TSE;Lu;0;L;;;;;N;;;;ABB4;
+13E5;CHEROKEE LETTER TSI;Lu;0;L;;;;;N;;;;ABB5;
+13E6;CHEROKEE LETTER TSO;Lu;0;L;;;;;N;;;;ABB6;
+13E7;CHEROKEE LETTER TSU;Lu;0;L;;;;;N;;;;ABB7;
+13E8;CHEROKEE LETTER TSV;Lu;0;L;;;;;N;;;;ABB8;
+13E9;CHEROKEE LETTER WA;Lu;0;L;;;;;N;;;;ABB9;
+13EA;CHEROKEE LETTER WE;Lu;0;L;;;;;N;;;;ABBA;
+13EB;CHEROKEE LETTER WI;Lu;0;L;;;;;N;;;;ABBB;
+13EC;CHEROKEE LETTER WO;Lu;0;L;;;;;N;;;;ABBC;
+13ED;CHEROKEE LETTER WU;Lu;0;L;;;;;N;;;;ABBD;
+13EE;CHEROKEE LETTER WV;Lu;0;L;;;;;N;;;;ABBE;
+13EF;CHEROKEE LETTER YA;Lu;0;L;;;;;N;;;;ABBF;
+13F0;CHEROKEE LETTER YE;Lu;0;L;;;;;N;;;;13F8;
+13F1;CHEROKEE LETTER YI;Lu;0;L;;;;;N;;;;13F9;
+13F2;CHEROKEE LETTER YO;Lu;0;L;;;;;N;;;;13FA;
+13F3;CHEROKEE LETTER YU;Lu;0;L;;;;;N;;;;13FB;
+13F4;CHEROKEE LETTER YV;Lu;0;L;;;;;N;;;;13FC;
+13F5;CHEROKEE LETTER MV;Lu;0;L;;;;;N;;;;13FD;
+13F8;CHEROKEE SMALL LETTER YE;Ll;0;L;;;;;N;;;13F0;;13F0
+13F9;CHEROKEE SMALL LETTER YI;Ll;0;L;;;;;N;;;13F1;;13F1
+13FA;CHEROKEE SMALL LETTER YO;Ll;0;L;;;;;N;;;13F2;;13F2
+13FB;CHEROKEE SMALL LETTER YU;Ll;0;L;;;;;N;;;13F3;;13F3
+13FC;CHEROKEE SMALL LETTER YV;Ll;0;L;;;;;N;;;13F4;;13F4
+13FD;CHEROKEE SMALL LETTER MV;Ll;0;L;;;;;N;;;13F5;;13F5
+1400;CANADIAN SYLLABICS HYPHEN;Pd;0;ON;;;;;N;;;;;
+1401;CANADIAN SYLLABICS E;Lo;0;L;;;;;N;;;;;
+1402;CANADIAN SYLLABICS AAI;Lo;0;L;;;;;N;;;;;
+1403;CANADIAN SYLLABICS I;Lo;0;L;;;;;N;;;;;
+1404;CANADIAN SYLLABICS II;Lo;0;L;;;;;N;;;;;
+1405;CANADIAN SYLLABICS O;Lo;0;L;;;;;N;;;;;
+1406;CANADIAN SYLLABICS OO;Lo;0;L;;;;;N;;;;;
+1407;CANADIAN SYLLABICS Y-CREE OO;Lo;0;L;;;;;N;;;;;
+1408;CANADIAN SYLLABICS CARRIER EE;Lo;0;L;;;;;N;;;;;
+1409;CANADIAN SYLLABICS CARRIER I;Lo;0;L;;;;;N;;;;;
+140A;CANADIAN SYLLABICS A;Lo;0;L;;;;;N;;;;;
+140B;CANADIAN SYLLABICS AA;Lo;0;L;;;;;N;;;;;
+140C;CANADIAN SYLLABICS WE;Lo;0;L;;;;;N;;;;;
+140D;CANADIAN SYLLABICS WEST-CREE WE;Lo;0;L;;;;;N;;;;;
+140E;CANADIAN SYLLABICS WI;Lo;0;L;;;;;N;;;;;
+140F;CANADIAN SYLLABICS WEST-CREE WI;Lo;0;L;;;;;N;;;;;
+1410;CANADIAN SYLLABICS WII;Lo;0;L;;;;;N;;;;;
+1411;CANADIAN SYLLABICS WEST-CREE WII;Lo;0;L;;;;;N;;;;;
+1412;CANADIAN SYLLABICS WO;Lo;0;L;;;;;N;;;;;
+1413;CANADIAN SYLLABICS WEST-CREE WO;Lo;0;L;;;;;N;;;;;
+1414;CANADIAN SYLLABICS WOO;Lo;0;L;;;;;N;;;;;
+1415;CANADIAN SYLLABICS WEST-CREE WOO;Lo;0;L;;;;;N;;;;;
+1416;CANADIAN SYLLABICS NASKAPI WOO;Lo;0;L;;;;;N;;;;;
+1417;CANADIAN SYLLABICS WA;Lo;0;L;;;;;N;;;;;
+1418;CANADIAN SYLLABICS WEST-CREE WA;Lo;0;L;;;;;N;;;;;
+1419;CANADIAN SYLLABICS WAA;Lo;0;L;;;;;N;;;;;
+141A;CANADIAN SYLLABICS WEST-CREE WAA;Lo;0;L;;;;;N;;;;;
+141B;CANADIAN SYLLABICS NASKAPI WAA;Lo;0;L;;;;;N;;;;;
+141C;CANADIAN SYLLABICS AI;Lo;0;L;;;;;N;;;;;
+141D;CANADIAN SYLLABICS Y-CREE W;Lo;0;L;;;;;N;;;;;
+141E;CANADIAN SYLLABICS GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+141F;CANADIAN SYLLABICS FINAL ACUTE;Lo;0;L;;;;;N;;;;;
+1420;CANADIAN SYLLABICS FINAL GRAVE;Lo;0;L;;;;;N;;;;;
+1421;CANADIAN SYLLABICS FINAL BOTTOM HALF RING;Lo;0;L;;;;;N;;;;;
+1422;CANADIAN SYLLABICS FINAL TOP HALF RING;Lo;0;L;;;;;N;;;;;
+1423;CANADIAN SYLLABICS FINAL RIGHT HALF RING;Lo;0;L;;;;;N;;;;;
+1424;CANADIAN SYLLABICS FINAL RING;Lo;0;L;;;;;N;;;;;
+1425;CANADIAN SYLLABICS FINAL DOUBLE ACUTE;Lo;0;L;;;;;N;;;;;
+1426;CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES;Lo;0;L;;;;;N;;;;;
+1427;CANADIAN SYLLABICS FINAL MIDDLE DOT;Lo;0;L;;;;;N;;;;;
+1428;CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE;Lo;0;L;;;;;N;;;;;
+1429;CANADIAN SYLLABICS FINAL PLUS;Lo;0;L;;;;;N;;;;;
+142A;CANADIAN SYLLABICS FINAL DOWN TACK;Lo;0;L;;;;;N;;;;;
+142B;CANADIAN SYLLABICS EN;Lo;0;L;;;;;N;;;;;
+142C;CANADIAN SYLLABICS IN;Lo;0;L;;;;;N;;;;;
+142D;CANADIAN SYLLABICS ON;Lo;0;L;;;;;N;;;;;
+142E;CANADIAN SYLLABICS AN;Lo;0;L;;;;;N;;;;;
+142F;CANADIAN SYLLABICS PE;Lo;0;L;;;;;N;;;;;
+1430;CANADIAN SYLLABICS PAAI;Lo;0;L;;;;;N;;;;;
+1431;CANADIAN SYLLABICS PI;Lo;0;L;;;;;N;;;;;
+1432;CANADIAN SYLLABICS PII;Lo;0;L;;;;;N;;;;;
+1433;CANADIAN SYLLABICS PO;Lo;0;L;;;;;N;;;;;
+1434;CANADIAN SYLLABICS POO;Lo;0;L;;;;;N;;;;;
+1435;CANADIAN SYLLABICS Y-CREE POO;Lo;0;L;;;;;N;;;;;
+1436;CANADIAN SYLLABICS CARRIER HEE;Lo;0;L;;;;;N;;;;;
+1437;CANADIAN SYLLABICS CARRIER HI;Lo;0;L;;;;;N;;;;;
+1438;CANADIAN SYLLABICS PA;Lo;0;L;;;;;N;;;;;
+1439;CANADIAN SYLLABICS PAA;Lo;0;L;;;;;N;;;;;
+143A;CANADIAN SYLLABICS PWE;Lo;0;L;;;;;N;;;;;
+143B;CANADIAN SYLLABICS WEST-CREE PWE;Lo;0;L;;;;;N;;;;;
+143C;CANADIAN SYLLABICS PWI;Lo;0;L;;;;;N;;;;;
+143D;CANADIAN SYLLABICS WEST-CREE PWI;Lo;0;L;;;;;N;;;;;
+143E;CANADIAN SYLLABICS PWII;Lo;0;L;;;;;N;;;;;
+143F;CANADIAN SYLLABICS WEST-CREE PWII;Lo;0;L;;;;;N;;;;;
+1440;CANADIAN SYLLABICS PWO;Lo;0;L;;;;;N;;;;;
+1441;CANADIAN SYLLABICS WEST-CREE PWO;Lo;0;L;;;;;N;;;;;
+1442;CANADIAN SYLLABICS PWOO;Lo;0;L;;;;;N;;;;;
+1443;CANADIAN SYLLABICS WEST-CREE PWOO;Lo;0;L;;;;;N;;;;;
+1444;CANADIAN SYLLABICS PWA;Lo;0;L;;;;;N;;;;;
+1445;CANADIAN SYLLABICS WEST-CREE PWA;Lo;0;L;;;;;N;;;;;
+1446;CANADIAN SYLLABICS PWAA;Lo;0;L;;;;;N;;;;;
+1447;CANADIAN SYLLABICS WEST-CREE PWAA;Lo;0;L;;;;;N;;;;;
+1448;CANADIAN SYLLABICS Y-CREE PWAA;Lo;0;L;;;;;N;;;;;
+1449;CANADIAN SYLLABICS P;Lo;0;L;;;;;N;;;;;
+144A;CANADIAN SYLLABICS WEST-CREE P;Lo;0;L;;;;;N;;;;;
+144B;CANADIAN SYLLABICS CARRIER H;Lo;0;L;;;;;N;;;;;
+144C;CANADIAN SYLLABICS TE;Lo;0;L;;;;;N;;;;;
+144D;CANADIAN SYLLABICS TAAI;Lo;0;L;;;;;N;;;;;
+144E;CANADIAN SYLLABICS TI;Lo;0;L;;;;;N;;;;;
+144F;CANADIAN SYLLABICS TII;Lo;0;L;;;;;N;;;;;
+1450;CANADIAN SYLLABICS TO;Lo;0;L;;;;;N;;;;;
+1451;CANADIAN SYLLABICS TOO;Lo;0;L;;;;;N;;;;;
+1452;CANADIAN SYLLABICS Y-CREE TOO;Lo;0;L;;;;;N;;;;;
+1453;CANADIAN SYLLABICS CARRIER DEE;Lo;0;L;;;;;N;;;;;
+1454;CANADIAN SYLLABICS CARRIER DI;Lo;0;L;;;;;N;;;;;
+1455;CANADIAN SYLLABICS TA;Lo;0;L;;;;;N;;;;;
+1456;CANADIAN SYLLABICS TAA;Lo;0;L;;;;;N;;;;;
+1457;CANADIAN SYLLABICS TWE;Lo;0;L;;;;;N;;;;;
+1458;CANADIAN SYLLABICS WEST-CREE TWE;Lo;0;L;;;;;N;;;;;
+1459;CANADIAN SYLLABICS TWI;Lo;0;L;;;;;N;;;;;
+145A;CANADIAN SYLLABICS WEST-CREE TWI;Lo;0;L;;;;;N;;;;;
+145B;CANADIAN SYLLABICS TWII;Lo;0;L;;;;;N;;;;;
+145C;CANADIAN SYLLABICS WEST-CREE TWII;Lo;0;L;;;;;N;;;;;
+145D;CANADIAN SYLLABICS TWO;Lo;0;L;;;;;N;;;;;
+145E;CANADIAN SYLLABICS WEST-CREE TWO;Lo;0;L;;;;;N;;;;;
+145F;CANADIAN SYLLABICS TWOO;Lo;0;L;;;;;N;;;;;
+1460;CANADIAN SYLLABICS WEST-CREE TWOO;Lo;0;L;;;;;N;;;;;
+1461;CANADIAN SYLLABICS TWA;Lo;0;L;;;;;N;;;;;
+1462;CANADIAN SYLLABICS WEST-CREE TWA;Lo;0;L;;;;;N;;;;;
+1463;CANADIAN SYLLABICS TWAA;Lo;0;L;;;;;N;;;;;
+1464;CANADIAN SYLLABICS WEST-CREE TWAA;Lo;0;L;;;;;N;;;;;
+1465;CANADIAN SYLLABICS NASKAPI TWAA;Lo;0;L;;;;;N;;;;;
+1466;CANADIAN SYLLABICS T;Lo;0;L;;;;;N;;;;;
+1467;CANADIAN SYLLABICS TTE;Lo;0;L;;;;;N;;;;;
+1468;CANADIAN SYLLABICS TTI;Lo;0;L;;;;;N;;;;;
+1469;CANADIAN SYLLABICS TTO;Lo;0;L;;;;;N;;;;;
+146A;CANADIAN SYLLABICS TTA;Lo;0;L;;;;;N;;;;;
+146B;CANADIAN SYLLABICS KE;Lo;0;L;;;;;N;;;;;
+146C;CANADIAN SYLLABICS KAAI;Lo;0;L;;;;;N;;;;;
+146D;CANADIAN SYLLABICS KI;Lo;0;L;;;;;N;;;;;
+146E;CANADIAN SYLLABICS KII;Lo;0;L;;;;;N;;;;;
+146F;CANADIAN SYLLABICS KO;Lo;0;L;;;;;N;;;;;
+1470;CANADIAN SYLLABICS KOO;Lo;0;L;;;;;N;;;;;
+1471;CANADIAN SYLLABICS Y-CREE KOO;Lo;0;L;;;;;N;;;;;
+1472;CANADIAN SYLLABICS KA;Lo;0;L;;;;;N;;;;;
+1473;CANADIAN SYLLABICS KAA;Lo;0;L;;;;;N;;;;;
+1474;CANADIAN SYLLABICS KWE;Lo;0;L;;;;;N;;;;;
+1475;CANADIAN SYLLABICS WEST-CREE KWE;Lo;0;L;;;;;N;;;;;
+1476;CANADIAN SYLLABICS KWI;Lo;0;L;;;;;N;;;;;
+1477;CANADIAN SYLLABICS WEST-CREE KWI;Lo;0;L;;;;;N;;;;;
+1478;CANADIAN SYLLABICS KWII;Lo;0;L;;;;;N;;;;;
+1479;CANADIAN SYLLABICS WEST-CREE KWII;Lo;0;L;;;;;N;;;;;
+147A;CANADIAN SYLLABICS KWO;Lo;0;L;;;;;N;;;;;
+147B;CANADIAN SYLLABICS WEST-CREE KWO;Lo;0;L;;;;;N;;;;;
+147C;CANADIAN SYLLABICS KWOO;Lo;0;L;;;;;N;;;;;
+147D;CANADIAN SYLLABICS WEST-CREE KWOO;Lo;0;L;;;;;N;;;;;
+147E;CANADIAN SYLLABICS KWA;Lo;0;L;;;;;N;;;;;
+147F;CANADIAN SYLLABICS WEST-CREE KWA;Lo;0;L;;;;;N;;;;;
+1480;CANADIAN SYLLABICS KWAA;Lo;0;L;;;;;N;;;;;
+1481;CANADIAN SYLLABICS WEST-CREE KWAA;Lo;0;L;;;;;N;;;;;
+1482;CANADIAN SYLLABICS NASKAPI KWAA;Lo;0;L;;;;;N;;;;;
+1483;CANADIAN SYLLABICS K;Lo;0;L;;;;;N;;;;;
+1484;CANADIAN SYLLABICS KW;Lo;0;L;;;;;N;;;;;
+1485;CANADIAN SYLLABICS SOUTH-SLAVEY KEH;Lo;0;L;;;;;N;;;;;
+1486;CANADIAN SYLLABICS SOUTH-SLAVEY KIH;Lo;0;L;;;;;N;;;;;
+1487;CANADIAN SYLLABICS SOUTH-SLAVEY KOH;Lo;0;L;;;;;N;;;;;
+1488;CANADIAN SYLLABICS SOUTH-SLAVEY KAH;Lo;0;L;;;;;N;;;;;
+1489;CANADIAN SYLLABICS CE;Lo;0;L;;;;;N;;;;;
+148A;CANADIAN SYLLABICS CAAI;Lo;0;L;;;;;N;;;;;
+148B;CANADIAN SYLLABICS CI;Lo;0;L;;;;;N;;;;;
+148C;CANADIAN SYLLABICS CII;Lo;0;L;;;;;N;;;;;
+148D;CANADIAN SYLLABICS CO;Lo;0;L;;;;;N;;;;;
+148E;CANADIAN SYLLABICS COO;Lo;0;L;;;;;N;;;;;
+148F;CANADIAN SYLLABICS Y-CREE COO;Lo;0;L;;;;;N;;;;;
+1490;CANADIAN SYLLABICS CA;Lo;0;L;;;;;N;;;;;
+1491;CANADIAN SYLLABICS CAA;Lo;0;L;;;;;N;;;;;
+1492;CANADIAN SYLLABICS CWE;Lo;0;L;;;;;N;;;;;
+1493;CANADIAN SYLLABICS WEST-CREE CWE;Lo;0;L;;;;;N;;;;;
+1494;CANADIAN SYLLABICS CWI;Lo;0;L;;;;;N;;;;;
+1495;CANADIAN SYLLABICS WEST-CREE CWI;Lo;0;L;;;;;N;;;;;
+1496;CANADIAN SYLLABICS CWII;Lo;0;L;;;;;N;;;;;
+1497;CANADIAN SYLLABICS WEST-CREE CWII;Lo;0;L;;;;;N;;;;;
+1498;CANADIAN SYLLABICS CWO;Lo;0;L;;;;;N;;;;;
+1499;CANADIAN SYLLABICS WEST-CREE CWO;Lo;0;L;;;;;N;;;;;
+149A;CANADIAN SYLLABICS CWOO;Lo;0;L;;;;;N;;;;;
+149B;CANADIAN SYLLABICS WEST-CREE CWOO;Lo;0;L;;;;;N;;;;;
+149C;CANADIAN SYLLABICS CWA;Lo;0;L;;;;;N;;;;;
+149D;CANADIAN SYLLABICS WEST-CREE CWA;Lo;0;L;;;;;N;;;;;
+149E;CANADIAN SYLLABICS CWAA;Lo;0;L;;;;;N;;;;;
+149F;CANADIAN SYLLABICS WEST-CREE CWAA;Lo;0;L;;;;;N;;;;;
+14A0;CANADIAN SYLLABICS NASKAPI CWAA;Lo;0;L;;;;;N;;;;;
+14A1;CANADIAN SYLLABICS C;Lo;0;L;;;;;N;;;;;
+14A2;CANADIAN SYLLABICS SAYISI TH;Lo;0;L;;;;;N;;;;;
+14A3;CANADIAN SYLLABICS ME;Lo;0;L;;;;;N;;;;;
+14A4;CANADIAN SYLLABICS MAAI;Lo;0;L;;;;;N;;;;;
+14A5;CANADIAN SYLLABICS MI;Lo;0;L;;;;;N;;;;;
+14A6;CANADIAN SYLLABICS MII;Lo;0;L;;;;;N;;;;;
+14A7;CANADIAN SYLLABICS MO;Lo;0;L;;;;;N;;;;;
+14A8;CANADIAN SYLLABICS MOO;Lo;0;L;;;;;N;;;;;
+14A9;CANADIAN SYLLABICS Y-CREE MOO;Lo;0;L;;;;;N;;;;;
+14AA;CANADIAN SYLLABICS MA;Lo;0;L;;;;;N;;;;;
+14AB;CANADIAN SYLLABICS MAA;Lo;0;L;;;;;N;;;;;
+14AC;CANADIAN SYLLABICS MWE;Lo;0;L;;;;;N;;;;;
+14AD;CANADIAN SYLLABICS WEST-CREE MWE;Lo;0;L;;;;;N;;;;;
+14AE;CANADIAN SYLLABICS MWI;Lo;0;L;;;;;N;;;;;
+14AF;CANADIAN SYLLABICS WEST-CREE MWI;Lo;0;L;;;;;N;;;;;
+14B0;CANADIAN SYLLABICS MWII;Lo;0;L;;;;;N;;;;;
+14B1;CANADIAN SYLLABICS WEST-CREE MWII;Lo;0;L;;;;;N;;;;;
+14B2;CANADIAN SYLLABICS MWO;Lo;0;L;;;;;N;;;;;
+14B3;CANADIAN SYLLABICS WEST-CREE MWO;Lo;0;L;;;;;N;;;;;
+14B4;CANADIAN SYLLABICS MWOO;Lo;0;L;;;;;N;;;;;
+14B5;CANADIAN SYLLABICS WEST-CREE MWOO;Lo;0;L;;;;;N;;;;;
+14B6;CANADIAN SYLLABICS MWA;Lo;0;L;;;;;N;;;;;
+14B7;CANADIAN SYLLABICS WEST-CREE MWA;Lo;0;L;;;;;N;;;;;
+14B8;CANADIAN SYLLABICS MWAA;Lo;0;L;;;;;N;;;;;
+14B9;CANADIAN SYLLABICS WEST-CREE MWAA;Lo;0;L;;;;;N;;;;;
+14BA;CANADIAN SYLLABICS NASKAPI MWAA;Lo;0;L;;;;;N;;;;;
+14BB;CANADIAN SYLLABICS M;Lo;0;L;;;;;N;;;;;
+14BC;CANADIAN SYLLABICS WEST-CREE M;Lo;0;L;;;;;N;;;;;
+14BD;CANADIAN SYLLABICS MH;Lo;0;L;;;;;N;;;;;
+14BE;CANADIAN SYLLABICS ATHAPASCAN M;Lo;0;L;;;;;N;;;;;
+14BF;CANADIAN SYLLABICS SAYISI M;Lo;0;L;;;;;N;;;;;
+14C0;CANADIAN SYLLABICS NE;Lo;0;L;;;;;N;;;;;
+14C1;CANADIAN SYLLABICS NAAI;Lo;0;L;;;;;N;;;;;
+14C2;CANADIAN SYLLABICS NI;Lo;0;L;;;;;N;;;;;
+14C3;CANADIAN SYLLABICS NII;Lo;0;L;;;;;N;;;;;
+14C4;CANADIAN SYLLABICS NO;Lo;0;L;;;;;N;;;;;
+14C5;CANADIAN SYLLABICS NOO;Lo;0;L;;;;;N;;;;;
+14C6;CANADIAN SYLLABICS Y-CREE NOO;Lo;0;L;;;;;N;;;;;
+14C7;CANADIAN SYLLABICS NA;Lo;0;L;;;;;N;;;;;
+14C8;CANADIAN SYLLABICS NAA;Lo;0;L;;;;;N;;;;;
+14C9;CANADIAN SYLLABICS NWE;Lo;0;L;;;;;N;;;;;
+14CA;CANADIAN SYLLABICS WEST-CREE NWE;Lo;0;L;;;;;N;;;;;
+14CB;CANADIAN SYLLABICS NWA;Lo;0;L;;;;;N;;;;;
+14CC;CANADIAN SYLLABICS WEST-CREE NWA;Lo;0;L;;;;;N;;;;;
+14CD;CANADIAN SYLLABICS NWAA;Lo;0;L;;;;;N;;;;;
+14CE;CANADIAN SYLLABICS WEST-CREE NWAA;Lo;0;L;;;;;N;;;;;
+14CF;CANADIAN SYLLABICS NASKAPI NWAA;Lo;0;L;;;;;N;;;;;
+14D0;CANADIAN SYLLABICS N;Lo;0;L;;;;;N;;;;;
+14D1;CANADIAN SYLLABICS CARRIER NG;Lo;0;L;;;;;N;;;;;
+14D2;CANADIAN SYLLABICS NH;Lo;0;L;;;;;N;;;;;
+14D3;CANADIAN SYLLABICS LE;Lo;0;L;;;;;N;;;;;
+14D4;CANADIAN SYLLABICS LAAI;Lo;0;L;;;;;N;;;;;
+14D5;CANADIAN SYLLABICS LI;Lo;0;L;;;;;N;;;;;
+14D6;CANADIAN SYLLABICS LII;Lo;0;L;;;;;N;;;;;
+14D7;CANADIAN SYLLABICS LO;Lo;0;L;;;;;N;;;;;
+14D8;CANADIAN SYLLABICS LOO;Lo;0;L;;;;;N;;;;;
+14D9;CANADIAN SYLLABICS Y-CREE LOO;Lo;0;L;;;;;N;;;;;
+14DA;CANADIAN SYLLABICS LA;Lo;0;L;;;;;N;;;;;
+14DB;CANADIAN SYLLABICS LAA;Lo;0;L;;;;;N;;;;;
+14DC;CANADIAN SYLLABICS LWE;Lo;0;L;;;;;N;;;;;
+14DD;CANADIAN SYLLABICS WEST-CREE LWE;Lo;0;L;;;;;N;;;;;
+14DE;CANADIAN SYLLABICS LWI;Lo;0;L;;;;;N;;;;;
+14DF;CANADIAN SYLLABICS WEST-CREE LWI;Lo;0;L;;;;;N;;;;;
+14E0;CANADIAN SYLLABICS LWII;Lo;0;L;;;;;N;;;;;
+14E1;CANADIAN SYLLABICS WEST-CREE LWII;Lo;0;L;;;;;N;;;;;
+14E2;CANADIAN SYLLABICS LWO;Lo;0;L;;;;;N;;;;;
+14E3;CANADIAN SYLLABICS WEST-CREE LWO;Lo;0;L;;;;;N;;;;;
+14E4;CANADIAN SYLLABICS LWOO;Lo;0;L;;;;;N;;;;;
+14E5;CANADIAN SYLLABICS WEST-CREE LWOO;Lo;0;L;;;;;N;;;;;
+14E6;CANADIAN SYLLABICS LWA;Lo;0;L;;;;;N;;;;;
+14E7;CANADIAN SYLLABICS WEST-CREE LWA;Lo;0;L;;;;;N;;;;;
+14E8;CANADIAN SYLLABICS LWAA;Lo;0;L;;;;;N;;;;;
+14E9;CANADIAN SYLLABICS WEST-CREE LWAA;Lo;0;L;;;;;N;;;;;
+14EA;CANADIAN SYLLABICS L;Lo;0;L;;;;;N;;;;;
+14EB;CANADIAN SYLLABICS WEST-CREE L;Lo;0;L;;;;;N;;;;;
+14EC;CANADIAN SYLLABICS MEDIAL L;Lo;0;L;;;;;N;;;;;
+14ED;CANADIAN SYLLABICS SE;Lo;0;L;;;;;N;;;;;
+14EE;CANADIAN SYLLABICS SAAI;Lo;0;L;;;;;N;;;;;
+14EF;CANADIAN SYLLABICS SI;Lo;0;L;;;;;N;;;;;
+14F0;CANADIAN SYLLABICS SII;Lo;0;L;;;;;N;;;;;
+14F1;CANADIAN SYLLABICS SO;Lo;0;L;;;;;N;;;;;
+14F2;CANADIAN SYLLABICS SOO;Lo;0;L;;;;;N;;;;;
+14F3;CANADIAN SYLLABICS Y-CREE SOO;Lo;0;L;;;;;N;;;;;
+14F4;CANADIAN SYLLABICS SA;Lo;0;L;;;;;N;;;;;
+14F5;CANADIAN SYLLABICS SAA;Lo;0;L;;;;;N;;;;;
+14F6;CANADIAN SYLLABICS SWE;Lo;0;L;;;;;N;;;;;
+14F7;CANADIAN SYLLABICS WEST-CREE SWE;Lo;0;L;;;;;N;;;;;
+14F8;CANADIAN SYLLABICS SWI;Lo;0;L;;;;;N;;;;;
+14F9;CANADIAN SYLLABICS WEST-CREE SWI;Lo;0;L;;;;;N;;;;;
+14FA;CANADIAN SYLLABICS SWII;Lo;0;L;;;;;N;;;;;
+14FB;CANADIAN SYLLABICS WEST-CREE SWII;Lo;0;L;;;;;N;;;;;
+14FC;CANADIAN SYLLABICS SWO;Lo;0;L;;;;;N;;;;;
+14FD;CANADIAN SYLLABICS WEST-CREE SWO;Lo;0;L;;;;;N;;;;;
+14FE;CANADIAN SYLLABICS SWOO;Lo;0;L;;;;;N;;;;;
+14FF;CANADIAN SYLLABICS WEST-CREE SWOO;Lo;0;L;;;;;N;;;;;
+1500;CANADIAN SYLLABICS SWA;Lo;0;L;;;;;N;;;;;
+1501;CANADIAN SYLLABICS WEST-CREE SWA;Lo;0;L;;;;;N;;;;;
+1502;CANADIAN SYLLABICS SWAA;Lo;0;L;;;;;N;;;;;
+1503;CANADIAN SYLLABICS WEST-CREE SWAA;Lo;0;L;;;;;N;;;;;
+1504;CANADIAN SYLLABICS NASKAPI SWAA;Lo;0;L;;;;;N;;;;;
+1505;CANADIAN SYLLABICS S;Lo;0;L;;;;;N;;;;;
+1506;CANADIAN SYLLABICS ATHAPASCAN S;Lo;0;L;;;;;N;;;;;
+1507;CANADIAN SYLLABICS SW;Lo;0;L;;;;;N;;;;;
+1508;CANADIAN SYLLABICS BLACKFOOT S;Lo;0;L;;;;;N;;;;;
+1509;CANADIAN SYLLABICS MOOSE-CREE SK;Lo;0;L;;;;;N;;;;;
+150A;CANADIAN SYLLABICS NASKAPI SKW;Lo;0;L;;;;;N;;;;;
+150B;CANADIAN SYLLABICS NASKAPI S-W;Lo;0;L;;;;;N;;;;;
+150C;CANADIAN SYLLABICS NASKAPI SPWA;Lo;0;L;;;;;N;;;;;
+150D;CANADIAN SYLLABICS NASKAPI STWA;Lo;0;L;;;;;N;;;;;
+150E;CANADIAN SYLLABICS NASKAPI SKWA;Lo;0;L;;;;;N;;;;;
+150F;CANADIAN SYLLABICS NASKAPI SCWA;Lo;0;L;;;;;N;;;;;
+1510;CANADIAN SYLLABICS SHE;Lo;0;L;;;;;N;;;;;
+1511;CANADIAN SYLLABICS SHI;Lo;0;L;;;;;N;;;;;
+1512;CANADIAN SYLLABICS SHII;Lo;0;L;;;;;N;;;;;
+1513;CANADIAN SYLLABICS SHO;Lo;0;L;;;;;N;;;;;
+1514;CANADIAN SYLLABICS SHOO;Lo;0;L;;;;;N;;;;;
+1515;CANADIAN SYLLABICS SHA;Lo;0;L;;;;;N;;;;;
+1516;CANADIAN SYLLABICS SHAA;Lo;0;L;;;;;N;;;;;
+1517;CANADIAN SYLLABICS SHWE;Lo;0;L;;;;;N;;;;;
+1518;CANADIAN SYLLABICS WEST-CREE SHWE;Lo;0;L;;;;;N;;;;;
+1519;CANADIAN SYLLABICS SHWI;Lo;0;L;;;;;N;;;;;
+151A;CANADIAN SYLLABICS WEST-CREE SHWI;Lo;0;L;;;;;N;;;;;
+151B;CANADIAN SYLLABICS SHWII;Lo;0;L;;;;;N;;;;;
+151C;CANADIAN SYLLABICS WEST-CREE SHWII;Lo;0;L;;;;;N;;;;;
+151D;CANADIAN SYLLABICS SHWO;Lo;0;L;;;;;N;;;;;
+151E;CANADIAN SYLLABICS WEST-CREE SHWO;Lo;0;L;;;;;N;;;;;
+151F;CANADIAN SYLLABICS SHWOO;Lo;0;L;;;;;N;;;;;
+1520;CANADIAN SYLLABICS WEST-CREE SHWOO;Lo;0;L;;;;;N;;;;;
+1521;CANADIAN SYLLABICS SHWA;Lo;0;L;;;;;N;;;;;
+1522;CANADIAN SYLLABICS WEST-CREE SHWA;Lo;0;L;;;;;N;;;;;
+1523;CANADIAN SYLLABICS SHWAA;Lo;0;L;;;;;N;;;;;
+1524;CANADIAN SYLLABICS WEST-CREE SHWAA;Lo;0;L;;;;;N;;;;;
+1525;CANADIAN SYLLABICS SH;Lo;0;L;;;;;N;;;;;
+1526;CANADIAN SYLLABICS YE;Lo;0;L;;;;;N;;;;;
+1527;CANADIAN SYLLABICS YAAI;Lo;0;L;;;;;N;;;;;
+1528;CANADIAN SYLLABICS YI;Lo;0;L;;;;;N;;;;;
+1529;CANADIAN SYLLABICS YII;Lo;0;L;;;;;N;;;;;
+152A;CANADIAN SYLLABICS YO;Lo;0;L;;;;;N;;;;;
+152B;CANADIAN SYLLABICS YOO;Lo;0;L;;;;;N;;;;;
+152C;CANADIAN SYLLABICS Y-CREE YOO;Lo;0;L;;;;;N;;;;;
+152D;CANADIAN SYLLABICS YA;Lo;0;L;;;;;N;;;;;
+152E;CANADIAN SYLLABICS YAA;Lo;0;L;;;;;N;;;;;
+152F;CANADIAN SYLLABICS YWE;Lo;0;L;;;;;N;;;;;
+1530;CANADIAN SYLLABICS WEST-CREE YWE;Lo;0;L;;;;;N;;;;;
+1531;CANADIAN SYLLABICS YWI;Lo;0;L;;;;;N;;;;;
+1532;CANADIAN SYLLABICS WEST-CREE YWI;Lo;0;L;;;;;N;;;;;
+1533;CANADIAN SYLLABICS YWII;Lo;0;L;;;;;N;;;;;
+1534;CANADIAN SYLLABICS WEST-CREE YWII;Lo;0;L;;;;;N;;;;;
+1535;CANADIAN SYLLABICS YWO;Lo;0;L;;;;;N;;;;;
+1536;CANADIAN SYLLABICS WEST-CREE YWO;Lo;0;L;;;;;N;;;;;
+1537;CANADIAN SYLLABICS YWOO;Lo;0;L;;;;;N;;;;;
+1538;CANADIAN SYLLABICS WEST-CREE YWOO;Lo;0;L;;;;;N;;;;;
+1539;CANADIAN SYLLABICS YWA;Lo;0;L;;;;;N;;;;;
+153A;CANADIAN SYLLABICS WEST-CREE YWA;Lo;0;L;;;;;N;;;;;
+153B;CANADIAN SYLLABICS YWAA;Lo;0;L;;;;;N;;;;;
+153C;CANADIAN SYLLABICS WEST-CREE YWAA;Lo;0;L;;;;;N;;;;;
+153D;CANADIAN SYLLABICS NASKAPI YWAA;Lo;0;L;;;;;N;;;;;
+153E;CANADIAN SYLLABICS Y;Lo;0;L;;;;;N;;;;;
+153F;CANADIAN SYLLABICS BIBLE-CREE Y;Lo;0;L;;;;;N;;;;;
+1540;CANADIAN SYLLABICS WEST-CREE Y;Lo;0;L;;;;;N;;;;;
+1541;CANADIAN SYLLABICS SAYISI YI;Lo;0;L;;;;;N;;;;;
+1542;CANADIAN SYLLABICS RE;Lo;0;L;;;;;N;;;;;
+1543;CANADIAN SYLLABICS R-CREE RE;Lo;0;L;;;;;N;;;;;
+1544;CANADIAN SYLLABICS WEST-CREE LE;Lo;0;L;;;;;N;;;;;
+1545;CANADIAN SYLLABICS RAAI;Lo;0;L;;;;;N;;;;;
+1546;CANADIAN SYLLABICS RI;Lo;0;L;;;;;N;;;;;
+1547;CANADIAN SYLLABICS RII;Lo;0;L;;;;;N;;;;;
+1548;CANADIAN SYLLABICS RO;Lo;0;L;;;;;N;;;;;
+1549;CANADIAN SYLLABICS ROO;Lo;0;L;;;;;N;;;;;
+154A;CANADIAN SYLLABICS WEST-CREE LO;Lo;0;L;;;;;N;;;;;
+154B;CANADIAN SYLLABICS RA;Lo;0;L;;;;;N;;;;;
+154C;CANADIAN SYLLABICS RAA;Lo;0;L;;;;;N;;;;;
+154D;CANADIAN SYLLABICS WEST-CREE LA;Lo;0;L;;;;;N;;;;;
+154E;CANADIAN SYLLABICS RWAA;Lo;0;L;;;;;N;;;;;
+154F;CANADIAN SYLLABICS WEST-CREE RWAA;Lo;0;L;;;;;N;;;;;
+1550;CANADIAN SYLLABICS R;Lo;0;L;;;;;N;;;;;
+1551;CANADIAN SYLLABICS WEST-CREE R;Lo;0;L;;;;;N;;;;;
+1552;CANADIAN SYLLABICS MEDIAL R;Lo;0;L;;;;;N;;;;;
+1553;CANADIAN SYLLABICS FE;Lo;0;L;;;;;N;;;;;
+1554;CANADIAN SYLLABICS FAAI;Lo;0;L;;;;;N;;;;;
+1555;CANADIAN SYLLABICS FI;Lo;0;L;;;;;N;;;;;
+1556;CANADIAN SYLLABICS FII;Lo;0;L;;;;;N;;;;;
+1557;CANADIAN SYLLABICS FO;Lo;0;L;;;;;N;;;;;
+1558;CANADIAN SYLLABICS FOO;Lo;0;L;;;;;N;;;;;
+1559;CANADIAN SYLLABICS FA;Lo;0;L;;;;;N;;;;;
+155A;CANADIAN SYLLABICS FAA;Lo;0;L;;;;;N;;;;;
+155B;CANADIAN SYLLABICS FWAA;Lo;0;L;;;;;N;;;;;
+155C;CANADIAN SYLLABICS WEST-CREE FWAA;Lo;0;L;;;;;N;;;;;
+155D;CANADIAN SYLLABICS F;Lo;0;L;;;;;N;;;;;
+155E;CANADIAN SYLLABICS THE;Lo;0;L;;;;;N;;;;;
+155F;CANADIAN SYLLABICS N-CREE THE;Lo;0;L;;;;;N;;;;;
+1560;CANADIAN SYLLABICS THI;Lo;0;L;;;;;N;;;;;
+1561;CANADIAN SYLLABICS N-CREE THI;Lo;0;L;;;;;N;;;;;
+1562;CANADIAN SYLLABICS THII;Lo;0;L;;;;;N;;;;;
+1563;CANADIAN SYLLABICS N-CREE THII;Lo;0;L;;;;;N;;;;;
+1564;CANADIAN SYLLABICS THO;Lo;0;L;;;;;N;;;;;
+1565;CANADIAN SYLLABICS THOO;Lo;0;L;;;;;N;;;;;
+1566;CANADIAN SYLLABICS THA;Lo;0;L;;;;;N;;;;;
+1567;CANADIAN SYLLABICS THAA;Lo;0;L;;;;;N;;;;;
+1568;CANADIAN SYLLABICS THWAA;Lo;0;L;;;;;N;;;;;
+1569;CANADIAN SYLLABICS WEST-CREE THWAA;Lo;0;L;;;;;N;;;;;
+156A;CANADIAN SYLLABICS TH;Lo;0;L;;;;;N;;;;;
+156B;CANADIAN SYLLABICS TTHE;Lo;0;L;;;;;N;;;;;
+156C;CANADIAN SYLLABICS TTHI;Lo;0;L;;;;;N;;;;;
+156D;CANADIAN SYLLABICS TTHO;Lo;0;L;;;;;N;;;;;
+156E;CANADIAN SYLLABICS TTHA;Lo;0;L;;;;;N;;;;;
+156F;CANADIAN SYLLABICS TTH;Lo;0;L;;;;;N;;;;;
+1570;CANADIAN SYLLABICS TYE;Lo;0;L;;;;;N;;;;;
+1571;CANADIAN SYLLABICS TYI;Lo;0;L;;;;;N;;;;;
+1572;CANADIAN SYLLABICS TYO;Lo;0;L;;;;;N;;;;;
+1573;CANADIAN SYLLABICS TYA;Lo;0;L;;;;;N;;;;;
+1574;CANADIAN SYLLABICS NUNAVIK HE;Lo;0;L;;;;;N;;;;;
+1575;CANADIAN SYLLABICS NUNAVIK HI;Lo;0;L;;;;;N;;;;;
+1576;CANADIAN SYLLABICS NUNAVIK HII;Lo;0;L;;;;;N;;;;;
+1577;CANADIAN SYLLABICS NUNAVIK HO;Lo;0;L;;;;;N;;;;;
+1578;CANADIAN SYLLABICS NUNAVIK HOO;Lo;0;L;;;;;N;;;;;
+1579;CANADIAN SYLLABICS NUNAVIK HA;Lo;0;L;;;;;N;;;;;
+157A;CANADIAN SYLLABICS NUNAVIK HAA;Lo;0;L;;;;;N;;;;;
+157B;CANADIAN SYLLABICS NUNAVIK H;Lo;0;L;;;;;N;;;;;
+157C;CANADIAN SYLLABICS NUNAVUT H;Lo;0;L;;;;;N;;;;;
+157D;CANADIAN SYLLABICS HK;Lo;0;L;;;;;N;;;;;
+157E;CANADIAN SYLLABICS QAAI;Lo;0;L;;;;;N;;;;;
+157F;CANADIAN SYLLABICS QI;Lo;0;L;;;;;N;;;;;
+1580;CANADIAN SYLLABICS QII;Lo;0;L;;;;;N;;;;;
+1581;CANADIAN SYLLABICS QO;Lo;0;L;;;;;N;;;;;
+1582;CANADIAN SYLLABICS QOO;Lo;0;L;;;;;N;;;;;
+1583;CANADIAN SYLLABICS QA;Lo;0;L;;;;;N;;;;;
+1584;CANADIAN SYLLABICS QAA;Lo;0;L;;;;;N;;;;;
+1585;CANADIAN SYLLABICS Q;Lo;0;L;;;;;N;;;;;
+1586;CANADIAN SYLLABICS TLHE;Lo;0;L;;;;;N;;;;;
+1587;CANADIAN SYLLABICS TLHI;Lo;0;L;;;;;N;;;;;
+1588;CANADIAN SYLLABICS TLHO;Lo;0;L;;;;;N;;;;;
+1589;CANADIAN SYLLABICS TLHA;Lo;0;L;;;;;N;;;;;
+158A;CANADIAN SYLLABICS WEST-CREE RE;Lo;0;L;;;;;N;;;;;
+158B;CANADIAN SYLLABICS WEST-CREE RI;Lo;0;L;;;;;N;;;;;
+158C;CANADIAN SYLLABICS WEST-CREE RO;Lo;0;L;;;;;N;;;;;
+158D;CANADIAN SYLLABICS WEST-CREE RA;Lo;0;L;;;;;N;;;;;
+158E;CANADIAN SYLLABICS NGAAI;Lo;0;L;;;;;N;;;;;
+158F;CANADIAN SYLLABICS NGI;Lo;0;L;;;;;N;;;;;
+1590;CANADIAN SYLLABICS NGII;Lo;0;L;;;;;N;;;;;
+1591;CANADIAN SYLLABICS NGO;Lo;0;L;;;;;N;;;;;
+1592;CANADIAN SYLLABICS NGOO;Lo;0;L;;;;;N;;;;;
+1593;CANADIAN SYLLABICS NGA;Lo;0;L;;;;;N;;;;;
+1594;CANADIAN SYLLABICS NGAA;Lo;0;L;;;;;N;;;;;
+1595;CANADIAN SYLLABICS NG;Lo;0;L;;;;;N;;;;;
+1596;CANADIAN SYLLABICS NNG;Lo;0;L;;;;;N;;;;;
+1597;CANADIAN SYLLABICS SAYISI SHE;Lo;0;L;;;;;N;;;;;
+1598;CANADIAN SYLLABICS SAYISI SHI;Lo;0;L;;;;;N;;;;;
+1599;CANADIAN SYLLABICS SAYISI SHO;Lo;0;L;;;;;N;;;;;
+159A;CANADIAN SYLLABICS SAYISI SHA;Lo;0;L;;;;;N;;;;;
+159B;CANADIAN SYLLABICS WOODS-CREE THE;Lo;0;L;;;;;N;;;;;
+159C;CANADIAN SYLLABICS WOODS-CREE THI;Lo;0;L;;;;;N;;;;;
+159D;CANADIAN SYLLABICS WOODS-CREE THO;Lo;0;L;;;;;N;;;;;
+159E;CANADIAN SYLLABICS WOODS-CREE THA;Lo;0;L;;;;;N;;;;;
+159F;CANADIAN SYLLABICS WOODS-CREE TH;Lo;0;L;;;;;N;;;;;
+15A0;CANADIAN SYLLABICS LHI;Lo;0;L;;;;;N;;;;;
+15A1;CANADIAN SYLLABICS LHII;Lo;0;L;;;;;N;;;;;
+15A2;CANADIAN SYLLABICS LHO;Lo;0;L;;;;;N;;;;;
+15A3;CANADIAN SYLLABICS LHOO;Lo;0;L;;;;;N;;;;;
+15A4;CANADIAN SYLLABICS LHA;Lo;0;L;;;;;N;;;;;
+15A5;CANADIAN SYLLABICS LHAA;Lo;0;L;;;;;N;;;;;
+15A6;CANADIAN SYLLABICS LH;Lo;0;L;;;;;N;;;;;
+15A7;CANADIAN SYLLABICS TH-CREE THE;Lo;0;L;;;;;N;;;;;
+15A8;CANADIAN SYLLABICS TH-CREE THI;Lo;0;L;;;;;N;;;;;
+15A9;CANADIAN SYLLABICS TH-CREE THII;Lo;0;L;;;;;N;;;;;
+15AA;CANADIAN SYLLABICS TH-CREE THO;Lo;0;L;;;;;N;;;;;
+15AB;CANADIAN SYLLABICS TH-CREE THOO;Lo;0;L;;;;;N;;;;;
+15AC;CANADIAN SYLLABICS TH-CREE THA;Lo;0;L;;;;;N;;;;;
+15AD;CANADIAN SYLLABICS TH-CREE THAA;Lo;0;L;;;;;N;;;;;
+15AE;CANADIAN SYLLABICS TH-CREE TH;Lo;0;L;;;;;N;;;;;
+15AF;CANADIAN SYLLABICS AIVILIK B;Lo;0;L;;;;;N;;;;;
+15B0;CANADIAN SYLLABICS BLACKFOOT E;Lo;0;L;;;;;N;;;;;
+15B1;CANADIAN SYLLABICS BLACKFOOT I;Lo;0;L;;;;;N;;;;;
+15B2;CANADIAN SYLLABICS BLACKFOOT O;Lo;0;L;;;;;N;;;;;
+15B3;CANADIAN SYLLABICS BLACKFOOT A;Lo;0;L;;;;;N;;;;;
+15B4;CANADIAN SYLLABICS BLACKFOOT WE;Lo;0;L;;;;;N;;;;;
+15B5;CANADIAN SYLLABICS BLACKFOOT WI;Lo;0;L;;;;;N;;;;;
+15B6;CANADIAN SYLLABICS BLACKFOOT WO;Lo;0;L;;;;;N;;;;;
+15B7;CANADIAN SYLLABICS BLACKFOOT WA;Lo;0;L;;;;;N;;;;;
+15B8;CANADIAN SYLLABICS BLACKFOOT NE;Lo;0;L;;;;;N;;;;;
+15B9;CANADIAN SYLLABICS BLACKFOOT NI;Lo;0;L;;;;;N;;;;;
+15BA;CANADIAN SYLLABICS BLACKFOOT NO;Lo;0;L;;;;;N;;;;;
+15BB;CANADIAN SYLLABICS BLACKFOOT NA;Lo;0;L;;;;;N;;;;;
+15BC;CANADIAN SYLLABICS BLACKFOOT KE;Lo;0;L;;;;;N;;;;;
+15BD;CANADIAN SYLLABICS BLACKFOOT KI;Lo;0;L;;;;;N;;;;;
+15BE;CANADIAN SYLLABICS BLACKFOOT KO;Lo;0;L;;;;;N;;;;;
+15BF;CANADIAN SYLLABICS BLACKFOOT KA;Lo;0;L;;;;;N;;;;;
+15C0;CANADIAN SYLLABICS SAYISI HE;Lo;0;L;;;;;N;;;;;
+15C1;CANADIAN SYLLABICS SAYISI HI;Lo;0;L;;;;;N;;;;;
+15C2;CANADIAN SYLLABICS SAYISI HO;Lo;0;L;;;;;N;;;;;
+15C3;CANADIAN SYLLABICS SAYISI HA;Lo;0;L;;;;;N;;;;;
+15C4;CANADIAN SYLLABICS CARRIER GHU;Lo;0;L;;;;;N;;;;;
+15C5;CANADIAN SYLLABICS CARRIER GHO;Lo;0;L;;;;;N;;;;;
+15C6;CANADIAN SYLLABICS CARRIER GHE;Lo;0;L;;;;;N;;;;;
+15C7;CANADIAN SYLLABICS CARRIER GHEE;Lo;0;L;;;;;N;;;;;
+15C8;CANADIAN SYLLABICS CARRIER GHI;Lo;0;L;;;;;N;;;;;
+15C9;CANADIAN SYLLABICS CARRIER GHA;Lo;0;L;;;;;N;;;;;
+15CA;CANADIAN SYLLABICS CARRIER RU;Lo;0;L;;;;;N;;;;;
+15CB;CANADIAN SYLLABICS CARRIER RO;Lo;0;L;;;;;N;;;;;
+15CC;CANADIAN SYLLABICS CARRIER RE;Lo;0;L;;;;;N;;;;;
+15CD;CANADIAN SYLLABICS CARRIER REE;Lo;0;L;;;;;N;;;;;
+15CE;CANADIAN SYLLABICS CARRIER RI;Lo;0;L;;;;;N;;;;;
+15CF;CANADIAN SYLLABICS CARRIER RA;Lo;0;L;;;;;N;;;;;
+15D0;CANADIAN SYLLABICS CARRIER WU;Lo;0;L;;;;;N;;;;;
+15D1;CANADIAN SYLLABICS CARRIER WO;Lo;0;L;;;;;N;;;;;
+15D2;CANADIAN SYLLABICS CARRIER WE;Lo;0;L;;;;;N;;;;;
+15D3;CANADIAN SYLLABICS CARRIER WEE;Lo;0;L;;;;;N;;;;;
+15D4;CANADIAN SYLLABICS CARRIER WI;Lo;0;L;;;;;N;;;;;
+15D5;CANADIAN SYLLABICS CARRIER WA;Lo;0;L;;;;;N;;;;;
+15D6;CANADIAN SYLLABICS CARRIER HWU;Lo;0;L;;;;;N;;;;;
+15D7;CANADIAN SYLLABICS CARRIER HWO;Lo;0;L;;;;;N;;;;;
+15D8;CANADIAN SYLLABICS CARRIER HWE;Lo;0;L;;;;;N;;;;;
+15D9;CANADIAN SYLLABICS CARRIER HWEE;Lo;0;L;;;;;N;;;;;
+15DA;CANADIAN SYLLABICS CARRIER HWI;Lo;0;L;;;;;N;;;;;
+15DB;CANADIAN SYLLABICS CARRIER HWA;Lo;0;L;;;;;N;;;;;
+15DC;CANADIAN SYLLABICS CARRIER THU;Lo;0;L;;;;;N;;;;;
+15DD;CANADIAN SYLLABICS CARRIER THO;Lo;0;L;;;;;N;;;;;
+15DE;CANADIAN SYLLABICS CARRIER THE;Lo;0;L;;;;;N;;;;;
+15DF;CANADIAN SYLLABICS CARRIER THEE;Lo;0;L;;;;;N;;;;;
+15E0;CANADIAN SYLLABICS CARRIER THI;Lo;0;L;;;;;N;;;;;
+15E1;CANADIAN SYLLABICS CARRIER THA;Lo;0;L;;;;;N;;;;;
+15E2;CANADIAN SYLLABICS CARRIER TTU;Lo;0;L;;;;;N;;;;;
+15E3;CANADIAN SYLLABICS CARRIER TTO;Lo;0;L;;;;;N;;;;;
+15E4;CANADIAN SYLLABICS CARRIER TTE;Lo;0;L;;;;;N;;;;;
+15E5;CANADIAN SYLLABICS CARRIER TTEE;Lo;0;L;;;;;N;;;;;
+15E6;CANADIAN SYLLABICS CARRIER TTI;Lo;0;L;;;;;N;;;;;
+15E7;CANADIAN SYLLABICS CARRIER TTA;Lo;0;L;;;;;N;;;;;
+15E8;CANADIAN SYLLABICS CARRIER PU;Lo;0;L;;;;;N;;;;;
+15E9;CANADIAN SYLLABICS CARRIER PO;Lo;0;L;;;;;N;;;;;
+15EA;CANADIAN SYLLABICS CARRIER PE;Lo;0;L;;;;;N;;;;;
+15EB;CANADIAN SYLLABICS CARRIER PEE;Lo;0;L;;;;;N;;;;;
+15EC;CANADIAN SYLLABICS CARRIER PI;Lo;0;L;;;;;N;;;;;
+15ED;CANADIAN SYLLABICS CARRIER PA;Lo;0;L;;;;;N;;;;;
+15EE;CANADIAN SYLLABICS CARRIER P;Lo;0;L;;;;;N;;;;;
+15EF;CANADIAN SYLLABICS CARRIER GU;Lo;0;L;;;;;N;;;;;
+15F0;CANADIAN SYLLABICS CARRIER GO;Lo;0;L;;;;;N;;;;;
+15F1;CANADIAN SYLLABICS CARRIER GE;Lo;0;L;;;;;N;;;;;
+15F2;CANADIAN SYLLABICS CARRIER GEE;Lo;0;L;;;;;N;;;;;
+15F3;CANADIAN SYLLABICS CARRIER GI;Lo;0;L;;;;;N;;;;;
+15F4;CANADIAN SYLLABICS CARRIER GA;Lo;0;L;;;;;N;;;;;
+15F5;CANADIAN SYLLABICS CARRIER KHU;Lo;0;L;;;;;N;;;;;
+15F6;CANADIAN SYLLABICS CARRIER KHO;Lo;0;L;;;;;N;;;;;
+15F7;CANADIAN SYLLABICS CARRIER KHE;Lo;0;L;;;;;N;;;;;
+15F8;CANADIAN SYLLABICS CARRIER KHEE;Lo;0;L;;;;;N;;;;;
+15F9;CANADIAN SYLLABICS CARRIER KHI;Lo;0;L;;;;;N;;;;;
+15FA;CANADIAN SYLLABICS CARRIER KHA;Lo;0;L;;;;;N;;;;;
+15FB;CANADIAN SYLLABICS CARRIER KKU;Lo;0;L;;;;;N;;;;;
+15FC;CANADIAN SYLLABICS CARRIER KKO;Lo;0;L;;;;;N;;;;;
+15FD;CANADIAN SYLLABICS CARRIER KKE;Lo;0;L;;;;;N;;;;;
+15FE;CANADIAN SYLLABICS CARRIER KKEE;Lo;0;L;;;;;N;;;;;
+15FF;CANADIAN SYLLABICS CARRIER KKI;Lo;0;L;;;;;N;;;;;
+1600;CANADIAN SYLLABICS CARRIER KKA;Lo;0;L;;;;;N;;;;;
+1601;CANADIAN SYLLABICS CARRIER KK;Lo;0;L;;;;;N;;;;;
+1602;CANADIAN SYLLABICS CARRIER NU;Lo;0;L;;;;;N;;;;;
+1603;CANADIAN SYLLABICS CARRIER NO;Lo;0;L;;;;;N;;;;;
+1604;CANADIAN SYLLABICS CARRIER NE;Lo;0;L;;;;;N;;;;;
+1605;CANADIAN SYLLABICS CARRIER NEE;Lo;0;L;;;;;N;;;;;
+1606;CANADIAN SYLLABICS CARRIER NI;Lo;0;L;;;;;N;;;;;
+1607;CANADIAN SYLLABICS CARRIER NA;Lo;0;L;;;;;N;;;;;
+1608;CANADIAN SYLLABICS CARRIER MU;Lo;0;L;;;;;N;;;;;
+1609;CANADIAN SYLLABICS CARRIER MO;Lo;0;L;;;;;N;;;;;
+160A;CANADIAN SYLLABICS CARRIER ME;Lo;0;L;;;;;N;;;;;
+160B;CANADIAN SYLLABICS CARRIER MEE;Lo;0;L;;;;;N;;;;;
+160C;CANADIAN SYLLABICS CARRIER MI;Lo;0;L;;;;;N;;;;;
+160D;CANADIAN SYLLABICS CARRIER MA;Lo;0;L;;;;;N;;;;;
+160E;CANADIAN SYLLABICS CARRIER YU;Lo;0;L;;;;;N;;;;;
+160F;CANADIAN SYLLABICS CARRIER YO;Lo;0;L;;;;;N;;;;;
+1610;CANADIAN SYLLABICS CARRIER YE;Lo;0;L;;;;;N;;;;;
+1611;CANADIAN SYLLABICS CARRIER YEE;Lo;0;L;;;;;N;;;;;
+1612;CANADIAN SYLLABICS CARRIER YI;Lo;0;L;;;;;N;;;;;
+1613;CANADIAN SYLLABICS CARRIER YA;Lo;0;L;;;;;N;;;;;
+1614;CANADIAN SYLLABICS CARRIER JU;Lo;0;L;;;;;N;;;;;
+1615;CANADIAN SYLLABICS SAYISI JU;Lo;0;L;;;;;N;;;;;
+1616;CANADIAN SYLLABICS CARRIER JO;Lo;0;L;;;;;N;;;;;
+1617;CANADIAN SYLLABICS CARRIER JE;Lo;0;L;;;;;N;;;;;
+1618;CANADIAN SYLLABICS CARRIER JEE;Lo;0;L;;;;;N;;;;;
+1619;CANADIAN SYLLABICS CARRIER JI;Lo;0;L;;;;;N;;;;;
+161A;CANADIAN SYLLABICS SAYISI JI;Lo;0;L;;;;;N;;;;;
+161B;CANADIAN SYLLABICS CARRIER JA;Lo;0;L;;;;;N;;;;;
+161C;CANADIAN SYLLABICS CARRIER JJU;Lo;0;L;;;;;N;;;;;
+161D;CANADIAN SYLLABICS CARRIER JJO;Lo;0;L;;;;;N;;;;;
+161E;CANADIAN SYLLABICS CARRIER JJE;Lo;0;L;;;;;N;;;;;
+161F;CANADIAN SYLLABICS CARRIER JJEE;Lo;0;L;;;;;N;;;;;
+1620;CANADIAN SYLLABICS CARRIER JJI;Lo;0;L;;;;;N;;;;;
+1621;CANADIAN SYLLABICS CARRIER JJA;Lo;0;L;;;;;N;;;;;
+1622;CANADIAN SYLLABICS CARRIER LU;Lo;0;L;;;;;N;;;;;
+1623;CANADIAN SYLLABICS CARRIER LO;Lo;0;L;;;;;N;;;;;
+1624;CANADIAN SYLLABICS CARRIER LE;Lo;0;L;;;;;N;;;;;
+1625;CANADIAN SYLLABICS CARRIER LEE;Lo;0;L;;;;;N;;;;;
+1626;CANADIAN SYLLABICS CARRIER LI;Lo;0;L;;;;;N;;;;;
+1627;CANADIAN SYLLABICS CARRIER LA;Lo;0;L;;;;;N;;;;;
+1628;CANADIAN SYLLABICS CARRIER DLU;Lo;0;L;;;;;N;;;;;
+1629;CANADIAN SYLLABICS CARRIER DLO;Lo;0;L;;;;;N;;;;;
+162A;CANADIAN SYLLABICS CARRIER DLE;Lo;0;L;;;;;N;;;;;
+162B;CANADIAN SYLLABICS CARRIER DLEE;Lo;0;L;;;;;N;;;;;
+162C;CANADIAN SYLLABICS CARRIER DLI;Lo;0;L;;;;;N;;;;;
+162D;CANADIAN SYLLABICS CARRIER DLA;Lo;0;L;;;;;N;;;;;
+162E;CANADIAN SYLLABICS CARRIER LHU;Lo;0;L;;;;;N;;;;;
+162F;CANADIAN SYLLABICS CARRIER LHO;Lo;0;L;;;;;N;;;;;
+1630;CANADIAN SYLLABICS CARRIER LHE;Lo;0;L;;;;;N;;;;;
+1631;CANADIAN SYLLABICS CARRIER LHEE;Lo;0;L;;;;;N;;;;;
+1632;CANADIAN SYLLABICS CARRIER LHI;Lo;0;L;;;;;N;;;;;
+1633;CANADIAN SYLLABICS CARRIER LHA;Lo;0;L;;;;;N;;;;;
+1634;CANADIAN SYLLABICS CARRIER TLHU;Lo;0;L;;;;;N;;;;;
+1635;CANADIAN SYLLABICS CARRIER TLHO;Lo;0;L;;;;;N;;;;;
+1636;CANADIAN SYLLABICS CARRIER TLHE;Lo;0;L;;;;;N;;;;;
+1637;CANADIAN SYLLABICS CARRIER TLHEE;Lo;0;L;;;;;N;;;;;
+1638;CANADIAN SYLLABICS CARRIER TLHI;Lo;0;L;;;;;N;;;;;
+1639;CANADIAN SYLLABICS CARRIER TLHA;Lo;0;L;;;;;N;;;;;
+163A;CANADIAN SYLLABICS CARRIER TLU;Lo;0;L;;;;;N;;;;;
+163B;CANADIAN SYLLABICS CARRIER TLO;Lo;0;L;;;;;N;;;;;
+163C;CANADIAN SYLLABICS CARRIER TLE;Lo;0;L;;;;;N;;;;;
+163D;CANADIAN SYLLABICS CARRIER TLEE;Lo;0;L;;;;;N;;;;;
+163E;CANADIAN SYLLABICS CARRIER TLI;Lo;0;L;;;;;N;;;;;
+163F;CANADIAN SYLLABICS CARRIER TLA;Lo;0;L;;;;;N;;;;;
+1640;CANADIAN SYLLABICS CARRIER ZU;Lo;0;L;;;;;N;;;;;
+1641;CANADIAN SYLLABICS CARRIER ZO;Lo;0;L;;;;;N;;;;;
+1642;CANADIAN SYLLABICS CARRIER ZE;Lo;0;L;;;;;N;;;;;
+1643;CANADIAN SYLLABICS CARRIER ZEE;Lo;0;L;;;;;N;;;;;
+1644;CANADIAN SYLLABICS CARRIER ZI;Lo;0;L;;;;;N;;;;;
+1645;CANADIAN SYLLABICS CARRIER ZA;Lo;0;L;;;;;N;;;;;
+1646;CANADIAN SYLLABICS CARRIER Z;Lo;0;L;;;;;N;;;;;
+1647;CANADIAN SYLLABICS CARRIER INITIAL Z;Lo;0;L;;;;;N;;;;;
+1648;CANADIAN SYLLABICS CARRIER DZU;Lo;0;L;;;;;N;;;;;
+1649;CANADIAN SYLLABICS CARRIER DZO;Lo;0;L;;;;;N;;;;;
+164A;CANADIAN SYLLABICS CARRIER DZE;Lo;0;L;;;;;N;;;;;
+164B;CANADIAN SYLLABICS CARRIER DZEE;Lo;0;L;;;;;N;;;;;
+164C;CANADIAN SYLLABICS CARRIER DZI;Lo;0;L;;;;;N;;;;;
+164D;CANADIAN SYLLABICS CARRIER DZA;Lo;0;L;;;;;N;;;;;
+164E;CANADIAN SYLLABICS CARRIER SU;Lo;0;L;;;;;N;;;;;
+164F;CANADIAN SYLLABICS CARRIER SO;Lo;0;L;;;;;N;;;;;
+1650;CANADIAN SYLLABICS CARRIER SE;Lo;0;L;;;;;N;;;;;
+1651;CANADIAN SYLLABICS CARRIER SEE;Lo;0;L;;;;;N;;;;;
+1652;CANADIAN SYLLABICS CARRIER SI;Lo;0;L;;;;;N;;;;;
+1653;CANADIAN SYLLABICS CARRIER SA;Lo;0;L;;;;;N;;;;;
+1654;CANADIAN SYLLABICS CARRIER SHU;Lo;0;L;;;;;N;;;;;
+1655;CANADIAN SYLLABICS CARRIER SHO;Lo;0;L;;;;;N;;;;;
+1656;CANADIAN SYLLABICS CARRIER SHE;Lo;0;L;;;;;N;;;;;
+1657;CANADIAN SYLLABICS CARRIER SHEE;Lo;0;L;;;;;N;;;;;
+1658;CANADIAN SYLLABICS CARRIER SHI;Lo;0;L;;;;;N;;;;;
+1659;CANADIAN SYLLABICS CARRIER SHA;Lo;0;L;;;;;N;;;;;
+165A;CANADIAN SYLLABICS CARRIER SH;Lo;0;L;;;;;N;;;;;
+165B;CANADIAN SYLLABICS CARRIER TSU;Lo;0;L;;;;;N;;;;;
+165C;CANADIAN SYLLABICS CARRIER TSO;Lo;0;L;;;;;N;;;;;
+165D;CANADIAN SYLLABICS CARRIER TSE;Lo;0;L;;;;;N;;;;;
+165E;CANADIAN SYLLABICS CARRIER TSEE;Lo;0;L;;;;;N;;;;;
+165F;CANADIAN SYLLABICS CARRIER TSI;Lo;0;L;;;;;N;;;;;
+1660;CANADIAN SYLLABICS CARRIER TSA;Lo;0;L;;;;;N;;;;;
+1661;CANADIAN SYLLABICS CARRIER CHU;Lo;0;L;;;;;N;;;;;
+1662;CANADIAN SYLLABICS CARRIER CHO;Lo;0;L;;;;;N;;;;;
+1663;CANADIAN SYLLABICS CARRIER CHE;Lo;0;L;;;;;N;;;;;
+1664;CANADIAN SYLLABICS CARRIER CHEE;Lo;0;L;;;;;N;;;;;
+1665;CANADIAN SYLLABICS CARRIER CHI;Lo;0;L;;;;;N;;;;;
+1666;CANADIAN SYLLABICS CARRIER CHA;Lo;0;L;;;;;N;;;;;
+1667;CANADIAN SYLLABICS CARRIER TTSU;Lo;0;L;;;;;N;;;;;
+1668;CANADIAN SYLLABICS CARRIER TTSO;Lo;0;L;;;;;N;;;;;
+1669;CANADIAN SYLLABICS CARRIER TTSE;Lo;0;L;;;;;N;;;;;
+166A;CANADIAN SYLLABICS CARRIER TTSEE;Lo;0;L;;;;;N;;;;;
+166B;CANADIAN SYLLABICS CARRIER TTSI;Lo;0;L;;;;;N;;;;;
+166C;CANADIAN SYLLABICS CARRIER TTSA;Lo;0;L;;;;;N;;;;;
+166D;CANADIAN SYLLABICS CHI SIGN;So;0;L;;;;;N;;;;;
+166E;CANADIAN SYLLABICS FULL STOP;Po;0;L;;;;;N;;;;;
+166F;CANADIAN SYLLABICS QAI;Lo;0;L;;;;;N;;;;;
+1670;CANADIAN SYLLABICS NGAI;Lo;0;L;;;;;N;;;;;
+1671;CANADIAN SYLLABICS NNGI;Lo;0;L;;;;;N;;;;;
+1672;CANADIAN SYLLABICS NNGII;Lo;0;L;;;;;N;;;;;
+1673;CANADIAN SYLLABICS NNGO;Lo;0;L;;;;;N;;;;;
+1674;CANADIAN SYLLABICS NNGOO;Lo;0;L;;;;;N;;;;;
+1675;CANADIAN SYLLABICS NNGA;Lo;0;L;;;;;N;;;;;
+1676;CANADIAN SYLLABICS NNGAA;Lo;0;L;;;;;N;;;;;
+1677;CANADIAN SYLLABICS WOODS-CREE THWEE;Lo;0;L;;;;;N;;;;;
+1678;CANADIAN SYLLABICS WOODS-CREE THWI;Lo;0;L;;;;;N;;;;;
+1679;CANADIAN SYLLABICS WOODS-CREE THWII;Lo;0;L;;;;;N;;;;;
+167A;CANADIAN SYLLABICS WOODS-CREE THWO;Lo;0;L;;;;;N;;;;;
+167B;CANADIAN SYLLABICS WOODS-CREE THWOO;Lo;0;L;;;;;N;;;;;
+167C;CANADIAN SYLLABICS WOODS-CREE THWA;Lo;0;L;;;;;N;;;;;
+167D;CANADIAN SYLLABICS WOODS-CREE THWAA;Lo;0;L;;;;;N;;;;;
+167E;CANADIAN SYLLABICS WOODS-CREE FINAL TH;Lo;0;L;;;;;N;;;;;
+167F;CANADIAN SYLLABICS BLACKFOOT W;Lo;0;L;;;;;N;;;;;
+1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
+1681;OGHAM LETTER BEITH;Lo;0;L;;;;;N;;;;;
+1682;OGHAM LETTER LUIS;Lo;0;L;;;;;N;;;;;
+1683;OGHAM LETTER FEARN;Lo;0;L;;;;;N;;;;;
+1684;OGHAM LETTER SAIL;Lo;0;L;;;;;N;;;;;
+1685;OGHAM LETTER NION;Lo;0;L;;;;;N;;;;;
+1686;OGHAM LETTER UATH;Lo;0;L;;;;;N;;;;;
+1687;OGHAM LETTER DAIR;Lo;0;L;;;;;N;;;;;
+1688;OGHAM LETTER TINNE;Lo;0;L;;;;;N;;;;;
+1689;OGHAM LETTER COLL;Lo;0;L;;;;;N;;;;;
+168A;OGHAM LETTER CEIRT;Lo;0;L;;;;;N;;;;;
+168B;OGHAM LETTER MUIN;Lo;0;L;;;;;N;;;;;
+168C;OGHAM LETTER GORT;Lo;0;L;;;;;N;;;;;
+168D;OGHAM LETTER NGEADAL;Lo;0;L;;;;;N;;;;;
+168E;OGHAM LETTER STRAIF;Lo;0;L;;;;;N;;;;;
+168F;OGHAM LETTER RUIS;Lo;0;L;;;;;N;;;;;
+1690;OGHAM LETTER AILM;Lo;0;L;;;;;N;;;;;
+1691;OGHAM LETTER ONN;Lo;0;L;;;;;N;;;;;
+1692;OGHAM LETTER UR;Lo;0;L;;;;;N;;;;;
+1693;OGHAM LETTER EADHADH;Lo;0;L;;;;;N;;;;;
+1694;OGHAM LETTER IODHADH;Lo;0;L;;;;;N;;;;;
+1695;OGHAM LETTER EABHADH;Lo;0;L;;;;;N;;;;;
+1696;OGHAM LETTER OR;Lo;0;L;;;;;N;;;;;
+1697;OGHAM LETTER UILLEANN;Lo;0;L;;;;;N;;;;;
+1698;OGHAM LETTER IFIN;Lo;0;L;;;;;N;;;;;
+1699;OGHAM LETTER EAMHANCHOLL;Lo;0;L;;;;;N;;;;;
+169A;OGHAM LETTER PEITH;Lo;0;L;;;;;N;;;;;
+169B;OGHAM FEATHER MARK;Ps;0;ON;;;;;Y;;;;;
+169C;OGHAM REVERSED FEATHER MARK;Pe;0;ON;;;;;Y;;;;;
+16A0;RUNIC LETTER FEHU FEOH FE F;Lo;0;L;;;;;N;;;;;
+16A1;RUNIC LETTER V;Lo;0;L;;;;;N;;;;;
+16A2;RUNIC LETTER URUZ UR U;Lo;0;L;;;;;N;;;;;
+16A3;RUNIC LETTER YR;Lo;0;L;;;;;N;;;;;
+16A4;RUNIC LETTER Y;Lo;0;L;;;;;N;;;;;
+16A5;RUNIC LETTER W;Lo;0;L;;;;;N;;;;;
+16A6;RUNIC LETTER THURISAZ THURS THORN;Lo;0;L;;;;;N;;;;;
+16A7;RUNIC LETTER ETH;Lo;0;L;;;;;N;;;;;
+16A8;RUNIC LETTER ANSUZ A;Lo;0;L;;;;;N;;;;;
+16A9;RUNIC LETTER OS O;Lo;0;L;;;;;N;;;;;
+16AA;RUNIC LETTER AC A;Lo;0;L;;;;;N;;;;;
+16AB;RUNIC LETTER AESC;Lo;0;L;;;;;N;;;;;
+16AC;RUNIC LETTER LONG-BRANCH-OSS O;Lo;0;L;;;;;N;;;;;
+16AD;RUNIC LETTER SHORT-TWIG-OSS O;Lo;0;L;;;;;N;;;;;
+16AE;RUNIC LETTER O;Lo;0;L;;;;;N;;;;;
+16AF;RUNIC LETTER OE;Lo;0;L;;;;;N;;;;;
+16B0;RUNIC LETTER ON;Lo;0;L;;;;;N;;;;;
+16B1;RUNIC LETTER RAIDO RAD REID R;Lo;0;L;;;;;N;;;;;
+16B2;RUNIC LETTER KAUNA;Lo;0;L;;;;;N;;;;;
+16B3;RUNIC LETTER CEN;Lo;0;L;;;;;N;;;;;
+16B4;RUNIC LETTER KAUN K;Lo;0;L;;;;;N;;;;;
+16B5;RUNIC LETTER G;Lo;0;L;;;;;N;;;;;
+16B6;RUNIC LETTER ENG;Lo;0;L;;;;;N;;;;;
+16B7;RUNIC LETTER GEBO GYFU G;Lo;0;L;;;;;N;;;;;
+16B8;RUNIC LETTER GAR;Lo;0;L;;;;;N;;;;;
+16B9;RUNIC LETTER WUNJO WYNN W;Lo;0;L;;;;;N;;;;;
+16BA;RUNIC LETTER HAGLAZ H;Lo;0;L;;;;;N;;;;;
+16BB;RUNIC LETTER HAEGL H;Lo;0;L;;;;;N;;;;;
+16BC;RUNIC LETTER LONG-BRANCH-HAGALL H;Lo;0;L;;;;;N;;;;;
+16BD;RUNIC LETTER SHORT-TWIG-HAGALL H;Lo;0;L;;;;;N;;;;;
+16BE;RUNIC LETTER NAUDIZ NYD NAUD N;Lo;0;L;;;;;N;;;;;
+16BF;RUNIC LETTER SHORT-TWIG-NAUD N;Lo;0;L;;;;;N;;;;;
+16C0;RUNIC LETTER DOTTED-N;Lo;0;L;;;;;N;;;;;
+16C1;RUNIC LETTER ISAZ IS ISS I;Lo;0;L;;;;;N;;;;;
+16C2;RUNIC LETTER E;Lo;0;L;;;;;N;;;;;
+16C3;RUNIC LETTER JERAN J;Lo;0;L;;;;;N;;;;;
+16C4;RUNIC LETTER GER;Lo;0;L;;;;;N;;;;;
+16C5;RUNIC LETTER LONG-BRANCH-AR AE;Lo;0;L;;;;;N;;;;;
+16C6;RUNIC LETTER SHORT-TWIG-AR A;Lo;0;L;;;;;N;;;;;
+16C7;RUNIC LETTER IWAZ EOH;Lo;0;L;;;;;N;;;;;
+16C8;RUNIC LETTER PERTHO PEORTH P;Lo;0;L;;;;;N;;;;;
+16C9;RUNIC LETTER ALGIZ EOLHX;Lo;0;L;;;;;N;;;;;
+16CA;RUNIC LETTER SOWILO S;Lo;0;L;;;;;N;;;;;
+16CB;RUNIC LETTER SIGEL LONG-BRANCH-SOL S;Lo;0;L;;;;;N;;;;;
+16CC;RUNIC LETTER SHORT-TWIG-SOL S;Lo;0;L;;;;;N;;;;;
+16CD;RUNIC LETTER C;Lo;0;L;;;;;N;;;;;
+16CE;RUNIC LETTER Z;Lo;0;L;;;;;N;;;;;
+16CF;RUNIC LETTER TIWAZ TIR TYR T;Lo;0;L;;;;;N;;;;;
+16D0;RUNIC LETTER SHORT-TWIG-TYR T;Lo;0;L;;;;;N;;;;;
+16D1;RUNIC LETTER D;Lo;0;L;;;;;N;;;;;
+16D2;RUNIC LETTER BERKANAN BEORC BJARKAN B;Lo;0;L;;;;;N;;;;;
+16D3;RUNIC LETTER SHORT-TWIG-BJARKAN B;Lo;0;L;;;;;N;;;;;
+16D4;RUNIC LETTER DOTTED-P;Lo;0;L;;;;;N;;;;;
+16D5;RUNIC LETTER OPEN-P;Lo;0;L;;;;;N;;;;;
+16D6;RUNIC LETTER EHWAZ EH E;Lo;0;L;;;;;N;;;;;
+16D7;RUNIC LETTER MANNAZ MAN M;Lo;0;L;;;;;N;;;;;
+16D8;RUNIC LETTER LONG-BRANCH-MADR M;Lo;0;L;;;;;N;;;;;
+16D9;RUNIC LETTER SHORT-TWIG-MADR M;Lo;0;L;;;;;N;;;;;
+16DA;RUNIC LETTER LAUKAZ LAGU LOGR L;Lo;0;L;;;;;N;;;;;
+16DB;RUNIC LETTER DOTTED-L;Lo;0;L;;;;;N;;;;;
+16DC;RUNIC LETTER INGWAZ;Lo;0;L;;;;;N;;;;;
+16DD;RUNIC LETTER ING;Lo;0;L;;;;;N;;;;;
+16DE;RUNIC LETTER DAGAZ DAEG D;Lo;0;L;;;;;N;;;;;
+16DF;RUNIC LETTER OTHALAN ETHEL O;Lo;0;L;;;;;N;;;;;
+16E0;RUNIC LETTER EAR;Lo;0;L;;;;;N;;;;;
+16E1;RUNIC LETTER IOR;Lo;0;L;;;;;N;;;;;
+16E2;RUNIC LETTER CWEORTH;Lo;0;L;;;;;N;;;;;
+16E3;RUNIC LETTER CALC;Lo;0;L;;;;;N;;;;;
+16E4;RUNIC LETTER CEALC;Lo;0;L;;;;;N;;;;;
+16E5;RUNIC LETTER STAN;Lo;0;L;;;;;N;;;;;
+16E6;RUNIC LETTER LONG-BRANCH-YR;Lo;0;L;;;;;N;;;;;
+16E7;RUNIC LETTER SHORT-TWIG-YR;Lo;0;L;;;;;N;;;;;
+16E8;RUNIC LETTER ICELANDIC-YR;Lo;0;L;;;;;N;;;;;
+16E9;RUNIC LETTER Q;Lo;0;L;;;;;N;;;;;
+16EA;RUNIC LETTER X;Lo;0;L;;;;;N;;;;;
+16EB;RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+16EC;RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+16ED;RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;;
+16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;;;;
+16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;;;;
+16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;;;;
+16F1;RUNIC LETTER K;Lo;0;L;;;;;N;;;;;
+16F2;RUNIC LETTER SH;Lo;0;L;;;;;N;;;;;
+16F3;RUNIC LETTER OO;Lo;0;L;;;;;N;;;;;
+16F4;RUNIC LETTER FRANKS CASKET OS;Lo;0;L;;;;;N;;;;;
+16F5;RUNIC LETTER FRANKS CASKET IS;Lo;0;L;;;;;N;;;;;
+16F6;RUNIC LETTER FRANKS CASKET EH;Lo;0;L;;;;;N;;;;;
+16F7;RUNIC LETTER FRANKS CASKET AC;Lo;0;L;;;;;N;;;;;
+16F8;RUNIC LETTER FRANKS CASKET AESC;Lo;0;L;;;;;N;;;;;
+1700;TAGALOG LETTER A;Lo;0;L;;;;;N;;;;;
+1701;TAGALOG LETTER I;Lo;0;L;;;;;N;;;;;
+1702;TAGALOG LETTER U;Lo;0;L;;;;;N;;;;;
+1703;TAGALOG LETTER KA;Lo;0;L;;;;;N;;;;;
+1704;TAGALOG LETTER GA;Lo;0;L;;;;;N;;;;;
+1705;TAGALOG LETTER NGA;Lo;0;L;;;;;N;;;;;
+1706;TAGALOG LETTER TA;Lo;0;L;;;;;N;;;;;
+1707;TAGALOG LETTER DA;Lo;0;L;;;;;N;;;;;
+1708;TAGALOG LETTER NA;Lo;0;L;;;;;N;;;;;
+1709;TAGALOG LETTER PA;Lo;0;L;;;;;N;;;;;
+170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;;
+170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;;
+170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;;
+170E;TAGALOG LETTER LA;Lo;0;L;;;;;N;;;;;
+170F;TAGALOG LETTER WA;Lo;0;L;;;;;N;;;;;
+1710;TAGALOG LETTER SA;Lo;0;L;;;;;N;;;;;
+1711;TAGALOG LETTER HA;Lo;0;L;;;;;N;;;;;
+1712;TAGALOG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1713;TAGALOG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1714;TAGALOG SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1720;HANUNOO LETTER A;Lo;0;L;;;;;N;;;;;
+1721;HANUNOO LETTER I;Lo;0;L;;;;;N;;;;;
+1722;HANUNOO LETTER U;Lo;0;L;;;;;N;;;;;
+1723;HANUNOO LETTER KA;Lo;0;L;;;;;N;;;;;
+1724;HANUNOO LETTER GA;Lo;0;L;;;;;N;;;;;
+1725;HANUNOO LETTER NGA;Lo;0;L;;;;;N;;;;;
+1726;HANUNOO LETTER TA;Lo;0;L;;;;;N;;;;;
+1727;HANUNOO LETTER DA;Lo;0;L;;;;;N;;;;;
+1728;HANUNOO LETTER NA;Lo;0;L;;;;;N;;;;;
+1729;HANUNOO LETTER PA;Lo;0;L;;;;;N;;;;;
+172A;HANUNOO LETTER BA;Lo;0;L;;;;;N;;;;;
+172B;HANUNOO LETTER MA;Lo;0;L;;;;;N;;;;;
+172C;HANUNOO LETTER YA;Lo;0;L;;;;;N;;;;;
+172D;HANUNOO LETTER RA;Lo;0;L;;;;;N;;;;;
+172E;HANUNOO LETTER LA;Lo;0;L;;;;;N;;;;;
+172F;HANUNOO LETTER WA;Lo;0;L;;;;;N;;;;;
+1730;HANUNOO LETTER SA;Lo;0;L;;;;;N;;;;;
+1731;HANUNOO LETTER HA;Lo;0;L;;;;;N;;;;;
+1732;HANUNOO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1733;HANUNOO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1734;HANUNOO SIGN PAMUDPOD;Mn;9;NSM;;;;;N;;;;;
+1735;PHILIPPINE SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+1736;PHILIPPINE DOUBLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+1740;BUHID LETTER A;Lo;0;L;;;;;N;;;;;
+1741;BUHID LETTER I;Lo;0;L;;;;;N;;;;;
+1742;BUHID LETTER U;Lo;0;L;;;;;N;;;;;
+1743;BUHID LETTER KA;Lo;0;L;;;;;N;;;;;
+1744;BUHID LETTER GA;Lo;0;L;;;;;N;;;;;
+1745;BUHID LETTER NGA;Lo;0;L;;;;;N;;;;;
+1746;BUHID LETTER TA;Lo;0;L;;;;;N;;;;;
+1747;BUHID LETTER DA;Lo;0;L;;;;;N;;;;;
+1748;BUHID LETTER NA;Lo;0;L;;;;;N;;;;;
+1749;BUHID LETTER PA;Lo;0;L;;;;;N;;;;;
+174A;BUHID LETTER BA;Lo;0;L;;;;;N;;;;;
+174B;BUHID LETTER MA;Lo;0;L;;;;;N;;;;;
+174C;BUHID LETTER YA;Lo;0;L;;;;;N;;;;;
+174D;BUHID LETTER RA;Lo;0;L;;;;;N;;;;;
+174E;BUHID LETTER LA;Lo;0;L;;;;;N;;;;;
+174F;BUHID LETTER WA;Lo;0;L;;;;;N;;;;;
+1750;BUHID LETTER SA;Lo;0;L;;;;;N;;;;;
+1751;BUHID LETTER HA;Lo;0;L;;;;;N;;;;;
+1752;BUHID VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1753;BUHID VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1760;TAGBANWA LETTER A;Lo;0;L;;;;;N;;;;;
+1761;TAGBANWA LETTER I;Lo;0;L;;;;;N;;;;;
+1762;TAGBANWA LETTER U;Lo;0;L;;;;;N;;;;;
+1763;TAGBANWA LETTER KA;Lo;0;L;;;;;N;;;;;
+1764;TAGBANWA LETTER GA;Lo;0;L;;;;;N;;;;;
+1765;TAGBANWA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1766;TAGBANWA LETTER TA;Lo;0;L;;;;;N;;;;;
+1767;TAGBANWA LETTER DA;Lo;0;L;;;;;N;;;;;
+1768;TAGBANWA LETTER NA;Lo;0;L;;;;;N;;;;;
+1769;TAGBANWA LETTER PA;Lo;0;L;;;;;N;;;;;
+176A;TAGBANWA LETTER BA;Lo;0;L;;;;;N;;;;;
+176B;TAGBANWA LETTER MA;Lo;0;L;;;;;N;;;;;
+176C;TAGBANWA LETTER YA;Lo;0;L;;;;;N;;;;;
+176E;TAGBANWA LETTER LA;Lo;0;L;;;;;N;;;;;
+176F;TAGBANWA LETTER WA;Lo;0;L;;;;;N;;;;;
+1770;TAGBANWA LETTER SA;Lo;0;L;;;;;N;;;;;
+1772;TAGBANWA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1773;TAGBANWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1780;KHMER LETTER KA;Lo;0;L;;;;;N;;;;;
+1781;KHMER LETTER KHA;Lo;0;L;;;;;N;;;;;
+1782;KHMER LETTER KO;Lo;0;L;;;;;N;;;;;
+1783;KHMER LETTER KHO;Lo;0;L;;;;;N;;;;;
+1784;KHMER LETTER NGO;Lo;0;L;;;;;N;;;;;
+1785;KHMER LETTER CA;Lo;0;L;;;;;N;;;;;
+1786;KHMER LETTER CHA;Lo;0;L;;;;;N;;;;;
+1787;KHMER LETTER CO;Lo;0;L;;;;;N;;;;;
+1788;KHMER LETTER CHO;Lo;0;L;;;;;N;;;;;
+1789;KHMER LETTER NYO;Lo;0;L;;;;;N;;;;;
+178A;KHMER LETTER DA;Lo;0;L;;;;;N;;;;;
+178B;KHMER LETTER TTHA;Lo;0;L;;;;;N;;;;;
+178C;KHMER LETTER DO;Lo;0;L;;;;;N;;;;;
+178D;KHMER LETTER TTHO;Lo;0;L;;;;;N;;;;;
+178E;KHMER LETTER NNO;Lo;0;L;;;;;N;;;;;
+178F;KHMER LETTER TA;Lo;0;L;;;;;N;;;;;
+1790;KHMER LETTER THA;Lo;0;L;;;;;N;;;;;
+1791;KHMER LETTER TO;Lo;0;L;;;;;N;;;;;
+1792;KHMER LETTER THO;Lo;0;L;;;;;N;;;;;
+1793;KHMER LETTER NO;Lo;0;L;;;;;N;;;;;
+1794;KHMER LETTER BA;Lo;0;L;;;;;N;;;;;
+1795;KHMER LETTER PHA;Lo;0;L;;;;;N;;;;;
+1796;KHMER LETTER PO;Lo;0;L;;;;;N;;;;;
+1797;KHMER LETTER PHO;Lo;0;L;;;;;N;;;;;
+1798;KHMER LETTER MO;Lo;0;L;;;;;N;;;;;
+1799;KHMER LETTER YO;Lo;0;L;;;;;N;;;;;
+179A;KHMER LETTER RO;Lo;0;L;;;;;N;;;;;
+179B;KHMER LETTER LO;Lo;0;L;;;;;N;;;;;
+179C;KHMER LETTER VO;Lo;0;L;;;;;N;;;;;
+179D;KHMER LETTER SHA;Lo;0;L;;;;;N;;;;;
+179E;KHMER LETTER SSO;Lo;0;L;;;;;N;;;;;
+179F;KHMER LETTER SA;Lo;0;L;;;;;N;;;;;
+17A0;KHMER LETTER HA;Lo;0;L;;;;;N;;;;;
+17A1;KHMER LETTER LA;Lo;0;L;;;;;N;;;;;
+17A2;KHMER LETTER QA;Lo;0;L;;;;;N;;;;;
+17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;;;;
+17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;;;;
+17A5;KHMER INDEPENDENT VOWEL QI;Lo;0;L;;;;;N;;;;;
+17A6;KHMER INDEPENDENT VOWEL QII;Lo;0;L;;;;;N;;;;;
+17A7;KHMER INDEPENDENT VOWEL QU;Lo;0;L;;;;;N;;;;;
+17A8;KHMER INDEPENDENT VOWEL QUK;Lo;0;L;;;;;N;;;;;
+17A9;KHMER INDEPENDENT VOWEL QUU;Lo;0;L;;;;;N;;;;;
+17AA;KHMER INDEPENDENT VOWEL QUUV;Lo;0;L;;;;;N;;;;;
+17AB;KHMER INDEPENDENT VOWEL RY;Lo;0;L;;;;;N;;;;;
+17AC;KHMER INDEPENDENT VOWEL RYY;Lo;0;L;;;;;N;;;;;
+17AD;KHMER INDEPENDENT VOWEL LY;Lo;0;L;;;;;N;;;;;
+17AE;KHMER INDEPENDENT VOWEL LYY;Lo;0;L;;;;;N;;;;;
+17AF;KHMER INDEPENDENT VOWEL QE;Lo;0;L;;;;;N;;;;;
+17B0;KHMER INDEPENDENT VOWEL QAI;Lo;0;L;;;;;N;;;;;
+17B1;KHMER INDEPENDENT VOWEL QOO TYPE ONE;Lo;0;L;;;;;N;;;;;
+17B2;KHMER INDEPENDENT VOWEL QOO TYPE TWO;Lo;0;L;;;;;N;;;;;
+17B3;KHMER INDEPENDENT VOWEL QAU;Lo;0;L;;;;;N;;;;;
+17B4;KHMER VOWEL INHERENT AQ;Mn;0;NSM;;;;;N;;;;;
+17B5;KHMER VOWEL INHERENT AA;Mn;0;NSM;;;;;N;;;;;
+17B6;KHMER VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+17B7;KHMER VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+17B8;KHMER VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+17B9;KHMER VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
+17BA;KHMER VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
+17BB;KHMER VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+17BC;KHMER VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+17BD;KHMER VOWEL SIGN UA;Mn;0;NSM;;;;;N;;;;;
+17BE;KHMER VOWEL SIGN OE;Mc;0;L;;;;;N;;;;;
+17BF;KHMER VOWEL SIGN YA;Mc;0;L;;;;;N;;;;;
+17C0;KHMER VOWEL SIGN IE;Mc;0;L;;;;;N;;;;;
+17C1;KHMER VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+17C2;KHMER VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+17C3;KHMER VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+17C4;KHMER VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+17C5;KHMER VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+17C6;KHMER SIGN NIKAHIT;Mn;0;NSM;;;;;N;;;;;
+17C7;KHMER SIGN REAHMUK;Mc;0;L;;;;;N;;;;;
+17C8;KHMER SIGN YUUKALEAPINTU;Mc;0;L;;;;;N;;;;;
+17C9;KHMER SIGN MUUSIKATOAN;Mn;0;NSM;;;;;N;;;;;
+17CA;KHMER SIGN TRIISAP;Mn;0;NSM;;;;;N;;;;;
+17CB;KHMER SIGN BANTOC;Mn;0;NSM;;;;;N;;;;;
+17CC;KHMER SIGN ROBAT;Mn;0;NSM;;;;;N;;;;;
+17CD;KHMER SIGN TOANDAKHIAT;Mn;0;NSM;;;;;N;;;;;
+17CE;KHMER SIGN KAKABAT;Mn;0;NSM;;;;;N;;;;;
+17CF;KHMER SIGN AHSDA;Mn;0;NSM;;;;;N;;;;;
+17D0;KHMER SIGN SAMYOK SANNYA;Mn;0;NSM;;;;;N;;;;;
+17D1;KHMER SIGN VIRIAM;Mn;0;NSM;;;;;N;;;;;
+17D2;KHMER SIGN COENG;Mn;9;NSM;;;;;N;;;;;
+17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;;;;
+17D4;KHMER SIGN KHAN;Po;0;L;;;;;N;;;;;
+17D5;KHMER SIGN BARIYOOSAN;Po;0;L;;;;;N;;;;;
+17D6;KHMER SIGN CAMNUC PII KUUH;Po;0;L;;;;;N;;;;;
+17D7;KHMER SIGN LEK TOO;Lm;0;L;;;;;N;;;;;
+17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;;;;
+17D9;KHMER SIGN PHNAEK MUAN;Po;0;L;;;;;N;;;;;
+17DA;KHMER SIGN KOOMUUT;Po;0;L;;;;;N;;;;;
+17DB;KHMER CURRENCY SYMBOL RIEL;Sc;0;ET;;;;;N;;;;;
+17DC;KHMER SIGN AVAKRAHASANYA;Lo;0;L;;;;;N;;;;;
+17DD;KHMER SIGN ATTHACAN;Mn;230;NSM;;;;;N;;;;;
+17E0;KHMER DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+17E1;KHMER DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+17E2;KHMER DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+17E3;KHMER DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+17E4;KHMER DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+17E5;KHMER DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+17E6;KHMER DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+17E7;KHMER DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+17E8;KHMER DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+17E9;KHMER DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+17F0;KHMER SYMBOL LEK ATTAK SON;No;0;ON;;;;0;N;;;;;
+17F1;KHMER SYMBOL LEK ATTAK MUOY;No;0;ON;;;;1;N;;;;;
+17F2;KHMER SYMBOL LEK ATTAK PII;No;0;ON;;;;2;N;;;;;
+17F3;KHMER SYMBOL LEK ATTAK BEI;No;0;ON;;;;3;N;;;;;
+17F4;KHMER SYMBOL LEK ATTAK BUON;No;0;ON;;;;4;N;;;;;
+17F5;KHMER SYMBOL LEK ATTAK PRAM;No;0;ON;;;;5;N;;;;;
+17F6;KHMER SYMBOL LEK ATTAK PRAM-MUOY;No;0;ON;;;;6;N;;;;;
+17F7;KHMER SYMBOL LEK ATTAK PRAM-PII;No;0;ON;;;;7;N;;;;;
+17F8;KHMER SYMBOL LEK ATTAK PRAM-BEI;No;0;ON;;;;8;N;;;;;
+17F9;KHMER SYMBOL LEK ATTAK PRAM-BUON;No;0;ON;;;;9;N;;;;;
+1800;MONGOLIAN BIRGA;Po;0;ON;;;;;N;;;;;
+1801;MONGOLIAN ELLIPSIS;Po;0;ON;;;;;N;;;;;
+1802;MONGOLIAN COMMA;Po;0;ON;;;;;N;;;;;
+1803;MONGOLIAN FULL STOP;Po;0;ON;;;;;N;;;;;
+1804;MONGOLIAN COLON;Po;0;ON;;;;;N;;;;;
+1805;MONGOLIAN FOUR DOTS;Po;0;ON;;;;;N;;;;;
+1806;MONGOLIAN TODO SOFT HYPHEN;Pd;0;ON;;;;;N;;;;;
+1807;MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER;Po;0;ON;;;;;N;;;;;
+1808;MONGOLIAN MANCHU COMMA;Po;0;ON;;;;;N;;;;;
+1809;MONGOLIAN MANCHU FULL STOP;Po;0;ON;;;;;N;;;;;
+180A;MONGOLIAN NIRUGU;Po;0;ON;;;;;N;;;;;
+180B;MONGOLIAN FREE VARIATION SELECTOR ONE;Mn;0;NSM;;;;;N;;;;;
+180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;;
+180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;;
+180E;MONGOLIAN VOWEL SEPARATOR;Cf;0;BN;;;;;N;;;;;
+1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1813;MONGOLIAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1814;MONGOLIAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1815;MONGOLIAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1816;MONGOLIAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1817;MONGOLIAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1818;MONGOLIAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1819;MONGOLIAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1820;MONGOLIAN LETTER A;Lo;0;L;;;;;N;;;;;
+1821;MONGOLIAN LETTER E;Lo;0;L;;;;;N;;;;;
+1822;MONGOLIAN LETTER I;Lo;0;L;;;;;N;;;;;
+1823;MONGOLIAN LETTER O;Lo;0;L;;;;;N;;;;;
+1824;MONGOLIAN LETTER U;Lo;0;L;;;;;N;;;;;
+1825;MONGOLIAN LETTER OE;Lo;0;L;;;;;N;;;;;
+1826;MONGOLIAN LETTER UE;Lo;0;L;;;;;N;;;;;
+1827;MONGOLIAN LETTER EE;Lo;0;L;;;;;N;;;;;
+1828;MONGOLIAN LETTER NA;Lo;0;L;;;;;N;;;;;
+1829;MONGOLIAN LETTER ANG;Lo;0;L;;;;;N;;;;;
+182A;MONGOLIAN LETTER BA;Lo;0;L;;;;;N;;;;;
+182B;MONGOLIAN LETTER PA;Lo;0;L;;;;;N;;;;;
+182C;MONGOLIAN LETTER QA;Lo;0;L;;;;;N;;;;;
+182D;MONGOLIAN LETTER GA;Lo;0;L;;;;;N;;;;;
+182E;MONGOLIAN LETTER MA;Lo;0;L;;;;;N;;;;;
+182F;MONGOLIAN LETTER LA;Lo;0;L;;;;;N;;;;;
+1830;MONGOLIAN LETTER SA;Lo;0;L;;;;;N;;;;;
+1831;MONGOLIAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+1832;MONGOLIAN LETTER TA;Lo;0;L;;;;;N;;;;;
+1833;MONGOLIAN LETTER DA;Lo;0;L;;;;;N;;;;;
+1834;MONGOLIAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+1835;MONGOLIAN LETTER JA;Lo;0;L;;;;;N;;;;;
+1836;MONGOLIAN LETTER YA;Lo;0;L;;;;;N;;;;;
+1837;MONGOLIAN LETTER RA;Lo;0;L;;;;;N;;;;;
+1838;MONGOLIAN LETTER WA;Lo;0;L;;;;;N;;;;;
+1839;MONGOLIAN LETTER FA;Lo;0;L;;;;;N;;;;;
+183A;MONGOLIAN LETTER KA;Lo;0;L;;;;;N;;;;;
+183B;MONGOLIAN LETTER KHA;Lo;0;L;;;;;N;;;;;
+183C;MONGOLIAN LETTER TSA;Lo;0;L;;;;;N;;;;;
+183D;MONGOLIAN LETTER ZA;Lo;0;L;;;;;N;;;;;
+183E;MONGOLIAN LETTER HAA;Lo;0;L;;;;;N;;;;;
+183F;MONGOLIAN LETTER ZRA;Lo;0;L;;;;;N;;;;;
+1840;MONGOLIAN LETTER LHA;Lo;0;L;;;;;N;;;;;
+1841;MONGOLIAN LETTER ZHI;Lo;0;L;;;;;N;;;;;
+1842;MONGOLIAN LETTER CHI;Lo;0;L;;;;;N;;;;;
+1843;MONGOLIAN LETTER TODO LONG VOWEL SIGN;Lm;0;L;;;;;N;;;;;
+1844;MONGOLIAN LETTER TODO E;Lo;0;L;;;;;N;;;;;
+1845;MONGOLIAN LETTER TODO I;Lo;0;L;;;;;N;;;;;
+1846;MONGOLIAN LETTER TODO O;Lo;0;L;;;;;N;;;;;
+1847;MONGOLIAN LETTER TODO U;Lo;0;L;;;;;N;;;;;
+1848;MONGOLIAN LETTER TODO OE;Lo;0;L;;;;;N;;;;;
+1849;MONGOLIAN LETTER TODO UE;Lo;0;L;;;;;N;;;;;
+184A;MONGOLIAN LETTER TODO ANG;Lo;0;L;;;;;N;;;;;
+184B;MONGOLIAN LETTER TODO BA;Lo;0;L;;;;;N;;;;;
+184C;MONGOLIAN LETTER TODO PA;Lo;0;L;;;;;N;;;;;
+184D;MONGOLIAN LETTER TODO QA;Lo;0;L;;;;;N;;;;;
+184E;MONGOLIAN LETTER TODO GA;Lo;0;L;;;;;N;;;;;
+184F;MONGOLIAN LETTER TODO MA;Lo;0;L;;;;;N;;;;;
+1850;MONGOLIAN LETTER TODO TA;Lo;0;L;;;;;N;;;;;
+1851;MONGOLIAN LETTER TODO DA;Lo;0;L;;;;;N;;;;;
+1852;MONGOLIAN LETTER TODO CHA;Lo;0;L;;;;;N;;;;;
+1853;MONGOLIAN LETTER TODO JA;Lo;0;L;;;;;N;;;;;
+1854;MONGOLIAN LETTER TODO TSA;Lo;0;L;;;;;N;;;;;
+1855;MONGOLIAN LETTER TODO YA;Lo;0;L;;;;;N;;;;;
+1856;MONGOLIAN LETTER TODO WA;Lo;0;L;;;;;N;;;;;
+1857;MONGOLIAN LETTER TODO KA;Lo;0;L;;;;;N;;;;;
+1858;MONGOLIAN LETTER TODO GAA;Lo;0;L;;;;;N;;;;;
+1859;MONGOLIAN LETTER TODO HAA;Lo;0;L;;;;;N;;;;;
+185A;MONGOLIAN LETTER TODO JIA;Lo;0;L;;;;;N;;;;;
+185B;MONGOLIAN LETTER TODO NIA;Lo;0;L;;;;;N;;;;;
+185C;MONGOLIAN LETTER TODO DZA;Lo;0;L;;;;;N;;;;;
+185D;MONGOLIAN LETTER SIBE E;Lo;0;L;;;;;N;;;;;
+185E;MONGOLIAN LETTER SIBE I;Lo;0;L;;;;;N;;;;;
+185F;MONGOLIAN LETTER SIBE IY;Lo;0;L;;;;;N;;;;;
+1860;MONGOLIAN LETTER SIBE UE;Lo;0;L;;;;;N;;;;;
+1861;MONGOLIAN LETTER SIBE U;Lo;0;L;;;;;N;;;;;
+1862;MONGOLIAN LETTER SIBE ANG;Lo;0;L;;;;;N;;;;;
+1863;MONGOLIAN LETTER SIBE KA;Lo;0;L;;;;;N;;;;;
+1864;MONGOLIAN LETTER SIBE GA;Lo;0;L;;;;;N;;;;;
+1865;MONGOLIAN LETTER SIBE HA;Lo;0;L;;;;;N;;;;;
+1866;MONGOLIAN LETTER SIBE PA;Lo;0;L;;;;;N;;;;;
+1867;MONGOLIAN LETTER SIBE SHA;Lo;0;L;;;;;N;;;;;
+1868;MONGOLIAN LETTER SIBE TA;Lo;0;L;;;;;N;;;;;
+1869;MONGOLIAN LETTER SIBE DA;Lo;0;L;;;;;N;;;;;
+186A;MONGOLIAN LETTER SIBE JA;Lo;0;L;;;;;N;;;;;
+186B;MONGOLIAN LETTER SIBE FA;Lo;0;L;;;;;N;;;;;
+186C;MONGOLIAN LETTER SIBE GAA;Lo;0;L;;;;;N;;;;;
+186D;MONGOLIAN LETTER SIBE HAA;Lo;0;L;;;;;N;;;;;
+186E;MONGOLIAN LETTER SIBE TSA;Lo;0;L;;;;;N;;;;;
+186F;MONGOLIAN LETTER SIBE ZA;Lo;0;L;;;;;N;;;;;
+1870;MONGOLIAN LETTER SIBE RAA;Lo;0;L;;;;;N;;;;;
+1871;MONGOLIAN LETTER SIBE CHA;Lo;0;L;;;;;N;;;;;
+1872;MONGOLIAN LETTER SIBE ZHA;Lo;0;L;;;;;N;;;;;
+1873;MONGOLIAN LETTER MANCHU I;Lo;0;L;;;;;N;;;;;
+1874;MONGOLIAN LETTER MANCHU KA;Lo;0;L;;;;;N;;;;;
+1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;;
+1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;;
+1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;;
+1878;MONGOLIAN LETTER CHA WITH TWO DOTS;Lo;0;L;;;;;N;;;;;
+1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;;
+1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;;
+1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
+1883;MONGOLIAN LETTER ALI GALI UBADAMA;Lo;0;L;;;;;N;;;;;
+1884;MONGOLIAN LETTER ALI GALI INVERTED UBADAMA;Lo;0;L;;;;;N;;;;;
+1885;MONGOLIAN LETTER ALI GALI BALUDA;Mn;0;NSM;;;;;N;;;;;
+1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Mn;0;NSM;;;;;N;;;;;
+1887;MONGOLIAN LETTER ALI GALI A;Lo;0;L;;;;;N;;;;;
+1888;MONGOLIAN LETTER ALI GALI I;Lo;0;L;;;;;N;;;;;
+1889;MONGOLIAN LETTER ALI GALI KA;Lo;0;L;;;;;N;;;;;
+188A;MONGOLIAN LETTER ALI GALI NGA;Lo;0;L;;;;;N;;;;;
+188B;MONGOLIAN LETTER ALI GALI CA;Lo;0;L;;;;;N;;;;;
+188C;MONGOLIAN LETTER ALI GALI TTA;Lo;0;L;;;;;N;;;;;
+188D;MONGOLIAN LETTER ALI GALI TTHA;Lo;0;L;;;;;N;;;;;
+188E;MONGOLIAN LETTER ALI GALI DDA;Lo;0;L;;;;;N;;;;;
+188F;MONGOLIAN LETTER ALI GALI NNA;Lo;0;L;;;;;N;;;;;
+1890;MONGOLIAN LETTER ALI GALI TA;Lo;0;L;;;;;N;;;;;
+1891;MONGOLIAN LETTER ALI GALI DA;Lo;0;L;;;;;N;;;;;
+1892;MONGOLIAN LETTER ALI GALI PA;Lo;0;L;;;;;N;;;;;
+1893;MONGOLIAN LETTER ALI GALI PHA;Lo;0;L;;;;;N;;;;;
+1894;MONGOLIAN LETTER ALI GALI SSA;Lo;0;L;;;;;N;;;;;
+1895;MONGOLIAN LETTER ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+1896;MONGOLIAN LETTER ALI GALI ZA;Lo;0;L;;;;;N;;;;;
+1897;MONGOLIAN LETTER ALI GALI AH;Lo;0;L;;;;;N;;;;;
+1898;MONGOLIAN LETTER TODO ALI GALI TA;Lo;0;L;;;;;N;;;;;
+1899;MONGOLIAN LETTER TODO ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+189A;MONGOLIAN LETTER MANCHU ALI GALI GHA;Lo;0;L;;;;;N;;;;;
+189B;MONGOLIAN LETTER MANCHU ALI GALI NGA;Lo;0;L;;;;;N;;;;;
+189C;MONGOLIAN LETTER MANCHU ALI GALI CA;Lo;0;L;;;;;N;;;;;
+189D;MONGOLIAN LETTER MANCHU ALI GALI JHA;Lo;0;L;;;;;N;;;;;
+189E;MONGOLIAN LETTER MANCHU ALI GALI TTA;Lo;0;L;;;;;N;;;;;
+189F;MONGOLIAN LETTER MANCHU ALI GALI DDHA;Lo;0;L;;;;;N;;;;;
+18A0;MONGOLIAN LETTER MANCHU ALI GALI TA;Lo;0;L;;;;;N;;;;;
+18A1;MONGOLIAN LETTER MANCHU ALI GALI DHA;Lo;0;L;;;;;N;;;;;
+18A2;MONGOLIAN LETTER MANCHU ALI GALI SSA;Lo;0;L;;;;;N;;;;;
+18A3;MONGOLIAN LETTER MANCHU ALI GALI CYA;Lo;0;L;;;;;N;;;;;
+18A4;MONGOLIAN LETTER MANCHU ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+18A5;MONGOLIAN LETTER MANCHU ALI GALI ZA;Lo;0;L;;;;;N;;;;;
+18A6;MONGOLIAN LETTER ALI GALI HALF U;Lo;0;L;;;;;N;;;;;
+18A7;MONGOLIAN LETTER ALI GALI HALF YA;Lo;0;L;;;;;N;;;;;
+18A8;MONGOLIAN LETTER MANCHU ALI GALI BHA;Lo;0;L;;;;;N;;;;;
+18A9;MONGOLIAN LETTER ALI GALI DAGALGA;Mn;228;NSM;;;;;N;;;;;
+18AA;MONGOLIAN LETTER MANCHU ALI GALI LHA;Lo;0;L;;;;;N;;;;;
+18B0;CANADIAN SYLLABICS OY;Lo;0;L;;;;;N;;;;;
+18B1;CANADIAN SYLLABICS AY;Lo;0;L;;;;;N;;;;;
+18B2;CANADIAN SYLLABICS AAY;Lo;0;L;;;;;N;;;;;
+18B3;CANADIAN SYLLABICS WAY;Lo;0;L;;;;;N;;;;;
+18B4;CANADIAN SYLLABICS POY;Lo;0;L;;;;;N;;;;;
+18B5;CANADIAN SYLLABICS PAY;Lo;0;L;;;;;N;;;;;
+18B6;CANADIAN SYLLABICS PWOY;Lo;0;L;;;;;N;;;;;
+18B7;CANADIAN SYLLABICS TAY;Lo;0;L;;;;;N;;;;;
+18B8;CANADIAN SYLLABICS KAY;Lo;0;L;;;;;N;;;;;
+18B9;CANADIAN SYLLABICS KWAY;Lo;0;L;;;;;N;;;;;
+18BA;CANADIAN SYLLABICS MAY;Lo;0;L;;;;;N;;;;;
+18BB;CANADIAN SYLLABICS NOY;Lo;0;L;;;;;N;;;;;
+18BC;CANADIAN SYLLABICS NAY;Lo;0;L;;;;;N;;;;;
+18BD;CANADIAN SYLLABICS LAY;Lo;0;L;;;;;N;;;;;
+18BE;CANADIAN SYLLABICS SOY;Lo;0;L;;;;;N;;;;;
+18BF;CANADIAN SYLLABICS SAY;Lo;0;L;;;;;N;;;;;
+18C0;CANADIAN SYLLABICS SHOY;Lo;0;L;;;;;N;;;;;
+18C1;CANADIAN SYLLABICS SHAY;Lo;0;L;;;;;N;;;;;
+18C2;CANADIAN SYLLABICS SHWOY;Lo;0;L;;;;;N;;;;;
+18C3;CANADIAN SYLLABICS YOY;Lo;0;L;;;;;N;;;;;
+18C4;CANADIAN SYLLABICS YAY;Lo;0;L;;;;;N;;;;;
+18C5;CANADIAN SYLLABICS RAY;Lo;0;L;;;;;N;;;;;
+18C6;CANADIAN SYLLABICS NWI;Lo;0;L;;;;;N;;;;;
+18C7;CANADIAN SYLLABICS OJIBWAY NWI;Lo;0;L;;;;;N;;;;;
+18C8;CANADIAN SYLLABICS NWII;Lo;0;L;;;;;N;;;;;
+18C9;CANADIAN SYLLABICS OJIBWAY NWII;Lo;0;L;;;;;N;;;;;
+18CA;CANADIAN SYLLABICS NWO;Lo;0;L;;;;;N;;;;;
+18CB;CANADIAN SYLLABICS OJIBWAY NWO;Lo;0;L;;;;;N;;;;;
+18CC;CANADIAN SYLLABICS NWOO;Lo;0;L;;;;;N;;;;;
+18CD;CANADIAN SYLLABICS OJIBWAY NWOO;Lo;0;L;;;;;N;;;;;
+18CE;CANADIAN SYLLABICS RWEE;Lo;0;L;;;;;N;;;;;
+18CF;CANADIAN SYLLABICS RWI;Lo;0;L;;;;;N;;;;;
+18D0;CANADIAN SYLLABICS RWII;Lo;0;L;;;;;N;;;;;
+18D1;CANADIAN SYLLABICS RWO;Lo;0;L;;;;;N;;;;;
+18D2;CANADIAN SYLLABICS RWOO;Lo;0;L;;;;;N;;;;;
+18D3;CANADIAN SYLLABICS RWA;Lo;0;L;;;;;N;;;;;
+18D4;CANADIAN SYLLABICS OJIBWAY P;Lo;0;L;;;;;N;;;;;
+18D5;CANADIAN SYLLABICS OJIBWAY T;Lo;0;L;;;;;N;;;;;
+18D6;CANADIAN SYLLABICS OJIBWAY K;Lo;0;L;;;;;N;;;;;
+18D7;CANADIAN SYLLABICS OJIBWAY C;Lo;0;L;;;;;N;;;;;
+18D8;CANADIAN SYLLABICS OJIBWAY M;Lo;0;L;;;;;N;;;;;
+18D9;CANADIAN SYLLABICS OJIBWAY N;Lo;0;L;;;;;N;;;;;
+18DA;CANADIAN SYLLABICS OJIBWAY S;Lo;0;L;;;;;N;;;;;
+18DB;CANADIAN SYLLABICS OJIBWAY SH;Lo;0;L;;;;;N;;;;;
+18DC;CANADIAN SYLLABICS EASTERN W;Lo;0;L;;;;;N;;;;;
+18DD;CANADIAN SYLLABICS WESTERN W;Lo;0;L;;;;;N;;;;;
+18DE;CANADIAN SYLLABICS FINAL SMALL RING;Lo;0;L;;;;;N;;;;;
+18DF;CANADIAN SYLLABICS FINAL RAISED DOT;Lo;0;L;;;;;N;;;;;
+18E0;CANADIAN SYLLABICS R-CREE RWE;Lo;0;L;;;;;N;;;;;
+18E1;CANADIAN SYLLABICS WEST-CREE LOO;Lo;0;L;;;;;N;;;;;
+18E2;CANADIAN SYLLABICS WEST-CREE LAA;Lo;0;L;;;;;N;;;;;
+18E3;CANADIAN SYLLABICS THWE;Lo;0;L;;;;;N;;;;;
+18E4;CANADIAN SYLLABICS THWA;Lo;0;L;;;;;N;;;;;
+18E5;CANADIAN SYLLABICS TTHWE;Lo;0;L;;;;;N;;;;;
+18E6;CANADIAN SYLLABICS TTHOO;Lo;0;L;;;;;N;;;;;
+18E7;CANADIAN SYLLABICS TTHAA;Lo;0;L;;;;;N;;;;;
+18E8;CANADIAN SYLLABICS TLHWE;Lo;0;L;;;;;N;;;;;
+18E9;CANADIAN SYLLABICS TLHOO;Lo;0;L;;;;;N;;;;;
+18EA;CANADIAN SYLLABICS SAYISI SHWE;Lo;0;L;;;;;N;;;;;
+18EB;CANADIAN SYLLABICS SAYISI SHOO;Lo;0;L;;;;;N;;;;;
+18EC;CANADIAN SYLLABICS SAYISI HOO;Lo;0;L;;;;;N;;;;;
+18ED;CANADIAN SYLLABICS CARRIER GWU;Lo;0;L;;;;;N;;;;;
+18EE;CANADIAN SYLLABICS CARRIER DENE GEE;Lo;0;L;;;;;N;;;;;
+18EF;CANADIAN SYLLABICS CARRIER GAA;Lo;0;L;;;;;N;;;;;
+18F0;CANADIAN SYLLABICS CARRIER GWA;Lo;0;L;;;;;N;;;;;
+18F1;CANADIAN SYLLABICS SAYISI JUU;Lo;0;L;;;;;N;;;;;
+18F2;CANADIAN SYLLABICS CARRIER JWA;Lo;0;L;;;;;N;;;;;
+18F3;CANADIAN SYLLABICS BEAVER DENE L;Lo;0;L;;;;;N;;;;;
+18F4;CANADIAN SYLLABICS BEAVER DENE R;Lo;0;L;;;;;N;;;;;
+18F5;CANADIAN SYLLABICS CARRIER DENTAL S;Lo;0;L;;;;;N;;;;;
+1900;LIMBU VOWEL-CARRIER LETTER;Lo;0;L;;;;;N;;;;;
+1901;LIMBU LETTER KA;Lo;0;L;;;;;N;;;;;
+1902;LIMBU LETTER KHA;Lo;0;L;;;;;N;;;;;
+1903;LIMBU LETTER GA;Lo;0;L;;;;;N;;;;;
+1904;LIMBU LETTER GHA;Lo;0;L;;;;;N;;;;;
+1905;LIMBU LETTER NGA;Lo;0;L;;;;;N;;;;;
+1906;LIMBU LETTER CA;Lo;0;L;;;;;N;;;;;
+1907;LIMBU LETTER CHA;Lo;0;L;;;;;N;;;;;
+1908;LIMBU LETTER JA;Lo;0;L;;;;;N;;;;;
+1909;LIMBU LETTER JHA;Lo;0;L;;;;;N;;;;;
+190A;LIMBU LETTER YAN;Lo;0;L;;;;;N;;;;;
+190B;LIMBU LETTER TA;Lo;0;L;;;;;N;;;;;
+190C;LIMBU LETTER THA;Lo;0;L;;;;;N;;;;;
+190D;LIMBU LETTER DA;Lo;0;L;;;;;N;;;;;
+190E;LIMBU LETTER DHA;Lo;0;L;;;;;N;;;;;
+190F;LIMBU LETTER NA;Lo;0;L;;;;;N;;;;;
+1910;LIMBU LETTER PA;Lo;0;L;;;;;N;;;;;
+1911;LIMBU LETTER PHA;Lo;0;L;;;;;N;;;;;
+1912;LIMBU LETTER BA;Lo;0;L;;;;;N;;;;;
+1913;LIMBU LETTER BHA;Lo;0;L;;;;;N;;;;;
+1914;LIMBU LETTER MA;Lo;0;L;;;;;N;;;;;
+1915;LIMBU LETTER YA;Lo;0;L;;;;;N;;;;;
+1916;LIMBU LETTER RA;Lo;0;L;;;;;N;;;;;
+1917;LIMBU LETTER LA;Lo;0;L;;;;;N;;;;;
+1918;LIMBU LETTER WA;Lo;0;L;;;;;N;;;;;
+1919;LIMBU LETTER SHA;Lo;0;L;;;;;N;;;;;
+191A;LIMBU LETTER SSA;Lo;0;L;;;;;N;;;;;
+191B;LIMBU LETTER SA;Lo;0;L;;;;;N;;;;;
+191C;LIMBU LETTER HA;Lo;0;L;;;;;N;;;;;
+191D;LIMBU LETTER GYAN;Lo;0;L;;;;;N;;;;;
+191E;LIMBU LETTER TRA;Lo;0;L;;;;;N;;;;;
+1920;LIMBU VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;;
+1921;LIMBU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1922;LIMBU VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1923;LIMBU VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+1924;LIMBU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1925;LIMBU VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1926;LIMBU VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+1927;LIMBU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1928;LIMBU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+1929;LIMBU SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+192A;LIMBU SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
+192B;LIMBU SUBJOINED LETTER WA;Mc;0;L;;;;;N;;;;;
+1930;LIMBU SMALL LETTER KA;Mc;0;L;;;;;N;;;;;
+1931;LIMBU SMALL LETTER NGA;Mc;0;L;;;;;N;;;;;
+1932;LIMBU SMALL LETTER ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1933;LIMBU SMALL LETTER TA;Mc;0;L;;;;;N;;;;;
+1934;LIMBU SMALL LETTER NA;Mc;0;L;;;;;N;;;;;
+1935;LIMBU SMALL LETTER PA;Mc;0;L;;;;;N;;;;;
+1936;LIMBU SMALL LETTER MA;Mc;0;L;;;;;N;;;;;
+1937;LIMBU SMALL LETTER RA;Mc;0;L;;;;;N;;;;;
+1938;LIMBU SMALL LETTER LA;Mc;0;L;;;;;N;;;;;
+1939;LIMBU SIGN MUKPHRENG;Mn;222;NSM;;;;;N;;;;;
+193A;LIMBU SIGN KEMPHRENG;Mn;230;NSM;;;;;N;;;;;
+193B;LIMBU SIGN SA-I;Mn;220;NSM;;;;;N;;;;;
+1940;LIMBU SIGN LOO;So;0;ON;;;;;N;;;;;
+1944;LIMBU EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+1945;LIMBU QUESTION MARK;Po;0;ON;;;;;N;;;;;
+1946;LIMBU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1947;LIMBU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1948;LIMBU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1949;LIMBU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+194A;LIMBU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+194B;LIMBU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+194C;LIMBU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+194D;LIMBU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+194E;LIMBU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+194F;LIMBU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1950;TAI LE LETTER KA;Lo;0;L;;;;;N;;;;;
+1951;TAI LE LETTER XA;Lo;0;L;;;;;N;;;;;
+1952;TAI LE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1953;TAI LE LETTER TSA;Lo;0;L;;;;;N;;;;;
+1954;TAI LE LETTER SA;Lo;0;L;;;;;N;;;;;
+1955;TAI LE LETTER YA;Lo;0;L;;;;;N;;;;;
+1956;TAI LE LETTER TA;Lo;0;L;;;;;N;;;;;
+1957;TAI LE LETTER THA;Lo;0;L;;;;;N;;;;;
+1958;TAI LE LETTER LA;Lo;0;L;;;;;N;;;;;
+1959;TAI LE LETTER PA;Lo;0;L;;;;;N;;;;;
+195A;TAI LE LETTER PHA;Lo;0;L;;;;;N;;;;;
+195B;TAI LE LETTER MA;Lo;0;L;;;;;N;;;;;
+195C;TAI LE LETTER FA;Lo;0;L;;;;;N;;;;;
+195D;TAI LE LETTER VA;Lo;0;L;;;;;N;;;;;
+195E;TAI LE LETTER HA;Lo;0;L;;;;;N;;;;;
+195F;TAI LE LETTER QA;Lo;0;L;;;;;N;;;;;
+1960;TAI LE LETTER KHA;Lo;0;L;;;;;N;;;;;
+1961;TAI LE LETTER TSHA;Lo;0;L;;;;;N;;;;;
+1962;TAI LE LETTER NA;Lo;0;L;;;;;N;;;;;
+1963;TAI LE LETTER A;Lo;0;L;;;;;N;;;;;
+1964;TAI LE LETTER I;Lo;0;L;;;;;N;;;;;
+1965;TAI LE LETTER EE;Lo;0;L;;;;;N;;;;;
+1966;TAI LE LETTER EH;Lo;0;L;;;;;N;;;;;
+1967;TAI LE LETTER U;Lo;0;L;;;;;N;;;;;
+1968;TAI LE LETTER OO;Lo;0;L;;;;;N;;;;;
+1969;TAI LE LETTER O;Lo;0;L;;;;;N;;;;;
+196A;TAI LE LETTER UE;Lo;0;L;;;;;N;;;;;
+196B;TAI LE LETTER E;Lo;0;L;;;;;N;;;;;
+196C;TAI LE LETTER AUE;Lo;0;L;;;;;N;;;;;
+196D;TAI LE LETTER AI;Lo;0;L;;;;;N;;;;;
+1970;TAI LE LETTER TONE-2;Lo;0;L;;;;;N;;;;;
+1971;TAI LE LETTER TONE-3;Lo;0;L;;;;;N;;;;;
+1972;TAI LE LETTER TONE-4;Lo;0;L;;;;;N;;;;;
+1973;TAI LE LETTER TONE-5;Lo;0;L;;;;;N;;;;;
+1974;TAI LE LETTER TONE-6;Lo;0;L;;;;;N;;;;;
+1980;NEW TAI LUE LETTER HIGH QA;Lo;0;L;;;;;N;;;;;
+1981;NEW TAI LUE LETTER LOW QA;Lo;0;L;;;;;N;;;;;
+1982;NEW TAI LUE LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
+1983;NEW TAI LUE LETTER HIGH XA;Lo;0;L;;;;;N;;;;;
+1984;NEW TAI LUE LETTER HIGH NGA;Lo;0;L;;;;;N;;;;;
+1985;NEW TAI LUE LETTER LOW KA;Lo;0;L;;;;;N;;;;;
+1986;NEW TAI LUE LETTER LOW XA;Lo;0;L;;;;;N;;;;;
+1987;NEW TAI LUE LETTER LOW NGA;Lo;0;L;;;;;N;;;;;
+1988;NEW TAI LUE LETTER HIGH TSA;Lo;0;L;;;;;N;;;;;
+1989;NEW TAI LUE LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
+198A;NEW TAI LUE LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
+198B;NEW TAI LUE LETTER LOW TSA;Lo;0;L;;;;;N;;;;;
+198C;NEW TAI LUE LETTER LOW SA;Lo;0;L;;;;;N;;;;;
+198D;NEW TAI LUE LETTER LOW YA;Lo;0;L;;;;;N;;;;;
+198E;NEW TAI LUE LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
+198F;NEW TAI LUE LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
+1990;NEW TAI LUE LETTER HIGH NA;Lo;0;L;;;;;N;;;;;
+1991;NEW TAI LUE LETTER LOW TA;Lo;0;L;;;;;N;;;;;
+1992;NEW TAI LUE LETTER LOW THA;Lo;0;L;;;;;N;;;;;
+1993;NEW TAI LUE LETTER LOW NA;Lo;0;L;;;;;N;;;;;
+1994;NEW TAI LUE LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
+1995;NEW TAI LUE LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
+1996;NEW TAI LUE LETTER HIGH MA;Lo;0;L;;;;;N;;;;;
+1997;NEW TAI LUE LETTER LOW PA;Lo;0;L;;;;;N;;;;;
+1998;NEW TAI LUE LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
+1999;NEW TAI LUE LETTER LOW MA;Lo;0;L;;;;;N;;;;;
+199A;NEW TAI LUE LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
+199B;NEW TAI LUE LETTER HIGH VA;Lo;0;L;;;;;N;;;;;
+199C;NEW TAI LUE LETTER HIGH LA;Lo;0;L;;;;;N;;;;;
+199D;NEW TAI LUE LETTER LOW FA;Lo;0;L;;;;;N;;;;;
+199E;NEW TAI LUE LETTER LOW VA;Lo;0;L;;;;;N;;;;;
+199F;NEW TAI LUE LETTER LOW LA;Lo;0;L;;;;;N;;;;;
+19A0;NEW TAI LUE LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
+19A1;NEW TAI LUE LETTER HIGH DA;Lo;0;L;;;;;N;;;;;
+19A2;NEW TAI LUE LETTER HIGH BA;Lo;0;L;;;;;N;;;;;
+19A3;NEW TAI LUE LETTER LOW HA;Lo;0;L;;;;;N;;;;;
+19A4;NEW TAI LUE LETTER LOW DA;Lo;0;L;;;;;N;;;;;
+19A5;NEW TAI LUE LETTER LOW BA;Lo;0;L;;;;;N;;;;;
+19A6;NEW TAI LUE LETTER HIGH KVA;Lo;0;L;;;;;N;;;;;
+19A7;NEW TAI LUE LETTER HIGH XVA;Lo;0;L;;;;;N;;;;;
+19A8;NEW TAI LUE LETTER LOW KVA;Lo;0;L;;;;;N;;;;;
+19A9;NEW TAI LUE LETTER LOW XVA;Lo;0;L;;;;;N;;;;;
+19AA;NEW TAI LUE LETTER HIGH SUA;Lo;0;L;;;;;N;;;;;
+19AB;NEW TAI LUE LETTER LOW SUA;Lo;0;L;;;;;N;;;;;
+19B0;NEW TAI LUE VOWEL SIGN VOWEL SHORTENER;Lo;0;L;;;;;N;;;;;
+19B1;NEW TAI LUE VOWEL SIGN AA;Lo;0;L;;;;;N;;;;;
+19B2;NEW TAI LUE VOWEL SIGN II;Lo;0;L;;;;;N;;;;;
+19B3;NEW TAI LUE VOWEL SIGN U;Lo;0;L;;;;;N;;;;;
+19B4;NEW TAI LUE VOWEL SIGN UU;Lo;0;L;;;;;N;;;;;
+19B5;NEW TAI LUE VOWEL SIGN E;Lo;0;L;;;;;N;;;;;
+19B6;NEW TAI LUE VOWEL SIGN AE;Lo;0;L;;;;;N;;;;;
+19B7;NEW TAI LUE VOWEL SIGN O;Lo;0;L;;;;;N;;;;;
+19B8;NEW TAI LUE VOWEL SIGN OA;Lo;0;L;;;;;N;;;;;
+19B9;NEW TAI LUE VOWEL SIGN UE;Lo;0;L;;;;;N;;;;;
+19BA;NEW TAI LUE VOWEL SIGN AY;Lo;0;L;;;;;N;;;;;
+19BB;NEW TAI LUE VOWEL SIGN AAY;Lo;0;L;;;;;N;;;;;
+19BC;NEW TAI LUE VOWEL SIGN UY;Lo;0;L;;;;;N;;;;;
+19BD;NEW TAI LUE VOWEL SIGN OY;Lo;0;L;;;;;N;;;;;
+19BE;NEW TAI LUE VOWEL SIGN OAY;Lo;0;L;;;;;N;;;;;
+19BF;NEW TAI LUE VOWEL SIGN UEY;Lo;0;L;;;;;N;;;;;
+19C0;NEW TAI LUE VOWEL SIGN IY;Lo;0;L;;;;;N;;;;;
+19C1;NEW TAI LUE LETTER FINAL V;Lo;0;L;;;;;N;;;;;
+19C2;NEW TAI LUE LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+19C3;NEW TAI LUE LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+19C4;NEW TAI LUE LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+19C5;NEW TAI LUE LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+19C6;NEW TAI LUE LETTER FINAL D;Lo;0;L;;;;;N;;;;;
+19C7;NEW TAI LUE LETTER FINAL B;Lo;0;L;;;;;N;;;;;
+19C8;NEW TAI LUE TONE MARK-1;Lo;0;L;;;;;N;;;;;
+19C9;NEW TAI LUE TONE MARK-2;Lo;0;L;;;;;N;;;;;
+19D0;NEW TAI LUE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+19D1;NEW TAI LUE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+19D2;NEW TAI LUE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+19D3;NEW TAI LUE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+19D4;NEW TAI LUE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+19D5;NEW TAI LUE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+19D6;NEW TAI LUE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+19D7;NEW TAI LUE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+19D8;NEW TAI LUE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+19D9;NEW TAI LUE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+19DA;NEW TAI LUE THAM DIGIT ONE;No;0;L;;;1;1;N;;;;;
+19DE;NEW TAI LUE SIGN LAE;So;0;ON;;;;;N;;;;;
+19DF;NEW TAI LUE SIGN LAEV;So;0;ON;;;;;N;;;;;
+19E0;KHMER SYMBOL PATHAMASAT;So;0;ON;;;;;N;;;;;
+19E1;KHMER SYMBOL MUOY KOET;So;0;ON;;;;;N;;;;;
+19E2;KHMER SYMBOL PII KOET;So;0;ON;;;;;N;;;;;
+19E3;KHMER SYMBOL BEI KOET;So;0;ON;;;;;N;;;;;
+19E4;KHMER SYMBOL BUON KOET;So;0;ON;;;;;N;;;;;
+19E5;KHMER SYMBOL PRAM KOET;So;0;ON;;;;;N;;;;;
+19E6;KHMER SYMBOL PRAM-MUOY KOET;So;0;ON;;;;;N;;;;;
+19E7;KHMER SYMBOL PRAM-PII KOET;So;0;ON;;;;;N;;;;;
+19E8;KHMER SYMBOL PRAM-BEI KOET;So;0;ON;;;;;N;;;;;
+19E9;KHMER SYMBOL PRAM-BUON KOET;So;0;ON;;;;;N;;;;;
+19EA;KHMER SYMBOL DAP KOET;So;0;ON;;;;;N;;;;;
+19EB;KHMER SYMBOL DAP-MUOY KOET;So;0;ON;;;;;N;;;;;
+19EC;KHMER SYMBOL DAP-PII KOET;So;0;ON;;;;;N;;;;;
+19ED;KHMER SYMBOL DAP-BEI KOET;So;0;ON;;;;;N;;;;;
+19EE;KHMER SYMBOL DAP-BUON KOET;So;0;ON;;;;;N;;;;;
+19EF;KHMER SYMBOL DAP-PRAM KOET;So;0;ON;;;;;N;;;;;
+19F0;KHMER SYMBOL TUTEYASAT;So;0;ON;;;;;N;;;;;
+19F1;KHMER SYMBOL MUOY ROC;So;0;ON;;;;;N;;;;;
+19F2;KHMER SYMBOL PII ROC;So;0;ON;;;;;N;;;;;
+19F3;KHMER SYMBOL BEI ROC;So;0;ON;;;;;N;;;;;
+19F4;KHMER SYMBOL BUON ROC;So;0;ON;;;;;N;;;;;
+19F5;KHMER SYMBOL PRAM ROC;So;0;ON;;;;;N;;;;;
+19F6;KHMER SYMBOL PRAM-MUOY ROC;So;0;ON;;;;;N;;;;;
+19F7;KHMER SYMBOL PRAM-PII ROC;So;0;ON;;;;;N;;;;;
+19F8;KHMER SYMBOL PRAM-BEI ROC;So;0;ON;;;;;N;;;;;
+19F9;KHMER SYMBOL PRAM-BUON ROC;So;0;ON;;;;;N;;;;;
+19FA;KHMER SYMBOL DAP ROC;So;0;ON;;;;;N;;;;;
+19FB;KHMER SYMBOL DAP-MUOY ROC;So;0;ON;;;;;N;;;;;
+19FC;KHMER SYMBOL DAP-PII ROC;So;0;ON;;;;;N;;;;;
+19FD;KHMER SYMBOL DAP-BEI ROC;So;0;ON;;;;;N;;;;;
+19FE;KHMER SYMBOL DAP-BUON ROC;So;0;ON;;;;;N;;;;;
+19FF;KHMER SYMBOL DAP-PRAM ROC;So;0;ON;;;;;N;;;;;
+1A00;BUGINESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1A01;BUGINESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1A02;BUGINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1A03;BUGINESE LETTER NGKA;Lo;0;L;;;;;N;;;;;
+1A04;BUGINESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1A05;BUGINESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1A06;BUGINESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1A07;BUGINESE LETTER MPA;Lo;0;L;;;;;N;;;;;
+1A08;BUGINESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1A09;BUGINESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1A0A;BUGINESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1A0B;BUGINESE LETTER NRA;Lo;0;L;;;;;N;;;;;
+1A0C;BUGINESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1A0D;BUGINESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1A0E;BUGINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1A0F;BUGINESE LETTER NYCA;Lo;0;L;;;;;N;;;;;
+1A10;BUGINESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1A11;BUGINESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1A12;BUGINESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1A13;BUGINESE LETTER VA;Lo;0;L;;;;;N;;;;;
+1A14;BUGINESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1A15;BUGINESE LETTER A;Lo;0;L;;;;;N;;;;;
+1A16;BUGINESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1A17;BUGINESE VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
+1A18;BUGINESE VOWEL SIGN U;Mn;220;NSM;;;;;N;;;;;
+1A19;BUGINESE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1A1A;BUGINESE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1A1B;BUGINESE VOWEL SIGN AE;Mn;0;NSM;;;;;N;;;;;
+1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;;
+1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;;
+1A20;TAI THAM LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
+1A21;TAI THAM LETTER HIGH KHA;Lo;0;L;;;;;N;;;;;
+1A22;TAI THAM LETTER HIGH KXA;Lo;0;L;;;;;N;;;;;
+1A23;TAI THAM LETTER LOW KA;Lo;0;L;;;;;N;;;;;
+1A24;TAI THAM LETTER LOW KXA;Lo;0;L;;;;;N;;;;;
+1A25;TAI THAM LETTER LOW KHA;Lo;0;L;;;;;N;;;;;
+1A26;TAI THAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+1A27;TAI THAM LETTER HIGH CA;Lo;0;L;;;;;N;;;;;
+1A28;TAI THAM LETTER HIGH CHA;Lo;0;L;;;;;N;;;;;
+1A29;TAI THAM LETTER LOW CA;Lo;0;L;;;;;N;;;;;
+1A2A;TAI THAM LETTER LOW SA;Lo;0;L;;;;;N;;;;;
+1A2B;TAI THAM LETTER LOW CHA;Lo;0;L;;;;;N;;;;;
+1A2C;TAI THAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+1A2D;TAI THAM LETTER RATA;Lo;0;L;;;;;N;;;;;
+1A2E;TAI THAM LETTER HIGH RATHA;Lo;0;L;;;;;N;;;;;
+1A2F;TAI THAM LETTER DA;Lo;0;L;;;;;N;;;;;
+1A30;TAI THAM LETTER LOW RATHA;Lo;0;L;;;;;N;;;;;
+1A31;TAI THAM LETTER RANA;Lo;0;L;;;;;N;;;;;
+1A32;TAI THAM LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
+1A33;TAI THAM LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
+1A34;TAI THAM LETTER LOW TA;Lo;0;L;;;;;N;;;;;
+1A35;TAI THAM LETTER LOW THA;Lo;0;L;;;;;N;;;;;
+1A36;TAI THAM LETTER NA;Lo;0;L;;;;;N;;;;;
+1A37;TAI THAM LETTER BA;Lo;0;L;;;;;N;;;;;
+1A38;TAI THAM LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
+1A39;TAI THAM LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
+1A3A;TAI THAM LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
+1A3B;TAI THAM LETTER LOW PA;Lo;0;L;;;;;N;;;;;
+1A3C;TAI THAM LETTER LOW FA;Lo;0;L;;;;;N;;;;;
+1A3D;TAI THAM LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
+1A3E;TAI THAM LETTER MA;Lo;0;L;;;;;N;;;;;
+1A3F;TAI THAM LETTER LOW YA;Lo;0;L;;;;;N;;;;;
+1A40;TAI THAM LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
+1A41;TAI THAM LETTER RA;Lo;0;L;;;;;N;;;;;
+1A42;TAI THAM LETTER RUE;Lo;0;L;;;;;N;;;;;
+1A43;TAI THAM LETTER LA;Lo;0;L;;;;;N;;;;;
+1A44;TAI THAM LETTER LUE;Lo;0;L;;;;;N;;;;;
+1A45;TAI THAM LETTER WA;Lo;0;L;;;;;N;;;;;
+1A46;TAI THAM LETTER HIGH SHA;Lo;0;L;;;;;N;;;;;
+1A47;TAI THAM LETTER HIGH SSA;Lo;0;L;;;;;N;;;;;
+1A48;TAI THAM LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
+1A49;TAI THAM LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
+1A4A;TAI THAM LETTER LLA;Lo;0;L;;;;;N;;;;;
+1A4B;TAI THAM LETTER A;Lo;0;L;;;;;N;;;;;
+1A4C;TAI THAM LETTER LOW HA;Lo;0;L;;;;;N;;;;;
+1A4D;TAI THAM LETTER I;Lo;0;L;;;;;N;;;;;
+1A4E;TAI THAM LETTER II;Lo;0;L;;;;;N;;;;;
+1A4F;TAI THAM LETTER U;Lo;0;L;;;;;N;;;;;
+1A50;TAI THAM LETTER UU;Lo;0;L;;;;;N;;;;;
+1A51;TAI THAM LETTER EE;Lo;0;L;;;;;N;;;;;
+1A52;TAI THAM LETTER OO;Lo;0;L;;;;;N;;;;;
+1A53;TAI THAM LETTER LAE;Lo;0;L;;;;;N;;;;;
+1A54;TAI THAM LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
+1A55;TAI THAM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
+1A56;TAI THAM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1A57;TAI THAM CONSONANT SIGN LA TANG LAI;Mc;0;L;;;;;N;;;;;
+1A58;TAI THAM SIGN MAI KANG LAI;Mn;0;NSM;;;;;N;;;;;
+1A59;TAI THAM CONSONANT SIGN FINAL NGA;Mn;0;NSM;;;;;N;;;;;
+1A5A;TAI THAM CONSONANT SIGN LOW PA;Mn;0;NSM;;;;;N;;;;;
+1A5B;TAI THAM CONSONANT SIGN HIGH RATHA OR LOW PA;Mn;0;NSM;;;;;N;;;;;
+1A5C;TAI THAM CONSONANT SIGN MA;Mn;0;NSM;;;;;N;;;;;
+1A5D;TAI THAM CONSONANT SIGN BA;Mn;0;NSM;;;;;N;;;;;
+1A5E;TAI THAM CONSONANT SIGN SA;Mn;0;NSM;;;;;N;;;;;
+1A60;TAI THAM SIGN SAKOT;Mn;9;NSM;;;;;N;;;;;
+1A61;TAI THAM VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+1A62;TAI THAM VOWEL SIGN MAI SAT;Mn;0;NSM;;;;;N;;;;;
+1A63;TAI THAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1A64;TAI THAM VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
+1A65;TAI THAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1A66;TAI THAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1A67;TAI THAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+1A68;TAI THAM VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;;
+1A69;TAI THAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1A6A;TAI THAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1A6B;TAI THAM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+1A6C;TAI THAM VOWEL SIGN OA BELOW;Mn;0;NSM;;;;;N;;;;;
+1A6D;TAI THAM VOWEL SIGN OY;Mc;0;L;;;;;N;;;;;
+1A6E;TAI THAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1A6F;TAI THAM VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+1A70;TAI THAM VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1A71;TAI THAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1A72;TAI THAM VOWEL SIGN THAM AI;Mc;0;L;;;;;N;;;;;
+1A73;TAI THAM VOWEL SIGN OA ABOVE;Mn;0;NSM;;;;;N;;;;;
+1A74;TAI THAM SIGN MAI KANG;Mn;0;NSM;;;;;N;;;;;
+1A75;TAI THAM SIGN TONE-1;Mn;230;NSM;;;;;N;;;;;
+1A76;TAI THAM SIGN TONE-2;Mn;230;NSM;;;;;N;;;;;
+1A77;TAI THAM SIGN KHUEN TONE-3;Mn;230;NSM;;;;;N;;;;;
+1A78;TAI THAM SIGN KHUEN TONE-4;Mn;230;NSM;;;;;N;;;;;
+1A79;TAI THAM SIGN KHUEN TONE-5;Mn;230;NSM;;;;;N;;;;;
+1A7A;TAI THAM SIGN RA HAAM;Mn;230;NSM;;;;;N;;;;;
+1A7B;TAI THAM SIGN MAI SAM;Mn;230;NSM;;;;;N;;;;;
+1A7C;TAI THAM SIGN KHUEN-LUE KARAN;Mn;230;NSM;;;;;N;;;;;
+1A7F;TAI THAM COMBINING CRYPTOGRAMMIC DOT;Mn;220;NSM;;;;;N;;;;;
+1A80;TAI THAM HORA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1A81;TAI THAM HORA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1A82;TAI THAM HORA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1A83;TAI THAM HORA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1A84;TAI THAM HORA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1A85;TAI THAM HORA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1A86;TAI THAM HORA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1A87;TAI THAM HORA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1A88;TAI THAM HORA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1A89;TAI THAM HORA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1A90;TAI THAM THAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1A91;TAI THAM THAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1A92;TAI THAM THAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1A93;TAI THAM THAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1A94;TAI THAM THAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1A95;TAI THAM THAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1A96;TAI THAM THAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1A97;TAI THAM THAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1A98;TAI THAM THAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1A99;TAI THAM THAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1AA0;TAI THAM SIGN WIANG;Po;0;L;;;;;N;;;;;
+1AA1;TAI THAM SIGN WIANGWAAK;Po;0;L;;;;;N;;;;;
+1AA2;TAI THAM SIGN SAWAN;Po;0;L;;;;;N;;;;;
+1AA3;TAI THAM SIGN KEOW;Po;0;L;;;;;N;;;;;
+1AA4;TAI THAM SIGN HOY;Po;0;L;;;;;N;;;;;
+1AA5;TAI THAM SIGN DOKMAI;Po;0;L;;;;;N;;;;;
+1AA6;TAI THAM SIGN REVERSED ROTATED RANA;Po;0;L;;;;;N;;;;;
+1AA7;TAI THAM SIGN MAI YAMOK;Lm;0;L;;;;;N;;;;;
+1AA8;TAI THAM SIGN KAAN;Po;0;L;;;;;N;;;;;
+1AA9;TAI THAM SIGN KAANKUU;Po;0;L;;;;;N;;;;;
+1AAA;TAI THAM SIGN SATKAAN;Po;0;L;;;;;N;;;;;
+1AAB;TAI THAM SIGN SATKAANKUU;Po;0;L;;;;;N;;;;;
+1AAC;TAI THAM SIGN HANG;Po;0;L;;;;;N;;;;;
+1AAD;TAI THAM SIGN CAANG;Po;0;L;;;;;N;;;;;
+1AB0;COMBINING DOUBLED CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;;;;;
+1AB1;COMBINING DIAERESIS-RING;Mn;230;NSM;;;;;N;;;;;
+1AB2;COMBINING INFINITY;Mn;230;NSM;;;;;N;;;;;
+1AB3;COMBINING DOWNWARDS ARROW;Mn;230;NSM;;;;;N;;;;;
+1AB4;COMBINING TRIPLE DOT;Mn;230;NSM;;;;;N;;;;;
+1AB5;COMBINING X-X BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB6;COMBINING WIGGLY LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB7;COMBINING OPEN MARK BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB8;COMBINING DOUBLE OPEN MARK BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB9;COMBINING LIGHT CENTRALIZATION STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1ABA;COMBINING STRONG CENTRALIZATION STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1ABB;COMBINING PARENTHESES ABOVE;Mn;230;NSM;;;;;N;;;;;
+1ABC;COMBINING DOUBLE PARENTHESES ABOVE;Mn;230;NSM;;;;;N;;;;;
+1ABD;COMBINING PARENTHESES BELOW;Mn;220;NSM;;;;;N;;;;;
+1ABE;COMBINING PARENTHESES OVERLAY;Me;0;NSM;;;;;N;;;;;
+1ABF;COMBINING LATIN SMALL LETTER W BELOW;Mn;220;NSM;;;;;N;;;;;
+1AC0;COMBINING LATIN SMALL LETTER TURNED W BELOW;Mn;220;NSM;;;;;N;;;;;
+1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;;
+1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;;
+1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;;
+1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;;;;
+1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;;;;
+1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;;;;
+1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;;;;
+1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;;;;
+1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;;;;
+1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;;;;
+1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;;;;
+1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;;;;
+1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;;;;
+1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;;;;
+1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;;;;
+1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;;;;
+1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;;;;
+1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;;;;
+1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;;;;
+1B13;BALINESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B15;BALINESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;;;;
+1B17;BALINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1B18;BALINESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;;;;
+1B1A;BALINESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;;;;
+1B1C;BALINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;;;;
+1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;;;;
+1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;;;;
+1B22;BALINESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;;;;
+1B24;BALINESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;;;;
+1B26;BALINESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1B27;BALINESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;;;;
+1B29;BALINESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;;;;
+1B2B;BALINESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1B2C;BALINESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1B2D;BALINESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1B2E;BALINESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1B2F;BALINESE LETTER WA;Lo;0;L;;;;;N;;;;;
+1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;;;;
+1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;;;;
+1B32;BALINESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1B33;BALINESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;;;;
+1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;;;;
+1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;;;;
+1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;;;;
+1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;;
+1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;;;;
+1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;;;;
+1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;;;;
+1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;;;;
+1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;;;;
+1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;;
+1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;;;;
+1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;;;;
+1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;;;;
+1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;;
+1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;;;;
+1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;;;;
+1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;;
+1B46;BALINESE LETTER KHOT SASAK;Lo;0;L;;;;;N;;;;;
+1B47;BALINESE LETTER TZIR SASAK;Lo;0;L;;;;;N;;;;;
+1B48;BALINESE LETTER EF SASAK;Lo;0;L;;;;;N;;;;;
+1B49;BALINESE LETTER VE SASAK;Lo;0;L;;;;;N;;;;;
+1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;;
+1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;;
+1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1B53;BALINESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1B54;BALINESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1B55;BALINESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1B56;BALINESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1B57;BALINESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1B58;BALINESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1B59;BALINESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1B5A;BALINESE PANTI;Po;0;L;;;;;N;;;;;
+1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;;;;
+1B5C;BALINESE WINDU;Po;0;L;;;;;N;;;;;
+1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;;;;
+1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;;;;
+1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;;;;
+1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;;;;
+1B61;BALINESE MUSICAL SYMBOL DONG;So;0;L;;;;;N;;;;;
+1B62;BALINESE MUSICAL SYMBOL DENG;So;0;L;;;;;N;;;;;
+1B63;BALINESE MUSICAL SYMBOL DUNG;So;0;L;;;;;N;;;;;
+1B64;BALINESE MUSICAL SYMBOL DANG;So;0;L;;;;;N;;;;;
+1B65;BALINESE MUSICAL SYMBOL DANG SURANG;So;0;L;;;;;N;;;;;
+1B66;BALINESE MUSICAL SYMBOL DING;So;0;L;;;;;N;;;;;
+1B67;BALINESE MUSICAL SYMBOL DAENG;So;0;L;;;;;N;;;;;
+1B68;BALINESE MUSICAL SYMBOL DEUNG;So;0;L;;;;;N;;;;;
+1B69;BALINESE MUSICAL SYMBOL DAING;So;0;L;;;;;N;;;;;
+1B6A;BALINESE MUSICAL SYMBOL DANG GEDE;So;0;L;;;;;N;;;;;
+1B6B;BALINESE MUSICAL SYMBOL COMBINING TEGEH;Mn;230;NSM;;;;;N;;;;;
+1B6C;BALINESE MUSICAL SYMBOL COMBINING ENDEP;Mn;220;NSM;;;;;N;;;;;
+1B6D;BALINESE MUSICAL SYMBOL COMBINING KEMPUL;Mn;230;NSM;;;;;N;;;;;
+1B6E;BALINESE MUSICAL SYMBOL COMBINING KEMPLI;Mn;230;NSM;;;;;N;;;;;
+1B6F;BALINESE MUSICAL SYMBOL COMBINING JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B70;BALINESE MUSICAL SYMBOL COMBINING KEMPUL WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B71;BALINESE MUSICAL SYMBOL COMBINING KEMPLI WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B72;BALINESE MUSICAL SYMBOL COMBINING BENDE;Mn;230;NSM;;;;;N;;;;;
+1B73;BALINESE MUSICAL SYMBOL COMBINING GONG;Mn;230;NSM;;;;;N;;;;;
+1B74;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG;So;0;L;;;;;N;;;;;
+1B75;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DAG;So;0;L;;;;;N;;;;;
+1B76;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TUK;So;0;L;;;;;N;;;;;
+1B77;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TAK;So;0;L;;;;;N;;;;;
+1B78;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PANG;So;0;L;;;;;N;;;;;
+1B79;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PUNG;So;0;L;;;;;N;;;;;
+1B7A;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK;So;0;L;;;;;N;;;;;
+1B7B;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK;So;0;L;;;;;N;;;;;
+1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;;
+1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;;
+1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;;
+1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;;
+1B83;SUNDANESE LETTER A;Lo;0;L;;;;;N;;;;;
+1B84;SUNDANESE LETTER I;Lo;0;L;;;;;N;;;;;
+1B85;SUNDANESE LETTER U;Lo;0;L;;;;;N;;;;;
+1B86;SUNDANESE LETTER AE;Lo;0;L;;;;;N;;;;;
+1B87;SUNDANESE LETTER O;Lo;0;L;;;;;N;;;;;
+1B88;SUNDANESE LETTER E;Lo;0;L;;;;;N;;;;;
+1B89;SUNDANESE LETTER EU;Lo;0;L;;;;;N;;;;;
+1B8A;SUNDANESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1B8B;SUNDANESE LETTER QA;Lo;0;L;;;;;N;;;;;
+1B8C;SUNDANESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1B8D;SUNDANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1B8E;SUNDANESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1B8F;SUNDANESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1B90;SUNDANESE LETTER ZA;Lo;0;L;;;;;N;;;;;
+1B91;SUNDANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1B92;SUNDANESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1B93;SUNDANESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1B94;SUNDANESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1B95;SUNDANESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1B96;SUNDANESE LETTER FA;Lo;0;L;;;;;N;;;;;
+1B97;SUNDANESE LETTER VA;Lo;0;L;;;;;N;;;;;
+1B98;SUNDANESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1B99;SUNDANESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1B9A;SUNDANESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1B9B;SUNDANESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1B9C;SUNDANESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1B9D;SUNDANESE LETTER WA;Lo;0;L;;;;;N;;;;;
+1B9E;SUNDANESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1B9F;SUNDANESE LETTER XA;Lo;0;L;;;;;N;;;;;
+1BA0;SUNDANESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1BA1;SUNDANESE CONSONANT SIGN PAMINGKAL;Mc;0;L;;;;;N;;;;;
+1BA2;SUNDANESE CONSONANT SIGN PANYAKRA;Mn;0;NSM;;;;;N;;;;;
+1BA3;SUNDANESE CONSONANT SIGN PANYIKU;Mn;0;NSM;;;;;N;;;;;
+1BA4;SUNDANESE VOWEL SIGN PANGHULU;Mn;0;NSM;;;;;N;;;;;
+1BA5;SUNDANESE VOWEL SIGN PANYUKU;Mn;0;NSM;;;;;N;;;;;
+1BA6;SUNDANESE VOWEL SIGN PANAELAENG;Mc;0;L;;;;;N;;;;;
+1BA7;SUNDANESE VOWEL SIGN PANOLONG;Mc;0;L;;;;;N;;;;;
+1BA8;SUNDANESE VOWEL SIGN PAMEPET;Mn;0;NSM;;;;;N;;;;;
+1BA9;SUNDANESE VOWEL SIGN PANEULEUNG;Mn;0;NSM;;;;;N;;;;;
+1BAA;SUNDANESE SIGN PAMAAEH;Mc;9;L;;;;;N;;;;;
+1BAB;SUNDANESE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1BAC;SUNDANESE CONSONANT SIGN PASANGAN MA;Mn;0;NSM;;;;;N;;;;;
+1BAD;SUNDANESE CONSONANT SIGN PASANGAN WA;Mn;0;NSM;;;;;N;;;;;
+1BAE;SUNDANESE LETTER KHA;Lo;0;L;;;;;N;;;;;
+1BAF;SUNDANESE LETTER SYA;Lo;0;L;;;;;N;;;;;
+1BB0;SUNDANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1BB1;SUNDANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1BB2;SUNDANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1BB3;SUNDANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1BB4;SUNDANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1BB5;SUNDANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1BB6;SUNDANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1BB7;SUNDANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1BB8;SUNDANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1BB9;SUNDANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1BBA;SUNDANESE AVAGRAHA;Lo;0;L;;;;;N;;;;;
+1BBB;SUNDANESE LETTER REU;Lo;0;L;;;;;N;;;;;
+1BBC;SUNDANESE LETTER LEU;Lo;0;L;;;;;N;;;;;
+1BBD;SUNDANESE LETTER BHA;Lo;0;L;;;;;N;;;;;
+1BBE;SUNDANESE LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+1BBF;SUNDANESE LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+1BC0;BATAK LETTER A;Lo;0;L;;;;;N;;;;;
+1BC1;BATAK LETTER SIMALUNGUN A;Lo;0;L;;;;;N;;;;;
+1BC2;BATAK LETTER HA;Lo;0;L;;;;;N;;;;;
+1BC3;BATAK LETTER SIMALUNGUN HA;Lo;0;L;;;;;N;;;;;
+1BC4;BATAK LETTER MANDAILING HA;Lo;0;L;;;;;N;;;;;
+1BC5;BATAK LETTER BA;Lo;0;L;;;;;N;;;;;
+1BC6;BATAK LETTER KARO BA;Lo;0;L;;;;;N;;;;;
+1BC7;BATAK LETTER PA;Lo;0;L;;;;;N;;;;;
+1BC8;BATAK LETTER SIMALUNGUN PA;Lo;0;L;;;;;N;;;;;
+1BC9;BATAK LETTER NA;Lo;0;L;;;;;N;;;;;
+1BCA;BATAK LETTER MANDAILING NA;Lo;0;L;;;;;N;;;;;
+1BCB;BATAK LETTER WA;Lo;0;L;;;;;N;;;;;
+1BCC;BATAK LETTER SIMALUNGUN WA;Lo;0;L;;;;;N;;;;;
+1BCD;BATAK LETTER PAKPAK WA;Lo;0;L;;;;;N;;;;;
+1BCE;BATAK LETTER GA;Lo;0;L;;;;;N;;;;;
+1BCF;BATAK LETTER SIMALUNGUN GA;Lo;0;L;;;;;N;;;;;
+1BD0;BATAK LETTER JA;Lo;0;L;;;;;N;;;;;
+1BD1;BATAK LETTER DA;Lo;0;L;;;;;N;;;;;
+1BD2;BATAK LETTER RA;Lo;0;L;;;;;N;;;;;
+1BD3;BATAK LETTER SIMALUNGUN RA;Lo;0;L;;;;;N;;;;;
+1BD4;BATAK LETTER MA;Lo;0;L;;;;;N;;;;;
+1BD5;BATAK LETTER SIMALUNGUN MA;Lo;0;L;;;;;N;;;;;
+1BD6;BATAK LETTER SOUTHERN TA;Lo;0;L;;;;;N;;;;;
+1BD7;BATAK LETTER NORTHERN TA;Lo;0;L;;;;;N;;;;;
+1BD8;BATAK LETTER SA;Lo;0;L;;;;;N;;;;;
+1BD9;BATAK LETTER SIMALUNGUN SA;Lo;0;L;;;;;N;;;;;
+1BDA;BATAK LETTER MANDAILING SA;Lo;0;L;;;;;N;;;;;
+1BDB;BATAK LETTER YA;Lo;0;L;;;;;N;;;;;
+1BDC;BATAK LETTER SIMALUNGUN YA;Lo;0;L;;;;;N;;;;;
+1BDD;BATAK LETTER NGA;Lo;0;L;;;;;N;;;;;
+1BDE;BATAK LETTER LA;Lo;0;L;;;;;N;;;;;
+1BDF;BATAK LETTER SIMALUNGUN LA;Lo;0;L;;;;;N;;;;;
+1BE0;BATAK LETTER NYA;Lo;0;L;;;;;N;;;;;
+1BE1;BATAK LETTER CA;Lo;0;L;;;;;N;;;;;
+1BE2;BATAK LETTER NDA;Lo;0;L;;;;;N;;;;;
+1BE3;BATAK LETTER MBA;Lo;0;L;;;;;N;;;;;
+1BE4;BATAK LETTER I;Lo;0;L;;;;;N;;;;;
+1BE5;BATAK LETTER U;Lo;0;L;;;;;N;;;;;
+1BE6;BATAK SIGN TOMPI;Mn;7;NSM;;;;;N;;;;;
+1BE7;BATAK VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1BE8;BATAK VOWEL SIGN PAKPAK E;Mn;0;NSM;;;;;N;;;;;
+1BE9;BATAK VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+1BEA;BATAK VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1BEB;BATAK VOWEL SIGN KARO I;Mc;0;L;;;;;N;;;;;
+1BEC;BATAK VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1BED;BATAK VOWEL SIGN KARO O;Mn;0;NSM;;;;;N;;;;;
+1BEE;BATAK VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+1BEF;BATAK VOWEL SIGN U FOR SIMALUNGUN SA;Mn;0;NSM;;;;;N;;;;;
+1BF0;BATAK CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+1BF1;BATAK CONSONANT SIGN H;Mn;0;NSM;;;;;N;;;;;
+1BF2;BATAK PANGOLAT;Mc;9;L;;;;;N;;;;;
+1BF3;BATAK PANONGONAN;Mc;9;L;;;;;N;;;;;
+1BFC;BATAK SYMBOL BINDU NA METEK;Po;0;L;;;;;N;;;;;
+1BFD;BATAK SYMBOL BINDU PINARBORAS;Po;0;L;;;;;N;;;;;
+1BFE;BATAK SYMBOL BINDU JUDUL;Po;0;L;;;;;N;;;;;
+1BFF;BATAK SYMBOL BINDU PANGOLAT;Po;0;L;;;;;N;;;;;
+1C00;LEPCHA LETTER KA;Lo;0;L;;;;;N;;;;;
+1C01;LEPCHA LETTER KLA;Lo;0;L;;;;;N;;;;;
+1C02;LEPCHA LETTER KHA;Lo;0;L;;;;;N;;;;;
+1C03;LEPCHA LETTER GA;Lo;0;L;;;;;N;;;;;
+1C04;LEPCHA LETTER GLA;Lo;0;L;;;;;N;;;;;
+1C05;LEPCHA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1C06;LEPCHA LETTER CA;Lo;0;L;;;;;N;;;;;
+1C07;LEPCHA LETTER CHA;Lo;0;L;;;;;N;;;;;
+1C08;LEPCHA LETTER JA;Lo;0;L;;;;;N;;;;;
+1C09;LEPCHA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1C0A;LEPCHA LETTER TA;Lo;0;L;;;;;N;;;;;
+1C0B;LEPCHA LETTER THA;Lo;0;L;;;;;N;;;;;
+1C0C;LEPCHA LETTER DA;Lo;0;L;;;;;N;;;;;
+1C0D;LEPCHA LETTER NA;Lo;0;L;;;;;N;;;;;
+1C0E;LEPCHA LETTER PA;Lo;0;L;;;;;N;;;;;
+1C0F;LEPCHA LETTER PLA;Lo;0;L;;;;;N;;;;;
+1C10;LEPCHA LETTER PHA;Lo;0;L;;;;;N;;;;;
+1C11;LEPCHA LETTER FA;Lo;0;L;;;;;N;;;;;
+1C12;LEPCHA LETTER FLA;Lo;0;L;;;;;N;;;;;
+1C13;LEPCHA LETTER BA;Lo;0;L;;;;;N;;;;;
+1C14;LEPCHA LETTER BLA;Lo;0;L;;;;;N;;;;;
+1C15;LEPCHA LETTER MA;Lo;0;L;;;;;N;;;;;
+1C16;LEPCHA LETTER MLA;Lo;0;L;;;;;N;;;;;
+1C17;LEPCHA LETTER TSA;Lo;0;L;;;;;N;;;;;
+1C18;LEPCHA LETTER TSHA;Lo;0;L;;;;;N;;;;;
+1C19;LEPCHA LETTER DZA;Lo;0;L;;;;;N;;;;;
+1C1A;LEPCHA LETTER YA;Lo;0;L;;;;;N;;;;;
+1C1B;LEPCHA LETTER RA;Lo;0;L;;;;;N;;;;;
+1C1C;LEPCHA LETTER LA;Lo;0;L;;;;;N;;;;;
+1C1D;LEPCHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1C1E;LEPCHA LETTER HLA;Lo;0;L;;;;;N;;;;;
+1C1F;LEPCHA LETTER VA;Lo;0;L;;;;;N;;;;;
+1C20;LEPCHA LETTER SA;Lo;0;L;;;;;N;;;;;
+1C21;LEPCHA LETTER SHA;Lo;0;L;;;;;N;;;;;
+1C22;LEPCHA LETTER WA;Lo;0;L;;;;;N;;;;;
+1C23;LEPCHA LETTER A;Lo;0;L;;;;;N;;;;;
+1C24;LEPCHA SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+1C25;LEPCHA SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
+1C26;LEPCHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1C27;LEPCHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1C28;LEPCHA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1C29;LEPCHA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1C2A;LEPCHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+1C2B;LEPCHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+1C2C;LEPCHA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1C2D;LEPCHA CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
+1C2E;LEPCHA CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
+1C2F;LEPCHA CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
+1C30;LEPCHA CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+1C31;LEPCHA CONSONANT SIGN P;Mn;0;NSM;;;;;N;;;;;
+1C32;LEPCHA CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+1C33;LEPCHA CONSONANT SIGN T;Mn;0;NSM;;;;;N;;;;;
+1C34;LEPCHA CONSONANT SIGN NYIN-DO;Mc;0;L;;;;;N;;;;;
+1C35;LEPCHA CONSONANT SIGN KANG;Mc;0;L;;;;;N;;;;;
+1C36;LEPCHA SIGN RAN;Mn;0;NSM;;;;;N;;;;;
+1C37;LEPCHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1C3B;LEPCHA PUNCTUATION TA-ROL;Po;0;L;;;;;N;;;;;
+1C3C;LEPCHA PUNCTUATION NYET THYOOM TA-ROL;Po;0;L;;;;;N;;;;;
+1C3D;LEPCHA PUNCTUATION CER-WA;Po;0;L;;;;;N;;;;;
+1C3E;LEPCHA PUNCTUATION TSHOOK CER-WA;Po;0;L;;;;;N;;;;;
+1C3F;LEPCHA PUNCTUATION TSHOOK;Po;0;L;;;;;N;;;;;
+1C40;LEPCHA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1C41;LEPCHA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1C42;LEPCHA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1C43;LEPCHA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1C44;LEPCHA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1C45;LEPCHA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1C46;LEPCHA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1C47;LEPCHA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1C48;LEPCHA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1C49;LEPCHA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C4D;LEPCHA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1C4E;LEPCHA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1C4F;LEPCHA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1C50;OL CHIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1C51;OL CHIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1C52;OL CHIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1C53;OL CHIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1C54;OL CHIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1C55;OL CHIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1C56;OL CHIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1C57;OL CHIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1C58;OL CHIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1C59;OL CHIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C5A;OL CHIKI LETTER LA;Lo;0;L;;;;;N;;;;;
+1C5B;OL CHIKI LETTER AT;Lo;0;L;;;;;N;;;;;
+1C5C;OL CHIKI LETTER AG;Lo;0;L;;;;;N;;;;;
+1C5D;OL CHIKI LETTER ANG;Lo;0;L;;;;;N;;;;;
+1C5E;OL CHIKI LETTER AL;Lo;0;L;;;;;N;;;;;
+1C5F;OL CHIKI LETTER LAA;Lo;0;L;;;;;N;;;;;
+1C60;OL CHIKI LETTER AAK;Lo;0;L;;;;;N;;;;;
+1C61;OL CHIKI LETTER AAJ;Lo;0;L;;;;;N;;;;;
+1C62;OL CHIKI LETTER AAM;Lo;0;L;;;;;N;;;;;
+1C63;OL CHIKI LETTER AAW;Lo;0;L;;;;;N;;;;;
+1C64;OL CHIKI LETTER LI;Lo;0;L;;;;;N;;;;;
+1C65;OL CHIKI LETTER IS;Lo;0;L;;;;;N;;;;;
+1C66;OL CHIKI LETTER IH;Lo;0;L;;;;;N;;;;;
+1C67;OL CHIKI LETTER INY;Lo;0;L;;;;;N;;;;;
+1C68;OL CHIKI LETTER IR;Lo;0;L;;;;;N;;;;;
+1C69;OL CHIKI LETTER LU;Lo;0;L;;;;;N;;;;;
+1C6A;OL CHIKI LETTER UC;Lo;0;L;;;;;N;;;;;
+1C6B;OL CHIKI LETTER UD;Lo;0;L;;;;;N;;;;;
+1C6C;OL CHIKI LETTER UNN;Lo;0;L;;;;;N;;;;;
+1C6D;OL CHIKI LETTER UY;Lo;0;L;;;;;N;;;;;
+1C6E;OL CHIKI LETTER LE;Lo;0;L;;;;;N;;;;;
+1C6F;OL CHIKI LETTER EP;Lo;0;L;;;;;N;;;;;
+1C70;OL CHIKI LETTER EDD;Lo;0;L;;;;;N;;;;;
+1C71;OL CHIKI LETTER EN;Lo;0;L;;;;;N;;;;;
+1C72;OL CHIKI LETTER ERR;Lo;0;L;;;;;N;;;;;
+1C73;OL CHIKI LETTER LO;Lo;0;L;;;;;N;;;;;
+1C74;OL CHIKI LETTER OTT;Lo;0;L;;;;;N;;;;;
+1C75;OL CHIKI LETTER OB;Lo;0;L;;;;;N;;;;;
+1C76;OL CHIKI LETTER OV;Lo;0;L;;;;;N;;;;;
+1C77;OL CHIKI LETTER OH;Lo;0;L;;;;;N;;;;;
+1C78;OL CHIKI MU TTUDDAG;Lm;0;L;;;;;N;;;;;
+1C79;OL CHIKI GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
+1C7A;OL CHIKI MU-GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
+1C7B;OL CHIKI RELAA;Lm;0;L;;;;;N;;;;;
+1C7C;OL CHIKI PHAARKAA;Lm;0;L;;;;;N;;;;;
+1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;;
+1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;;
+1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;;
+1C80;CYRILLIC SMALL LETTER ROUNDED VE;Ll;0;L;;;;;N;;;0412;;0412
+1C81;CYRILLIC SMALL LETTER LONG-LEGGED DE;Ll;0;L;;;;;N;;;0414;;0414
+1C82;CYRILLIC SMALL LETTER NARROW O;Ll;0;L;;;;;N;;;041E;;041E
+1C83;CYRILLIC SMALL LETTER WIDE ES;Ll;0;L;;;;;N;;;0421;;0421
+1C84;CYRILLIC SMALL LETTER TALL TE;Ll;0;L;;;;;N;;;0422;;0422
+1C85;CYRILLIC SMALL LETTER THREE-LEGGED TE;Ll;0;L;;;;;N;;;0422;;0422
+1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
+1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462
+1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A
+1C90;GEORGIAN MTAVRULI CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;10D0;
+1C91;GEORGIAN MTAVRULI CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;10D1;
+1C92;GEORGIAN MTAVRULI CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;10D2;
+1C93;GEORGIAN MTAVRULI CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;10D3;
+1C94;GEORGIAN MTAVRULI CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;10D4;
+1C95;GEORGIAN MTAVRULI CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;10D5;
+1C96;GEORGIAN MTAVRULI CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;10D6;
+1C97;GEORGIAN MTAVRULI CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;10D7;
+1C98;GEORGIAN MTAVRULI CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;10D8;
+1C99;GEORGIAN MTAVRULI CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;10D9;
+1C9A;GEORGIAN MTAVRULI CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;10DA;
+1C9B;GEORGIAN MTAVRULI CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;10DB;
+1C9C;GEORGIAN MTAVRULI CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;10DC;
+1C9D;GEORGIAN MTAVRULI CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;10DD;
+1C9E;GEORGIAN MTAVRULI CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;10DE;
+1C9F;GEORGIAN MTAVRULI CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;10DF;
+1CA0;GEORGIAN MTAVRULI CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;10E0;
+1CA1;GEORGIAN MTAVRULI CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;10E1;
+1CA2;GEORGIAN MTAVRULI CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;10E2;
+1CA3;GEORGIAN MTAVRULI CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;10E3;
+1CA4;GEORGIAN MTAVRULI CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;10E4;
+1CA5;GEORGIAN MTAVRULI CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;10E5;
+1CA6;GEORGIAN MTAVRULI CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;10E6;
+1CA7;GEORGIAN MTAVRULI CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;10E7;
+1CA8;GEORGIAN MTAVRULI CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;10E8;
+1CA9;GEORGIAN MTAVRULI CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;10E9;
+1CAA;GEORGIAN MTAVRULI CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;10EA;
+1CAB;GEORGIAN MTAVRULI CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;10EB;
+1CAC;GEORGIAN MTAVRULI CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;10EC;
+1CAD;GEORGIAN MTAVRULI CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;10ED;
+1CAE;GEORGIAN MTAVRULI CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;10EE;
+1CAF;GEORGIAN MTAVRULI CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;10EF;
+1CB0;GEORGIAN MTAVRULI CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;10F0;
+1CB1;GEORGIAN MTAVRULI CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;10F1;
+1CB2;GEORGIAN MTAVRULI CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;10F2;
+1CB3;GEORGIAN MTAVRULI CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;10F3;
+1CB4;GEORGIAN MTAVRULI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;10F4;
+1CB5;GEORGIAN MTAVRULI CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;10F5;
+1CB6;GEORGIAN MTAVRULI CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;10F6;
+1CB7;GEORGIAN MTAVRULI CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;10F7;
+1CB8;GEORGIAN MTAVRULI CAPITAL LETTER ELIFI;Lu;0;L;;;;;N;;;;10F8;
+1CB9;GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN;Lu;0;L;;;;;N;;;;10F9;
+1CBA;GEORGIAN MTAVRULI CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;10FA;
+1CBD;GEORGIAN MTAVRULI CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;10FD;
+1CBE;GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;10FE;
+1CBF;GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN;Lu;0;L;;;;;N;;;;10FF;
+1CC0;SUNDANESE PUNCTUATION BINDU SURYA;Po;0;L;;;;;N;;;;;
+1CC1;SUNDANESE PUNCTUATION BINDU PANGLONG;Po;0;L;;;;;N;;;;;
+1CC2;SUNDANESE PUNCTUATION BINDU PURNAMA;Po;0;L;;;;;N;;;;;
+1CC3;SUNDANESE PUNCTUATION BINDU CAKRA;Po;0;L;;;;;N;;;;;
+1CC4;SUNDANESE PUNCTUATION BINDU LEU SATANGA;Po;0;L;;;;;N;;;;;
+1CC5;SUNDANESE PUNCTUATION BINDU KA SATANGA;Po;0;L;;;;;N;;;;;
+1CC6;SUNDANESE PUNCTUATION BINDU DA SATANGA;Po;0;L;;;;;N;;;;;
+1CC7;SUNDANESE PUNCTUATION BINDU BA SATANGA;Po;0;L;;;;;N;;;;;
+1CD0;VEDIC TONE KARSHANA;Mn;230;NSM;;;;;N;;;;;
+1CD1;VEDIC TONE SHARA;Mn;230;NSM;;;;;N;;;;;
+1CD2;VEDIC TONE PRENKHA;Mn;230;NSM;;;;;N;;;;;
+1CD3;VEDIC SIGN NIHSHVASA;Po;0;L;;;;;N;;;;;
+1CD4;VEDIC SIGN YAJURVEDIC MIDLINE SVARITA;Mn;1;NSM;;;;;N;;;;;
+1CD5;VEDIC TONE YAJURVEDIC AGGRAVATED INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD6;VEDIC TONE YAJURVEDIC INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD7;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD8;VEDIC TONE CANDRA BELOW;Mn;220;NSM;;;;;N;;;;;
+1CD9;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA SCHROEDER;Mn;220;NSM;;;;;N;;;;;
+1CDA;VEDIC TONE DOUBLE SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CDB;VEDIC TONE TRIPLE SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CDC;VEDIC TONE KATHAKA ANUDATTA;Mn;220;NSM;;;;;N;;;;;
+1CDD;VEDIC TONE DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+1CDE;VEDIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+1CDF;VEDIC TONE THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+1CE0;VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CE1;VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA;Mc;0;L;;;;;N;;;;;
+1CE2;VEDIC SIGN VISARGA SVARITA;Mn;1;NSM;;;;;N;;;;;
+1CE3;VEDIC SIGN VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE4;VEDIC SIGN REVERSED VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE5;VEDIC SIGN VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE6;VEDIC SIGN REVERSED VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE7;VEDIC SIGN VISARGA UDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;;
+1CE8;VEDIC SIGN VISARGA ANUDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;;
+1CE9;VEDIC SIGN ANUSVARA ANTARGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEA;VEDIC SIGN ANUSVARA BAHIRGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEB;VEDIC SIGN ANUSVARA VAMAGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEC;VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL;Lo;0;L;;;;;N;;;;;
+1CED;VEDIC SIGN TIRYAK;Mn;220;NSM;;;;;N;;;;;
+1CEE;VEDIC SIGN HEXIFORM LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CEF;VEDIC SIGN LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CF0;VEDIC SIGN RTHANG LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CF1;VEDIC SIGN ANUSVARA UBHAYATO MUKHA;Lo;0;L;;;;;N;;;;;
+1CF2;VEDIC SIGN ARDHAVISARGA;Lo;0;L;;;;;N;;;;;
+1CF3;VEDIC SIGN ROTATED ARDHAVISARGA;Lo;0;L;;;;;N;;;;;
+1CF4;VEDIC TONE CANDRA ABOVE;Mn;230;NSM;;;;;N;;;;;
+1CF5;VEDIC SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+1CF6;VEDIC SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+1CF7;VEDIC SIGN ATIKRAMA;Mc;0;L;;;;;N;;;;;
+1CF8;VEDIC TONE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+1CF9;VEDIC TONE DOUBLE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+1CFA;VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA;Lo;0;L;;;;;N;;;;;
+1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
+1D01;LATIN LETTER SMALL CAPITAL AE;Ll;0;L;;;;;N;;;;;
+1D02;LATIN SMALL LETTER TURNED AE;Ll;0;L;;;;;N;;;;;
+1D03;LATIN LETTER SMALL CAPITAL BARRED B;Ll;0;L;;;;;N;;;;;
+1D04;LATIN LETTER SMALL CAPITAL C;Ll;0;L;;;;;N;;;;;
+1D05;LATIN LETTER SMALL CAPITAL D;Ll;0;L;;;;;N;;;;;
+1D06;LATIN LETTER SMALL CAPITAL ETH;Ll;0;L;;;;;N;;;;;
+1D07;LATIN LETTER SMALL CAPITAL E;Ll;0;L;;;;;N;;;;;
+1D08;LATIN SMALL LETTER TURNED OPEN E;Ll;0;L;;;;;N;;;;;
+1D09;LATIN SMALL LETTER TURNED I;Ll;0;L;;;;;N;;;;;
+1D0A;LATIN LETTER SMALL CAPITAL J;Ll;0;L;;;;;N;;;;;
+1D0B;LATIN LETTER SMALL CAPITAL K;Ll;0;L;;;;;N;;;;;
+1D0C;LATIN LETTER SMALL CAPITAL L WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D0D;LATIN LETTER SMALL CAPITAL M;Ll;0;L;;;;;N;;;;;
+1D0E;LATIN LETTER SMALL CAPITAL REVERSED N;Ll;0;L;;;;;N;;;;;
+1D0F;LATIN LETTER SMALL CAPITAL O;Ll;0;L;;;;;N;;;;;
+1D10;LATIN LETTER SMALL CAPITAL OPEN O;Ll;0;L;;;;;N;;;;;
+1D11;LATIN SMALL LETTER SIDEWAYS O;Ll;0;L;;;;;N;;;;;
+1D12;LATIN SMALL LETTER SIDEWAYS OPEN O;Ll;0;L;;;;;N;;;;;
+1D13;LATIN SMALL LETTER SIDEWAYS O WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D14;LATIN SMALL LETTER TURNED OE;Ll;0;L;;;;;N;;;;;
+1D15;LATIN LETTER SMALL CAPITAL OU;Ll;0;L;;;;;N;;;;;
+1D16;LATIN SMALL LETTER TOP HALF O;Ll;0;L;;;;;N;;;;;
+1D17;LATIN SMALL LETTER BOTTOM HALF O;Ll;0;L;;;;;N;;;;;
+1D18;LATIN LETTER SMALL CAPITAL P;Ll;0;L;;;;;N;;;;;
+1D19;LATIN LETTER SMALL CAPITAL REVERSED R;Ll;0;L;;;;;N;;;;;
+1D1A;LATIN LETTER SMALL CAPITAL TURNED R;Ll;0;L;;;;;N;;;;;
+1D1B;LATIN LETTER SMALL CAPITAL T;Ll;0;L;;;;;N;;;;;
+1D1C;LATIN LETTER SMALL CAPITAL U;Ll;0;L;;;;;N;;;;;
+1D1D;LATIN SMALL LETTER SIDEWAYS U;Ll;0;L;;;;;N;;;;;
+1D1E;LATIN SMALL LETTER SIDEWAYS DIAERESIZED U;Ll;0;L;;;;;N;;;;;
+1D1F;LATIN SMALL LETTER SIDEWAYS TURNED M;Ll;0;L;;;;;N;;;;;
+1D20;LATIN LETTER SMALL CAPITAL V;Ll;0;L;;;;;N;;;;;
+1D21;LATIN LETTER SMALL CAPITAL W;Ll;0;L;;;;;N;;;;;
+1D22;LATIN LETTER SMALL CAPITAL Z;Ll;0;L;;;;;N;;;;;
+1D23;LATIN LETTER SMALL CAPITAL EZH;Ll;0;L;;;;;N;;;;;
+1D24;LATIN LETTER VOICED LARYNGEAL SPIRANT;Ll;0;L;;;;;N;;;;;
+1D25;LATIN LETTER AIN;Ll;0;L;;;;;N;;;;;
+1D26;GREEK LETTER SMALL CAPITAL GAMMA;Ll;0;L;;;;;N;;;;;
+1D27;GREEK LETTER SMALL CAPITAL LAMDA;Ll;0;L;;;;;N;;;;;
+1D28;GREEK LETTER SMALL CAPITAL PI;Ll;0;L;;;;;N;;;;;
+1D29;GREEK LETTER SMALL CAPITAL RHO;Ll;0;L;;;;;N;;;;;
+1D2A;GREEK LETTER SMALL CAPITAL PSI;Ll;0;L;;;;;N;;;;;
+1D2B;CYRILLIC LETTER SMALL CAPITAL EL;Ll;0;L;;;;;N;;;;;
+1D2C;MODIFIER LETTER CAPITAL A;Lm;0;L;<super> 0041;;;;N;;;;;
+1D2D;MODIFIER LETTER CAPITAL AE;Lm;0;L;<super> 00C6;;;;N;;;;;
+1D2E;MODIFIER LETTER CAPITAL B;Lm;0;L;<super> 0042;;;;N;;;;;
+1D2F;MODIFIER LETTER CAPITAL BARRED B;Lm;0;L;;;;;N;;;;;
+1D30;MODIFIER LETTER CAPITAL D;Lm;0;L;<super> 0044;;;;N;;;;;
+1D31;MODIFIER LETTER CAPITAL E;Lm;0;L;<super> 0045;;;;N;;;;;
+1D32;MODIFIER LETTER CAPITAL REVERSED E;Lm;0;L;<super> 018E;;;;N;;;;;
+1D33;MODIFIER LETTER CAPITAL G;Lm;0;L;<super> 0047;;;;N;;;;;
+1D34;MODIFIER LETTER CAPITAL H;Lm;0;L;<super> 0048;;;;N;;;;;
+1D35;MODIFIER LETTER CAPITAL I;Lm;0;L;<super> 0049;;;;N;;;;;
+1D36;MODIFIER LETTER CAPITAL J;Lm;0;L;<super> 004A;;;;N;;;;;
+1D37;MODIFIER LETTER CAPITAL K;Lm;0;L;<super> 004B;;;;N;;;;;
+1D38;MODIFIER LETTER CAPITAL L;Lm;0;L;<super> 004C;;;;N;;;;;
+1D39;MODIFIER LETTER CAPITAL M;Lm;0;L;<super> 004D;;;;N;;;;;
+1D3A;MODIFIER LETTER CAPITAL N;Lm;0;L;<super> 004E;;;;N;;;;;
+1D3B;MODIFIER LETTER CAPITAL REVERSED N;Lm;0;L;;;;;N;;;;;
+1D3C;MODIFIER LETTER CAPITAL O;Lm;0;L;<super> 004F;;;;N;;;;;
+1D3D;MODIFIER LETTER CAPITAL OU;Lm;0;L;<super> 0222;;;;N;;;;;
+1D3E;MODIFIER LETTER CAPITAL P;Lm;0;L;<super> 0050;;;;N;;;;;
+1D3F;MODIFIER LETTER CAPITAL R;Lm;0;L;<super> 0052;;;;N;;;;;
+1D40;MODIFIER LETTER CAPITAL T;Lm;0;L;<super> 0054;;;;N;;;;;
+1D41;MODIFIER LETTER CAPITAL U;Lm;0;L;<super> 0055;;;;N;;;;;
+1D42;MODIFIER LETTER CAPITAL W;Lm;0;L;<super> 0057;;;;N;;;;;
+1D43;MODIFIER LETTER SMALL A;Lm;0;L;<super> 0061;;;;N;;;;;
+1D44;MODIFIER LETTER SMALL TURNED A;Lm;0;L;<super> 0250;;;;N;;;;;
+1D45;MODIFIER LETTER SMALL ALPHA;Lm;0;L;<super> 0251;;;;N;;;;;
+1D46;MODIFIER LETTER SMALL TURNED AE;Lm;0;L;<super> 1D02;;;;N;;;;;
+1D47;MODIFIER LETTER SMALL B;Lm;0;L;<super> 0062;;;;N;;;;;
+1D48;MODIFIER LETTER SMALL D;Lm;0;L;<super> 0064;;;;N;;;;;
+1D49;MODIFIER LETTER SMALL E;Lm;0;L;<super> 0065;;;;N;;;;;
+1D4A;MODIFIER LETTER SMALL SCHWA;Lm;0;L;<super> 0259;;;;N;;;;;
+1D4B;MODIFIER LETTER SMALL OPEN E;Lm;0;L;<super> 025B;;;;N;;;;;
+1D4C;MODIFIER LETTER SMALL TURNED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
+1D4D;MODIFIER LETTER SMALL G;Lm;0;L;<super> 0067;;;;N;;;;;
+1D4E;MODIFIER LETTER SMALL TURNED I;Lm;0;L;;;;;N;;;;;
+1D4F;MODIFIER LETTER SMALL K;Lm;0;L;<super> 006B;;;;N;;;;;
+1D50;MODIFIER LETTER SMALL M;Lm;0;L;<super> 006D;;;;N;;;;;
+1D51;MODIFIER LETTER SMALL ENG;Lm;0;L;<super> 014B;;;;N;;;;;
+1D52;MODIFIER LETTER SMALL O;Lm;0;L;<super> 006F;;;;N;;;;;
+1D53;MODIFIER LETTER SMALL OPEN O;Lm;0;L;<super> 0254;;;;N;;;;;
+1D54;MODIFIER LETTER SMALL TOP HALF O;Lm;0;L;<super> 1D16;;;;N;;;;;
+1D55;MODIFIER LETTER SMALL BOTTOM HALF O;Lm;0;L;<super> 1D17;;;;N;;;;;
+1D56;MODIFIER LETTER SMALL P;Lm;0;L;<super> 0070;;;;N;;;;;
+1D57;MODIFIER LETTER SMALL T;Lm;0;L;<super> 0074;;;;N;;;;;
+1D58;MODIFIER LETTER SMALL U;Lm;0;L;<super> 0075;;;;N;;;;;
+1D59;MODIFIER LETTER SMALL SIDEWAYS U;Lm;0;L;<super> 1D1D;;;;N;;;;;
+1D5A;MODIFIER LETTER SMALL TURNED M;Lm;0;L;<super> 026F;;;;N;;;;;
+1D5B;MODIFIER LETTER SMALL V;Lm;0;L;<super> 0076;;;;N;;;;;
+1D5C;MODIFIER LETTER SMALL AIN;Lm;0;L;<super> 1D25;;;;N;;;;;
+1D5D;MODIFIER LETTER SMALL BETA;Lm;0;L;<super> 03B2;;;;N;;;;;
+1D5E;MODIFIER LETTER SMALL GREEK GAMMA;Lm;0;L;<super> 03B3;;;;N;;;;;
+1D5F;MODIFIER LETTER SMALL DELTA;Lm;0;L;<super> 03B4;;;;N;;;;;
+1D60;MODIFIER LETTER SMALL GREEK PHI;Lm;0;L;<super> 03C6;;;;N;;;;;
+1D61;MODIFIER LETTER SMALL CHI;Lm;0;L;<super> 03C7;;;;N;;;;;
+1D62;LATIN SUBSCRIPT SMALL LETTER I;Lm;0;L;<sub> 0069;;;;N;;;;;
+1D63;LATIN SUBSCRIPT SMALL LETTER R;Lm;0;L;<sub> 0072;;;;N;;;;;
+1D64;LATIN SUBSCRIPT SMALL LETTER U;Lm;0;L;<sub> 0075;;;;N;;;;;
+1D65;LATIN SUBSCRIPT SMALL LETTER V;Lm;0;L;<sub> 0076;;;;N;;;;;
+1D66;GREEK SUBSCRIPT SMALL LETTER BETA;Lm;0;L;<sub> 03B2;;;;N;;;;;
+1D67;GREEK SUBSCRIPT SMALL LETTER GAMMA;Lm;0;L;<sub> 03B3;;;;N;;;;;
+1D68;GREEK SUBSCRIPT SMALL LETTER RHO;Lm;0;L;<sub> 03C1;;;;N;;;;;
+1D69;GREEK SUBSCRIPT SMALL LETTER PHI;Lm;0;L;<sub> 03C6;;;;N;;;;;
+1D6A;GREEK SUBSCRIPT SMALL LETTER CHI;Lm;0;L;<sub> 03C7;;;;N;;;;;
+1D6B;LATIN SMALL LETTER UE;Ll;0;L;;;;;N;;;;;
+1D6C;LATIN SMALL LETTER B WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6D;LATIN SMALL LETTER D WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6E;LATIN SMALL LETTER F WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6F;LATIN SMALL LETTER M WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D70;LATIN SMALL LETTER N WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D71;LATIN SMALL LETTER P WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D72;LATIN SMALL LETTER R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D73;LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D74;LATIN SMALL LETTER S WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D75;LATIN SMALL LETTER T WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D76;LATIN SMALL LETTER Z WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D77;LATIN SMALL LETTER TURNED G;Ll;0;L;;;;;N;;;;;
+1D78;MODIFIER LETTER CYRILLIC EN;Lm;0;L;<super> 043D;;;;N;;;;;
+1D79;LATIN SMALL LETTER INSULAR G;Ll;0;L;;;;;N;;;A77D;;A77D
+1D7A;LATIN SMALL LETTER TH WITH STRIKETHROUGH;Ll;0;L;;;;;N;;;;;
+1D7B;LATIN SMALL CAPITAL LETTER I WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7C;LATIN SMALL LETTER IOTA WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7D;LATIN SMALL LETTER P WITH STROKE;Ll;0;L;;;;;N;;;2C63;;2C63
+1D7E;LATIN SMALL CAPITAL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7F;LATIN SMALL LETTER UPSILON WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D80;LATIN SMALL LETTER B WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D81;LATIN SMALL LETTER D WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D82;LATIN SMALL LETTER F WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D83;LATIN SMALL LETTER G WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D84;LATIN SMALL LETTER K WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D85;LATIN SMALL LETTER L WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D86;LATIN SMALL LETTER M WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D87;LATIN SMALL LETTER N WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D88;LATIN SMALL LETTER P WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D89;LATIN SMALL LETTER R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8A;LATIN SMALL LETTER S WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8B;LATIN SMALL LETTER ESH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8C;LATIN SMALL LETTER V WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8D;LATIN SMALL LETTER X WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8E;LATIN SMALL LETTER Z WITH PALATAL HOOK;Ll;0;L;;;;;N;;;A7C6;;A7C6
+1D8F;LATIN SMALL LETTER A WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D90;LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D91;LATIN SMALL LETTER D WITH HOOK AND TAIL;Ll;0;L;;;;;N;;;;;
+1D92;LATIN SMALL LETTER E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D93;LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D94;LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D95;LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D96;LATIN SMALL LETTER I WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D97;LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D98;LATIN SMALL LETTER ESH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D99;LATIN SMALL LETTER U WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D9A;LATIN SMALL LETTER EZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D9B;MODIFIER LETTER SMALL TURNED ALPHA;Lm;0;L;<super> 0252;;;;N;;;;;
+1D9C;MODIFIER LETTER SMALL C;Lm;0;L;<super> 0063;;;;N;;;;;
+1D9D;MODIFIER LETTER SMALL C WITH CURL;Lm;0;L;<super> 0255;;;;N;;;;;
+1D9E;MODIFIER LETTER SMALL ETH;Lm;0;L;<super> 00F0;;;;N;;;;;
+1D9F;MODIFIER LETTER SMALL REVERSED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
+1DA0;MODIFIER LETTER SMALL F;Lm;0;L;<super> 0066;;;;N;;;;;
+1DA1;MODIFIER LETTER SMALL DOTLESS J WITH STROKE;Lm;0;L;<super> 025F;;;;N;;;;;
+1DA2;MODIFIER LETTER SMALL SCRIPT G;Lm;0;L;<super> 0261;;;;N;;;;;
+1DA3;MODIFIER LETTER SMALL TURNED H;Lm;0;L;<super> 0265;;;;N;;;;;
+1DA4;MODIFIER LETTER SMALL I WITH STROKE;Lm;0;L;<super> 0268;;;;N;;;;;
+1DA5;MODIFIER LETTER SMALL IOTA;Lm;0;L;<super> 0269;;;;N;;;;;
+1DA6;MODIFIER LETTER SMALL CAPITAL I;Lm;0;L;<super> 026A;;;;N;;;;;
+1DA7;MODIFIER LETTER SMALL CAPITAL I WITH STROKE;Lm;0;L;<super> 1D7B;;;;N;;;;;
+1DA8;MODIFIER LETTER SMALL J WITH CROSSED-TAIL;Lm;0;L;<super> 029D;;;;N;;;;;
+1DA9;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK;Lm;0;L;<super> 026D;;;;N;;;;;
+1DAA;MODIFIER LETTER SMALL L WITH PALATAL HOOK;Lm;0;L;<super> 1D85;;;;N;;;;;
+1DAB;MODIFIER LETTER SMALL CAPITAL L;Lm;0;L;<super> 029F;;;;N;;;;;
+1DAC;MODIFIER LETTER SMALL M WITH HOOK;Lm;0;L;<super> 0271;;;;N;;;;;
+1DAD;MODIFIER LETTER SMALL TURNED M WITH LONG LEG;Lm;0;L;<super> 0270;;;;N;;;;;
+1DAE;MODIFIER LETTER SMALL N WITH LEFT HOOK;Lm;0;L;<super> 0272;;;;N;;;;;
+1DAF;MODIFIER LETTER SMALL N WITH RETROFLEX HOOK;Lm;0;L;<super> 0273;;;;N;;;;;
+1DB0;MODIFIER LETTER SMALL CAPITAL N;Lm;0;L;<super> 0274;;;;N;;;;;
+1DB1;MODIFIER LETTER SMALL BARRED O;Lm;0;L;<super> 0275;;;;N;;;;;
+1DB2;MODIFIER LETTER SMALL PHI;Lm;0;L;<super> 0278;;;;N;;;;;
+1DB3;MODIFIER LETTER SMALL S WITH HOOK;Lm;0;L;<super> 0282;;;;N;;;;;
+1DB4;MODIFIER LETTER SMALL ESH;Lm;0;L;<super> 0283;;;;N;;;;;
+1DB5;MODIFIER LETTER SMALL T WITH PALATAL HOOK;Lm;0;L;<super> 01AB;;;;N;;;;;
+1DB6;MODIFIER LETTER SMALL U BAR;Lm;0;L;<super> 0289;;;;N;;;;;
+1DB7;MODIFIER LETTER SMALL UPSILON;Lm;0;L;<super> 028A;;;;N;;;;;
+1DB8;MODIFIER LETTER SMALL CAPITAL U;Lm;0;L;<super> 1D1C;;;;N;;;;;
+1DB9;MODIFIER LETTER SMALL V WITH HOOK;Lm;0;L;<super> 028B;;;;N;;;;;
+1DBA;MODIFIER LETTER SMALL TURNED V;Lm;0;L;<super> 028C;;;;N;;;;;
+1DBB;MODIFIER LETTER SMALL Z;Lm;0;L;<super> 007A;;;;N;;;;;
+1DBC;MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK;Lm;0;L;<super> 0290;;;;N;;;;;
+1DBD;MODIFIER LETTER SMALL Z WITH CURL;Lm;0;L;<super> 0291;;;;N;;;;;
+1DBE;MODIFIER LETTER SMALL EZH;Lm;0;L;<super> 0292;;;;N;;;;;
+1DBF;MODIFIER LETTER SMALL THETA;Lm;0;L;<super> 03B8;;;;N;;;;;
+1DC0;COMBINING DOTTED GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1DC1;COMBINING DOTTED ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1DC2;COMBINING SNAKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1DC3;COMBINING SUSPENSION MARK;Mn;230;NSM;;;;;N;;;;;
+1DC4;COMBINING MACRON-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1DC5;COMBINING GRAVE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DC6;COMBINING MACRON-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1DC7;COMBINING ACUTE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DC8;COMBINING GRAVE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1DC9;COMBINING ACUTE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1DCA;COMBINING LATIN SMALL LETTER R BELOW;Mn;220;NSM;;;;;N;;;;;
+1DCB;COMBINING BREVE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DCC;COMBINING MACRON-BREVE;Mn;230;NSM;;;;;N;;;;;
+1DCD;COMBINING DOUBLE CIRCUMFLEX ABOVE;Mn;234;NSM;;;;;N;;;;;
+1DCE;COMBINING OGONEK ABOVE;Mn;214;NSM;;;;;N;;;;;
+1DCF;COMBINING ZIGZAG BELOW;Mn;220;NSM;;;;;N;;;;;
+1DD0;COMBINING IS BELOW;Mn;202;NSM;;;;;N;;;;;
+1DD1;COMBINING UR ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD2;COMBINING US ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD3;COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD4;COMBINING LATIN SMALL LETTER AE;Mn;230;NSM;;;;;N;;;;;
+1DD5;COMBINING LATIN SMALL LETTER AO;Mn;230;NSM;;;;;N;;;;;
+1DD6;COMBINING LATIN SMALL LETTER AV;Mn;230;NSM;;;;;N;;;;;
+1DD7;COMBINING LATIN SMALL LETTER C CEDILLA;Mn;230;NSM;;;;;N;;;;;
+1DD8;COMBINING LATIN SMALL LETTER INSULAR D;Mn;230;NSM;;;;;N;;;;;
+1DD9;COMBINING LATIN SMALL LETTER ETH;Mn;230;NSM;;;;;N;;;;;
+1DDA;COMBINING LATIN SMALL LETTER G;Mn;230;NSM;;;;;N;;;;;
+1DDB;COMBINING LATIN LETTER SMALL CAPITAL G;Mn;230;NSM;;;;;N;;;;;
+1DDC;COMBINING LATIN SMALL LETTER K;Mn;230;NSM;;;;;N;;;;;
+1DDD;COMBINING LATIN SMALL LETTER L;Mn;230;NSM;;;;;N;;;;;
+1DDE;COMBINING LATIN LETTER SMALL CAPITAL L;Mn;230;NSM;;;;;N;;;;;
+1DDF;COMBINING LATIN LETTER SMALL CAPITAL M;Mn;230;NSM;;;;;N;;;;;
+1DE0;COMBINING LATIN SMALL LETTER N;Mn;230;NSM;;;;;N;;;;;
+1DE1;COMBINING LATIN LETTER SMALL CAPITAL N;Mn;230;NSM;;;;;N;;;;;
+1DE2;COMBINING LATIN LETTER SMALL CAPITAL R;Mn;230;NSM;;;;;N;;;;;
+1DE3;COMBINING LATIN SMALL LETTER R ROTUNDA;Mn;230;NSM;;;;;N;;;;;
+1DE4;COMBINING LATIN SMALL LETTER S;Mn;230;NSM;;;;;N;;;;;
+1DE5;COMBINING LATIN SMALL LETTER LONG S;Mn;230;NSM;;;;;N;;;;;
+1DE6;COMBINING LATIN SMALL LETTER Z;Mn;230;NSM;;;;;N;;;;;
+1DE7;COMBINING LATIN SMALL LETTER ALPHA;Mn;230;NSM;;;;;N;;;;;
+1DE8;COMBINING LATIN SMALL LETTER B;Mn;230;NSM;;;;;N;;;;;
+1DE9;COMBINING LATIN SMALL LETTER BETA;Mn;230;NSM;;;;;N;;;;;
+1DEA;COMBINING LATIN SMALL LETTER SCHWA;Mn;230;NSM;;;;;N;;;;;
+1DEB;COMBINING LATIN SMALL LETTER F;Mn;230;NSM;;;;;N;;;;;
+1DEC;COMBINING LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE;Mn;230;NSM;;;;;N;;;;;
+1DED;COMBINING LATIN SMALL LETTER O WITH LIGHT CENTRALIZATION STROKE;Mn;230;NSM;;;;;N;;;;;
+1DEE;COMBINING LATIN SMALL LETTER P;Mn;230;NSM;;;;;N;;;;;
+1DEF;COMBINING LATIN SMALL LETTER ESH;Mn;230;NSM;;;;;N;;;;;
+1DF0;COMBINING LATIN SMALL LETTER U WITH LIGHT CENTRALIZATION STROKE;Mn;230;NSM;;;;;N;;;;;
+1DF1;COMBINING LATIN SMALL LETTER W;Mn;230;NSM;;;;;N;;;;;
+1DF2;COMBINING LATIN SMALL LETTER A WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
+1DF3;COMBINING LATIN SMALL LETTER O WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
+1DF4;COMBINING LATIN SMALL LETTER U WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
+1DF5;COMBINING UP TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DF6;COMBINING KAVYKA ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
+1DF7;COMBINING KAVYKA ABOVE LEFT;Mn;228;NSM;;;;;N;;;;;
+1DF8;COMBINING DOT ABOVE LEFT;Mn;228;NSM;;;;;N;;;;;
+1DF9;COMBINING WIDE INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;;;;;
+1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;;
+1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
+1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;;
+1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DFF;COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+1E00;LATIN CAPITAL LETTER A WITH RING BELOW;Lu;0;L;0041 0325;;;;N;;;;1E01;
+1E01;LATIN SMALL LETTER A WITH RING BELOW;Ll;0;L;0061 0325;;;;N;;;1E00;;1E00
+1E02;LATIN CAPITAL LETTER B WITH DOT ABOVE;Lu;0;L;0042 0307;;;;N;;;;1E03;
+1E03;LATIN SMALL LETTER B WITH DOT ABOVE;Ll;0;L;0062 0307;;;;N;;;1E02;;1E02
+1E04;LATIN CAPITAL LETTER B WITH DOT BELOW;Lu;0;L;0042 0323;;;;N;;;;1E05;
+1E05;LATIN SMALL LETTER B WITH DOT BELOW;Ll;0;L;0062 0323;;;;N;;;1E04;;1E04
+1E06;LATIN CAPITAL LETTER B WITH LINE BELOW;Lu;0;L;0042 0331;;;;N;;;;1E07;
+1E07;LATIN SMALL LETTER B WITH LINE BELOW;Ll;0;L;0062 0331;;;;N;;;1E06;;1E06
+1E08;LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE;Lu;0;L;00C7 0301;;;;N;;;;1E09;
+1E09;LATIN SMALL LETTER C WITH CEDILLA AND ACUTE;Ll;0;L;00E7 0301;;;;N;;;1E08;;1E08
+1E0A;LATIN CAPITAL LETTER D WITH DOT ABOVE;Lu;0;L;0044 0307;;;;N;;;;1E0B;
+1E0B;LATIN SMALL LETTER D WITH DOT ABOVE;Ll;0;L;0064 0307;;;;N;;;1E0A;;1E0A
+1E0C;LATIN CAPITAL LETTER D WITH DOT BELOW;Lu;0;L;0044 0323;;;;N;;;;1E0D;
+1E0D;LATIN SMALL LETTER D WITH DOT BELOW;Ll;0;L;0064 0323;;;;N;;;1E0C;;1E0C
+1E0E;LATIN CAPITAL LETTER D WITH LINE BELOW;Lu;0;L;0044 0331;;;;N;;;;1E0F;
+1E0F;LATIN SMALL LETTER D WITH LINE BELOW;Ll;0;L;0064 0331;;;;N;;;1E0E;;1E0E
+1E10;LATIN CAPITAL LETTER D WITH CEDILLA;Lu;0;L;0044 0327;;;;N;;;;1E11;
+1E11;LATIN SMALL LETTER D WITH CEDILLA;Ll;0;L;0064 0327;;;;N;;;1E10;;1E10
+1E12;LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW;Lu;0;L;0044 032D;;;;N;;;;1E13;
+1E13;LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW;Ll;0;L;0064 032D;;;;N;;;1E12;;1E12
+1E14;LATIN CAPITAL LETTER E WITH MACRON AND GRAVE;Lu;0;L;0112 0300;;;;N;;;;1E15;
+1E15;LATIN SMALL LETTER E WITH MACRON AND GRAVE;Ll;0;L;0113 0300;;;;N;;;1E14;;1E14
+1E16;LATIN CAPITAL LETTER E WITH MACRON AND ACUTE;Lu;0;L;0112 0301;;;;N;;;;1E17;
+1E17;LATIN SMALL LETTER E WITH MACRON AND ACUTE;Ll;0;L;0113 0301;;;;N;;;1E16;;1E16
+1E18;LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW;Lu;0;L;0045 032D;;;;N;;;;1E19;
+1E19;LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW;Ll;0;L;0065 032D;;;;N;;;1E18;;1E18
+1E1A;LATIN CAPITAL LETTER E WITH TILDE BELOW;Lu;0;L;0045 0330;;;;N;;;;1E1B;
+1E1B;LATIN SMALL LETTER E WITH TILDE BELOW;Ll;0;L;0065 0330;;;;N;;;1E1A;;1E1A
+1E1C;LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE;Lu;0;L;0228 0306;;;;N;;;;1E1D;
+1E1D;LATIN SMALL LETTER E WITH CEDILLA AND BREVE;Ll;0;L;0229 0306;;;;N;;;1E1C;;1E1C
+1E1E;LATIN CAPITAL LETTER F WITH DOT ABOVE;Lu;0;L;0046 0307;;;;N;;;;1E1F;
+1E1F;LATIN SMALL LETTER F WITH DOT ABOVE;Ll;0;L;0066 0307;;;;N;;;1E1E;;1E1E
+1E20;LATIN CAPITAL LETTER G WITH MACRON;Lu;0;L;0047 0304;;;;N;;;;1E21;
+1E21;LATIN SMALL LETTER G WITH MACRON;Ll;0;L;0067 0304;;;;N;;;1E20;;1E20
+1E22;LATIN CAPITAL LETTER H WITH DOT ABOVE;Lu;0;L;0048 0307;;;;N;;;;1E23;
+1E23;LATIN SMALL LETTER H WITH DOT ABOVE;Ll;0;L;0068 0307;;;;N;;;1E22;;1E22
+1E24;LATIN CAPITAL LETTER H WITH DOT BELOW;Lu;0;L;0048 0323;;;;N;;;;1E25;
+1E25;LATIN SMALL LETTER H WITH DOT BELOW;Ll;0;L;0068 0323;;;;N;;;1E24;;1E24
+1E26;LATIN CAPITAL LETTER H WITH DIAERESIS;Lu;0;L;0048 0308;;;;N;;;;1E27;
+1E27;LATIN SMALL LETTER H WITH DIAERESIS;Ll;0;L;0068 0308;;;;N;;;1E26;;1E26
+1E28;LATIN CAPITAL LETTER H WITH CEDILLA;Lu;0;L;0048 0327;;;;N;;;;1E29;
+1E29;LATIN SMALL LETTER H WITH CEDILLA;Ll;0;L;0068 0327;;;;N;;;1E28;;1E28
+1E2A;LATIN CAPITAL LETTER H WITH BREVE BELOW;Lu;0;L;0048 032E;;;;N;;;;1E2B;
+1E2B;LATIN SMALL LETTER H WITH BREVE BELOW;Ll;0;L;0068 032E;;;;N;;;1E2A;;1E2A
+1E2C;LATIN CAPITAL LETTER I WITH TILDE BELOW;Lu;0;L;0049 0330;;;;N;;;;1E2D;
+1E2D;LATIN SMALL LETTER I WITH TILDE BELOW;Ll;0;L;0069 0330;;;;N;;;1E2C;;1E2C
+1E2E;LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE;Lu;0;L;00CF 0301;;;;N;;;;1E2F;
+1E2F;LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE;Ll;0;L;00EF 0301;;;;N;;;1E2E;;1E2E
+1E30;LATIN CAPITAL LETTER K WITH ACUTE;Lu;0;L;004B 0301;;;;N;;;;1E31;
+1E31;LATIN SMALL LETTER K WITH ACUTE;Ll;0;L;006B 0301;;;;N;;;1E30;;1E30
+1E32;LATIN CAPITAL LETTER K WITH DOT BELOW;Lu;0;L;004B 0323;;;;N;;;;1E33;
+1E33;LATIN SMALL LETTER K WITH DOT BELOW;Ll;0;L;006B 0323;;;;N;;;1E32;;1E32
+1E34;LATIN CAPITAL LETTER K WITH LINE BELOW;Lu;0;L;004B 0331;;;;N;;;;1E35;
+1E35;LATIN SMALL LETTER K WITH LINE BELOW;Ll;0;L;006B 0331;;;;N;;;1E34;;1E34
+1E36;LATIN CAPITAL LETTER L WITH DOT BELOW;Lu;0;L;004C 0323;;;;N;;;;1E37;
+1E37;LATIN SMALL LETTER L WITH DOT BELOW;Ll;0;L;006C 0323;;;;N;;;1E36;;1E36
+1E38;LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON;Lu;0;L;1E36 0304;;;;N;;;;1E39;
+1E39;LATIN SMALL LETTER L WITH DOT BELOW AND MACRON;Ll;0;L;1E37 0304;;;;N;;;1E38;;1E38
+1E3A;LATIN CAPITAL LETTER L WITH LINE BELOW;Lu;0;L;004C 0331;;;;N;;;;1E3B;
+1E3B;LATIN SMALL LETTER L WITH LINE BELOW;Ll;0;L;006C 0331;;;;N;;;1E3A;;1E3A
+1E3C;LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW;Lu;0;L;004C 032D;;;;N;;;;1E3D;
+1E3D;LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW;Ll;0;L;006C 032D;;;;N;;;1E3C;;1E3C
+1E3E;LATIN CAPITAL LETTER M WITH ACUTE;Lu;0;L;004D 0301;;;;N;;;;1E3F;
+1E3F;LATIN SMALL LETTER M WITH ACUTE;Ll;0;L;006D 0301;;;;N;;;1E3E;;1E3E
+1E40;LATIN CAPITAL LETTER M WITH DOT ABOVE;Lu;0;L;004D 0307;;;;N;;;;1E41;
+1E41;LATIN SMALL LETTER M WITH DOT ABOVE;Ll;0;L;006D 0307;;;;N;;;1E40;;1E40
+1E42;LATIN CAPITAL LETTER M WITH DOT BELOW;Lu;0;L;004D 0323;;;;N;;;;1E43;
+1E43;LATIN SMALL LETTER M WITH DOT BELOW;Ll;0;L;006D 0323;;;;N;;;1E42;;1E42
+1E44;LATIN CAPITAL LETTER N WITH DOT ABOVE;Lu;0;L;004E 0307;;;;N;;;;1E45;
+1E45;LATIN SMALL LETTER N WITH DOT ABOVE;Ll;0;L;006E 0307;;;;N;;;1E44;;1E44
+1E46;LATIN CAPITAL LETTER N WITH DOT BELOW;Lu;0;L;004E 0323;;;;N;;;;1E47;
+1E47;LATIN SMALL LETTER N WITH DOT BELOW;Ll;0;L;006E 0323;;;;N;;;1E46;;1E46
+1E48;LATIN CAPITAL LETTER N WITH LINE BELOW;Lu;0;L;004E 0331;;;;N;;;;1E49;
+1E49;LATIN SMALL LETTER N WITH LINE BELOW;Ll;0;L;006E 0331;;;;N;;;1E48;;1E48
+1E4A;LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW;Lu;0;L;004E 032D;;;;N;;;;1E4B;
+1E4B;LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW;Ll;0;L;006E 032D;;;;N;;;1E4A;;1E4A
+1E4C;LATIN CAPITAL LETTER O WITH TILDE AND ACUTE;Lu;0;L;00D5 0301;;;;N;;;;1E4D;
+1E4D;LATIN SMALL LETTER O WITH TILDE AND ACUTE;Ll;0;L;00F5 0301;;;;N;;;1E4C;;1E4C
+1E4E;LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS;Lu;0;L;00D5 0308;;;;N;;;;1E4F;
+1E4F;LATIN SMALL LETTER O WITH TILDE AND DIAERESIS;Ll;0;L;00F5 0308;;;;N;;;1E4E;;1E4E
+1E50;LATIN CAPITAL LETTER O WITH MACRON AND GRAVE;Lu;0;L;014C 0300;;;;N;;;;1E51;
+1E51;LATIN SMALL LETTER O WITH MACRON AND GRAVE;Ll;0;L;014D 0300;;;;N;;;1E50;;1E50
+1E52;LATIN CAPITAL LETTER O WITH MACRON AND ACUTE;Lu;0;L;014C 0301;;;;N;;;;1E53;
+1E53;LATIN SMALL LETTER O WITH MACRON AND ACUTE;Ll;0;L;014D 0301;;;;N;;;1E52;;1E52
+1E54;LATIN CAPITAL LETTER P WITH ACUTE;Lu;0;L;0050 0301;;;;N;;;;1E55;
+1E55;LATIN SMALL LETTER P WITH ACUTE;Ll;0;L;0070 0301;;;;N;;;1E54;;1E54
+1E56;LATIN CAPITAL LETTER P WITH DOT ABOVE;Lu;0;L;0050 0307;;;;N;;;;1E57;
+1E57;LATIN SMALL LETTER P WITH DOT ABOVE;Ll;0;L;0070 0307;;;;N;;;1E56;;1E56
+1E58;LATIN CAPITAL LETTER R WITH DOT ABOVE;Lu;0;L;0052 0307;;;;N;;;;1E59;
+1E59;LATIN SMALL LETTER R WITH DOT ABOVE;Ll;0;L;0072 0307;;;;N;;;1E58;;1E58
+1E5A;LATIN CAPITAL LETTER R WITH DOT BELOW;Lu;0;L;0052 0323;;;;N;;;;1E5B;
+1E5B;LATIN SMALL LETTER R WITH DOT BELOW;Ll;0;L;0072 0323;;;;N;;;1E5A;;1E5A
+1E5C;LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON;Lu;0;L;1E5A 0304;;;;N;;;;1E5D;
+1E5D;LATIN SMALL LETTER R WITH DOT BELOW AND MACRON;Ll;0;L;1E5B 0304;;;;N;;;1E5C;;1E5C
+1E5E;LATIN CAPITAL LETTER R WITH LINE BELOW;Lu;0;L;0052 0331;;;;N;;;;1E5F;
+1E5F;LATIN SMALL LETTER R WITH LINE BELOW;Ll;0;L;0072 0331;;;;N;;;1E5E;;1E5E
+1E60;LATIN CAPITAL LETTER S WITH DOT ABOVE;Lu;0;L;0053 0307;;;;N;;;;1E61;
+1E61;LATIN SMALL LETTER S WITH DOT ABOVE;Ll;0;L;0073 0307;;;;N;;;1E60;;1E60
+1E62;LATIN CAPITAL LETTER S WITH DOT BELOW;Lu;0;L;0053 0323;;;;N;;;;1E63;
+1E63;LATIN SMALL LETTER S WITH DOT BELOW;Ll;0;L;0073 0323;;;;N;;;1E62;;1E62
+1E64;LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE;Lu;0;L;015A 0307;;;;N;;;;1E65;
+1E65;LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE;Ll;0;L;015B 0307;;;;N;;;1E64;;1E64
+1E66;LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE;Lu;0;L;0160 0307;;;;N;;;;1E67;
+1E67;LATIN SMALL LETTER S WITH CARON AND DOT ABOVE;Ll;0;L;0161 0307;;;;N;;;1E66;;1E66
+1E68;LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE;Lu;0;L;1E62 0307;;;;N;;;;1E69;
+1E69;LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE;Ll;0;L;1E63 0307;;;;N;;;1E68;;1E68
+1E6A;LATIN CAPITAL LETTER T WITH DOT ABOVE;Lu;0;L;0054 0307;;;;N;;;;1E6B;
+1E6B;LATIN SMALL LETTER T WITH DOT ABOVE;Ll;0;L;0074 0307;;;;N;;;1E6A;;1E6A
+1E6C;LATIN CAPITAL LETTER T WITH DOT BELOW;Lu;0;L;0054 0323;;;;N;;;;1E6D;
+1E6D;LATIN SMALL LETTER T WITH DOT BELOW;Ll;0;L;0074 0323;;;;N;;;1E6C;;1E6C
+1E6E;LATIN CAPITAL LETTER T WITH LINE BELOW;Lu;0;L;0054 0331;;;;N;;;;1E6F;
+1E6F;LATIN SMALL LETTER T WITH LINE BELOW;Ll;0;L;0074 0331;;;;N;;;1E6E;;1E6E
+1E70;LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW;Lu;0;L;0054 032D;;;;N;;;;1E71;
+1E71;LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW;Ll;0;L;0074 032D;;;;N;;;1E70;;1E70
+1E72;LATIN CAPITAL LETTER U WITH DIAERESIS BELOW;Lu;0;L;0055 0324;;;;N;;;;1E73;
+1E73;LATIN SMALL LETTER U WITH DIAERESIS BELOW;Ll;0;L;0075 0324;;;;N;;;1E72;;1E72
+1E74;LATIN CAPITAL LETTER U WITH TILDE BELOW;Lu;0;L;0055 0330;;;;N;;;;1E75;
+1E75;LATIN SMALL LETTER U WITH TILDE BELOW;Ll;0;L;0075 0330;;;;N;;;1E74;;1E74
+1E76;LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW;Lu;0;L;0055 032D;;;;N;;;;1E77;
+1E77;LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW;Ll;0;L;0075 032D;;;;N;;;1E76;;1E76
+1E78;LATIN CAPITAL LETTER U WITH TILDE AND ACUTE;Lu;0;L;0168 0301;;;;N;;;;1E79;
+1E79;LATIN SMALL LETTER U WITH TILDE AND ACUTE;Ll;0;L;0169 0301;;;;N;;;1E78;;1E78
+1E7A;LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS;Lu;0;L;016A 0308;;;;N;;;;1E7B;
+1E7B;LATIN SMALL LETTER U WITH MACRON AND DIAERESIS;Ll;0;L;016B 0308;;;;N;;;1E7A;;1E7A
+1E7C;LATIN CAPITAL LETTER V WITH TILDE;Lu;0;L;0056 0303;;;;N;;;;1E7D;
+1E7D;LATIN SMALL LETTER V WITH TILDE;Ll;0;L;0076 0303;;;;N;;;1E7C;;1E7C
+1E7E;LATIN CAPITAL LETTER V WITH DOT BELOW;Lu;0;L;0056 0323;;;;N;;;;1E7F;
+1E7F;LATIN SMALL LETTER V WITH DOT BELOW;Ll;0;L;0076 0323;;;;N;;;1E7E;;1E7E
+1E80;LATIN CAPITAL LETTER W WITH GRAVE;Lu;0;L;0057 0300;;;;N;;;;1E81;
+1E81;LATIN SMALL LETTER W WITH GRAVE;Ll;0;L;0077 0300;;;;N;;;1E80;;1E80
+1E82;LATIN CAPITAL LETTER W WITH ACUTE;Lu;0;L;0057 0301;;;;N;;;;1E83;
+1E83;LATIN SMALL LETTER W WITH ACUTE;Ll;0;L;0077 0301;;;;N;;;1E82;;1E82
+1E84;LATIN CAPITAL LETTER W WITH DIAERESIS;Lu;0;L;0057 0308;;;;N;;;;1E85;
+1E85;LATIN SMALL LETTER W WITH DIAERESIS;Ll;0;L;0077 0308;;;;N;;;1E84;;1E84
+1E86;LATIN CAPITAL LETTER W WITH DOT ABOVE;Lu;0;L;0057 0307;;;;N;;;;1E87;
+1E87;LATIN SMALL LETTER W WITH DOT ABOVE;Ll;0;L;0077 0307;;;;N;;;1E86;;1E86
+1E88;LATIN CAPITAL LETTER W WITH DOT BELOW;Lu;0;L;0057 0323;;;;N;;;;1E89;
+1E89;LATIN SMALL LETTER W WITH DOT BELOW;Ll;0;L;0077 0323;;;;N;;;1E88;;1E88
+1E8A;LATIN CAPITAL LETTER X WITH DOT ABOVE;Lu;0;L;0058 0307;;;;N;;;;1E8B;
+1E8B;LATIN SMALL LETTER X WITH DOT ABOVE;Ll;0;L;0078 0307;;;;N;;;1E8A;;1E8A
+1E8C;LATIN CAPITAL LETTER X WITH DIAERESIS;Lu;0;L;0058 0308;;;;N;;;;1E8D;
+1E8D;LATIN SMALL LETTER X WITH DIAERESIS;Ll;0;L;0078 0308;;;;N;;;1E8C;;1E8C
+1E8E;LATIN CAPITAL LETTER Y WITH DOT ABOVE;Lu;0;L;0059 0307;;;;N;;;;1E8F;
+1E8F;LATIN SMALL LETTER Y WITH DOT ABOVE;Ll;0;L;0079 0307;;;;N;;;1E8E;;1E8E
+1E90;LATIN CAPITAL LETTER Z WITH CIRCUMFLEX;Lu;0;L;005A 0302;;;;N;;;;1E91;
+1E91;LATIN SMALL LETTER Z WITH CIRCUMFLEX;Ll;0;L;007A 0302;;;;N;;;1E90;;1E90
+1E92;LATIN CAPITAL LETTER Z WITH DOT BELOW;Lu;0;L;005A 0323;;;;N;;;;1E93;
+1E93;LATIN SMALL LETTER Z WITH DOT BELOW;Ll;0;L;007A 0323;;;;N;;;1E92;;1E92
+1E94;LATIN CAPITAL LETTER Z WITH LINE BELOW;Lu;0;L;005A 0331;;;;N;;;;1E95;
+1E95;LATIN SMALL LETTER Z WITH LINE BELOW;Ll;0;L;007A 0331;;;;N;;;1E94;;1E94
+1E96;LATIN SMALL LETTER H WITH LINE BELOW;Ll;0;L;0068 0331;;;;N;;;;;
+1E97;LATIN SMALL LETTER T WITH DIAERESIS;Ll;0;L;0074 0308;;;;N;;;;;
+1E98;LATIN SMALL LETTER W WITH RING ABOVE;Ll;0;L;0077 030A;;;;N;;;;;
+1E99;LATIN SMALL LETTER Y WITH RING ABOVE;Ll;0;L;0079 030A;;;;N;;;;;
+1E9A;LATIN SMALL LETTER A WITH RIGHT HALF RING;Ll;0;L;<compat> 0061 02BE;;;;N;;;;;
+1E9B;LATIN SMALL LETTER LONG S WITH DOT ABOVE;Ll;0;L;017F 0307;;;;N;;;1E60;;1E60
+1E9C;LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;;;
+1E9D;LATIN SMALL LETTER LONG S WITH HIGH STROKE;Ll;0;L;;;;;N;;;;;
+1E9E;LATIN CAPITAL LETTER SHARP S;Lu;0;L;;;;;N;;;;00DF;
+1E9F;LATIN SMALL LETTER DELTA;Ll;0;L;;;;;N;;;;;
+1EA0;LATIN CAPITAL LETTER A WITH DOT BELOW;Lu;0;L;0041 0323;;;;N;;;;1EA1;
+1EA1;LATIN SMALL LETTER A WITH DOT BELOW;Ll;0;L;0061 0323;;;;N;;;1EA0;;1EA0
+1EA2;LATIN CAPITAL LETTER A WITH HOOK ABOVE;Lu;0;L;0041 0309;;;;N;;;;1EA3;
+1EA3;LATIN SMALL LETTER A WITH HOOK ABOVE;Ll;0;L;0061 0309;;;;N;;;1EA2;;1EA2
+1EA4;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00C2 0301;;;;N;;;;1EA5;
+1EA5;LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00E2 0301;;;;N;;;1EA4;;1EA4
+1EA6;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00C2 0300;;;;N;;;;1EA7;
+1EA7;LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00E2 0300;;;;N;;;1EA6;;1EA6
+1EA8;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00C2 0309;;;;N;;;;1EA9;
+1EA9;LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00E2 0309;;;;N;;;1EA8;;1EA8
+1EAA;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE;Lu;0;L;00C2 0303;;;;N;;;;1EAB;
+1EAB;LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE;Ll;0;L;00E2 0303;;;;N;;;1EAA;;1EAA
+1EAC;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EA0 0302;;;;N;;;;1EAD;
+1EAD;LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EA1 0302;;;;N;;;1EAC;;1EAC
+1EAE;LATIN CAPITAL LETTER A WITH BREVE AND ACUTE;Lu;0;L;0102 0301;;;;N;;;;1EAF;
+1EAF;LATIN SMALL LETTER A WITH BREVE AND ACUTE;Ll;0;L;0103 0301;;;;N;;;1EAE;;1EAE
+1EB0;LATIN CAPITAL LETTER A WITH BREVE AND GRAVE;Lu;0;L;0102 0300;;;;N;;;;1EB1;
+1EB1;LATIN SMALL LETTER A WITH BREVE AND GRAVE;Ll;0;L;0103 0300;;;;N;;;1EB0;;1EB0
+1EB2;LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE;Lu;0;L;0102 0309;;;;N;;;;1EB3;
+1EB3;LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE;Ll;0;L;0103 0309;;;;N;;;1EB2;;1EB2
+1EB4;LATIN CAPITAL LETTER A WITH BREVE AND TILDE;Lu;0;L;0102 0303;;;;N;;;;1EB5;
+1EB5;LATIN SMALL LETTER A WITH BREVE AND TILDE;Ll;0;L;0103 0303;;;;N;;;1EB4;;1EB4
+1EB6;LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW;Lu;0;L;1EA0 0306;;;;N;;;;1EB7;
+1EB7;LATIN SMALL LETTER A WITH BREVE AND DOT BELOW;Ll;0;L;1EA1 0306;;;;N;;;1EB6;;1EB6
+1EB8;LATIN CAPITAL LETTER E WITH DOT BELOW;Lu;0;L;0045 0323;;;;N;;;;1EB9;
+1EB9;LATIN SMALL LETTER E WITH DOT BELOW;Ll;0;L;0065 0323;;;;N;;;1EB8;;1EB8
+1EBA;LATIN CAPITAL LETTER E WITH HOOK ABOVE;Lu;0;L;0045 0309;;;;N;;;;1EBB;
+1EBB;LATIN SMALL LETTER E WITH HOOK ABOVE;Ll;0;L;0065 0309;;;;N;;;1EBA;;1EBA
+1EBC;LATIN CAPITAL LETTER E WITH TILDE;Lu;0;L;0045 0303;;;;N;;;;1EBD;
+1EBD;LATIN SMALL LETTER E WITH TILDE;Ll;0;L;0065 0303;;;;N;;;1EBC;;1EBC
+1EBE;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00CA 0301;;;;N;;;;1EBF;
+1EBF;LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00EA 0301;;;;N;;;1EBE;;1EBE
+1EC0;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00CA 0300;;;;N;;;;1EC1;
+1EC1;LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00EA 0300;;;;N;;;1EC0;;1EC0
+1EC2;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00CA 0309;;;;N;;;;1EC3;
+1EC3;LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00EA 0309;;;;N;;;1EC2;;1EC2
+1EC4;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE;Lu;0;L;00CA 0303;;;;N;;;;1EC5;
+1EC5;LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE;Ll;0;L;00EA 0303;;;;N;;;1EC4;;1EC4
+1EC6;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EB8 0302;;;;N;;;;1EC7;
+1EC7;LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EB9 0302;;;;N;;;1EC6;;1EC6
+1EC8;LATIN CAPITAL LETTER I WITH HOOK ABOVE;Lu;0;L;0049 0309;;;;N;;;;1EC9;
+1EC9;LATIN SMALL LETTER I WITH HOOK ABOVE;Ll;0;L;0069 0309;;;;N;;;1EC8;;1EC8
+1ECA;LATIN CAPITAL LETTER I WITH DOT BELOW;Lu;0;L;0049 0323;;;;N;;;;1ECB;
+1ECB;LATIN SMALL LETTER I WITH DOT BELOW;Ll;0;L;0069 0323;;;;N;;;1ECA;;1ECA
+1ECC;LATIN CAPITAL LETTER O WITH DOT BELOW;Lu;0;L;004F 0323;;;;N;;;;1ECD;
+1ECD;LATIN SMALL LETTER O WITH DOT BELOW;Ll;0;L;006F 0323;;;;N;;;1ECC;;1ECC
+1ECE;LATIN CAPITAL LETTER O WITH HOOK ABOVE;Lu;0;L;004F 0309;;;;N;;;;1ECF;
+1ECF;LATIN SMALL LETTER O WITH HOOK ABOVE;Ll;0;L;006F 0309;;;;N;;;1ECE;;1ECE
+1ED0;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00D4 0301;;;;N;;;;1ED1;
+1ED1;LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00F4 0301;;;;N;;;1ED0;;1ED0
+1ED2;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00D4 0300;;;;N;;;;1ED3;
+1ED3;LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00F4 0300;;;;N;;;1ED2;;1ED2
+1ED4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00D4 0309;;;;N;;;;1ED5;
+1ED5;LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00F4 0309;;;;N;;;1ED4;;1ED4
+1ED6;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE;Lu;0;L;00D4 0303;;;;N;;;;1ED7;
+1ED7;LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE;Ll;0;L;00F4 0303;;;;N;;;1ED6;;1ED6
+1ED8;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1ECC 0302;;;;N;;;;1ED9;
+1ED9;LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1ECD 0302;;;;N;;;1ED8;;1ED8
+1EDA;LATIN CAPITAL LETTER O WITH HORN AND ACUTE;Lu;0;L;01A0 0301;;;;N;;;;1EDB;
+1EDB;LATIN SMALL LETTER O WITH HORN AND ACUTE;Ll;0;L;01A1 0301;;;;N;;;1EDA;;1EDA
+1EDC;LATIN CAPITAL LETTER O WITH HORN AND GRAVE;Lu;0;L;01A0 0300;;;;N;;;;1EDD;
+1EDD;LATIN SMALL LETTER O WITH HORN AND GRAVE;Ll;0;L;01A1 0300;;;;N;;;1EDC;;1EDC
+1EDE;LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE;Lu;0;L;01A0 0309;;;;N;;;;1EDF;
+1EDF;LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE;Ll;0;L;01A1 0309;;;;N;;;1EDE;;1EDE
+1EE0;LATIN CAPITAL LETTER O WITH HORN AND TILDE;Lu;0;L;01A0 0303;;;;N;;;;1EE1;
+1EE1;LATIN SMALL LETTER O WITH HORN AND TILDE;Ll;0;L;01A1 0303;;;;N;;;1EE0;;1EE0
+1EE2;LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW;Lu;0;L;01A0 0323;;;;N;;;;1EE3;
+1EE3;LATIN SMALL LETTER O WITH HORN AND DOT BELOW;Ll;0;L;01A1 0323;;;;N;;;1EE2;;1EE2
+1EE4;LATIN CAPITAL LETTER U WITH DOT BELOW;Lu;0;L;0055 0323;;;;N;;;;1EE5;
+1EE5;LATIN SMALL LETTER U WITH DOT BELOW;Ll;0;L;0075 0323;;;;N;;;1EE4;;1EE4
+1EE6;LATIN CAPITAL LETTER U WITH HOOK ABOVE;Lu;0;L;0055 0309;;;;N;;;;1EE7;
+1EE7;LATIN SMALL LETTER U WITH HOOK ABOVE;Ll;0;L;0075 0309;;;;N;;;1EE6;;1EE6
+1EE8;LATIN CAPITAL LETTER U WITH HORN AND ACUTE;Lu;0;L;01AF 0301;;;;N;;;;1EE9;
+1EE9;LATIN SMALL LETTER U WITH HORN AND ACUTE;Ll;0;L;01B0 0301;;;;N;;;1EE8;;1EE8
+1EEA;LATIN CAPITAL LETTER U WITH HORN AND GRAVE;Lu;0;L;01AF 0300;;;;N;;;;1EEB;
+1EEB;LATIN SMALL LETTER U WITH HORN AND GRAVE;Ll;0;L;01B0 0300;;;;N;;;1EEA;;1EEA
+1EEC;LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE;Lu;0;L;01AF 0309;;;;N;;;;1EED;
+1EED;LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE;Ll;0;L;01B0 0309;;;;N;;;1EEC;;1EEC
+1EEE;LATIN CAPITAL LETTER U WITH HORN AND TILDE;Lu;0;L;01AF 0303;;;;N;;;;1EEF;
+1EEF;LATIN SMALL LETTER U WITH HORN AND TILDE;Ll;0;L;01B0 0303;;;;N;;;1EEE;;1EEE
+1EF0;LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW;Lu;0;L;01AF 0323;;;;N;;;;1EF1;
+1EF1;LATIN SMALL LETTER U WITH HORN AND DOT BELOW;Ll;0;L;01B0 0323;;;;N;;;1EF0;;1EF0
+1EF2;LATIN CAPITAL LETTER Y WITH GRAVE;Lu;0;L;0059 0300;;;;N;;;;1EF3;
+1EF3;LATIN SMALL LETTER Y WITH GRAVE;Ll;0;L;0079 0300;;;;N;;;1EF2;;1EF2
+1EF4;LATIN CAPITAL LETTER Y WITH DOT BELOW;Lu;0;L;0059 0323;;;;N;;;;1EF5;
+1EF5;LATIN SMALL LETTER Y WITH DOT BELOW;Ll;0;L;0079 0323;;;;N;;;1EF4;;1EF4
+1EF6;LATIN CAPITAL LETTER Y WITH HOOK ABOVE;Lu;0;L;0059 0309;;;;N;;;;1EF7;
+1EF7;LATIN SMALL LETTER Y WITH HOOK ABOVE;Ll;0;L;0079 0309;;;;N;;;1EF6;;1EF6
+1EF8;LATIN CAPITAL LETTER Y WITH TILDE;Lu;0;L;0059 0303;;;;N;;;;1EF9;
+1EF9;LATIN SMALL LETTER Y WITH TILDE;Ll;0;L;0079 0303;;;;N;;;1EF8;;1EF8
+1EFA;LATIN CAPITAL LETTER MIDDLE-WELSH LL;Lu;0;L;;;;;N;;;;1EFB;
+1EFB;LATIN SMALL LETTER MIDDLE-WELSH LL;Ll;0;L;;;;;N;;;1EFA;;1EFA
+1EFC;LATIN CAPITAL LETTER MIDDLE-WELSH V;Lu;0;L;;;;;N;;;;1EFD;
+1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC
+1EFE;LATIN CAPITAL LETTER Y WITH LOOP;Lu;0;L;;;;;N;;;;1EFF;
+1EFF;LATIN SMALL LETTER Y WITH LOOP;Ll;0;L;;;;;N;;;1EFE;;1EFE
+1F00;GREEK SMALL LETTER ALPHA WITH PSILI;Ll;0;L;03B1 0313;;;;N;;;1F08;;1F08
+1F01;GREEK SMALL LETTER ALPHA WITH DASIA;Ll;0;L;03B1 0314;;;;N;;;1F09;;1F09
+1F02;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA;Ll;0;L;1F00 0300;;;;N;;;1F0A;;1F0A
+1F03;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA;Ll;0;L;1F01 0300;;;;N;;;1F0B;;1F0B
+1F04;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA;Ll;0;L;1F00 0301;;;;N;;;1F0C;;1F0C
+1F05;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA;Ll;0;L;1F01 0301;;;;N;;;1F0D;;1F0D
+1F06;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI;Ll;0;L;1F00 0342;;;;N;;;1F0E;;1F0E
+1F07;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI;Ll;0;L;1F01 0342;;;;N;;;1F0F;;1F0F
+1F08;GREEK CAPITAL LETTER ALPHA WITH PSILI;Lu;0;L;0391 0313;;;;N;;;;1F00;
+1F09;GREEK CAPITAL LETTER ALPHA WITH DASIA;Lu;0;L;0391 0314;;;;N;;;;1F01;
+1F0A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA;Lu;0;L;1F08 0300;;;;N;;;;1F02;
+1F0B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA;Lu;0;L;1F09 0300;;;;N;;;;1F03;
+1F0C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA;Lu;0;L;1F08 0301;;;;N;;;;1F04;
+1F0D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA;Lu;0;L;1F09 0301;;;;N;;;;1F05;
+1F0E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI;Lu;0;L;1F08 0342;;;;N;;;;1F06;
+1F0F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI;Lu;0;L;1F09 0342;;;;N;;;;1F07;
+1F10;GREEK SMALL LETTER EPSILON WITH PSILI;Ll;0;L;03B5 0313;;;;N;;;1F18;;1F18
+1F11;GREEK SMALL LETTER EPSILON WITH DASIA;Ll;0;L;03B5 0314;;;;N;;;1F19;;1F19
+1F12;GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA;Ll;0;L;1F10 0300;;;;N;;;1F1A;;1F1A
+1F13;GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA;Ll;0;L;1F11 0300;;;;N;;;1F1B;;1F1B
+1F14;GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA;Ll;0;L;1F10 0301;;;;N;;;1F1C;;1F1C
+1F15;GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA;Ll;0;L;1F11 0301;;;;N;;;1F1D;;1F1D
+1F18;GREEK CAPITAL LETTER EPSILON WITH PSILI;Lu;0;L;0395 0313;;;;N;;;;1F10;
+1F19;GREEK CAPITAL LETTER EPSILON WITH DASIA;Lu;0;L;0395 0314;;;;N;;;;1F11;
+1F1A;GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA;Lu;0;L;1F18 0300;;;;N;;;;1F12;
+1F1B;GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA;Lu;0;L;1F19 0300;;;;N;;;;1F13;
+1F1C;GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA;Lu;0;L;1F18 0301;;;;N;;;;1F14;
+1F1D;GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA;Lu;0;L;1F19 0301;;;;N;;;;1F15;
+1F20;GREEK SMALL LETTER ETA WITH PSILI;Ll;0;L;03B7 0313;;;;N;;;1F28;;1F28
+1F21;GREEK SMALL LETTER ETA WITH DASIA;Ll;0;L;03B7 0314;;;;N;;;1F29;;1F29
+1F22;GREEK SMALL LETTER ETA WITH PSILI AND VARIA;Ll;0;L;1F20 0300;;;;N;;;1F2A;;1F2A
+1F23;GREEK SMALL LETTER ETA WITH DASIA AND VARIA;Ll;0;L;1F21 0300;;;;N;;;1F2B;;1F2B
+1F24;GREEK SMALL LETTER ETA WITH PSILI AND OXIA;Ll;0;L;1F20 0301;;;;N;;;1F2C;;1F2C
+1F25;GREEK SMALL LETTER ETA WITH DASIA AND OXIA;Ll;0;L;1F21 0301;;;;N;;;1F2D;;1F2D
+1F26;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI;Ll;0;L;1F20 0342;;;;N;;;1F2E;;1F2E
+1F27;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI;Ll;0;L;1F21 0342;;;;N;;;1F2F;;1F2F
+1F28;GREEK CAPITAL LETTER ETA WITH PSILI;Lu;0;L;0397 0313;;;;N;;;;1F20;
+1F29;GREEK CAPITAL LETTER ETA WITH DASIA;Lu;0;L;0397 0314;;;;N;;;;1F21;
+1F2A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA;Lu;0;L;1F28 0300;;;;N;;;;1F22;
+1F2B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA;Lu;0;L;1F29 0300;;;;N;;;;1F23;
+1F2C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA;Lu;0;L;1F28 0301;;;;N;;;;1F24;
+1F2D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA;Lu;0;L;1F29 0301;;;;N;;;;1F25;
+1F2E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI;Lu;0;L;1F28 0342;;;;N;;;;1F26;
+1F2F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI;Lu;0;L;1F29 0342;;;;N;;;;1F27;
+1F30;GREEK SMALL LETTER IOTA WITH PSILI;Ll;0;L;03B9 0313;;;;N;;;1F38;;1F38
+1F31;GREEK SMALL LETTER IOTA WITH DASIA;Ll;0;L;03B9 0314;;;;N;;;1F39;;1F39
+1F32;GREEK SMALL LETTER IOTA WITH PSILI AND VARIA;Ll;0;L;1F30 0300;;;;N;;;1F3A;;1F3A
+1F33;GREEK SMALL LETTER IOTA WITH DASIA AND VARIA;Ll;0;L;1F31 0300;;;;N;;;1F3B;;1F3B
+1F34;GREEK SMALL LETTER IOTA WITH PSILI AND OXIA;Ll;0;L;1F30 0301;;;;N;;;1F3C;;1F3C
+1F35;GREEK SMALL LETTER IOTA WITH DASIA AND OXIA;Ll;0;L;1F31 0301;;;;N;;;1F3D;;1F3D
+1F36;GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI;Ll;0;L;1F30 0342;;;;N;;;1F3E;;1F3E
+1F37;GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI;Ll;0;L;1F31 0342;;;;N;;;1F3F;;1F3F
+1F38;GREEK CAPITAL LETTER IOTA WITH PSILI;Lu;0;L;0399 0313;;;;N;;;;1F30;
+1F39;GREEK CAPITAL LETTER IOTA WITH DASIA;Lu;0;L;0399 0314;;;;N;;;;1F31;
+1F3A;GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA;Lu;0;L;1F38 0300;;;;N;;;;1F32;
+1F3B;GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA;Lu;0;L;1F39 0300;;;;N;;;;1F33;
+1F3C;GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA;Lu;0;L;1F38 0301;;;;N;;;;1F34;
+1F3D;GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA;Lu;0;L;1F39 0301;;;;N;;;;1F35;
+1F3E;GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI;Lu;0;L;1F38 0342;;;;N;;;;1F36;
+1F3F;GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI;Lu;0;L;1F39 0342;;;;N;;;;1F37;
+1F40;GREEK SMALL LETTER OMICRON WITH PSILI;Ll;0;L;03BF 0313;;;;N;;;1F48;;1F48
+1F41;GREEK SMALL LETTER OMICRON WITH DASIA;Ll;0;L;03BF 0314;;;;N;;;1F49;;1F49
+1F42;GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA;Ll;0;L;1F40 0300;;;;N;;;1F4A;;1F4A
+1F43;GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA;Ll;0;L;1F41 0300;;;;N;;;1F4B;;1F4B
+1F44;GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA;Ll;0;L;1F40 0301;;;;N;;;1F4C;;1F4C
+1F45;GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA;Ll;0;L;1F41 0301;;;;N;;;1F4D;;1F4D
+1F48;GREEK CAPITAL LETTER OMICRON WITH PSILI;Lu;0;L;039F 0313;;;;N;;;;1F40;
+1F49;GREEK CAPITAL LETTER OMICRON WITH DASIA;Lu;0;L;039F 0314;;;;N;;;;1F41;
+1F4A;GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA;Lu;0;L;1F48 0300;;;;N;;;;1F42;
+1F4B;GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA;Lu;0;L;1F49 0300;;;;N;;;;1F43;
+1F4C;GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA;Lu;0;L;1F48 0301;;;;N;;;;1F44;
+1F4D;GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA;Lu;0;L;1F49 0301;;;;N;;;;1F45;
+1F50;GREEK SMALL LETTER UPSILON WITH PSILI;Ll;0;L;03C5 0313;;;;N;;;;;
+1F51;GREEK SMALL LETTER UPSILON WITH DASIA;Ll;0;L;03C5 0314;;;;N;;;1F59;;1F59
+1F52;GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA;Ll;0;L;1F50 0300;;;;N;;;;;
+1F53;GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA;Ll;0;L;1F51 0300;;;;N;;;1F5B;;1F5B
+1F54;GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA;Ll;0;L;1F50 0301;;;;N;;;;;
+1F55;GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA;Ll;0;L;1F51 0301;;;;N;;;1F5D;;1F5D
+1F56;GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI;Ll;0;L;1F50 0342;;;;N;;;;;
+1F57;GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI;Ll;0;L;1F51 0342;;;;N;;;1F5F;;1F5F
+1F59;GREEK CAPITAL LETTER UPSILON WITH DASIA;Lu;0;L;03A5 0314;;;;N;;;;1F51;
+1F5B;GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA;Lu;0;L;1F59 0300;;;;N;;;;1F53;
+1F5D;GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA;Lu;0;L;1F59 0301;;;;N;;;;1F55;
+1F5F;GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI;Lu;0;L;1F59 0342;;;;N;;;;1F57;
+1F60;GREEK SMALL LETTER OMEGA WITH PSILI;Ll;0;L;03C9 0313;;;;N;;;1F68;;1F68
+1F61;GREEK SMALL LETTER OMEGA WITH DASIA;Ll;0;L;03C9 0314;;;;N;;;1F69;;1F69
+1F62;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA;Ll;0;L;1F60 0300;;;;N;;;1F6A;;1F6A
+1F63;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA;Ll;0;L;1F61 0300;;;;N;;;1F6B;;1F6B
+1F64;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA;Ll;0;L;1F60 0301;;;;N;;;1F6C;;1F6C
+1F65;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA;Ll;0;L;1F61 0301;;;;N;;;1F6D;;1F6D
+1F66;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI;Ll;0;L;1F60 0342;;;;N;;;1F6E;;1F6E
+1F67;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI;Ll;0;L;1F61 0342;;;;N;;;1F6F;;1F6F
+1F68;GREEK CAPITAL LETTER OMEGA WITH PSILI;Lu;0;L;03A9 0313;;;;N;;;;1F60;
+1F69;GREEK CAPITAL LETTER OMEGA WITH DASIA;Lu;0;L;03A9 0314;;;;N;;;;1F61;
+1F6A;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA;Lu;0;L;1F68 0300;;;;N;;;;1F62;
+1F6B;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA;Lu;0;L;1F69 0300;;;;N;;;;1F63;
+1F6C;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA;Lu;0;L;1F68 0301;;;;N;;;;1F64;
+1F6D;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA;Lu;0;L;1F69 0301;;;;N;;;;1F65;
+1F6E;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI;Lu;0;L;1F68 0342;;;;N;;;;1F66;
+1F6F;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI;Lu;0;L;1F69 0342;;;;N;;;;1F67;
+1F70;GREEK SMALL LETTER ALPHA WITH VARIA;Ll;0;L;03B1 0300;;;;N;;;1FBA;;1FBA
+1F71;GREEK SMALL LETTER ALPHA WITH OXIA;Ll;0;L;03AC;;;;N;;;1FBB;;1FBB
+1F72;GREEK SMALL LETTER EPSILON WITH VARIA;Ll;0;L;03B5 0300;;;;N;;;1FC8;;1FC8
+1F73;GREEK SMALL LETTER EPSILON WITH OXIA;Ll;0;L;03AD;;;;N;;;1FC9;;1FC9
+1F74;GREEK SMALL LETTER ETA WITH VARIA;Ll;0;L;03B7 0300;;;;N;;;1FCA;;1FCA
+1F75;GREEK SMALL LETTER ETA WITH OXIA;Ll;0;L;03AE;;;;N;;;1FCB;;1FCB
+1F76;GREEK SMALL LETTER IOTA WITH VARIA;Ll;0;L;03B9 0300;;;;N;;;1FDA;;1FDA
+1F77;GREEK SMALL LETTER IOTA WITH OXIA;Ll;0;L;03AF;;;;N;;;1FDB;;1FDB
+1F78;GREEK SMALL LETTER OMICRON WITH VARIA;Ll;0;L;03BF 0300;;;;N;;;1FF8;;1FF8
+1F79;GREEK SMALL LETTER OMICRON WITH OXIA;Ll;0;L;03CC;;;;N;;;1FF9;;1FF9
+1F7A;GREEK SMALL LETTER UPSILON WITH VARIA;Ll;0;L;03C5 0300;;;;N;;;1FEA;;1FEA
+1F7B;GREEK SMALL LETTER UPSILON WITH OXIA;Ll;0;L;03CD;;;;N;;;1FEB;;1FEB
+1F7C;GREEK SMALL LETTER OMEGA WITH VARIA;Ll;0;L;03C9 0300;;;;N;;;1FFA;;1FFA
+1F7D;GREEK SMALL LETTER OMEGA WITH OXIA;Ll;0;L;03CE;;;;N;;;1FFB;;1FFB
+1F80;GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F00 0345;;;;N;;;1F88;;1F88
+1F81;GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F01 0345;;;;N;;;1F89;;1F89
+1F82;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F02 0345;;;;N;;;1F8A;;1F8A
+1F83;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F03 0345;;;;N;;;1F8B;;1F8B
+1F84;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F04 0345;;;;N;;;1F8C;;1F8C
+1F85;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F05 0345;;;;N;;;1F8D;;1F8D
+1F86;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F06 0345;;;;N;;;1F8E;;1F8E
+1F87;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F07 0345;;;;N;;;1F8F;;1F8F
+1F88;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F08 0345;;;;N;;;;1F80;
+1F89;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F09 0345;;;;N;;;;1F81;
+1F8A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0A 0345;;;;N;;;;1F82;
+1F8B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0B 0345;;;;N;;;;1F83;
+1F8C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0C 0345;;;;N;;;;1F84;
+1F8D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0D 0345;;;;N;;;;1F85;
+1F8E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0E 0345;;;;N;;;;1F86;
+1F8F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0F 0345;;;;N;;;;1F87;
+1F90;GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F20 0345;;;;N;;;1F98;;1F98
+1F91;GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F21 0345;;;;N;;;1F99;;1F99
+1F92;GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F22 0345;;;;N;;;1F9A;;1F9A
+1F93;GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F23 0345;;;;N;;;1F9B;;1F9B
+1F94;GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F24 0345;;;;N;;;1F9C;;1F9C
+1F95;GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F25 0345;;;;N;;;1F9D;;1F9D
+1F96;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F26 0345;;;;N;;;1F9E;;1F9E
+1F97;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F27 0345;;;;N;;;1F9F;;1F9F
+1F98;GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F28 0345;;;;N;;;;1F90;
+1F99;GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F29 0345;;;;N;;;;1F91;
+1F9A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2A 0345;;;;N;;;;1F92;
+1F9B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2B 0345;;;;N;;;;1F93;
+1F9C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2C 0345;;;;N;;;;1F94;
+1F9D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2D 0345;;;;N;;;;1F95;
+1F9E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2E 0345;;;;N;;;;1F96;
+1F9F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2F 0345;;;;N;;;;1F97;
+1FA0;GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F60 0345;;;;N;;;1FA8;;1FA8
+1FA1;GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F61 0345;;;;N;;;1FA9;;1FA9
+1FA2;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F62 0345;;;;N;;;1FAA;;1FAA
+1FA3;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F63 0345;;;;N;;;1FAB;;1FAB
+1FA4;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F64 0345;;;;N;;;1FAC;;1FAC
+1FA5;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F65 0345;;;;N;;;1FAD;;1FAD
+1FA6;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F66 0345;;;;N;;;1FAE;;1FAE
+1FA7;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F67 0345;;;;N;;;1FAF;;1FAF
+1FA8;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F68 0345;;;;N;;;;1FA0;
+1FA9;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F69 0345;;;;N;;;;1FA1;
+1FAA;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6A 0345;;;;N;;;;1FA2;
+1FAB;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6B 0345;;;;N;;;;1FA3;
+1FAC;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6C 0345;;;;N;;;;1FA4;
+1FAD;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6D 0345;;;;N;;;;1FA5;
+1FAE;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6E 0345;;;;N;;;;1FA6;
+1FAF;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6F 0345;;;;N;;;;1FA7;
+1FB0;GREEK SMALL LETTER ALPHA WITH VRACHY;Ll;0;L;03B1 0306;;;;N;;;1FB8;;1FB8
+1FB1;GREEK SMALL LETTER ALPHA WITH MACRON;Ll;0;L;03B1 0304;;;;N;;;1FB9;;1FB9
+1FB2;GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F70 0345;;;;N;;;;;
+1FB3;GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI;Ll;0;L;03B1 0345;;;;N;;;1FBC;;1FBC
+1FB4;GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AC 0345;;;;N;;;;;
+1FB6;GREEK SMALL LETTER ALPHA WITH PERISPOMENI;Ll;0;L;03B1 0342;;;;N;;;;;
+1FB7;GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FB6 0345;;;;N;;;;;
+1FB8;GREEK CAPITAL LETTER ALPHA WITH VRACHY;Lu;0;L;0391 0306;;;;N;;;;1FB0;
+1FB9;GREEK CAPITAL LETTER ALPHA WITH MACRON;Lu;0;L;0391 0304;;;;N;;;;1FB1;
+1FBA;GREEK CAPITAL LETTER ALPHA WITH VARIA;Lu;0;L;0391 0300;;;;N;;;;1F70;
+1FBB;GREEK CAPITAL LETTER ALPHA WITH OXIA;Lu;0;L;0386;;;;N;;;;1F71;
+1FBC;GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI;Lt;0;L;0391 0345;;;;N;;;;1FB3;
+1FBD;GREEK KORONIS;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
+1FBE;GREEK PROSGEGRAMMENI;Ll;0;L;03B9;;;;N;;;0399;;0399
+1FBF;GREEK PSILI;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
+1FC0;GREEK PERISPOMENI;Sk;0;ON;<compat> 0020 0342;;;;N;;;;;
+1FC1;GREEK DIALYTIKA AND PERISPOMENI;Sk;0;ON;00A8 0342;;;;N;;;;;
+1FC2;GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F74 0345;;;;N;;;;;
+1FC3;GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI;Ll;0;L;03B7 0345;;;;N;;;1FCC;;1FCC
+1FC4;GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AE 0345;;;;N;;;;;
+1FC6;GREEK SMALL LETTER ETA WITH PERISPOMENI;Ll;0;L;03B7 0342;;;;N;;;;;
+1FC7;GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FC6 0345;;;;N;;;;;
+1FC8;GREEK CAPITAL LETTER EPSILON WITH VARIA;Lu;0;L;0395 0300;;;;N;;;;1F72;
+1FC9;GREEK CAPITAL LETTER EPSILON WITH OXIA;Lu;0;L;0388;;;;N;;;;1F73;
+1FCA;GREEK CAPITAL LETTER ETA WITH VARIA;Lu;0;L;0397 0300;;;;N;;;;1F74;
+1FCB;GREEK CAPITAL LETTER ETA WITH OXIA;Lu;0;L;0389;;;;N;;;;1F75;
+1FCC;GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI;Lt;0;L;0397 0345;;;;N;;;;1FC3;
+1FCD;GREEK PSILI AND VARIA;Sk;0;ON;1FBF 0300;;;;N;;;;;
+1FCE;GREEK PSILI AND OXIA;Sk;0;ON;1FBF 0301;;;;N;;;;;
+1FCF;GREEK PSILI AND PERISPOMENI;Sk;0;ON;1FBF 0342;;;;N;;;;;
+1FD0;GREEK SMALL LETTER IOTA WITH VRACHY;Ll;0;L;03B9 0306;;;;N;;;1FD8;;1FD8
+1FD1;GREEK SMALL LETTER IOTA WITH MACRON;Ll;0;L;03B9 0304;;;;N;;;1FD9;;1FD9
+1FD2;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA;Ll;0;L;03CA 0300;;;;N;;;;;
+1FD3;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA;Ll;0;L;0390;;;;N;;;;;
+1FD6;GREEK SMALL LETTER IOTA WITH PERISPOMENI;Ll;0;L;03B9 0342;;;;N;;;;;
+1FD7;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CA 0342;;;;N;;;;;
+1FD8;GREEK CAPITAL LETTER IOTA WITH VRACHY;Lu;0;L;0399 0306;;;;N;;;;1FD0;
+1FD9;GREEK CAPITAL LETTER IOTA WITH MACRON;Lu;0;L;0399 0304;;;;N;;;;1FD1;
+1FDA;GREEK CAPITAL LETTER IOTA WITH VARIA;Lu;0;L;0399 0300;;;;N;;;;1F76;
+1FDB;GREEK CAPITAL LETTER IOTA WITH OXIA;Lu;0;L;038A;;;;N;;;;1F77;
+1FDD;GREEK DASIA AND VARIA;Sk;0;ON;1FFE 0300;;;;N;;;;;
+1FDE;GREEK DASIA AND OXIA;Sk;0;ON;1FFE 0301;;;;N;;;;;
+1FDF;GREEK DASIA AND PERISPOMENI;Sk;0;ON;1FFE 0342;;;;N;;;;;
+1FE0;GREEK SMALL LETTER UPSILON WITH VRACHY;Ll;0;L;03C5 0306;;;;N;;;1FE8;;1FE8
+1FE1;GREEK SMALL LETTER UPSILON WITH MACRON;Ll;0;L;03C5 0304;;;;N;;;1FE9;;1FE9
+1FE2;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA;Ll;0;L;03CB 0300;;;;N;;;;;
+1FE3;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA;Ll;0;L;03B0;;;;N;;;;;
+1FE4;GREEK SMALL LETTER RHO WITH PSILI;Ll;0;L;03C1 0313;;;;N;;;;;
+1FE5;GREEK SMALL LETTER RHO WITH DASIA;Ll;0;L;03C1 0314;;;;N;;;1FEC;;1FEC
+1FE6;GREEK SMALL LETTER UPSILON WITH PERISPOMENI;Ll;0;L;03C5 0342;;;;N;;;;;
+1FE7;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CB 0342;;;;N;;;;;
+1FE8;GREEK CAPITAL LETTER UPSILON WITH VRACHY;Lu;0;L;03A5 0306;;;;N;;;;1FE0;
+1FE9;GREEK CAPITAL LETTER UPSILON WITH MACRON;Lu;0;L;03A5 0304;;;;N;;;;1FE1;
+1FEA;GREEK CAPITAL LETTER UPSILON WITH VARIA;Lu;0;L;03A5 0300;;;;N;;;;1F7A;
+1FEB;GREEK CAPITAL LETTER UPSILON WITH OXIA;Lu;0;L;038E;;;;N;;;;1F7B;
+1FEC;GREEK CAPITAL LETTER RHO WITH DASIA;Lu;0;L;03A1 0314;;;;N;;;;1FE5;
+1FED;GREEK DIALYTIKA AND VARIA;Sk;0;ON;00A8 0300;;;;N;;;;;
+1FEE;GREEK DIALYTIKA AND OXIA;Sk;0;ON;0385;;;;N;;;;;
+1FEF;GREEK VARIA;Sk;0;ON;0060;;;;N;;;;;
+1FF2;GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F7C 0345;;;;N;;;;;
+1FF3;GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI;Ll;0;L;03C9 0345;;;;N;;;1FFC;;1FFC
+1FF4;GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03CE 0345;;;;N;;;;;
+1FF6;GREEK SMALL LETTER OMEGA WITH PERISPOMENI;Ll;0;L;03C9 0342;;;;N;;;;;
+1FF7;GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FF6 0345;;;;N;;;;;
+1FF8;GREEK CAPITAL LETTER OMICRON WITH VARIA;Lu;0;L;039F 0300;;;;N;;;;1F78;
+1FF9;GREEK CAPITAL LETTER OMICRON WITH OXIA;Lu;0;L;038C;;;;N;;;;1F79;
+1FFA;GREEK CAPITAL LETTER OMEGA WITH VARIA;Lu;0;L;03A9 0300;;;;N;;;;1F7C;
+1FFB;GREEK CAPITAL LETTER OMEGA WITH OXIA;Lu;0;L;038F;;;;N;;;;1F7D;
+1FFC;GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI;Lt;0;L;03A9 0345;;;;N;;;;1FF3;
+1FFD;GREEK OXIA;Sk;0;ON;00B4;;;;N;;;;;
+1FFE;GREEK DASIA;Sk;0;ON;<compat> 0020 0314;;;;N;;;;;
+2000;EN QUAD;Zs;0;WS;2002;;;;N;;;;;
+2001;EM QUAD;Zs;0;WS;2003;;;;N;;;;;
+2002;EN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2003;EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2004;THREE-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2005;FOUR-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2006;SIX-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2007;FIGURE SPACE;Zs;0;WS;<noBreak> 0020;;;;N;;;;;
+2008;PUNCTUATION SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2009;THIN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+200A;HAIR SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+200B;ZERO WIDTH SPACE;Cf;0;BN;;;;;N;;;;;
+200C;ZERO WIDTH NON-JOINER;Cf;0;BN;;;;;N;;;;;
+200D;ZERO WIDTH JOINER;Cf;0;BN;;;;;N;;;;;
+200E;LEFT-TO-RIGHT MARK;Cf;0;L;;;;;N;;;;;
+200F;RIGHT-TO-LEFT MARK;Cf;0;R;;;;;N;;;;;
+2010;HYPHEN;Pd;0;ON;;;;;N;;;;;
+2011;NON-BREAKING HYPHEN;Pd;0;ON;<noBreak> 2010;;;;N;;;;;
+2012;FIGURE DASH;Pd;0;ON;;;;;N;;;;;
+2013;EN DASH;Pd;0;ON;;;;;N;;;;;
+2014;EM DASH;Pd;0;ON;;;;;N;;;;;
+2015;HORIZONTAL BAR;Pd;0;ON;;;;;N;QUOTATION DASH;;;;
+2016;DOUBLE VERTICAL LINE;Po;0;ON;;;;;N;DOUBLE VERTICAL BAR;;;;
+2017;DOUBLE LOW LINE;Po;0;ON;<compat> 0020 0333;;;;N;SPACING DOUBLE UNDERSCORE;;;;
+2018;LEFT SINGLE QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE TURNED COMMA QUOTATION MARK;;;;
+2019;RIGHT SINGLE QUOTATION MARK;Pf;0;ON;;;;;N;SINGLE COMMA QUOTATION MARK;;;;
+201A;SINGLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW SINGLE COMMA QUOTATION MARK;;;;
+201B;SINGLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE REVERSED COMMA QUOTATION MARK;;;;
+201C;LEFT DOUBLE QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE TURNED COMMA QUOTATION MARK;;;;
+201D;RIGHT DOUBLE QUOTATION MARK;Pf;0;ON;;;;;N;DOUBLE COMMA QUOTATION MARK;;;;
+201E;DOUBLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW DOUBLE COMMA QUOTATION MARK;;;;
+201F;DOUBLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE REVERSED COMMA QUOTATION MARK;;;;
+2020;DAGGER;Po;0;ON;;;;;N;;;;;
+2021;DOUBLE DAGGER;Po;0;ON;;;;;N;;;;;
+2022;BULLET;Po;0;ON;;;;;N;;;;;
+2023;TRIANGULAR BULLET;Po;0;ON;;;;;N;;;;;
+2024;ONE DOT LEADER;Po;0;ON;<compat> 002E;;;;N;;;;;
+2025;TWO DOT LEADER;Po;0;ON;<compat> 002E 002E;;;;N;;;;;
+2026;HORIZONTAL ELLIPSIS;Po;0;ON;<compat> 002E 002E 002E;;;;N;;;;;
+2027;HYPHENATION POINT;Po;0;ON;;;;;N;;;;;
+2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;;
+2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;;
+202A;LEFT-TO-RIGHT EMBEDDING;Cf;0;LRE;;;;;N;;;;;
+202B;RIGHT-TO-LEFT EMBEDDING;Cf;0;RLE;;;;;N;;;;;
+202C;POP DIRECTIONAL FORMATTING;Cf;0;PDF;;;;;N;;;;;
+202D;LEFT-TO-RIGHT OVERRIDE;Cf;0;LRO;;;;;N;;;;;
+202E;RIGHT-TO-LEFT OVERRIDE;Cf;0;RLO;;;;;N;;;;;
+202F;NARROW NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;;;;;
+2030;PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
+2031;PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
+2032;PRIME;Po;0;ET;;;;;N;;;;;
+2033;DOUBLE PRIME;Po;0;ET;<compat> 2032 2032;;;;N;;;;;
+2034;TRIPLE PRIME;Po;0;ET;<compat> 2032 2032 2032;;;;N;;;;;
+2035;REVERSED PRIME;Po;0;ON;;;;;N;;;;;
+2036;REVERSED DOUBLE PRIME;Po;0;ON;<compat> 2035 2035;;;;N;;;;;
+2037;REVERSED TRIPLE PRIME;Po;0;ON;<compat> 2035 2035 2035;;;;N;;;;;
+2038;CARET;Po;0;ON;;;;;N;;;;;
+2039;SINGLE LEFT-POINTING ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING SINGLE GUILLEMET;;;;
+203A;SINGLE RIGHT-POINTING ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING SINGLE GUILLEMET;;;;
+203B;REFERENCE MARK;Po;0;ON;;;;;N;;;;;
+203C;DOUBLE EXCLAMATION MARK;Po;0;ON;<compat> 0021 0021;;;;N;;;;;
+203D;INTERROBANG;Po;0;ON;;;;;N;;;;;
+203E;OVERLINE;Po;0;ON;<compat> 0020 0305;;;;N;SPACING OVERSCORE;;;;
+203F;UNDERTIE;Pc;0;ON;;;;;N;;;;;
+2040;CHARACTER TIE;Pc;0;ON;;;;;N;;;;;
+2041;CARET INSERTION POINT;Po;0;ON;;;;;N;;;;;
+2042;ASTERISM;Po;0;ON;;;;;N;;;;;
+2043;HYPHEN BULLET;Po;0;ON;;;;;N;;;;;
+2044;FRACTION SLASH;Sm;0;CS;;;;;N;;;;;
+2045;LEFT SQUARE BRACKET WITH QUILL;Ps;0;ON;;;;;Y;;;;;
+2046;RIGHT SQUARE BRACKET WITH QUILL;Pe;0;ON;;;;;Y;;;;;
+2047;DOUBLE QUESTION MARK;Po;0;ON;<compat> 003F 003F;;;;N;;;;;
+2048;QUESTION EXCLAMATION MARK;Po;0;ON;<compat> 003F 0021;;;;N;;;;;
+2049;EXCLAMATION QUESTION MARK;Po;0;ON;<compat> 0021 003F;;;;N;;;;;
+204A;TIRONIAN SIGN ET;Po;0;ON;;;;;N;;;;;
+204B;REVERSED PILCROW SIGN;Po;0;ON;;;;;N;;;;;
+204C;BLACK LEFTWARDS BULLET;Po;0;ON;;;;;N;;;;;
+204D;BLACK RIGHTWARDS BULLET;Po;0;ON;;;;;N;;;;;
+204E;LOW ASTERISK;Po;0;ON;;;;;N;;;;;
+204F;REVERSED SEMICOLON;Po;0;ON;;;;;N;;;;;
+2050;CLOSE UP;Po;0;ON;;;;;N;;;;;
+2051;TWO ASTERISKS ALIGNED VERTICALLY;Po;0;ON;;;;;N;;;;;
+2052;COMMERCIAL MINUS SIGN;Sm;0;ON;;;;;N;;;;;
+2053;SWUNG DASH;Po;0;ON;;;;;N;;;;;
+2054;INVERTED UNDERTIE;Pc;0;ON;;;;;N;;;;;
+2055;FLOWER PUNCTUATION MARK;Po;0;ON;;;;;N;;;;;
+2056;THREE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2057;QUADRUPLE PRIME;Po;0;ON;<compat> 2032 2032 2032 2032;;;;N;;;;;
+2058;FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2059;FIVE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+205A;TWO DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+205B;FOUR DOT MARK;Po;0;ON;;;;;N;;;;;
+205C;DOTTED CROSS;Po;0;ON;;;;;N;;;;;
+205D;TRICOLON;Po;0;ON;;;;;N;;;;;
+205E;VERTICAL FOUR DOTS;Po;0;ON;;;;;N;;;;;
+205F;MEDIUM MATHEMATICAL SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2060;WORD JOINER;Cf;0;BN;;;;;N;;;;;
+2061;FUNCTION APPLICATION;Cf;0;BN;;;;;N;;;;;
+2062;INVISIBLE TIMES;Cf;0;BN;;;;;N;;;;;
+2063;INVISIBLE SEPARATOR;Cf;0;BN;;;;;N;;;;;
+2064;INVISIBLE PLUS;Cf;0;BN;;;;;N;;;;;
+2066;LEFT-TO-RIGHT ISOLATE;Cf;0;LRI;;;;;N;;;;;
+2067;RIGHT-TO-LEFT ISOLATE;Cf;0;RLI;;;;;N;;;;;
+2068;FIRST STRONG ISOLATE;Cf;0;FSI;;;;;N;;;;;
+2069;POP DIRECTIONAL ISOLATE;Cf;0;PDI;;;;;N;;;;;
+206A;INHIBIT SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
+206B;ACTIVATE SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
+206C;INHIBIT ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
+206D;ACTIVATE ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
+206E;NATIONAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
+206F;NOMINAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
+2070;SUPERSCRIPT ZERO;No;0;EN;<super> 0030;;0;0;N;SUPERSCRIPT DIGIT ZERO;;;;
+2071;SUPERSCRIPT LATIN SMALL LETTER I;Lm;0;L;<super> 0069;;;;N;;;;;
+2074;SUPERSCRIPT FOUR;No;0;EN;<super> 0034;;4;4;N;SUPERSCRIPT DIGIT FOUR;;;;
+2075;SUPERSCRIPT FIVE;No;0;EN;<super> 0035;;5;5;N;SUPERSCRIPT DIGIT FIVE;;;;
+2076;SUPERSCRIPT SIX;No;0;EN;<super> 0036;;6;6;N;SUPERSCRIPT DIGIT SIX;;;;
+2077;SUPERSCRIPT SEVEN;No;0;EN;<super> 0037;;7;7;N;SUPERSCRIPT DIGIT SEVEN;;;;
+2078;SUPERSCRIPT EIGHT;No;0;EN;<super> 0038;;8;8;N;SUPERSCRIPT DIGIT EIGHT;;;;
+2079;SUPERSCRIPT NINE;No;0;EN;<super> 0039;;9;9;N;SUPERSCRIPT DIGIT NINE;;;;
+207A;SUPERSCRIPT PLUS SIGN;Sm;0;ES;<super> 002B;;;;N;;;;;
+207B;SUPERSCRIPT MINUS;Sm;0;ES;<super> 2212;;;;N;SUPERSCRIPT HYPHEN-MINUS;;;;
+207C;SUPERSCRIPT EQUALS SIGN;Sm;0;ON;<super> 003D;;;;N;;;;;
+207D;SUPERSCRIPT LEFT PARENTHESIS;Ps;0;ON;<super> 0028;;;;Y;SUPERSCRIPT OPENING PARENTHESIS;;;;
+207E;SUPERSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<super> 0029;;;;Y;SUPERSCRIPT CLOSING PARENTHESIS;;;;
+207F;SUPERSCRIPT LATIN SMALL LETTER N;Lm;0;L;<super> 006E;;;;N;;;;;
+2080;SUBSCRIPT ZERO;No;0;EN;<sub> 0030;;0;0;N;SUBSCRIPT DIGIT ZERO;;;;
+2081;SUBSCRIPT ONE;No;0;EN;<sub> 0031;;1;1;N;SUBSCRIPT DIGIT ONE;;;;
+2082;SUBSCRIPT TWO;No;0;EN;<sub> 0032;;2;2;N;SUBSCRIPT DIGIT TWO;;;;
+2083;SUBSCRIPT THREE;No;0;EN;<sub> 0033;;3;3;N;SUBSCRIPT DIGIT THREE;;;;
+2084;SUBSCRIPT FOUR;No;0;EN;<sub> 0034;;4;4;N;SUBSCRIPT DIGIT FOUR;;;;
+2085;SUBSCRIPT FIVE;No;0;EN;<sub> 0035;;5;5;N;SUBSCRIPT DIGIT FIVE;;;;
+2086;SUBSCRIPT SIX;No;0;EN;<sub> 0036;;6;6;N;SUBSCRIPT DIGIT SIX;;;;
+2087;SUBSCRIPT SEVEN;No;0;EN;<sub> 0037;;7;7;N;SUBSCRIPT DIGIT SEVEN;;;;
+2088;SUBSCRIPT EIGHT;No;0;EN;<sub> 0038;;8;8;N;SUBSCRIPT DIGIT EIGHT;;;;
+2089;SUBSCRIPT NINE;No;0;EN;<sub> 0039;;9;9;N;SUBSCRIPT DIGIT NINE;;;;
+208A;SUBSCRIPT PLUS SIGN;Sm;0;ES;<sub> 002B;;;;N;;;;;
+208B;SUBSCRIPT MINUS;Sm;0;ES;<sub> 2212;;;;N;SUBSCRIPT HYPHEN-MINUS;;;;
+208C;SUBSCRIPT EQUALS SIGN;Sm;0;ON;<sub> 003D;;;;N;;;;;
+208D;SUBSCRIPT LEFT PARENTHESIS;Ps;0;ON;<sub> 0028;;;;Y;SUBSCRIPT OPENING PARENTHESIS;;;;
+208E;SUBSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<sub> 0029;;;;Y;SUBSCRIPT CLOSING PARENTHESIS;;;;
+2090;LATIN SUBSCRIPT SMALL LETTER A;Lm;0;L;<sub> 0061;;;;N;;;;;
+2091;LATIN SUBSCRIPT SMALL LETTER E;Lm;0;L;<sub> 0065;;;;N;;;;;
+2092;LATIN SUBSCRIPT SMALL LETTER O;Lm;0;L;<sub> 006F;;;;N;;;;;
+2093;LATIN SUBSCRIPT SMALL LETTER X;Lm;0;L;<sub> 0078;;;;N;;;;;
+2094;LATIN SUBSCRIPT SMALL LETTER SCHWA;Lm;0;L;<sub> 0259;;;;N;;;;;
+2095;LATIN SUBSCRIPT SMALL LETTER H;Lm;0;L;<sub> 0068;;;;N;;;;;
+2096;LATIN SUBSCRIPT SMALL LETTER K;Lm;0;L;<sub> 006B;;;;N;;;;;
+2097;LATIN SUBSCRIPT SMALL LETTER L;Lm;0;L;<sub> 006C;;;;N;;;;;
+2098;LATIN SUBSCRIPT SMALL LETTER M;Lm;0;L;<sub> 006D;;;;N;;;;;
+2099;LATIN SUBSCRIPT SMALL LETTER N;Lm;0;L;<sub> 006E;;;;N;;;;;
+209A;LATIN SUBSCRIPT SMALL LETTER P;Lm;0;L;<sub> 0070;;;;N;;;;;
+209B;LATIN SUBSCRIPT SMALL LETTER S;Lm;0;L;<sub> 0073;;;;N;;;;;
+209C;LATIN SUBSCRIPT SMALL LETTER T;Lm;0;L;<sub> 0074;;;;N;;;;;
+20A0;EURO-CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
+20A1;COLON SIGN;Sc;0;ET;;;;;N;;;;;
+20A2;CRUZEIRO SIGN;Sc;0;ET;;;;;N;;;;;
+20A3;FRENCH FRANC SIGN;Sc;0;ET;;;;;N;;;;;
+20A4;LIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20A5;MILL SIGN;Sc;0;ET;;;;;N;;;;;
+20A6;NAIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20A7;PESETA SIGN;Sc;0;ET;;;;;N;;;;;
+20A8;RUPEE SIGN;Sc;0;ET;<compat> 0052 0073;;;;N;;;;;
+20A9;WON SIGN;Sc;0;ET;;;;;N;;;;;
+20AA;NEW SHEQEL SIGN;Sc;0;ET;;;;;N;;;;;
+20AB;DONG SIGN;Sc;0;ET;;;;;N;;;;;
+20AC;EURO SIGN;Sc;0;ET;;;;;N;;;;;
+20AD;KIP SIGN;Sc;0;ET;;;;;N;;;;;
+20AE;TUGRIK SIGN;Sc;0;ET;;;;;N;;;;;
+20AF;DRACHMA SIGN;Sc;0;ET;;;;;N;;;;;
+20B0;GERMAN PENNY SIGN;Sc;0;ET;;;;;N;;;;;
+20B1;PESO SIGN;Sc;0;ET;;;;;N;;;;;
+20B2;GUARANI SIGN;Sc;0;ET;;;;;N;;;;;
+20B3;AUSTRAL SIGN;Sc;0;ET;;;;;N;;;;;
+20B4;HRYVNIA SIGN;Sc;0;ET;;;;;N;;;;;
+20B5;CEDI SIGN;Sc;0;ET;;;;;N;;;;;
+20B6;LIVRE TOURNOIS SIGN;Sc;0;ET;;;;;N;;;;;
+20B7;SPESMILO SIGN;Sc;0;ET;;;;;N;;;;;
+20B8;TENGE SIGN;Sc;0;ET;;;;;N;;;;;
+20B9;INDIAN RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+20BA;TURKISH LIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20BB;NORDIC MARK SIGN;Sc;0;ET;;;;;N;;;;;
+20BC;MANAT SIGN;Sc;0;ET;;;;;N;;;;;
+20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;;
+20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;;
+20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;;
+20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
+20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
+20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
+20D3;COMBINING SHORT VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT VERTICAL BAR OVERLAY;;;;
+20D4;COMBINING ANTICLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING ANTICLOCKWISE ARROW ABOVE;;;;
+20D5;COMBINING CLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING CLOCKWISE ARROW ABOVE;;;;
+20D6;COMBINING LEFT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT ARROW ABOVE;;;;
+20D7;COMBINING RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT ARROW ABOVE;;;;
+20D8;COMBINING RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING RING OVERLAY;;;;
+20D9;COMBINING CLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING CLOCKWISE RING OVERLAY;;;;
+20DA;COMBINING ANTICLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING ANTICLOCKWISE RING OVERLAY;;;;
+20DB;COMBINING THREE DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING THREE DOTS ABOVE;;;;
+20DC;COMBINING FOUR DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING FOUR DOTS ABOVE;;;;
+20DD;COMBINING ENCLOSING CIRCLE;Me;0;NSM;;;;;N;ENCLOSING CIRCLE;;;;
+20DE;COMBINING ENCLOSING SQUARE;Me;0;NSM;;;;;N;ENCLOSING SQUARE;;;;
+20DF;COMBINING ENCLOSING DIAMOND;Me;0;NSM;;;;;N;ENCLOSING DIAMOND;;;;
+20E0;COMBINING ENCLOSING CIRCLE BACKSLASH;Me;0;NSM;;;;;N;ENCLOSING CIRCLE SLASH;;;;
+20E1;COMBINING LEFT RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT RIGHT ARROW ABOVE;;;;
+20E2;COMBINING ENCLOSING SCREEN;Me;0;NSM;;;;;N;;;;;
+20E3;COMBINING ENCLOSING KEYCAP;Me;0;NSM;;;;;N;;;;;
+20E4;COMBINING ENCLOSING UPWARD POINTING TRIANGLE;Me;0;NSM;;;;;N;;;;;
+20E5;COMBINING REVERSE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20E6;COMBINING DOUBLE VERTICAL STROKE OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20E7;COMBINING ANNUITY SYMBOL;Mn;230;NSM;;;;;N;;;;;
+20E8;COMBINING TRIPLE UNDERDOT;Mn;220;NSM;;;;;N;;;;;
+20E9;COMBINING WIDE BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+20EA;COMBINING LEFTWARDS ARROW OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20EB;COMBINING LONG DOUBLE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20EC;COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
+20ED;COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
+20EE;COMBINING LEFT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+20EF;COMBINING RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+20F0;COMBINING ASTERISK ABOVE;Mn;230;NSM;;;;;N;;;;;
+2100;ACCOUNT OF;So;0;ON;<compat> 0061 002F 0063;;;;N;;;;;
+2101;ADDRESSED TO THE SUBJECT;So;0;ON;<compat> 0061 002F 0073;;;;N;;;;;
+2102;DOUBLE-STRUCK CAPITAL C;Lu;0;L;<font> 0043;;;;N;DOUBLE-STRUCK C;;;;
+2103;DEGREE CELSIUS;So;0;ON;<compat> 00B0 0043;;;;N;DEGREES CENTIGRADE;;;;
+2104;CENTRE LINE SYMBOL;So;0;ON;;;;;N;C L SYMBOL;;;;
+2105;CARE OF;So;0;ON;<compat> 0063 002F 006F;;;;N;;;;;
+2106;CADA UNA;So;0;ON;<compat> 0063 002F 0075;;;;N;;;;;
+2107;EULER CONSTANT;Lu;0;L;<compat> 0190;;;;N;EULERS;;;;
+2108;SCRUPLE;So;0;ON;;;;;N;;;;;
+2109;DEGREE FAHRENHEIT;So;0;ON;<compat> 00B0 0046;;;;N;DEGREES FAHRENHEIT;;;;
+210A;SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+210B;SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;SCRIPT H;;;;
+210C;BLACK-LETTER CAPITAL H;Lu;0;L;<font> 0048;;;;N;BLACK-LETTER H;;;;
+210D;DOUBLE-STRUCK CAPITAL H;Lu;0;L;<font> 0048;;;;N;DOUBLE-STRUCK H;;;;
+210E;PLANCK CONSTANT;Ll;0;L;<font> 0068;;;;N;;;;;
+210F;PLANCK CONSTANT OVER TWO PI;Ll;0;L;<font> 0127;;;;N;PLANCK CONSTANT OVER 2 PI;;;;
+2110;SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;SCRIPT I;;;;
+2111;BLACK-LETTER CAPITAL I;Lu;0;L;<font> 0049;;;;N;BLACK-LETTER I;;;;
+2112;SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;SCRIPT L;;;;
+2113;SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+2114;L B BAR SYMBOL;So;0;ON;;;;;N;;;;;
+2115;DOUBLE-STRUCK CAPITAL N;Lu;0;L;<font> 004E;;;;N;DOUBLE-STRUCK N;;;;
+2116;NUMERO SIGN;So;0;ON;<compat> 004E 006F;;;;N;NUMERO;;;;
+2117;SOUND RECORDING COPYRIGHT;So;0;ON;;;;;N;;;;;
+2118;SCRIPT CAPITAL P;Sm;0;ON;;;;;N;SCRIPT P;;;;
+2119;DOUBLE-STRUCK CAPITAL P;Lu;0;L;<font> 0050;;;;N;DOUBLE-STRUCK P;;;;
+211A;DOUBLE-STRUCK CAPITAL Q;Lu;0;L;<font> 0051;;;;N;DOUBLE-STRUCK Q;;;;
+211B;SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;SCRIPT R;;;;
+211C;BLACK-LETTER CAPITAL R;Lu;0;L;<font> 0052;;;;N;BLACK-LETTER R;;;;
+211D;DOUBLE-STRUCK CAPITAL R;Lu;0;L;<font> 0052;;;;N;DOUBLE-STRUCK R;;;;
+211E;PRESCRIPTION TAKE;So;0;ON;;;;;N;;;;;
+211F;RESPONSE;So;0;ON;;;;;N;;;;;
+2120;SERVICE MARK;So;0;ON;<super> 0053 004D;;;;N;;;;;
+2121;TELEPHONE SIGN;So;0;ON;<compat> 0054 0045 004C;;;;N;T E L SYMBOL;;;;
+2122;TRADE MARK SIGN;So;0;ON;<super> 0054 004D;;;;N;TRADEMARK;;;;
+2123;VERSICLE;So;0;ON;;;;;N;;;;;
+2124;DOUBLE-STRUCK CAPITAL Z;Lu;0;L;<font> 005A;;;;N;DOUBLE-STRUCK Z;;;;
+2125;OUNCE SIGN;So;0;ON;;;;;N;OUNCE;;;;
+2126;OHM SIGN;Lu;0;L;03A9;;;;N;OHM;;;03C9;
+2127;INVERTED OHM SIGN;So;0;ON;;;;;N;MHO;;;;
+2128;BLACK-LETTER CAPITAL Z;Lu;0;L;<font> 005A;;;;N;BLACK-LETTER Z;;;;
+2129;TURNED GREEK SMALL LETTER IOTA;So;0;ON;;;;;N;;;;;
+212A;KELVIN SIGN;Lu;0;L;004B;;;;N;DEGREES KELVIN;;;006B;
+212B;ANGSTROM SIGN;Lu;0;L;00C5;;;;N;ANGSTROM UNIT;;;00E5;
+212C;SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;SCRIPT B;;;;
+212D;BLACK-LETTER CAPITAL C;Lu;0;L;<font> 0043;;;;N;BLACK-LETTER C;;;;
+212E;ESTIMATED SYMBOL;So;0;ET;;;;;N;;;;;
+212F;SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+2130;SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;SCRIPT E;;;;
+2131;SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;SCRIPT F;;;;
+2132;TURNED CAPITAL F;Lu;0;L;;;;;N;TURNED F;;;214E;
+2133;SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;SCRIPT M;;;;
+2134;SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+2135;ALEF SYMBOL;Lo;0;L;<compat> 05D0;;;;N;FIRST TRANSFINITE CARDINAL;;;;
+2136;BET SYMBOL;Lo;0;L;<compat> 05D1;;;;N;SECOND TRANSFINITE CARDINAL;;;;
+2137;GIMEL SYMBOL;Lo;0;L;<compat> 05D2;;;;N;THIRD TRANSFINITE CARDINAL;;;;
+2138;DALET SYMBOL;Lo;0;L;<compat> 05D3;;;;N;FOURTH TRANSFINITE CARDINAL;;;;
+2139;INFORMATION SOURCE;Ll;0;L;<font> 0069;;;;N;;;;;
+213A;ROTATED CAPITAL Q;So;0;ON;;;;;N;;;;;
+213B;FACSIMILE SIGN;So;0;ON;<compat> 0046 0041 0058;;;;N;;;;;
+213C;DOUBLE-STRUCK SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+213D;DOUBLE-STRUCK SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+213E;DOUBLE-STRUCK CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+213F;DOUBLE-STRUCK CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+2140;DOUBLE-STRUCK N-ARY SUMMATION;Sm;0;ON;<font> 2211;;;;Y;;;;;
+2141;TURNED SANS-SERIF CAPITAL G;Sm;0;ON;;;;;N;;;;;
+2142;TURNED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
+2143;REVERSED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
+2144;TURNED SANS-SERIF CAPITAL Y;Sm;0;ON;;;;;N;;;;;
+2145;DOUBLE-STRUCK ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+2146;DOUBLE-STRUCK ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+2147;DOUBLE-STRUCK ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+2148;DOUBLE-STRUCK ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+2149;DOUBLE-STRUCK ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+214A;PROPERTY LINE;So;0;ON;;;;;N;;;;;
+214B;TURNED AMPERSAND;Sm;0;ON;;;;;N;;;;;
+214C;PER SIGN;So;0;ON;;;;;N;;;;;
+214D;AKTIESELSKAB;So;0;ON;;;;;N;;;;;
+214E;TURNED SMALL F;Ll;0;L;;;;;N;;;2132;;2132
+214F;SYMBOL FOR SAMARITAN SOURCE;So;0;L;;;;;N;;;;;
+2150;VULGAR FRACTION ONE SEVENTH;No;0;ON;<fraction> 0031 2044 0037;;;1/7;N;;;;;
+2151;VULGAR FRACTION ONE NINTH;No;0;ON;<fraction> 0031 2044 0039;;;1/9;N;;;;;
+2152;VULGAR FRACTION ONE TENTH;No;0;ON;<fraction> 0031 2044 0031 0030;;;1/10;N;;;;;
+2153;VULGAR FRACTION ONE THIRD;No;0;ON;<fraction> 0031 2044 0033;;;1/3;N;FRACTION ONE THIRD;;;;
+2154;VULGAR FRACTION TWO THIRDS;No;0;ON;<fraction> 0032 2044 0033;;;2/3;N;FRACTION TWO THIRDS;;;;
+2155;VULGAR FRACTION ONE FIFTH;No;0;ON;<fraction> 0031 2044 0035;;;1/5;N;FRACTION ONE FIFTH;;;;
+2156;VULGAR FRACTION TWO FIFTHS;No;0;ON;<fraction> 0032 2044 0035;;;2/5;N;FRACTION TWO FIFTHS;;;;
+2157;VULGAR FRACTION THREE FIFTHS;No;0;ON;<fraction> 0033 2044 0035;;;3/5;N;FRACTION THREE FIFTHS;;;;
+2158;VULGAR FRACTION FOUR FIFTHS;No;0;ON;<fraction> 0034 2044 0035;;;4/5;N;FRACTION FOUR FIFTHS;;;;
+2159;VULGAR FRACTION ONE SIXTH;No;0;ON;<fraction> 0031 2044 0036;;;1/6;N;FRACTION ONE SIXTH;;;;
+215A;VULGAR FRACTION FIVE SIXTHS;No;0;ON;<fraction> 0035 2044 0036;;;5/6;N;FRACTION FIVE SIXTHS;;;;
+215B;VULGAR FRACTION ONE EIGHTH;No;0;ON;<fraction> 0031 2044 0038;;;1/8;N;FRACTION ONE EIGHTH;;;;
+215C;VULGAR FRACTION THREE EIGHTHS;No;0;ON;<fraction> 0033 2044 0038;;;3/8;N;FRACTION THREE EIGHTHS;;;;
+215D;VULGAR FRACTION FIVE EIGHTHS;No;0;ON;<fraction> 0035 2044 0038;;;5/8;N;FRACTION FIVE EIGHTHS;;;;
+215E;VULGAR FRACTION SEVEN EIGHTHS;No;0;ON;<fraction> 0037 2044 0038;;;7/8;N;FRACTION SEVEN EIGHTHS;;;;
+215F;FRACTION NUMERATOR ONE;No;0;ON;<fraction> 0031 2044;;;1;N;;;;;
+2160;ROMAN NUMERAL ONE;Nl;0;L;<compat> 0049;;;1;N;;;;2170;
+2161;ROMAN NUMERAL TWO;Nl;0;L;<compat> 0049 0049;;;2;N;;;;2171;
+2162;ROMAN NUMERAL THREE;Nl;0;L;<compat> 0049 0049 0049;;;3;N;;;;2172;
+2163;ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0049 0056;;;4;N;;;;2173;
+2164;ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0056;;;5;N;;;;2174;
+2165;ROMAN NUMERAL SIX;Nl;0;L;<compat> 0056 0049;;;6;N;;;;2175;
+2166;ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0056 0049 0049;;;7;N;;;;2176;
+2167;ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0056 0049 0049 0049;;;8;N;;;;2177;
+2168;ROMAN NUMERAL NINE;Nl;0;L;<compat> 0049 0058;;;9;N;;;;2178;
+2169;ROMAN NUMERAL TEN;Nl;0;L;<compat> 0058;;;10;N;;;;2179;
+216A;ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0058 0049;;;11;N;;;;217A;
+216B;ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0058 0049 0049;;;12;N;;;;217B;
+216C;ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 004C;;;50;N;;;;217C;
+216D;ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0043;;;100;N;;;;217D;
+216E;ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0044;;;500;N;;;;217E;
+216F;ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 004D;;;1000;N;;;;217F;
+2170;SMALL ROMAN NUMERAL ONE;Nl;0;L;<compat> 0069;;;1;N;;;2160;;2160
+2171;SMALL ROMAN NUMERAL TWO;Nl;0;L;<compat> 0069 0069;;;2;N;;;2161;;2161
+2172;SMALL ROMAN NUMERAL THREE;Nl;0;L;<compat> 0069 0069 0069;;;3;N;;;2162;;2162
+2173;SMALL ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0069 0076;;;4;N;;;2163;;2163
+2174;SMALL ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0076;;;5;N;;;2164;;2164
+2175;SMALL ROMAN NUMERAL SIX;Nl;0;L;<compat> 0076 0069;;;6;N;;;2165;;2165
+2176;SMALL ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0076 0069 0069;;;7;N;;;2166;;2166
+2177;SMALL ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0076 0069 0069 0069;;;8;N;;;2167;;2167
+2178;SMALL ROMAN NUMERAL NINE;Nl;0;L;<compat> 0069 0078;;;9;N;;;2168;;2168
+2179;SMALL ROMAN NUMERAL TEN;Nl;0;L;<compat> 0078;;;10;N;;;2169;;2169
+217A;SMALL ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0078 0069;;;11;N;;;216A;;216A
+217B;SMALL ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0078 0069 0069;;;12;N;;;216B;;216B
+217C;SMALL ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 006C;;;50;N;;;216C;;216C
+217D;SMALL ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0063;;;100;N;;;216D;;216D
+217E;SMALL ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0064;;;500;N;;;216E;;216E
+217F;SMALL ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 006D;;;1000;N;;;216F;;216F
+2180;ROMAN NUMERAL ONE THOUSAND C D;Nl;0;L;;;;1000;N;;;;;
+2181;ROMAN NUMERAL FIVE THOUSAND;Nl;0;L;;;;5000;N;;;;;
+2182;ROMAN NUMERAL TEN THOUSAND;Nl;0;L;;;;10000;N;;;;;
+2183;ROMAN NUMERAL REVERSED ONE HUNDRED;Lu;0;L;;;;;N;;;;2184;
+2184;LATIN SMALL LETTER REVERSED C;Ll;0;L;;;;;N;;;2183;;2183
+2185;ROMAN NUMERAL SIX LATE FORM;Nl;0;L;;;;6;N;;;;;
+2186;ROMAN NUMERAL FIFTY EARLY FORM;Nl;0;L;;;;50;N;;;;;
+2187;ROMAN NUMERAL FIFTY THOUSAND;Nl;0;L;;;;50000;N;;;;;
+2188;ROMAN NUMERAL ONE HUNDRED THOUSAND;Nl;0;L;;;;100000;N;;;;;
+2189;VULGAR FRACTION ZERO THIRDS;No;0;ON;<fraction> 0030 2044 0033;;;0;N;;;;;
+218A;TURNED DIGIT TWO;So;0;ON;;;;;N;;;;;
+218B;TURNED DIGIT THREE;So;0;ON;;;;;N;;;;;
+2190;LEFTWARDS ARROW;Sm;0;ON;;;;;N;LEFT ARROW;;;;
+2191;UPWARDS ARROW;Sm;0;ON;;;;;N;UP ARROW;;;;
+2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;
+2193;DOWNWARDS ARROW;Sm;0;ON;;;;;N;DOWN ARROW;;;;
+2194;LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
+2195;UP DOWN ARROW;So;0;ON;;;;;N;;;;;
+2196;NORTH WEST ARROW;So;0;ON;;;;;N;UPPER LEFT ARROW;;;;
+2197;NORTH EAST ARROW;So;0;ON;;;;;N;UPPER RIGHT ARROW;;;;
+2198;SOUTH EAST ARROW;So;0;ON;;;;;N;LOWER RIGHT ARROW;;;;
+2199;SOUTH WEST ARROW;So;0;ON;;;;;N;LOWER LEFT ARROW;;;;
+219A;LEFTWARDS ARROW WITH STROKE;Sm;0;ON;2190 0338;;;;N;LEFT ARROW WITH STROKE;;;;
+219B;RIGHTWARDS ARROW WITH STROKE;Sm;0;ON;2192 0338;;;;N;RIGHT ARROW WITH STROKE;;;;
+219C;LEFTWARDS WAVE ARROW;So;0;ON;;;;;N;LEFT WAVE ARROW;;;;
+219D;RIGHTWARDS WAVE ARROW;So;0;ON;;;;;N;RIGHT WAVE ARROW;;;;
+219E;LEFTWARDS TWO HEADED ARROW;So;0;ON;;;;;N;LEFT TWO HEADED ARROW;;;;
+219F;UPWARDS TWO HEADED ARROW;So;0;ON;;;;;N;UP TWO HEADED ARROW;;;;
+21A0;RIGHTWARDS TWO HEADED ARROW;Sm;0;ON;;;;;N;RIGHT TWO HEADED ARROW;;;;
+21A1;DOWNWARDS TWO HEADED ARROW;So;0;ON;;;;;N;DOWN TWO HEADED ARROW;;;;
+21A2;LEFTWARDS ARROW WITH TAIL;So;0;ON;;;;;N;LEFT ARROW WITH TAIL;;;;
+21A3;RIGHTWARDS ARROW WITH TAIL;Sm;0;ON;;;;;N;RIGHT ARROW WITH TAIL;;;;
+21A4;LEFTWARDS ARROW FROM BAR;So;0;ON;;;;;N;LEFT ARROW FROM BAR;;;;
+21A5;UPWARDS ARROW FROM BAR;So;0;ON;;;;;N;UP ARROW FROM BAR;;;;
+21A6;RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;RIGHT ARROW FROM BAR;;;;
+21A7;DOWNWARDS ARROW FROM BAR;So;0;ON;;;;;N;DOWN ARROW FROM BAR;;;;
+21A8;UP DOWN ARROW WITH BASE;So;0;ON;;;;;N;;;;;
+21A9;LEFTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;LEFT ARROW WITH HOOK;;;;
+21AA;RIGHTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;RIGHT ARROW WITH HOOK;;;;
+21AB;LEFTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;LEFT ARROW WITH LOOP;;;;
+21AC;RIGHTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;RIGHT ARROW WITH LOOP;;;;
+21AD;LEFT RIGHT WAVE ARROW;So;0;ON;;;;;N;;;;;
+21AE;LEFT RIGHT ARROW WITH STROKE;Sm;0;ON;2194 0338;;;;N;;;;;
+21AF;DOWNWARDS ZIGZAG ARROW;So;0;ON;;;;;N;DOWN ZIGZAG ARROW;;;;
+21B0;UPWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP LEFT;;;;
+21B1;UPWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP RIGHT;;;;
+21B2;DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP LEFT;;;;
+21B3;DOWNWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP RIGHT;;;;
+21B4;RIGHTWARDS ARROW WITH CORNER DOWNWARDS;So;0;ON;;;;;N;RIGHT ARROW WITH CORNER DOWN;;;;
+21B5;DOWNWARDS ARROW WITH CORNER LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH CORNER LEFT;;;;
+21B6;ANTICLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21B7;CLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21B8;NORTH WEST ARROW TO LONG BAR;So;0;ON;;;;;N;UPPER LEFT ARROW TO LONG BAR;;;;
+21B9;LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR OVER RIGHT ARROW TO BAR;;;;
+21BA;ANTICLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21BB;CLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21BC;LEFTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB UP;;;;
+21BD;LEFTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB DOWN;;;;
+21BE;UPWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB RIGHT;;;;
+21BF;UPWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB LEFT;;;;
+21C0;RIGHTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB UP;;;;
+21C1;RIGHTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB DOWN;;;;
+21C2;DOWNWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB RIGHT;;;;
+21C3;DOWNWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB LEFT;;;;
+21C4;RIGHTWARDS ARROW OVER LEFTWARDS ARROW;So;0;ON;;;;;N;RIGHT ARROW OVER LEFT ARROW;;;;
+21C5;UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW;So;0;ON;;;;;N;UP ARROW LEFT OF DOWN ARROW;;;;
+21C6;LEFTWARDS ARROW OVER RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT ARROW OVER RIGHT ARROW;;;;
+21C7;LEFTWARDS PAIRED ARROWS;So;0;ON;;;;;N;LEFT PAIRED ARROWS;;;;
+21C8;UPWARDS PAIRED ARROWS;So;0;ON;;;;;N;UP PAIRED ARROWS;;;;
+21C9;RIGHTWARDS PAIRED ARROWS;So;0;ON;;;;;N;RIGHT PAIRED ARROWS;;;;
+21CA;DOWNWARDS PAIRED ARROWS;So;0;ON;;;;;N;DOWN PAIRED ARROWS;;;;
+21CB;LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON;So;0;ON;;;;;N;LEFT HARPOON OVER RIGHT HARPOON;;;;
+21CC;RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON;So;0;ON;;;;;N;RIGHT HARPOON OVER LEFT HARPOON;;;;
+21CD;LEFTWARDS DOUBLE ARROW WITH STROKE;So;0;ON;21D0 0338;;;;N;LEFT DOUBLE ARROW WITH STROKE;;;;
+21CE;LEFT RIGHT DOUBLE ARROW WITH STROKE;Sm;0;ON;21D4 0338;;;;N;;;;;
+21CF;RIGHTWARDS DOUBLE ARROW WITH STROKE;Sm;0;ON;21D2 0338;;;;N;RIGHT DOUBLE ARROW WITH STROKE;;;;
+21D0;LEFTWARDS DOUBLE ARROW;So;0;ON;;;;;N;LEFT DOUBLE ARROW;;;;
+21D1;UPWARDS DOUBLE ARROW;So;0;ON;;;;;N;UP DOUBLE ARROW;;;;
+21D2;RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;RIGHT DOUBLE ARROW;;;;
+21D3;DOWNWARDS DOUBLE ARROW;So;0;ON;;;;;N;DOWN DOUBLE ARROW;;;;
+21D4;LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+21D5;UP DOWN DOUBLE ARROW;So;0;ON;;;;;N;;;;;
+21D6;NORTH WEST DOUBLE ARROW;So;0;ON;;;;;N;UPPER LEFT DOUBLE ARROW;;;;
+21D7;NORTH EAST DOUBLE ARROW;So;0;ON;;;;;N;UPPER RIGHT DOUBLE ARROW;;;;
+21D8;SOUTH EAST DOUBLE ARROW;So;0;ON;;;;;N;LOWER RIGHT DOUBLE ARROW;;;;
+21D9;SOUTH WEST DOUBLE ARROW;So;0;ON;;;;;N;LOWER LEFT DOUBLE ARROW;;;;
+21DA;LEFTWARDS TRIPLE ARROW;So;0;ON;;;;;N;LEFT TRIPLE ARROW;;;;
+21DB;RIGHTWARDS TRIPLE ARROW;So;0;ON;;;;;N;RIGHT TRIPLE ARROW;;;;
+21DC;LEFTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;LEFT SQUIGGLE ARROW;;;;
+21DD;RIGHTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;RIGHT SQUIGGLE ARROW;;;;
+21DE;UPWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;UP ARROW WITH DOUBLE STROKE;;;;
+21DF;DOWNWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;DOWN ARROW WITH DOUBLE STROKE;;;;
+21E0;LEFTWARDS DASHED ARROW;So;0;ON;;;;;N;LEFT DASHED ARROW;;;;
+21E1;UPWARDS DASHED ARROW;So;0;ON;;;;;N;UP DASHED ARROW;;;;
+21E2;RIGHTWARDS DASHED ARROW;So;0;ON;;;;;N;RIGHT DASHED ARROW;;;;
+21E3;DOWNWARDS DASHED ARROW;So;0;ON;;;;;N;DOWN DASHED ARROW;;;;
+21E4;LEFTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR;;;;
+21E5;RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;RIGHT ARROW TO BAR;;;;
+21E6;LEFTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE LEFT ARROW;;;;
+21E7;UPWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE UP ARROW;;;;
+21E8;RIGHTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE RIGHT ARROW;;;;
+21E9;DOWNWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE DOWN ARROW;;;;
+21EA;UPWARDS WHITE ARROW FROM BAR;So;0;ON;;;;;N;WHITE UP ARROW FROM BAR;;;;
+21EB;UPWARDS WHITE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
+21EC;UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
+21ED;UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+21EE;UPWARDS WHITE DOUBLE ARROW;So;0;ON;;;;;N;;;;;
+21EF;UPWARDS WHITE DOUBLE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
+21F0;RIGHTWARDS WHITE ARROW FROM WALL;So;0;ON;;;;;N;;;;;
+21F1;NORTH WEST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
+21F2;SOUTH EAST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
+21F3;UP DOWN WHITE ARROW;So;0;ON;;;;;N;;;;;
+21F4;RIGHT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+21F5;DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+21F6;THREE RIGHTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
+21F7;LEFTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21F8;RIGHTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21F9;LEFT RIGHT ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FA;LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FB;RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FC;LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FD;LEFTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+21FE;RIGHTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+21FF;LEFT RIGHT OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+2200;FOR ALL;Sm;0;ON;;;;;N;;;;;
+2201;COMPLEMENT;Sm;0;ON;;;;;Y;;;;;
+2202;PARTIAL DIFFERENTIAL;Sm;0;ON;;;;;Y;;;;;
+2203;THERE EXISTS;Sm;0;ON;;;;;Y;;;;;
+2204;THERE DOES NOT EXIST;Sm;0;ON;2203 0338;;;;Y;;;;;
+2205;EMPTY SET;Sm;0;ON;;;;;N;;;;;
+2206;INCREMENT;Sm;0;ON;;;;;N;;;;;
+2207;NABLA;Sm;0;ON;;;;;N;;;;;
+2208;ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
+2209;NOT AN ELEMENT OF;Sm;0;ON;2208 0338;;;;Y;;;;;
+220A;SMALL ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
+220B;CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
+220C;DOES NOT CONTAIN AS MEMBER;Sm;0;ON;220B 0338;;;;Y;;;;;
+220D;SMALL CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
+220E;END OF PROOF;Sm;0;ON;;;;;N;;;;;
+220F;N-ARY PRODUCT;Sm;0;ON;;;;;N;;;;;
+2210;N-ARY COPRODUCT;Sm;0;ON;;;;;N;;;;;
+2211;N-ARY SUMMATION;Sm;0;ON;;;;;Y;;;;;
+2212;MINUS SIGN;Sm;0;ES;;;;;N;;;;;
+2213;MINUS-OR-PLUS SIGN;Sm;0;ET;;;;;N;;;;;
+2214;DOT PLUS;Sm;0;ON;;;;;N;;;;;
+2215;DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
+2216;SET MINUS;Sm;0;ON;;;;;Y;;;;;
+2217;ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
+2218;RING OPERATOR;Sm;0;ON;;;;;N;;;;;
+2219;BULLET OPERATOR;Sm;0;ON;;;;;N;;;;;
+221A;SQUARE ROOT;Sm;0;ON;;;;;Y;;;;;
+221B;CUBE ROOT;Sm;0;ON;;;;;Y;;;;;
+221C;FOURTH ROOT;Sm;0;ON;;;;;Y;;;;;
+221D;PROPORTIONAL TO;Sm;0;ON;;;;;Y;;;;;
+221E;INFINITY;Sm;0;ON;;;;;N;;;;;
+221F;RIGHT ANGLE;Sm;0;ON;;;;;Y;;;;;
+2220;ANGLE;Sm;0;ON;;;;;Y;;;;;
+2221;MEASURED ANGLE;Sm;0;ON;;;;;Y;;;;;
+2222;SPHERICAL ANGLE;Sm;0;ON;;;;;Y;;;;;
+2223;DIVIDES;Sm;0;ON;;;;;N;;;;;
+2224;DOES NOT DIVIDE;Sm;0;ON;2223 0338;;;;Y;;;;;
+2225;PARALLEL TO;Sm;0;ON;;;;;N;;;;;
+2226;NOT PARALLEL TO;Sm;0;ON;2225 0338;;;;Y;;;;;
+2227;LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2228;LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2229;INTERSECTION;Sm;0;ON;;;;;N;;;;;
+222A;UNION;Sm;0;ON;;;;;N;;;;;
+222B;INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+222C;DOUBLE INTEGRAL;Sm;0;ON;<compat> 222B 222B;;;;Y;;;;;
+222D;TRIPLE INTEGRAL;Sm;0;ON;<compat> 222B 222B 222B;;;;Y;;;;;
+222E;CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+222F;SURFACE INTEGRAL;Sm;0;ON;<compat> 222E 222E;;;;Y;;;;;
+2230;VOLUME INTEGRAL;Sm;0;ON;<compat> 222E 222E 222E;;;;Y;;;;;
+2231;CLOCKWISE INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2232;CLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2233;ANTICLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2234;THEREFORE;Sm;0;ON;;;;;N;;;;;
+2235;BECAUSE;Sm;0;ON;;;;;N;;;;;
+2236;RATIO;Sm;0;ON;;;;;N;;;;;
+2237;PROPORTION;Sm;0;ON;;;;;N;;;;;
+2238;DOT MINUS;Sm;0;ON;;;;;N;;;;;
+2239;EXCESS;Sm;0;ON;;;;;Y;;;;;
+223A;GEOMETRIC PROPORTION;Sm;0;ON;;;;;N;;;;;
+223B;HOMOTHETIC;Sm;0;ON;;;;;Y;;;;;
+223C;TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;;;;
+223E;INVERTED LAZY S;Sm;0;ON;;;;;Y;;;;;
+223F;SINE WAVE;Sm;0;ON;;;;;Y;;;;;
+2240;WREATH PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2241;NOT TILDE;Sm;0;ON;223C 0338;;;;Y;;;;;
+2242;MINUS TILDE;Sm;0;ON;;;;;Y;;;;;
+2243;ASYMPTOTICALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2244;NOT ASYMPTOTICALLY EQUAL TO;Sm;0;ON;2243 0338;;;;Y;;;;;
+2245;APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2246;APPROXIMATELY BUT NOT ACTUALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2247;NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO;Sm;0;ON;2245 0338;;;;Y;;;;;
+2248;ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2249;NOT ALMOST EQUAL TO;Sm;0;ON;2248 0338;;;;Y;;;;;
+224A;ALMOST EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+224B;TRIPLE TILDE;Sm;0;ON;;;;;Y;;;;;
+224C;ALL EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+224D;EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+224E;GEOMETRICALLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+224F;DIFFERENCE BETWEEN;Sm;0;ON;;;;;N;;;;;
+2250;APPROACHES THE LIMIT;Sm;0;ON;;;;;N;;;;;
+2251;GEOMETRICALLY EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2252;APPROXIMATELY EQUAL TO OR THE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+2253;IMAGE OF OR APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2254;COLON EQUALS;Sm;0;ON;;;;;Y;COLON EQUAL;;;;
+2255;EQUALS COLON;Sm;0;ON;;;;;Y;EQUAL COLON;;;;
+2256;RING IN EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2257;RING EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2258;CORRESPONDS TO;Sm;0;ON;;;;;N;;;;;
+2259;ESTIMATES;Sm;0;ON;;;;;N;;;;;
+225A;EQUIANGULAR TO;Sm;0;ON;;;;;N;;;;;
+225B;STAR EQUALS;Sm;0;ON;;;;;N;;;;;
+225C;DELTA EQUAL TO;Sm;0;ON;;;;;N;;;;;
+225D;EQUAL TO BY DEFINITION;Sm;0;ON;;;;;N;;;;;
+225E;MEASURED BY;Sm;0;ON;;;;;N;;;;;
+225F;QUESTIONED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2260;NOT EQUAL TO;Sm;0;ON;003D 0338;;;;Y;;;;;
+2261;IDENTICAL TO;Sm;0;ON;;;;;N;;;;;
+2262;NOT IDENTICAL TO;Sm;0;ON;2261 0338;;;;Y;;;;;
+2263;STRICTLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+2264;LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUAL TO;;;;
+2265;GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUAL TO;;;;
+2266;LESS-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OVER EQUAL TO;;;;
+2267;GREATER-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OVER EQUAL TO;;;;
+2268;LESS-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUAL TO;;;;
+2269;GREATER-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUAL TO;;;;
+226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;;
+226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;;
+226C;BETWEEN;Sm;0;ON;;;;;N;;;;;
+226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;N;;;;;
+226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;;
+226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;;
+2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;;
+2271;NEITHER GREATER-THAN NOR EQUAL TO;Sm;0;ON;2265 0338;;;;Y;NEITHER GREATER THAN NOR EQUAL TO;;;;
+2272;LESS-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUIVALENT TO;;;;
+2273;GREATER-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUIVALENT TO;;;;
+2274;NEITHER LESS-THAN NOR EQUIVALENT TO;Sm;0;ON;2272 0338;;;;Y;NEITHER LESS THAN NOR EQUIVALENT TO;;;;
+2275;NEITHER GREATER-THAN NOR EQUIVALENT TO;Sm;0;ON;2273 0338;;;;Y;NEITHER GREATER THAN NOR EQUIVALENT TO;;;;
+2276;LESS-THAN OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN OR GREATER THAN;;;;
+2277;GREATER-THAN OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN OR LESS THAN;;;;
+2278;NEITHER LESS-THAN NOR GREATER-THAN;Sm;0;ON;2276 0338;;;;Y;NEITHER LESS THAN NOR GREATER THAN;;;;
+2279;NEITHER GREATER-THAN NOR LESS-THAN;Sm;0;ON;2277 0338;;;;Y;NEITHER GREATER THAN NOR LESS THAN;;;;
+227A;PRECEDES;Sm;0;ON;;;;;Y;;;;;
+227B;SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+227C;PRECEDES OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+227D;SUCCEEDS OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+227E;PRECEDES OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+227F;SUCCEEDS OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+2280;DOES NOT PRECEDE;Sm;0;ON;227A 0338;;;;Y;;;;;
+2281;DOES NOT SUCCEED;Sm;0;ON;227B 0338;;;;Y;;;;;
+2282;SUBSET OF;Sm;0;ON;;;;;Y;;;;;
+2283;SUPERSET OF;Sm;0;ON;;;;;Y;;;;;
+2284;NOT A SUBSET OF;Sm;0;ON;2282 0338;;;;Y;;;;;
+2285;NOT A SUPERSET OF;Sm;0;ON;2283 0338;;;;Y;;;;;
+2286;SUBSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2287;SUPERSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2288;NEITHER A SUBSET OF NOR EQUAL TO;Sm;0;ON;2286 0338;;;;Y;;;;;
+2289;NEITHER A SUPERSET OF NOR EQUAL TO;Sm;0;ON;2287 0338;;;;Y;;;;;
+228A;SUBSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUBSET OF OR NOT EQUAL TO;;;;
+228B;SUPERSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUPERSET OF OR NOT EQUAL TO;;;;
+228C;MULTISET;Sm;0;ON;;;;;Y;;;;;
+228D;MULTISET MULTIPLICATION;Sm;0;ON;;;;;N;;;;;
+228E;MULTISET UNION;Sm;0;ON;;;;;N;;;;;
+228F;SQUARE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+2290;SQUARE ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
+2291;SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2292;SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2293;SQUARE CAP;Sm;0;ON;;;;;N;;;;;
+2294;SQUARE CUP;Sm;0;ON;;;;;N;;;;;
+2295;CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+2296;CIRCLED MINUS;Sm;0;ON;;;;;N;;;;;
+2297;CIRCLED TIMES;Sm;0;ON;;;;;N;;;;;
+2298;CIRCLED DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
+2299;CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+229A;CIRCLED RING OPERATOR;Sm;0;ON;;;;;N;;;;;
+229B;CIRCLED ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
+229C;CIRCLED EQUALS;Sm;0;ON;;;;;N;;;;;
+229D;CIRCLED DASH;Sm;0;ON;;;;;N;;;;;
+229E;SQUARED PLUS;Sm;0;ON;;;;;N;;;;;
+229F;SQUARED MINUS;Sm;0;ON;;;;;N;;;;;
+22A0;SQUARED TIMES;Sm;0;ON;;;;;N;;;;;
+22A1;SQUARED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+22A2;RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
+22A3;LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+22A4;DOWN TACK;Sm;0;ON;;;;;N;;;;;
+22A5;UP TACK;Sm;0;ON;;;;;N;;;;;
+22A6;ASSERTION;Sm;0;ON;;;;;Y;;;;;
+22A7;MODELS;Sm;0;ON;;;;;Y;;;;;
+22A8;TRUE;Sm;0;ON;;;;;Y;;;;;
+22A9;FORCES;Sm;0;ON;;;;;Y;;;;;
+22AA;TRIPLE VERTICAL BAR RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+22AB;DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+22AC;DOES NOT PROVE;Sm;0;ON;22A2 0338;;;;Y;;;;;
+22AD;NOT TRUE;Sm;0;ON;22A8 0338;;;;Y;;;;;
+22AE;DOES NOT FORCE;Sm;0;ON;22A9 0338;;;;Y;;;;;
+22AF;NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;22AB 0338;;;;Y;;;;;
+22B0;PRECEDES UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
+22B1;SUCCEEDS UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
+22B2;NORMAL SUBGROUP OF;Sm;0;ON;;;;;Y;;;;;
+22B3;CONTAINS AS NORMAL SUBGROUP;Sm;0;ON;;;;;Y;;;;;
+22B4;NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22B5;CONTAINS AS NORMAL SUBGROUP OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22B6;ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
+22B7;IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+22B8;MULTIMAP;Sm;0;ON;;;;;Y;;;;;
+22B9;HERMITIAN CONJUGATE MATRIX;Sm;0;ON;;;;;N;;;;;
+22BA;INTERCALATE;Sm;0;ON;;;;;N;;;;;
+22BB;XOR;Sm;0;ON;;;;;N;;;;;
+22BC;NAND;Sm;0;ON;;;;;N;;;;;
+22BD;NOR;Sm;0;ON;;;;;N;;;;;
+22BE;RIGHT ANGLE WITH ARC;Sm;0;ON;;;;;Y;;;;;
+22BF;RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+22C0;N-ARY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+22C1;N-ARY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+22C2;N-ARY INTERSECTION;Sm;0;ON;;;;;N;;;;;
+22C3;N-ARY UNION;Sm;0;ON;;;;;N;;;;;
+22C4;DIAMOND OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C5;DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C6;STAR OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C7;DIVISION TIMES;Sm;0;ON;;;;;N;;;;;
+22C8;BOWTIE;Sm;0;ON;;;;;N;;;;;
+22C9;LEFT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CA;RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CB;LEFT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CC;RIGHT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CD;REVERSED TILDE EQUALS;Sm;0;ON;;;;;Y;;;;;
+22CE;CURLY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+22CF;CURLY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+22D0;DOUBLE SUBSET;Sm;0;ON;;;;;Y;;;;;
+22D1;DOUBLE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+22D2;DOUBLE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+22D3;DOUBLE UNION;Sm;0;ON;;;;;N;;;;;
+22D4;PITCHFORK;Sm;0;ON;;;;;N;;;;;
+22D5;EQUAL AND PARALLEL TO;Sm;0;ON;;;;;N;;;;;
+22D6;LESS-THAN WITH DOT;Sm;0;ON;;;;;Y;LESS THAN WITH DOT;;;;
+22D7;GREATER-THAN WITH DOT;Sm;0;ON;;;;;Y;GREATER THAN WITH DOT;;;;
+22D8;VERY MUCH LESS-THAN;Sm;0;ON;;;;;Y;VERY MUCH LESS THAN;;;;
+22D9;VERY MUCH GREATER-THAN;Sm;0;ON;;;;;Y;VERY MUCH GREATER THAN;;;;
+22DA;LESS-THAN EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN EQUAL TO OR GREATER THAN;;;;
+22DB;GREATER-THAN EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN EQUAL TO OR LESS THAN;;;;
+22DC;EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR LESS THAN;;;;
+22DD;EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR GREATER THAN;;;;
+22DE;EQUAL TO OR PRECEDES;Sm;0;ON;;;;;Y;;;;;
+22DF;EQUAL TO OR SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+22E0;DOES NOT PRECEDE OR EQUAL;Sm;0;ON;227C 0338;;;;Y;;;;;
+22E1;DOES NOT SUCCEED OR EQUAL;Sm;0;ON;227D 0338;;;;Y;;;;;
+22E2;NOT SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;2291 0338;;;;Y;;;;;
+22E3;NOT SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;2292 0338;;;;Y;;;;;
+22E4;SQUARE IMAGE OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22E5;SQUARE ORIGINAL OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22E6;LESS-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUIVALENT TO;;;;
+22E7;GREATER-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUIVALENT TO;;;;
+22E8;PRECEDES BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+22E9;SUCCEEDS BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+22EA;NOT NORMAL SUBGROUP OF;Sm;0;ON;22B2 0338;;;;Y;;;;;
+22EB;DOES NOT CONTAIN AS NORMAL SUBGROUP;Sm;0;ON;22B3 0338;;;;Y;;;;;
+22EC;NOT NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;22B4 0338;;;;Y;;;;;
+22ED;DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL;Sm;0;ON;22B5 0338;;;;Y;;;;;
+22EE;VERTICAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
+22EF;MIDLINE HORIZONTAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
+22F0;UP RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
+22F1;DOWN RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
+22F2;ELEMENT OF WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F3;ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F4;SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F5;ELEMENT OF WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+22F6;ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22F7;SMALL ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22F8;ELEMENT OF WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+22F9;ELEMENT OF WITH TWO HORIZONTAL STROKES;Sm;0;ON;;;;;Y;;;;;
+22FA;CONTAINS WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FB;CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FC;SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FD;CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22FE;SMALL CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22FF;Z NOTATION BAG MEMBERSHIP;Sm;0;ON;;;;;Y;;;;;
+2300;DIAMETER SIGN;So;0;ON;;;;;N;;;;;
+2301;ELECTRIC ARROW;So;0;ON;;;;;N;;;;;
+2302;HOUSE;So;0;ON;;;;;N;;;;;
+2303;UP ARROWHEAD;So;0;ON;;;;;N;;;;;
+2304;DOWN ARROWHEAD;So;0;ON;;;;;N;;;;;
+2305;PROJECTIVE;So;0;ON;;;;;N;;;;;
+2306;PERSPECTIVE;So;0;ON;;;;;N;;;;;
+2307;WAVY LINE;So;0;ON;;;;;N;;;;;
+2308;LEFT CEILING;Ps;0;ON;;;;;Y;;;;;
+2309;RIGHT CEILING;Pe;0;ON;;;;;Y;;;;;
+230A;LEFT FLOOR;Ps;0;ON;;;;;Y;;;;;
+230B;RIGHT FLOOR;Pe;0;ON;;;;;Y;;;;;
+230C;BOTTOM RIGHT CROP;So;0;ON;;;;;N;;;;;
+230D;BOTTOM LEFT CROP;So;0;ON;;;;;N;;;;;
+230E;TOP RIGHT CROP;So;0;ON;;;;;N;;;;;
+230F;TOP LEFT CROP;So;0;ON;;;;;N;;;;;
+2310;REVERSED NOT SIGN;So;0;ON;;;;;N;;;;;
+2311;SQUARE LOZENGE;So;0;ON;;;;;N;;;;;
+2312;ARC;So;0;ON;;;;;N;;;;;
+2313;SEGMENT;So;0;ON;;;;;N;;;;;
+2314;SECTOR;So;0;ON;;;;;N;;;;;
+2315;TELEPHONE RECORDER;So;0;ON;;;;;N;;;;;
+2316;POSITION INDICATOR;So;0;ON;;;;;N;;;;;
+2317;VIEWDATA SQUARE;So;0;ON;;;;;N;;;;;
+2318;PLACE OF INTEREST SIGN;So;0;ON;;;;;N;COMMAND KEY;;;;
+2319;TURNED NOT SIGN;So;0;ON;;;;;N;;;;;
+231A;WATCH;So;0;ON;;;;;N;;;;;
+231B;HOURGLASS;So;0;ON;;;;;N;;;;;
+231C;TOP LEFT CORNER;So;0;ON;;;;;N;;;;;
+231D;TOP RIGHT CORNER;So;0;ON;;;;;N;;;;;
+231E;BOTTOM LEFT CORNER;So;0;ON;;;;;N;;;;;
+231F;BOTTOM RIGHT CORNER;So;0;ON;;;;;N;;;;;
+2320;TOP HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2321;BOTTOM HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2322;FROWN;So;0;ON;;;;;N;;;;;
+2323;SMILE;So;0;ON;;;;;N;;;;;
+2324;UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS;So;0;ON;;;;;N;ENTER KEY;;;;
+2325;OPTION KEY;So;0;ON;;;;;N;;;;;
+2326;ERASE TO THE RIGHT;So;0;ON;;;;;N;DELETE TO THE RIGHT KEY;;;;
+2327;X IN A RECTANGLE BOX;So;0;ON;;;;;N;CLEAR KEY;;;;
+2328;KEYBOARD;So;0;ON;;;;;N;;;;;
+2329;LEFT-POINTING ANGLE BRACKET;Ps;0;ON;3008;;;;Y;BRA;;;;
+232A;RIGHT-POINTING ANGLE BRACKET;Pe;0;ON;3009;;;;Y;KET;;;;
+232B;ERASE TO THE LEFT;So;0;ON;;;;;N;DELETE TO THE LEFT KEY;;;;
+232C;BENZENE RING;So;0;ON;;;;;N;;;;;
+232D;CYLINDRICITY;So;0;ON;;;;;N;;;;;
+232E;ALL AROUND-PROFILE;So;0;ON;;;;;N;;;;;
+232F;SYMMETRY;So;0;ON;;;;;N;;;;;
+2330;TOTAL RUNOUT;So;0;ON;;;;;N;;;;;
+2331;DIMENSION ORIGIN;So;0;ON;;;;;N;;;;;
+2332;CONICAL TAPER;So;0;ON;;;;;N;;;;;
+2333;SLOPE;So;0;ON;;;;;N;;;;;
+2334;COUNTERBORE;So;0;ON;;;;;N;;;;;
+2335;COUNTERSINK;So;0;ON;;;;;N;;;;;
+2336;APL FUNCTIONAL SYMBOL I-BEAM;So;0;L;;;;;N;;;;;
+2337;APL FUNCTIONAL SYMBOL SQUISH QUAD;So;0;L;;;;;N;;;;;
+2338;APL FUNCTIONAL SYMBOL QUAD EQUAL;So;0;L;;;;;N;;;;;
+2339;APL FUNCTIONAL SYMBOL QUAD DIVIDE;So;0;L;;;;;N;;;;;
+233A;APL FUNCTIONAL SYMBOL QUAD DIAMOND;So;0;L;;;;;N;;;;;
+233B;APL FUNCTIONAL SYMBOL QUAD JOT;So;0;L;;;;;N;;;;;
+233C;APL FUNCTIONAL SYMBOL QUAD CIRCLE;So;0;L;;;;;N;;;;;
+233D;APL FUNCTIONAL SYMBOL CIRCLE STILE;So;0;L;;;;;N;;;;;
+233E;APL FUNCTIONAL SYMBOL CIRCLE JOT;So;0;L;;;;;N;;;;;
+233F;APL FUNCTIONAL SYMBOL SLASH BAR;So;0;L;;;;;N;;;;;
+2340;APL FUNCTIONAL SYMBOL BACKSLASH BAR;So;0;L;;;;;N;;;;;
+2341;APL FUNCTIONAL SYMBOL QUAD SLASH;So;0;L;;;;;N;;;;;
+2342;APL FUNCTIONAL SYMBOL QUAD BACKSLASH;So;0;L;;;;;N;;;;;
+2343;APL FUNCTIONAL SYMBOL QUAD LESS-THAN;So;0;L;;;;;N;;;;;
+2344;APL FUNCTIONAL SYMBOL QUAD GREATER-THAN;So;0;L;;;;;N;;;;;
+2345;APL FUNCTIONAL SYMBOL LEFTWARDS VANE;So;0;L;;;;;N;;;;;
+2346;APL FUNCTIONAL SYMBOL RIGHTWARDS VANE;So;0;L;;;;;N;;;;;
+2347;APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW;So;0;L;;;;;N;;;;;
+2348;APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW;So;0;L;;;;;N;;;;;
+2349;APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH;So;0;L;;;;;N;;;;;
+234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;;;;
+234B;APL FUNCTIONAL SYMBOL DELTA STILE;So;0;L;;;;;N;;;;;
+234C;APL FUNCTIONAL SYMBOL QUAD DOWN CARET;So;0;L;;;;;N;;;;;
+234D;APL FUNCTIONAL SYMBOL QUAD DELTA;So;0;L;;;;;N;;;;;
+234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;;;;
+234F;APL FUNCTIONAL SYMBOL UPWARDS VANE;So;0;L;;;;;N;;;;;
+2350;APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW;So;0;L;;;;;N;;;;;
+2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;;;;
+2352;APL FUNCTIONAL SYMBOL DEL STILE;So;0;L;;;;;N;;;;;
+2353;APL FUNCTIONAL SYMBOL QUAD UP CARET;So;0;L;;;;;N;;;;;
+2354;APL FUNCTIONAL SYMBOL QUAD DEL;So;0;L;;;;;N;;;;;
+2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;;;;
+2356;APL FUNCTIONAL SYMBOL DOWNWARDS VANE;So;0;L;;;;;N;;;;;
+2357;APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW;So;0;L;;;;;N;;;;;
+2358;APL FUNCTIONAL SYMBOL QUOTE UNDERBAR;So;0;L;;;;;N;;;;;
+2359;APL FUNCTIONAL SYMBOL DELTA UNDERBAR;So;0;L;;;;;N;;;;;
+235A;APL FUNCTIONAL SYMBOL DIAMOND UNDERBAR;So;0;L;;;;;N;;;;;
+235B;APL FUNCTIONAL SYMBOL JOT UNDERBAR;So;0;L;;;;;N;;;;;
+235C;APL FUNCTIONAL SYMBOL CIRCLE UNDERBAR;So;0;L;;;;;N;;;;;
+235D;APL FUNCTIONAL SYMBOL UP SHOE JOT;So;0;L;;;;;N;;;;;
+235E;APL FUNCTIONAL SYMBOL QUOTE QUAD;So;0;L;;;;;N;;;;;
+235F;APL FUNCTIONAL SYMBOL CIRCLE STAR;So;0;L;;;;;N;;;;;
+2360;APL FUNCTIONAL SYMBOL QUAD COLON;So;0;L;;;;;N;;;;;
+2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;;;;
+2362;APL FUNCTIONAL SYMBOL DEL DIAERESIS;So;0;L;;;;;N;;;;;
+2363;APL FUNCTIONAL SYMBOL STAR DIAERESIS;So;0;L;;;;;N;;;;;
+2364;APL FUNCTIONAL SYMBOL JOT DIAERESIS;So;0;L;;;;;N;;;;;
+2365;APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS;So;0;L;;;;;N;;;;;
+2366;APL FUNCTIONAL SYMBOL DOWN SHOE STILE;So;0;L;;;;;N;;;;;
+2367;APL FUNCTIONAL SYMBOL LEFT SHOE STILE;So;0;L;;;;;N;;;;;
+2368;APL FUNCTIONAL SYMBOL TILDE DIAERESIS;So;0;L;;;;;N;;;;;
+2369;APL FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS;So;0;L;;;;;N;;;;;
+236A;APL FUNCTIONAL SYMBOL COMMA BAR;So;0;L;;;;;N;;;;;
+236B;APL FUNCTIONAL SYMBOL DEL TILDE;So;0;L;;;;;N;;;;;
+236C;APL FUNCTIONAL SYMBOL ZILDE;So;0;L;;;;;N;;;;;
+236D;APL FUNCTIONAL SYMBOL STILE TILDE;So;0;L;;;;;N;;;;;
+236E;APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR;So;0;L;;;;;N;;;;;
+236F;APL FUNCTIONAL SYMBOL QUAD NOT EQUAL;So;0;L;;;;;N;;;;;
+2370;APL FUNCTIONAL SYMBOL QUAD QUESTION;So;0;L;;;;;N;;;;;
+2371;APL FUNCTIONAL SYMBOL DOWN CARET TILDE;So;0;L;;;;;N;;;;;
+2372;APL FUNCTIONAL SYMBOL UP CARET TILDE;So;0;L;;;;;N;;;;;
+2373;APL FUNCTIONAL SYMBOL IOTA;So;0;L;;;;;N;;;;;
+2374;APL FUNCTIONAL SYMBOL RHO;So;0;L;;;;;N;;;;;
+2375;APL FUNCTIONAL SYMBOL OMEGA;So;0;L;;;;;N;;;;;
+2376;APL FUNCTIONAL SYMBOL ALPHA UNDERBAR;So;0;L;;;;;N;;;;;
+2377;APL FUNCTIONAL SYMBOL EPSILON UNDERBAR;So;0;L;;;;;N;;;;;
+2378;APL FUNCTIONAL SYMBOL IOTA UNDERBAR;So;0;L;;;;;N;;;;;
+2379;APL FUNCTIONAL SYMBOL OMEGA UNDERBAR;So;0;L;;;;;N;;;;;
+237A;APL FUNCTIONAL SYMBOL ALPHA;So;0;L;;;;;N;;;;;
+237B;NOT CHECK MARK;So;0;ON;;;;;N;;;;;
+237C;RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW;Sm;0;ON;;;;;N;;;;;
+237D;SHOULDERED OPEN BOX;So;0;ON;;;;;N;;;;;
+237E;BELL SYMBOL;So;0;ON;;;;;N;;;;;
+237F;VERTICAL LINE WITH MIDDLE DOT;So;0;ON;;;;;N;;;;;
+2380;INSERTION SYMBOL;So;0;ON;;;;;N;;;;;
+2381;CONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
+2382;DISCONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
+2383;EMPHASIS SYMBOL;So;0;ON;;;;;N;;;;;
+2384;COMPOSITION SYMBOL;So;0;ON;;;;;N;;;;;
+2385;WHITE SQUARE WITH CENTRE VERTICAL LINE;So;0;ON;;;;;N;;;;;
+2386;ENTER SYMBOL;So;0;ON;;;;;N;;;;;
+2387;ALTERNATIVE KEY SYMBOL;So;0;ON;;;;;N;;;;;
+2388;HELM SYMBOL;So;0;ON;;;;;N;;;;;
+2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;;;;
+238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;;;;
+238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;;;;
+238C;UNDO SYMBOL;So;0;ON;;;;;N;;;;;
+238D;MONOSTABLE SYMBOL;So;0;ON;;;;;N;;;;;
+238E;HYSTERESIS SYMBOL;So;0;ON;;;;;N;;;;;
+238F;OPEN-CIRCUIT-OUTPUT H-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
+2390;OPEN-CIRCUIT-OUTPUT L-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
+2391;PASSIVE-PULL-DOWN-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
+2392;PASSIVE-PULL-UP-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
+2393;DIRECT CURRENT SYMBOL FORM TWO;So;0;ON;;;;;N;;;;;
+2394;SOFTWARE-FUNCTION SYMBOL;So;0;ON;;;;;N;;;;;
+2395;APL FUNCTIONAL SYMBOL QUAD;So;0;L;;;;;N;;;;;
+2396;DECIMAL SEPARATOR KEY SYMBOL;So;0;ON;;;;;N;;;;;
+2397;PREVIOUS PAGE;So;0;ON;;;;;N;;;;;
+2398;NEXT PAGE;So;0;ON;;;;;N;;;;;
+2399;PRINT SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
+239A;CLEAR SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
+239B;LEFT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+239C;LEFT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
+239D;LEFT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+239E;RIGHT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+239F;RIGHT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A0;RIGHT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23A1;LEFT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
+23A2;LEFT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A3;LEFT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
+23A4;RIGHT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
+23A5;RIGHT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A6;RIGHT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
+23A7;LEFT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+23A8;LEFT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
+23A9;LEFT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23AA;CURLY BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23AB;RIGHT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+23AC;RIGHT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
+23AD;RIGHT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23AE;INTEGRAL EXTENSION;Sm;0;ON;;;;;N;;;;;
+23AF;HORIZONTAL LINE EXTENSION;Sm;0;ON;;;;;N;;;;;
+23B0;UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
+23B1;UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
+23B2;SUMMATION TOP;Sm;0;ON;;;;;N;;;;;
+23B3;SUMMATION BOTTOM;Sm;0;ON;;;;;N;;;;;
+23B4;TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B5;BOTTOM SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B6;BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B7;RADICAL SYMBOL BOTTOM;So;0;ON;;;;;N;;;;;
+23B8;LEFT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
+23B9;RIGHT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
+23BA;HORIZONTAL SCAN LINE-1;So;0;ON;;;;;N;;;;;
+23BB;HORIZONTAL SCAN LINE-3;So;0;ON;;;;;N;;;;;
+23BC;HORIZONTAL SCAN LINE-7;So;0;ON;;;;;N;;;;;
+23BD;HORIZONTAL SCAN LINE-9;So;0;ON;;;;;N;;;;;
+23BE;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;;
+23BF;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;;
+23C0;DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C1;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C2;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C3;DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C4;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C5;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C6;DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE;So;0;ON;;;;;N;;;;;
+23C7;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
+23C8;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
+23C9;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;;;;;
+23CA;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;;;;;
+23CB;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;;
+23CC;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;;
+23CD;SQUARE FOOT;So;0;ON;;;;;N;;;;;
+23CE;RETURN SYMBOL;So;0;ON;;;;;N;;;;;
+23CF;EJECT SYMBOL;So;0;ON;;;;;N;;;;;
+23D0;VERTICAL LINE EXTENSION;So;0;ON;;;;;N;;;;;
+23D1;METRICAL BREVE;So;0;ON;;;;;N;;;;;
+23D2;METRICAL LONG OVER SHORT;So;0;ON;;;;;N;;;;;
+23D3;METRICAL SHORT OVER LONG;So;0;ON;;;;;N;;;;;
+23D4;METRICAL LONG OVER TWO SHORTS;So;0;ON;;;;;N;;;;;
+23D5;METRICAL TWO SHORTS OVER LONG;So;0;ON;;;;;N;;;;;
+23D6;METRICAL TWO SHORTS JOINED;So;0;ON;;;;;N;;;;;
+23D7;METRICAL TRISEME;So;0;ON;;;;;N;;;;;
+23D8;METRICAL TETRASEME;So;0;ON;;;;;N;;;;;
+23D9;METRICAL PENTASEME;So;0;ON;;;;;N;;;;;
+23DA;EARTH GROUND;So;0;ON;;;;;N;;;;;
+23DB;FUSE;So;0;ON;;;;;N;;;;;
+23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;;;;
+23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;;;;
+23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;;;;
+23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;;;;
+23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;;
+23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;;
+23E2;WHITE TRAPEZIUM;So;0;ON;;;;;N;;;;;
+23E3;BENZENE RING WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23E4;STRAIGHTNESS;So;0;ON;;;;;N;;;;;
+23E5;FLATNESS;So;0;ON;;;;;N;;;;;
+23E6;AC CURRENT;So;0;ON;;;;;N;;;;;
+23E7;ELECTRICAL INTERSECTION;So;0;ON;;;;;N;;;;;
+23E8;DECIMAL EXPONENT SYMBOL;So;0;ON;;;;;N;;;;;
+23E9;BLACK RIGHT-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23EA;BLACK LEFT-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23EB;BLACK UP-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23EC;BLACK DOWN-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23ED;BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23EE;BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23EF;BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23F0;ALARM CLOCK;So;0;ON;;;;;N;;;;;
+23F1;STOPWATCH;So;0;ON;;;;;N;;;;;
+23F2;TIMER CLOCK;So;0;ON;;;;;N;;;;;
+23F3;HOURGLASS WITH FLOWING SAND;So;0;ON;;;;;N;;;;;
+23F4;BLACK MEDIUM LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F5;BLACK MEDIUM RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F6;BLACK MEDIUM UP-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F7;BLACK MEDIUM DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F8;DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23F9;BLACK SQUARE FOR STOP;So;0;ON;;;;;N;;;;;
+23FA;BLACK CIRCLE FOR RECORD;So;0;ON;;;;;N;;;;;
+23FB;POWER SYMBOL;So;0;ON;;;;;N;;;;;
+23FC;POWER ON-OFF SYMBOL;So;0;ON;;;;;N;;;;;
+23FD;POWER ON SYMBOL;So;0;ON;;;;;N;;;;;
+23FE;POWER SLEEP SYMBOL;So;0;ON;;;;;N;;;;;
+23FF;OBSERVER EYE SYMBOL;So;0;ON;;;;;N;;;;;
+2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
+2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
+2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
+2403;SYMBOL FOR END OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR END OF TEXT;;;;
+2404;SYMBOL FOR END OF TRANSMISSION;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION;;;;
+2405;SYMBOL FOR ENQUIRY;So;0;ON;;;;;N;GRAPHIC FOR ENQUIRY;;;;
+2406;SYMBOL FOR ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR ACKNOWLEDGE;;;;
+2407;SYMBOL FOR BELL;So;0;ON;;;;;N;GRAPHIC FOR BELL;;;;
+2408;SYMBOL FOR BACKSPACE;So;0;ON;;;;;N;GRAPHIC FOR BACKSPACE;;;;
+2409;SYMBOL FOR HORIZONTAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR HORIZONTAL TABULATION;;;;
+240A;SYMBOL FOR LINE FEED;So;0;ON;;;;;N;GRAPHIC FOR LINE FEED;;;;
+240B;SYMBOL FOR VERTICAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR VERTICAL TABULATION;;;;
+240C;SYMBOL FOR FORM FEED;So;0;ON;;;;;N;GRAPHIC FOR FORM FEED;;;;
+240D;SYMBOL FOR CARRIAGE RETURN;So;0;ON;;;;;N;GRAPHIC FOR CARRIAGE RETURN;;;;
+240E;SYMBOL FOR SHIFT OUT;So;0;ON;;;;;N;GRAPHIC FOR SHIFT OUT;;;;
+240F;SYMBOL FOR SHIFT IN;So;0;ON;;;;;N;GRAPHIC FOR SHIFT IN;;;;
+2410;SYMBOL FOR DATA LINK ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR DATA LINK ESCAPE;;;;
+2411;SYMBOL FOR DEVICE CONTROL ONE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL ONE;;;;
+2412;SYMBOL FOR DEVICE CONTROL TWO;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL TWO;;;;
+2413;SYMBOL FOR DEVICE CONTROL THREE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL THREE;;;;
+2414;SYMBOL FOR DEVICE CONTROL FOUR;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL FOUR;;;;
+2415;SYMBOL FOR NEGATIVE ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR NEGATIVE ACKNOWLEDGE;;;;
+2416;SYMBOL FOR SYNCHRONOUS IDLE;So;0;ON;;;;;N;GRAPHIC FOR SYNCHRONOUS IDLE;;;;
+2417;SYMBOL FOR END OF TRANSMISSION BLOCK;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION BLOCK;;;;
+2418;SYMBOL FOR CANCEL;So;0;ON;;;;;N;GRAPHIC FOR CANCEL;;;;
+2419;SYMBOL FOR END OF MEDIUM;So;0;ON;;;;;N;GRAPHIC FOR END OF MEDIUM;;;;
+241A;SYMBOL FOR SUBSTITUTE;So;0;ON;;;;;N;GRAPHIC FOR SUBSTITUTE;;;;
+241B;SYMBOL FOR ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR ESCAPE;;;;
+241C;SYMBOL FOR FILE SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR FILE SEPARATOR;;;;
+241D;SYMBOL FOR GROUP SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR GROUP SEPARATOR;;;;
+241E;SYMBOL FOR RECORD SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR RECORD SEPARATOR;;;;
+241F;SYMBOL FOR UNIT SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR UNIT SEPARATOR;;;;
+2420;SYMBOL FOR SPACE;So;0;ON;;;;;N;GRAPHIC FOR SPACE;;;;
+2421;SYMBOL FOR DELETE;So;0;ON;;;;;N;GRAPHIC FOR DELETE;;;;
+2422;BLANK SYMBOL;So;0;ON;;;;;N;BLANK;;;;
+2423;OPEN BOX;So;0;ON;;;;;N;;;;;
+2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;;
+2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;;
+2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;;
+2440;OCR HOOK;So;0;ON;;;;;N;;;;;
+2441;OCR CHAIR;So;0;ON;;;;;N;;;;;
+2442;OCR FORK;So;0;ON;;;;;N;;;;;
+2443;OCR INVERTED FORK;So;0;ON;;;;;N;;;;;
+2444;OCR BELT BUCKLE;So;0;ON;;;;;N;;;;;
+2445;OCR BOW TIE;So;0;ON;;;;;N;;;;;
+2446;OCR BRANCH BANK IDENTIFICATION;So;0;ON;;;;;N;;;;;
+2447;OCR AMOUNT OF CHECK;So;0;ON;;;;;N;;;;;
+2448;OCR DASH;So;0;ON;;;;;N;;;;;
+2449;OCR CUSTOMER ACCOUNT NUMBER;So;0;ON;;;;;N;;;;;
+244A;OCR DOUBLE BACKSLASH;So;0;ON;;;;;N;;;;;
+2460;CIRCLED DIGIT ONE;No;0;ON;<circle> 0031;;1;1;N;;;;;
+2461;CIRCLED DIGIT TWO;No;0;ON;<circle> 0032;;2;2;N;;;;;
+2462;CIRCLED DIGIT THREE;No;0;ON;<circle> 0033;;3;3;N;;;;;
+2463;CIRCLED DIGIT FOUR;No;0;ON;<circle> 0034;;4;4;N;;;;;
+2464;CIRCLED DIGIT FIVE;No;0;ON;<circle> 0035;;5;5;N;;;;;
+2465;CIRCLED DIGIT SIX;No;0;ON;<circle> 0036;;6;6;N;;;;;
+2466;CIRCLED DIGIT SEVEN;No;0;ON;<circle> 0037;;7;7;N;;;;;
+2467;CIRCLED DIGIT EIGHT;No;0;ON;<circle> 0038;;8;8;N;;;;;
+2468;CIRCLED DIGIT NINE;No;0;ON;<circle> 0039;;9;9;N;;;;;
+2469;CIRCLED NUMBER TEN;No;0;ON;<circle> 0031 0030;;;10;N;;;;;
+246A;CIRCLED NUMBER ELEVEN;No;0;ON;<circle> 0031 0031;;;11;N;;;;;
+246B;CIRCLED NUMBER TWELVE;No;0;ON;<circle> 0031 0032;;;12;N;;;;;
+246C;CIRCLED NUMBER THIRTEEN;No;0;ON;<circle> 0031 0033;;;13;N;;;;;
+246D;CIRCLED NUMBER FOURTEEN;No;0;ON;<circle> 0031 0034;;;14;N;;;;;
+246E;CIRCLED NUMBER FIFTEEN;No;0;ON;<circle> 0031 0035;;;15;N;;;;;
+246F;CIRCLED NUMBER SIXTEEN;No;0;ON;<circle> 0031 0036;;;16;N;;;;;
+2470;CIRCLED NUMBER SEVENTEEN;No;0;ON;<circle> 0031 0037;;;17;N;;;;;
+2471;CIRCLED NUMBER EIGHTEEN;No;0;ON;<circle> 0031 0038;;;18;N;;;;;
+2472;CIRCLED NUMBER NINETEEN;No;0;ON;<circle> 0031 0039;;;19;N;;;;;
+2473;CIRCLED NUMBER TWENTY;No;0;ON;<circle> 0032 0030;;;20;N;;;;;
+2474;PARENTHESIZED DIGIT ONE;No;0;ON;<compat> 0028 0031 0029;;1;1;N;;;;;
+2475;PARENTHESIZED DIGIT TWO;No;0;ON;<compat> 0028 0032 0029;;2;2;N;;;;;
+2476;PARENTHESIZED DIGIT THREE;No;0;ON;<compat> 0028 0033 0029;;3;3;N;;;;;
+2477;PARENTHESIZED DIGIT FOUR;No;0;ON;<compat> 0028 0034 0029;;4;4;N;;;;;
+2478;PARENTHESIZED DIGIT FIVE;No;0;ON;<compat> 0028 0035 0029;;5;5;N;;;;;
+2479;PARENTHESIZED DIGIT SIX;No;0;ON;<compat> 0028 0036 0029;;6;6;N;;;;;
+247A;PARENTHESIZED DIGIT SEVEN;No;0;ON;<compat> 0028 0037 0029;;7;7;N;;;;;
+247B;PARENTHESIZED DIGIT EIGHT;No;0;ON;<compat> 0028 0038 0029;;8;8;N;;;;;
+247C;PARENTHESIZED DIGIT NINE;No;0;ON;<compat> 0028 0039 0029;;9;9;N;;;;;
+247D;PARENTHESIZED NUMBER TEN;No;0;ON;<compat> 0028 0031 0030 0029;;;10;N;;;;;
+247E;PARENTHESIZED NUMBER ELEVEN;No;0;ON;<compat> 0028 0031 0031 0029;;;11;N;;;;;
+247F;PARENTHESIZED NUMBER TWELVE;No;0;ON;<compat> 0028 0031 0032 0029;;;12;N;;;;;
+2480;PARENTHESIZED NUMBER THIRTEEN;No;0;ON;<compat> 0028 0031 0033 0029;;;13;N;;;;;
+2481;PARENTHESIZED NUMBER FOURTEEN;No;0;ON;<compat> 0028 0031 0034 0029;;;14;N;;;;;
+2482;PARENTHESIZED NUMBER FIFTEEN;No;0;ON;<compat> 0028 0031 0035 0029;;;15;N;;;;;
+2483;PARENTHESIZED NUMBER SIXTEEN;No;0;ON;<compat> 0028 0031 0036 0029;;;16;N;;;;;
+2484;PARENTHESIZED NUMBER SEVENTEEN;No;0;ON;<compat> 0028 0031 0037 0029;;;17;N;;;;;
+2485;PARENTHESIZED NUMBER EIGHTEEN;No;0;ON;<compat> 0028 0031 0038 0029;;;18;N;;;;;
+2486;PARENTHESIZED NUMBER NINETEEN;No;0;ON;<compat> 0028 0031 0039 0029;;;19;N;;;;;
+2487;PARENTHESIZED NUMBER TWENTY;No;0;ON;<compat> 0028 0032 0030 0029;;;20;N;;;;;
+2488;DIGIT ONE FULL STOP;No;0;EN;<compat> 0031 002E;;1;1;N;DIGIT ONE PERIOD;;;;
+2489;DIGIT TWO FULL STOP;No;0;EN;<compat> 0032 002E;;2;2;N;DIGIT TWO PERIOD;;;;
+248A;DIGIT THREE FULL STOP;No;0;EN;<compat> 0033 002E;;3;3;N;DIGIT THREE PERIOD;;;;
+248B;DIGIT FOUR FULL STOP;No;0;EN;<compat> 0034 002E;;4;4;N;DIGIT FOUR PERIOD;;;;
+248C;DIGIT FIVE FULL STOP;No;0;EN;<compat> 0035 002E;;5;5;N;DIGIT FIVE PERIOD;;;;
+248D;DIGIT SIX FULL STOP;No;0;EN;<compat> 0036 002E;;6;6;N;DIGIT SIX PERIOD;;;;
+248E;DIGIT SEVEN FULL STOP;No;0;EN;<compat> 0037 002E;;7;7;N;DIGIT SEVEN PERIOD;;;;
+248F;DIGIT EIGHT FULL STOP;No;0;EN;<compat> 0038 002E;;8;8;N;DIGIT EIGHT PERIOD;;;;
+2490;DIGIT NINE FULL STOP;No;0;EN;<compat> 0039 002E;;9;9;N;DIGIT NINE PERIOD;;;;
+2491;NUMBER TEN FULL STOP;No;0;EN;<compat> 0031 0030 002E;;;10;N;NUMBER TEN PERIOD;;;;
+2492;NUMBER ELEVEN FULL STOP;No;0;EN;<compat> 0031 0031 002E;;;11;N;NUMBER ELEVEN PERIOD;;;;
+2493;NUMBER TWELVE FULL STOP;No;0;EN;<compat> 0031 0032 002E;;;12;N;NUMBER TWELVE PERIOD;;;;
+2494;NUMBER THIRTEEN FULL STOP;No;0;EN;<compat> 0031 0033 002E;;;13;N;NUMBER THIRTEEN PERIOD;;;;
+2495;NUMBER FOURTEEN FULL STOP;No;0;EN;<compat> 0031 0034 002E;;;14;N;NUMBER FOURTEEN PERIOD;;;;
+2496;NUMBER FIFTEEN FULL STOP;No;0;EN;<compat> 0031 0035 002E;;;15;N;NUMBER FIFTEEN PERIOD;;;;
+2497;NUMBER SIXTEEN FULL STOP;No;0;EN;<compat> 0031 0036 002E;;;16;N;NUMBER SIXTEEN PERIOD;;;;
+2498;NUMBER SEVENTEEN FULL STOP;No;0;EN;<compat> 0031 0037 002E;;;17;N;NUMBER SEVENTEEN PERIOD;;;;
+2499;NUMBER EIGHTEEN FULL STOP;No;0;EN;<compat> 0031 0038 002E;;;18;N;NUMBER EIGHTEEN PERIOD;;;;
+249A;NUMBER NINETEEN FULL STOP;No;0;EN;<compat> 0031 0039 002E;;;19;N;NUMBER NINETEEN PERIOD;;;;
+249B;NUMBER TWENTY FULL STOP;No;0;EN;<compat> 0032 0030 002E;;;20;N;NUMBER TWENTY PERIOD;;;;
+249C;PARENTHESIZED LATIN SMALL LETTER A;So;0;L;<compat> 0028 0061 0029;;;;N;;;;;
+249D;PARENTHESIZED LATIN SMALL LETTER B;So;0;L;<compat> 0028 0062 0029;;;;N;;;;;
+249E;PARENTHESIZED LATIN SMALL LETTER C;So;0;L;<compat> 0028 0063 0029;;;;N;;;;;
+249F;PARENTHESIZED LATIN SMALL LETTER D;So;0;L;<compat> 0028 0064 0029;;;;N;;;;;
+24A0;PARENTHESIZED LATIN SMALL LETTER E;So;0;L;<compat> 0028 0065 0029;;;;N;;;;;
+24A1;PARENTHESIZED LATIN SMALL LETTER F;So;0;L;<compat> 0028 0066 0029;;;;N;;;;;
+24A2;PARENTHESIZED LATIN SMALL LETTER G;So;0;L;<compat> 0028 0067 0029;;;;N;;;;;
+24A3;PARENTHESIZED LATIN SMALL LETTER H;So;0;L;<compat> 0028 0068 0029;;;;N;;;;;
+24A4;PARENTHESIZED LATIN SMALL LETTER I;So;0;L;<compat> 0028 0069 0029;;;;N;;;;;
+24A5;PARENTHESIZED LATIN SMALL LETTER J;So;0;L;<compat> 0028 006A 0029;;;;N;;;;;
+24A6;PARENTHESIZED LATIN SMALL LETTER K;So;0;L;<compat> 0028 006B 0029;;;;N;;;;;
+24A7;PARENTHESIZED LATIN SMALL LETTER L;So;0;L;<compat> 0028 006C 0029;;;;N;;;;;
+24A8;PARENTHESIZED LATIN SMALL LETTER M;So;0;L;<compat> 0028 006D 0029;;;;N;;;;;
+24A9;PARENTHESIZED LATIN SMALL LETTER N;So;0;L;<compat> 0028 006E 0029;;;;N;;;;;
+24AA;PARENTHESIZED LATIN SMALL LETTER O;So;0;L;<compat> 0028 006F 0029;;;;N;;;;;
+24AB;PARENTHESIZED LATIN SMALL LETTER P;So;0;L;<compat> 0028 0070 0029;;;;N;;;;;
+24AC;PARENTHESIZED LATIN SMALL LETTER Q;So;0;L;<compat> 0028 0071 0029;;;;N;;;;;
+24AD;PARENTHESIZED LATIN SMALL LETTER R;So;0;L;<compat> 0028 0072 0029;;;;N;;;;;
+24AE;PARENTHESIZED LATIN SMALL LETTER S;So;0;L;<compat> 0028 0073 0029;;;;N;;;;;
+24AF;PARENTHESIZED LATIN SMALL LETTER T;So;0;L;<compat> 0028 0074 0029;;;;N;;;;;
+24B0;PARENTHESIZED LATIN SMALL LETTER U;So;0;L;<compat> 0028 0075 0029;;;;N;;;;;
+24B1;PARENTHESIZED LATIN SMALL LETTER V;So;0;L;<compat> 0028 0076 0029;;;;N;;;;;
+24B2;PARENTHESIZED LATIN SMALL LETTER W;So;0;L;<compat> 0028 0077 0029;;;;N;;;;;
+24B3;PARENTHESIZED LATIN SMALL LETTER X;So;0;L;<compat> 0028 0078 0029;;;;N;;;;;
+24B4;PARENTHESIZED LATIN SMALL LETTER Y;So;0;L;<compat> 0028 0079 0029;;;;N;;;;;
+24B5;PARENTHESIZED LATIN SMALL LETTER Z;So;0;L;<compat> 0028 007A 0029;;;;N;;;;;
+24B6;CIRCLED LATIN CAPITAL LETTER A;So;0;L;<circle> 0041;;;;N;;;;24D0;
+24B7;CIRCLED LATIN CAPITAL LETTER B;So;0;L;<circle> 0042;;;;N;;;;24D1;
+24B8;CIRCLED LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;24D2;
+24B9;CIRCLED LATIN CAPITAL LETTER D;So;0;L;<circle> 0044;;;;N;;;;24D3;
+24BA;CIRCLED LATIN CAPITAL LETTER E;So;0;L;<circle> 0045;;;;N;;;;24D4;
+24BB;CIRCLED LATIN CAPITAL LETTER F;So;0;L;<circle> 0046;;;;N;;;;24D5;
+24BC;CIRCLED LATIN CAPITAL LETTER G;So;0;L;<circle> 0047;;;;N;;;;24D6;
+24BD;CIRCLED LATIN CAPITAL LETTER H;So;0;L;<circle> 0048;;;;N;;;;24D7;
+24BE;CIRCLED LATIN CAPITAL LETTER I;So;0;L;<circle> 0049;;;;N;;;;24D8;
+24BF;CIRCLED LATIN CAPITAL LETTER J;So;0;L;<circle> 004A;;;;N;;;;24D9;
+24C0;CIRCLED LATIN CAPITAL LETTER K;So;0;L;<circle> 004B;;;;N;;;;24DA;
+24C1;CIRCLED LATIN CAPITAL LETTER L;So;0;L;<circle> 004C;;;;N;;;;24DB;
+24C2;CIRCLED LATIN CAPITAL LETTER M;So;0;L;<circle> 004D;;;;N;;;;24DC;
+24C3;CIRCLED LATIN CAPITAL LETTER N;So;0;L;<circle> 004E;;;;N;;;;24DD;
+24C4;CIRCLED LATIN CAPITAL LETTER O;So;0;L;<circle> 004F;;;;N;;;;24DE;
+24C5;CIRCLED LATIN CAPITAL LETTER P;So;0;L;<circle> 0050;;;;N;;;;24DF;
+24C6;CIRCLED LATIN CAPITAL LETTER Q;So;0;L;<circle> 0051;;;;N;;;;24E0;
+24C7;CIRCLED LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;24E1;
+24C8;CIRCLED LATIN CAPITAL LETTER S;So;0;L;<circle> 0053;;;;N;;;;24E2;
+24C9;CIRCLED LATIN CAPITAL LETTER T;So;0;L;<circle> 0054;;;;N;;;;24E3;
+24CA;CIRCLED LATIN CAPITAL LETTER U;So;0;L;<circle> 0055;;;;N;;;;24E4;
+24CB;CIRCLED LATIN CAPITAL LETTER V;So;0;L;<circle> 0056;;;;N;;;;24E5;
+24CC;CIRCLED LATIN CAPITAL LETTER W;So;0;L;<circle> 0057;;;;N;;;;24E6;
+24CD;CIRCLED LATIN CAPITAL LETTER X;So;0;L;<circle> 0058;;;;N;;;;24E7;
+24CE;CIRCLED LATIN CAPITAL LETTER Y;So;0;L;<circle> 0059;;;;N;;;;24E8;
+24CF;CIRCLED LATIN CAPITAL LETTER Z;So;0;L;<circle> 005A;;;;N;;;;24E9;
+24D0;CIRCLED LATIN SMALL LETTER A;So;0;L;<circle> 0061;;;;N;;;24B6;;24B6
+24D1;CIRCLED LATIN SMALL LETTER B;So;0;L;<circle> 0062;;;;N;;;24B7;;24B7
+24D2;CIRCLED LATIN SMALL LETTER C;So;0;L;<circle> 0063;;;;N;;;24B8;;24B8
+24D3;CIRCLED LATIN SMALL LETTER D;So;0;L;<circle> 0064;;;;N;;;24B9;;24B9
+24D4;CIRCLED LATIN SMALL LETTER E;So;0;L;<circle> 0065;;;;N;;;24BA;;24BA
+24D5;CIRCLED LATIN SMALL LETTER F;So;0;L;<circle> 0066;;;;N;;;24BB;;24BB
+24D6;CIRCLED LATIN SMALL LETTER G;So;0;L;<circle> 0067;;;;N;;;24BC;;24BC
+24D7;CIRCLED LATIN SMALL LETTER H;So;0;L;<circle> 0068;;;;N;;;24BD;;24BD
+24D8;CIRCLED LATIN SMALL LETTER I;So;0;L;<circle> 0069;;;;N;;;24BE;;24BE
+24D9;CIRCLED LATIN SMALL LETTER J;So;0;L;<circle> 006A;;;;N;;;24BF;;24BF
+24DA;CIRCLED LATIN SMALL LETTER K;So;0;L;<circle> 006B;;;;N;;;24C0;;24C0
+24DB;CIRCLED LATIN SMALL LETTER L;So;0;L;<circle> 006C;;;;N;;;24C1;;24C1
+24DC;CIRCLED LATIN SMALL LETTER M;So;0;L;<circle> 006D;;;;N;;;24C2;;24C2
+24DD;CIRCLED LATIN SMALL LETTER N;So;0;L;<circle> 006E;;;;N;;;24C3;;24C3
+24DE;CIRCLED LATIN SMALL LETTER O;So;0;L;<circle> 006F;;;;N;;;24C4;;24C4
+24DF;CIRCLED LATIN SMALL LETTER P;So;0;L;<circle> 0070;;;;N;;;24C5;;24C5
+24E0;CIRCLED LATIN SMALL LETTER Q;So;0;L;<circle> 0071;;;;N;;;24C6;;24C6
+24E1;CIRCLED LATIN SMALL LETTER R;So;0;L;<circle> 0072;;;;N;;;24C7;;24C7
+24E2;CIRCLED LATIN SMALL LETTER S;So;0;L;<circle> 0073;;;;N;;;24C8;;24C8
+24E3;CIRCLED LATIN SMALL LETTER T;So;0;L;<circle> 0074;;;;N;;;24C9;;24C9
+24E4;CIRCLED LATIN SMALL LETTER U;So;0;L;<circle> 0075;;;;N;;;24CA;;24CA
+24E5;CIRCLED LATIN SMALL LETTER V;So;0;L;<circle> 0076;;;;N;;;24CB;;24CB
+24E6;CIRCLED LATIN SMALL LETTER W;So;0;L;<circle> 0077;;;;N;;;24CC;;24CC
+24E7;CIRCLED LATIN SMALL LETTER X;So;0;L;<circle> 0078;;;;N;;;24CD;;24CD
+24E8;CIRCLED LATIN SMALL LETTER Y;So;0;L;<circle> 0079;;;;N;;;24CE;;24CE
+24E9;CIRCLED LATIN SMALL LETTER Z;So;0;L;<circle> 007A;;;;N;;;24CF;;24CF
+24EA;CIRCLED DIGIT ZERO;No;0;ON;<circle> 0030;;0;0;N;;;;;
+24EB;NEGATIVE CIRCLED NUMBER ELEVEN;No;0;ON;;;;11;N;;;;;
+24EC;NEGATIVE CIRCLED NUMBER TWELVE;No;0;ON;;;;12;N;;;;;
+24ED;NEGATIVE CIRCLED NUMBER THIRTEEN;No;0;ON;;;;13;N;;;;;
+24EE;NEGATIVE CIRCLED NUMBER FOURTEEN;No;0;ON;;;;14;N;;;;;
+24EF;NEGATIVE CIRCLED NUMBER FIFTEEN;No;0;ON;;;;15;N;;;;;
+24F0;NEGATIVE CIRCLED NUMBER SIXTEEN;No;0;ON;;;;16;N;;;;;
+24F1;NEGATIVE CIRCLED NUMBER SEVENTEEN;No;0;ON;;;;17;N;;;;;
+24F2;NEGATIVE CIRCLED NUMBER EIGHTEEN;No;0;ON;;;;18;N;;;;;
+24F3;NEGATIVE CIRCLED NUMBER NINETEEN;No;0;ON;;;;19;N;;;;;
+24F4;NEGATIVE CIRCLED NUMBER TWENTY;No;0;ON;;;;20;N;;;;;
+24F5;DOUBLE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;;;;;
+24F6;DOUBLE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;;;;;
+24F7;DOUBLE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;;;;;
+24F8;DOUBLE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;;;;;
+24F9;DOUBLE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;;;;;
+24FA;DOUBLE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;;;;;
+24FB;DOUBLE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;;;;;
+24FC;DOUBLE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;;;;;
+24FD;DOUBLE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;;;;;
+24FE;DOUBLE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;;;;;
+24FF;NEGATIVE CIRCLED DIGIT ZERO;No;0;ON;;;0;0;N;;;;;
+2500;BOX DRAWINGS LIGHT HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT HORIZONTAL;;;;
+2501;BOX DRAWINGS HEAVY HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY HORIZONTAL;;;;
+2502;BOX DRAWINGS LIGHT VERTICAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL;;;;
+2503;BOX DRAWINGS HEAVY VERTICAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL;;;;
+2504;BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH HORIZONTAL;;;;
+2505;BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH HORIZONTAL;;;;
+2506;BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH VERTICAL;;;;
+2507;BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH VERTICAL;;;;
+2508;BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH HORIZONTAL;;;;
+2509;BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH HORIZONTAL;;;;
+250A;BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH VERTICAL;;;;
+250B;BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH VERTICAL;;;;
+250C;BOX DRAWINGS LIGHT DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND RIGHT;;;;
+250D;BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT HEAVY;;;;
+250E;BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT LIGHT;;;;
+250F;BOX DRAWINGS HEAVY DOWN AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND RIGHT;;;;
+2510;BOX DRAWINGS LIGHT DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND LEFT;;;;
+2511;BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT HEAVY;;;;
+2512;BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT LIGHT;;;;
+2513;BOX DRAWINGS HEAVY DOWN AND LEFT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND LEFT;;;;
+2514;BOX DRAWINGS LIGHT UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT UP AND RIGHT;;;;
+2515;BOX DRAWINGS UP LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT HEAVY;;;;
+2516;BOX DRAWINGS UP HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT LIGHT;;;;
+2517;BOX DRAWINGS HEAVY UP AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY UP AND RIGHT;;;;
+2518;BOX DRAWINGS LIGHT UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT UP AND LEFT;;;;
+2519;BOX DRAWINGS UP LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT HEAVY;;;;
+251A;BOX DRAWINGS UP HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT LIGHT;;;;
+251B;BOX DRAWINGS HEAVY UP AND LEFT;So;0;ON;;;;;N;FORMS HEAVY UP AND LEFT;;;;
+251C;BOX DRAWINGS LIGHT VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND RIGHT;;;;
+251D;BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND RIGHT HEAVY;;;;
+251E;BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT DOWN LIGHT;;;;
+251F;BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT UP LIGHT;;;;
+2520;BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND RIGHT LIGHT;;;;
+2521;BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT UP HEAVY;;;;
+2522;BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT DOWN HEAVY;;;;
+2523;BOX DRAWINGS HEAVY VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND RIGHT;;;;
+2524;BOX DRAWINGS LIGHT VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND LEFT;;;;
+2525;BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND LEFT HEAVY;;;;
+2526;BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT DOWN LIGHT;;;;
+2527;BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT UP LIGHT;;;;
+2528;BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND LEFT LIGHT;;;;
+2529;BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT UP HEAVY;;;;
+252A;BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT DOWN HEAVY;;;;
+252B;BOX DRAWINGS HEAVY VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND LEFT;;;;
+252C;BOX DRAWINGS LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOWN AND HORIZONTAL;;;;
+252D;BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT DOWN LIGHT;;;;
+252E;BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT DOWN LIGHT;;;;
+252F;BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND HORIZONTAL HEAVY;;;;
+2530;BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND HORIZONTAL LIGHT;;;;
+2531;BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT DOWN HEAVY;;;;
+2532;BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT DOWN HEAVY;;;;
+2533;BOX DRAWINGS HEAVY DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOWN AND HORIZONTAL;;;;
+2534;BOX DRAWINGS LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT UP AND HORIZONTAL;;;;
+2535;BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT UP LIGHT;;;;
+2536;BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT UP LIGHT;;;;
+2537;BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND HORIZONTAL HEAVY;;;;
+2538;BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND HORIZONTAL LIGHT;;;;
+2539;BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT UP HEAVY;;;;
+253A;BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT UP HEAVY;;;;
+253B;BOX DRAWINGS HEAVY UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY UP AND HORIZONTAL;;;;
+253C;BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND HORIZONTAL;;;;
+253D;BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT VERTICAL LIGHT;;;;
+253E;BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT VERTICAL LIGHT;;;;
+253F;BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND HORIZONTAL HEAVY;;;;
+2540;BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND DOWN HORIZONTAL LIGHT;;;;
+2541;BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND UP HORIZONTAL LIGHT;;;;
+2542;BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND HORIZONTAL LIGHT;;;;
+2543;BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT UP HEAVY AND RIGHT DOWN LIGHT;;;;
+2544;BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT UP HEAVY AND LEFT DOWN LIGHT;;;;
+2545;BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT DOWN HEAVY AND RIGHT UP LIGHT;;;;
+2546;BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT DOWN HEAVY AND LEFT UP LIGHT;;;;
+2547;BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND UP HORIZONTAL HEAVY;;;;
+2548;BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND DOWN HORIZONTAL HEAVY;;;;
+2549;BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT VERTICAL HEAVY;;;;
+254A;BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT VERTICAL HEAVY;;;;
+254B;BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND HORIZONTAL;;;;
+254C;BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH HORIZONTAL;;;;
+254D;BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH HORIZONTAL;;;;
+254E;BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH VERTICAL;;;;
+254F;BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH VERTICAL;;;;
+2550;BOX DRAWINGS DOUBLE HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE HORIZONTAL;;;;
+2551;BOX DRAWINGS DOUBLE VERTICAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL;;;;
+2552;BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND RIGHT DOUBLE;;;;
+2553;BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND RIGHT SINGLE;;;;
+2554;BOX DRAWINGS DOUBLE DOWN AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND RIGHT;;;;
+2555;BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND LEFT DOUBLE;;;;
+2556;BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND LEFT SINGLE;;;;
+2557;BOX DRAWINGS DOUBLE DOWN AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND LEFT;;;;
+2558;BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND RIGHT DOUBLE;;;;
+2559;BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND RIGHT SINGLE;;;;
+255A;BOX DRAWINGS DOUBLE UP AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE UP AND RIGHT;;;;
+255B;BOX DRAWINGS UP SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND LEFT DOUBLE;;;;
+255C;BOX DRAWINGS UP DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND LEFT SINGLE;;;;
+255D;BOX DRAWINGS DOUBLE UP AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE UP AND LEFT;;;;
+255E;BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND RIGHT DOUBLE;;;;
+255F;BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND RIGHT SINGLE;;;;
+2560;BOX DRAWINGS DOUBLE VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND RIGHT;;;;
+2561;BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND LEFT DOUBLE;;;;
+2562;BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND LEFT SINGLE;;;;
+2563;BOX DRAWINGS DOUBLE VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND LEFT;;;;
+2564;BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND HORIZONTAL DOUBLE;;;;
+2565;BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND HORIZONTAL SINGLE;;;;
+2566;BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND HORIZONTAL;;;;
+2567;BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND HORIZONTAL DOUBLE;;;;
+2568;BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND HORIZONTAL SINGLE;;;;
+2569;BOX DRAWINGS DOUBLE UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE UP AND HORIZONTAL;;;;
+256A;BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND HORIZONTAL DOUBLE;;;;
+256B;BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND HORIZONTAL SINGLE;;;;
+256C;BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND HORIZONTAL;;;;
+256D;BOX DRAWINGS LIGHT ARC DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND RIGHT;;;;
+256E;BOX DRAWINGS LIGHT ARC DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND LEFT;;;;
+256F;BOX DRAWINGS LIGHT ARC UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND LEFT;;;;
+2570;BOX DRAWINGS LIGHT ARC UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND RIGHT;;;;
+2571;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;;;;
+2572;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;;;;
+2573;BOX DRAWINGS LIGHT DIAGONAL CROSS;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL CROSS;;;;
+2574;BOX DRAWINGS LIGHT LEFT;So;0;ON;;;;;N;FORMS LIGHT LEFT;;;;
+2575;BOX DRAWINGS LIGHT UP;So;0;ON;;;;;N;FORMS LIGHT UP;;;;
+2576;BOX DRAWINGS LIGHT RIGHT;So;0;ON;;;;;N;FORMS LIGHT RIGHT;;;;
+2577;BOX DRAWINGS LIGHT DOWN;So;0;ON;;;;;N;FORMS LIGHT DOWN;;;;
+2578;BOX DRAWINGS HEAVY LEFT;So;0;ON;;;;;N;FORMS HEAVY LEFT;;;;
+2579;BOX DRAWINGS HEAVY UP;So;0;ON;;;;;N;FORMS HEAVY UP;;;;
+257A;BOX DRAWINGS HEAVY RIGHT;So;0;ON;;;;;N;FORMS HEAVY RIGHT;;;;
+257B;BOX DRAWINGS HEAVY DOWN;So;0;ON;;;;;N;FORMS HEAVY DOWN;;;;
+257C;BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT;So;0;ON;;;;;N;FORMS LIGHT LEFT AND HEAVY RIGHT;;;;
+257D;BOX DRAWINGS LIGHT UP AND HEAVY DOWN;So;0;ON;;;;;N;FORMS LIGHT UP AND HEAVY DOWN;;;;
+257E;BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT;So;0;ON;;;;;N;FORMS HEAVY LEFT AND LIGHT RIGHT;;;;
+257F;BOX DRAWINGS HEAVY UP AND LIGHT DOWN;So;0;ON;;;;;N;FORMS HEAVY UP AND LIGHT DOWN;;;;
+2580;UPPER HALF BLOCK;So;0;ON;;;;;N;;;;;
+2581;LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2582;LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+2583;LOWER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2584;LOWER HALF BLOCK;So;0;ON;;;;;N;;;;;
+2585;LOWER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2586;LOWER THREE QUARTERS BLOCK;So;0;ON;;;;;N;LOWER THREE QUARTER BLOCK;;;;
+2587;LOWER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2588;FULL BLOCK;So;0;ON;;;;;N;;;;;
+2589;LEFT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258A;LEFT THREE QUARTERS BLOCK;So;0;ON;;;;;N;LEFT THREE QUARTER BLOCK;;;;
+258B;LEFT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258C;LEFT HALF BLOCK;So;0;ON;;;;;N;;;;;
+258D;LEFT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258E;LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+258F;LEFT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2590;RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;;
+2591;LIGHT SHADE;So;0;ON;;;;;N;;;;;
+2592;MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+2593;DARK SHADE;So;0;ON;;;;;N;;;;;
+2594;UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2595;RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2596;QUADRANT LOWER LEFT;So;0;ON;;;;;N;;;;;
+2597;QUADRANT LOWER RIGHT;So;0;ON;;;;;N;;;;;
+2598;QUADRANT UPPER LEFT;So;0;ON;;;;;N;;;;;
+2599;QUADRANT UPPER LEFT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259A;QUADRANT UPPER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259B;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
+259C;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259D;QUADRANT UPPER RIGHT;So;0;ON;;;;;N;;;;;
+259E;QUADRANT UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
+259F;QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+25A0;BLACK SQUARE;So;0;ON;;;;;N;;;;;
+25A1;WHITE SQUARE;So;0;ON;;;;;N;;;;;
+25A2;WHITE SQUARE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
+25A3;WHITE SQUARE CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25A4;SQUARE WITH HORIZONTAL FILL;So;0;ON;;;;;N;;;;;
+25A5;SQUARE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
+25A6;SQUARE WITH ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
+25A7;SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;;
+25A8;SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;;
+25A9;SQUARE WITH DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
+25AA;BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25AB;WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25AC;BLACK RECTANGLE;So;0;ON;;;;;N;;;;;
+25AD;WHITE RECTANGLE;So;0;ON;;;;;N;;;;;
+25AE;BLACK VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
+25AF;WHITE VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
+25B0;BLACK PARALLELOGRAM;So;0;ON;;;;;N;;;;;
+25B1;WHITE PARALLELOGRAM;So;0;ON;;;;;N;;;;;
+25B2;BLACK UP-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING TRIANGLE;;;;
+25B3;WHITE UP-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE;;;;
+25B4;BLACK UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING SMALL TRIANGLE;;;;
+25B5;WHITE UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING SMALL TRIANGLE;;;;
+25B6;BLACK RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING TRIANGLE;;;;
+25B7;WHITE RIGHT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE RIGHT POINTING TRIANGLE;;;;
+25B8;BLACK RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING SMALL TRIANGLE;;;;
+25B9;WHITE RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE RIGHT POINTING SMALL TRIANGLE;;;;
+25BA;BLACK RIGHT-POINTING POINTER;So;0;ON;;;;;N;BLACK RIGHT POINTING POINTER;;;;
+25BB;WHITE RIGHT-POINTING POINTER;So;0;ON;;;;;N;WHITE RIGHT POINTING POINTER;;;;
+25BC;BLACK DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING TRIANGLE;;;;
+25BD;WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING TRIANGLE;;;;
+25BE;BLACK DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING SMALL TRIANGLE;;;;
+25BF;WHITE DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING SMALL TRIANGLE;;;;
+25C0;BLACK LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING TRIANGLE;;;;
+25C1;WHITE LEFT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE LEFT POINTING TRIANGLE;;;;
+25C2;BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING SMALL TRIANGLE;;;;
+25C3;WHITE LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE LEFT POINTING SMALL TRIANGLE;;;;
+25C4;BLACK LEFT-POINTING POINTER;So;0;ON;;;;;N;BLACK LEFT POINTING POINTER;;;;
+25C5;WHITE LEFT-POINTING POINTER;So;0;ON;;;;;N;WHITE LEFT POINTING POINTER;;;;
+25C6;BLACK DIAMOND;So;0;ON;;;;;N;;;;;
+25C7;WHITE DIAMOND;So;0;ON;;;;;N;;;;;
+25C8;WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+25C9;FISHEYE;So;0;ON;;;;;N;;;;;
+25CA;LOZENGE;So;0;ON;;;;;N;;;;;
+25CB;WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25CC;DOTTED CIRCLE;So;0;ON;;;;;N;;;;;
+25CD;CIRCLE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
+25CE;BULLSEYE;So;0;ON;;;;;N;;;;;
+25CF;BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D0;CIRCLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+25D1;CIRCLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+25D2;CIRCLE WITH LOWER HALF BLACK;So;0;ON;;;;;N;;;;;
+25D3;CIRCLE WITH UPPER HALF BLACK;So;0;ON;;;;;N;;;;;
+25D4;CIRCLE WITH UPPER RIGHT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
+25D5;CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
+25D6;LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D7;RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D8;INVERSE BULLET;So;0;ON;;;;;N;;;;;
+25D9;INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DA;UPPER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DB;LOWER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DC;UPPER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DD;UPPER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DE;LOWER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DF;LOWER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25E0;UPPER HALF CIRCLE;So;0;ON;;;;;N;;;;;
+25E1;LOWER HALF CIRCLE;So;0;ON;;;;;N;;;;;
+25E2;BLACK LOWER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E3;BLACK LOWER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E4;BLACK UPPER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E5;BLACK UPPER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E6;WHITE BULLET;So;0;ON;;;;;N;;;;;
+25E7;SQUARE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+25E8;SQUARE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+25E9;SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+25EA;SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+25EB;WHITE SQUARE WITH VERTICAL BISECTING LINE;So;0;ON;;;;;N;;;;;
+25EC;WHITE UP-POINTING TRIANGLE WITH DOT;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE WITH DOT;;;;
+25ED;UP-POINTING TRIANGLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH LEFT HALF BLACK;;;;
+25EE;UP-POINTING TRIANGLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH RIGHT HALF BLACK;;;;
+25EF;LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+25F0;WHITE SQUARE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F1;WHITE SQUARE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F2;WHITE SQUARE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F3;WHITE SQUARE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F4;WHITE CIRCLE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F5;WHITE CIRCLE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F6;WHITE CIRCLE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F7;WHITE CIRCLE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F8;UPPER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25F9;UPPER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25FA;LOWER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25FB;WHITE MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
+25FC;BLACK MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
+25FD;WHITE MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
+25FE;BLACK MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
+25FF;LOWER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2600;BLACK SUN WITH RAYS;So;0;ON;;;;;N;;;;;
+2601;CLOUD;So;0;ON;;;;;N;;;;;
+2602;UMBRELLA;So;0;ON;;;;;N;;;;;
+2603;SNOWMAN;So;0;ON;;;;;N;;;;;
+2604;COMET;So;0;ON;;;;;N;;;;;
+2605;BLACK STAR;So;0;ON;;;;;N;;;;;
+2606;WHITE STAR;So;0;ON;;;;;N;;;;;
+2607;LIGHTNING;So;0;ON;;;;;N;;;;;
+2608;THUNDERSTORM;So;0;ON;;;;;N;;;;;
+2609;SUN;So;0;ON;;;;;N;;;;;
+260A;ASCENDING NODE;So;0;ON;;;;;N;;;;;
+260B;DESCENDING NODE;So;0;ON;;;;;N;;;;;
+260C;CONJUNCTION;So;0;ON;;;;;N;;;;;
+260D;OPPOSITION;So;0;ON;;;;;N;;;;;
+260E;BLACK TELEPHONE;So;0;ON;;;;;N;;;;;
+260F;WHITE TELEPHONE;So;0;ON;;;;;N;;;;;
+2610;BALLOT BOX;So;0;ON;;;;;N;;;;;
+2611;BALLOT BOX WITH CHECK;So;0;ON;;;;;N;;;;;
+2612;BALLOT BOX WITH X;So;0;ON;;;;;N;;;;;
+2613;SALTIRE;So;0;ON;;;;;N;;;;;
+2614;UMBRELLA WITH RAIN DROPS;So;0;ON;;;;;N;;;;;
+2615;HOT BEVERAGE;So;0;ON;;;;;N;;;;;
+2616;WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
+2617;BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
+2618;SHAMROCK;So;0;ON;;;;;N;;;;;
+2619;REVERSED ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
+261A;BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261B;BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261C;WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261D;WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+261E;WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261F;WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+2620;SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;;
+2621;CAUTION SIGN;So;0;ON;;;;;N;;;;;
+2622;RADIOACTIVE SIGN;So;0;ON;;;;;N;;;;;
+2623;BIOHAZARD SIGN;So;0;ON;;;;;N;;;;;
+2624;CADUCEUS;So;0;ON;;;;;N;;;;;
+2625;ANKH;So;0;ON;;;;;N;;;;;
+2626;ORTHODOX CROSS;So;0;ON;;;;;N;;;;;
+2627;CHI RHO;So;0;ON;;;;;N;;;;;
+2628;CROSS OF LORRAINE;So;0;ON;;;;;N;;;;;
+2629;CROSS OF JERUSALEM;So;0;ON;;;;;N;;;;;
+262A;STAR AND CRESCENT;So;0;ON;;;;;N;;;;;
+262B;FARSI SYMBOL;So;0;ON;;;;;N;SYMBOL OF IRAN;;;;
+262C;ADI SHAKTI;So;0;ON;;;;;N;;;;;
+262D;HAMMER AND SICKLE;So;0;ON;;;;;N;;;;;
+262E;PEACE SYMBOL;So;0;ON;;;;;N;;;;;
+262F;YIN YANG;So;0;ON;;;;;N;;;;;
+2630;TRIGRAM FOR HEAVEN;So;0;ON;;;;;N;;;;;
+2631;TRIGRAM FOR LAKE;So;0;ON;;;;;N;;;;;
+2632;TRIGRAM FOR FIRE;So;0;ON;;;;;N;;;;;
+2633;TRIGRAM FOR THUNDER;So;0;ON;;;;;N;;;;;
+2634;TRIGRAM FOR WIND;So;0;ON;;;;;N;;;;;
+2635;TRIGRAM FOR WATER;So;0;ON;;;;;N;;;;;
+2636;TRIGRAM FOR MOUNTAIN;So;0;ON;;;;;N;;;;;
+2637;TRIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+2638;WHEEL OF DHARMA;So;0;ON;;;;;N;;;;;
+2639;WHITE FROWNING FACE;So;0;ON;;;;;N;;;;;
+263A;WHITE SMILING FACE;So;0;ON;;;;;N;;;;;
+263B;BLACK SMILING FACE;So;0;ON;;;;;N;;;;;
+263C;WHITE SUN WITH RAYS;So;0;ON;;;;;N;;;;;
+263D;FIRST QUARTER MOON;So;0;ON;;;;;N;;;;;
+263E;LAST QUARTER MOON;So;0;ON;;;;;N;;;;;
+263F;MERCURY;So;0;ON;;;;;N;;;;;
+2640;FEMALE SIGN;So;0;ON;;;;;N;;;;;
+2641;EARTH;So;0;ON;;;;;N;;;;;
+2642;MALE SIGN;So;0;ON;;;;;N;;;;;
+2643;JUPITER;So;0;ON;;;;;N;;;;;
+2644;SATURN;So;0;ON;;;;;N;;;;;
+2645;URANUS;So;0;ON;;;;;N;;;;;
+2646;NEPTUNE;So;0;ON;;;;;N;;;;;
+2647;PLUTO;So;0;ON;;;;;N;;;;;
+2648;ARIES;So;0;ON;;;;;N;;;;;
+2649;TAURUS;So;0;ON;;;;;N;;;;;
+264A;GEMINI;So;0;ON;;;;;N;;;;;
+264B;CANCER;So;0;ON;;;;;N;;;;;
+264C;LEO;So;0;ON;;;;;N;;;;;
+264D;VIRGO;So;0;ON;;;;;N;;;;;
+264E;LIBRA;So;0;ON;;;;;N;;;;;
+264F;SCORPIUS;So;0;ON;;;;;N;;;;;
+2650;SAGITTARIUS;So;0;ON;;;;;N;;;;;
+2651;CAPRICORN;So;0;ON;;;;;N;;;;;
+2652;AQUARIUS;So;0;ON;;;;;N;;;;;
+2653;PISCES;So;0;ON;;;;;N;;;;;
+2654;WHITE CHESS KING;So;0;ON;;;;;N;;;;;
+2655;WHITE CHESS QUEEN;So;0;ON;;;;;N;;;;;
+2656;WHITE CHESS ROOK;So;0;ON;;;;;N;;;;;
+2657;WHITE CHESS BISHOP;So;0;ON;;;;;N;;;;;
+2658;WHITE CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+2659;WHITE CHESS PAWN;So;0;ON;;;;;N;;;;;
+265A;BLACK CHESS KING;So;0;ON;;;;;N;;;;;
+265B;BLACK CHESS QUEEN;So;0;ON;;;;;N;;;;;
+265C;BLACK CHESS ROOK;So;0;ON;;;;;N;;;;;
+265D;BLACK CHESS BISHOP;So;0;ON;;;;;N;;;;;
+265E;BLACK CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+265F;BLACK CHESS PAWN;So;0;ON;;;;;N;;;;;
+2660;BLACK SPADE SUIT;So;0;ON;;;;;N;;;;;
+2661;WHITE HEART SUIT;So;0;ON;;;;;N;;;;;
+2662;WHITE DIAMOND SUIT;So;0;ON;;;;;N;;;;;
+2663;BLACK CLUB SUIT;So;0;ON;;;;;N;;;;;
+2664;WHITE SPADE SUIT;So;0;ON;;;;;N;;;;;
+2665;BLACK HEART SUIT;So;0;ON;;;;;N;;;;;
+2666;BLACK DIAMOND SUIT;So;0;ON;;;;;N;;;;;
+2667;WHITE CLUB SUIT;So;0;ON;;;;;N;;;;;
+2668;HOT SPRINGS;So;0;ON;;;;;N;;;;;
+2669;QUARTER NOTE;So;0;ON;;;;;N;;;;;
+266A;EIGHTH NOTE;So;0;ON;;;;;N;;;;;
+266B;BEAMED EIGHTH NOTES;So;0;ON;;;;;N;BARRED EIGHTH NOTES;;;;
+266C;BEAMED SIXTEENTH NOTES;So;0;ON;;;;;N;BARRED SIXTEENTH NOTES;;;;
+266D;MUSIC FLAT SIGN;So;0;ON;;;;;N;FLAT;;;;
+266E;MUSIC NATURAL SIGN;So;0;ON;;;;;N;NATURAL;;;;
+266F;MUSIC SHARP SIGN;Sm;0;ON;;;;;N;SHARP;;;;
+2670;WEST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
+2671;EAST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
+2672;UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
+2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;;;;
+2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;;;;
+2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;;;;
+2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;;;;
+2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;;;;
+2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;;;;
+2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;;;;
+267A;RECYCLING SYMBOL FOR GENERIC MATERIALS;So;0;ON;;;;;N;;;;;
+267B;BLACK UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
+267C;RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
+267D;PARTIALLY-RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
+267E;PERMANENT PAPER SIGN;So;0;ON;;;;;N;;;;;
+267F;WHEELCHAIR SYMBOL;So;0;ON;;;;;N;;;;;
+2680;DIE FACE-1;So;0;ON;;;;;N;;;;;
+2681;DIE FACE-2;So;0;ON;;;;;N;;;;;
+2682;DIE FACE-3;So;0;ON;;;;;N;;;;;
+2683;DIE FACE-4;So;0;ON;;;;;N;;;;;
+2684;DIE FACE-5;So;0;ON;;;;;N;;;;;
+2685;DIE FACE-6;So;0;ON;;;;;N;;;;;
+2686;WHITE CIRCLE WITH DOT RIGHT;So;0;ON;;;;;N;;;;;
+2687;WHITE CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+2688;BLACK CIRCLE WITH WHITE DOT RIGHT;So;0;ON;;;;;N;;;;;
+2689;BLACK CIRCLE WITH TWO WHITE DOTS;So;0;ON;;;;;N;;;;;
+268A;MONOGRAM FOR YANG;So;0;ON;;;;;N;;;;;
+268B;MONOGRAM FOR YIN;So;0;ON;;;;;N;;;;;
+268C;DIGRAM FOR GREATER YANG;So;0;ON;;;;;N;;;;;
+268D;DIGRAM FOR LESSER YIN;So;0;ON;;;;;N;;;;;
+268E;DIGRAM FOR LESSER YANG;So;0;ON;;;;;N;;;;;
+268F;DIGRAM FOR GREATER YIN;So;0;ON;;;;;N;;;;;
+2690;WHITE FLAG;So;0;ON;;;;;N;;;;;
+2691;BLACK FLAG;So;0;ON;;;;;N;;;;;
+2692;HAMMER AND PICK;So;0;ON;;;;;N;;;;;
+2693;ANCHOR;So;0;ON;;;;;N;;;;;
+2694;CROSSED SWORDS;So;0;ON;;;;;N;;;;;
+2695;STAFF OF AESCULAPIUS;So;0;ON;;;;;N;;;;;
+2696;SCALES;So;0;ON;;;;;N;;;;;
+2697;ALEMBIC;So;0;ON;;;;;N;;;;;
+2698;FLOWER;So;0;ON;;;;;N;;;;;
+2699;GEAR;So;0;ON;;;;;N;;;;;
+269A;STAFF OF HERMES;So;0;ON;;;;;N;;;;;
+269B;ATOM SYMBOL;So;0;ON;;;;;N;;;;;
+269C;FLEUR-DE-LIS;So;0;ON;;;;;N;;;;;
+269D;OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+269E;THREE LINES CONVERGING RIGHT;So;0;ON;;;;;N;;;;;
+269F;THREE LINES CONVERGING LEFT;So;0;ON;;;;;N;;;;;
+26A0;WARNING SIGN;So;0;ON;;;;;N;;;;;
+26A1;HIGH VOLTAGE SIGN;So;0;ON;;;;;N;;;;;
+26A2;DOUBLED FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A3;DOUBLED MALE SIGN;So;0;ON;;;;;N;;;;;
+26A4;INTERLOCKED FEMALE AND MALE SIGN;So;0;ON;;;;;N;;;;;
+26A5;MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A6;MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26A7;MALE WITH STROKE AND MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A8;VERTICAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26A9;HORIZONTAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26AA;MEDIUM WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+26AB;MEDIUM BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+26AC;MEDIUM SMALL WHITE CIRCLE;So;0;L;;;;;N;;;;;
+26AD;MARRIAGE SYMBOL;So;0;ON;;;;;N;;;;;
+26AE;DIVORCE SYMBOL;So;0;ON;;;;;N;;;;;
+26AF;UNMARRIED PARTNERSHIP SYMBOL;So;0;ON;;;;;N;;;;;
+26B0;COFFIN;So;0;ON;;;;;N;;;;;
+26B1;FUNERAL URN;So;0;ON;;;;;N;;;;;
+26B2;NEUTER;So;0;ON;;;;;N;;;;;
+26B3;CERES;So;0;ON;;;;;N;;;;;
+26B4;PALLAS;So;0;ON;;;;;N;;;;;
+26B5;JUNO;So;0;ON;;;;;N;;;;;
+26B6;VESTA;So;0;ON;;;;;N;;;;;
+26B7;CHIRON;So;0;ON;;;;;N;;;;;
+26B8;BLACK MOON LILITH;So;0;ON;;;;;N;;;;;
+26B9;SEXTILE;So;0;ON;;;;;N;;;;;
+26BA;SEMISEXTILE;So;0;ON;;;;;N;;;;;
+26BB;QUINCUNX;So;0;ON;;;;;N;;;;;
+26BC;SESQUIQUADRATE;So;0;ON;;;;;N;;;;;
+26BD;SOCCER BALL;So;0;ON;;;;;N;;;;;
+26BE;BASEBALL;So;0;ON;;;;;N;;;;;
+26BF;SQUARED KEY;So;0;ON;;;;;N;;;;;
+26C0;WHITE DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
+26C1;WHITE DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+26C2;BLACK DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
+26C3;BLACK DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+26C4;SNOWMAN WITHOUT SNOW;So;0;ON;;;;;N;;;;;
+26C5;SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;;
+26C6;RAIN;So;0;ON;;;;;N;;;;;
+26C7;BLACK SNOWMAN;So;0;ON;;;;;N;;;;;
+26C8;THUNDER CLOUD AND RAIN;So;0;ON;;;;;N;;;;;
+26C9;TURNED WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
+26CA;TURNED BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
+26CB;WHITE DIAMOND IN SQUARE;So;0;ON;;;;;N;;;;;
+26CC;CROSSING LANES;So;0;ON;;;;;N;;;;;
+26CD;DISABLED CAR;So;0;ON;;;;;N;;;;;
+26CE;OPHIUCHUS;So;0;ON;;;;;N;;;;;
+26CF;PICK;So;0;ON;;;;;N;;;;;
+26D0;CAR SLIDING;So;0;ON;;;;;N;;;;;
+26D1;HELMET WITH WHITE CROSS;So;0;ON;;;;;N;;;;;
+26D2;CIRCLED CROSSING LANES;So;0;ON;;;;;N;;;;;
+26D3;CHAINS;So;0;ON;;;;;N;;;;;
+26D4;NO ENTRY;So;0;ON;;;;;N;;;;;
+26D5;ALTERNATE ONE-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D6;BLACK TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D7;WHITE TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D8;BLACK LEFT LANE MERGE;So;0;ON;;;;;N;;;;;
+26D9;WHITE LEFT LANE MERGE;So;0;ON;;;;;N;;;;;
+26DA;DRIVE SLOW SIGN;So;0;ON;;;;;N;;;;;
+26DB;HEAVY WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+26DC;LEFT CLOSED ENTRY;So;0;ON;;;;;N;;;;;
+26DD;SQUARED SALTIRE;So;0;ON;;;;;N;;;;;
+26DE;FALLING DIAGONAL IN WHITE CIRCLE IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+26DF;BLACK TRUCK;So;0;ON;;;;;N;;;;;
+26E0;RESTRICTED LEFT ENTRY-1;So;0;ON;;;;;N;;;;;
+26E1;RESTRICTED LEFT ENTRY-2;So;0;ON;;;;;N;;;;;
+26E2;ASTRONOMICAL SYMBOL FOR URANUS;So;0;ON;;;;;N;;;;;
+26E3;HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE;So;0;ON;;;;;N;;;;;
+26E4;PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E5;RIGHT-HANDED INTERLACED PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E6;LEFT-HANDED INTERLACED PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E7;INVERTED PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E8;BLACK CROSS ON SHIELD;So;0;ON;;;;;N;;;;;
+26E9;SHINTO SHRINE;So;0;ON;;;;;N;;;;;
+26EA;CHURCH;So;0;ON;;;;;N;;;;;
+26EB;CASTLE;So;0;ON;;;;;N;;;;;
+26EC;HISTORIC SITE;So;0;ON;;;;;N;;;;;
+26ED;GEAR WITHOUT HUB;So;0;ON;;;;;N;;;;;
+26EE;GEAR WITH HANDLES;So;0;ON;;;;;N;;;;;
+26EF;MAP SYMBOL FOR LIGHTHOUSE;So;0;ON;;;;;N;;;;;
+26F0;MOUNTAIN;So;0;ON;;;;;N;;;;;
+26F1;UMBRELLA ON GROUND;So;0;ON;;;;;N;;;;;
+26F2;FOUNTAIN;So;0;ON;;;;;N;;;;;
+26F3;FLAG IN HOLE;So;0;ON;;;;;N;;;;;
+26F4;FERRY;So;0;ON;;;;;N;;;;;
+26F5;SAILBOAT;So;0;ON;;;;;N;;;;;
+26F6;SQUARE FOUR CORNERS;So;0;ON;;;;;N;;;;;
+26F7;SKIER;So;0;ON;;;;;N;;;;;
+26F8;ICE SKATE;So;0;ON;;;;;N;;;;;
+26F9;PERSON WITH BALL;So;0;ON;;;;;N;;;;;
+26FA;TENT;So;0;ON;;;;;N;;;;;
+26FB;JAPANESE BANK SYMBOL;So;0;ON;;;;;N;;;;;
+26FC;HEADSTONE GRAVEYARD SYMBOL;So;0;ON;;;;;N;;;;;
+26FD;FUEL PUMP;So;0;ON;;;;;N;;;;;
+26FE;CUP ON BLACK SQUARE;So;0;ON;;;;;N;;;;;
+26FF;WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE;So;0;ON;;;;;N;;;;;
+2700;BLACK SAFETY SCISSORS;So;0;ON;;;;;N;;;;;
+2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
+2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;;
+2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
+2704;WHITE SCISSORS;So;0;ON;;;;;N;;;;;
+2705;WHITE HEAVY CHECK MARK;So;0;ON;;;;;N;;;;;
+2706;TELEPHONE LOCATION SIGN;So;0;ON;;;;;N;;;;;
+2707;TAPE DRIVE;So;0;ON;;;;;N;;;;;
+2708;AIRPLANE;So;0;ON;;;;;N;;;;;
+2709;ENVELOPE;So;0;ON;;;;;N;;;;;
+270A;RAISED FIST;So;0;ON;;;;;N;;;;;
+270B;RAISED HAND;So;0;ON;;;;;N;;;;;
+270C;VICTORY HAND;So;0;ON;;;;;N;;;;;
+270D;WRITING HAND;So;0;ON;;;;;N;;;;;
+270E;LOWER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
+270F;PENCIL;So;0;ON;;;;;N;;;;;
+2710;UPPER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
+2711;WHITE NIB;So;0;ON;;;;;N;;;;;
+2712;BLACK NIB;So;0;ON;;;;;N;;;;;
+2713;CHECK MARK;So;0;ON;;;;;N;;;;;
+2714;HEAVY CHECK MARK;So;0;ON;;;;;N;;;;;
+2715;MULTIPLICATION X;So;0;ON;;;;;N;;;;;
+2716;HEAVY MULTIPLICATION X;So;0;ON;;;;;N;;;;;
+2717;BALLOT X;So;0;ON;;;;;N;;;;;
+2718;HEAVY BALLOT X;So;0;ON;;;;;N;;;;;
+2719;OUTLINED GREEK CROSS;So;0;ON;;;;;N;;;;;
+271A;HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+271B;OPEN CENTRE CROSS;So;0;ON;;;;;N;OPEN CENTER CROSS;;;;
+271C;HEAVY OPEN CENTRE CROSS;So;0;ON;;;;;N;HEAVY OPEN CENTER CROSS;;;;
+271D;LATIN CROSS;So;0;ON;;;;;N;;;;;
+271E;SHADOWED WHITE LATIN CROSS;So;0;ON;;;;;N;;;;;
+271F;OUTLINED LATIN CROSS;So;0;ON;;;;;N;;;;;
+2720;MALTESE CROSS;So;0;ON;;;;;N;;;;;
+2721;STAR OF DAVID;So;0;ON;;;;;N;;;;;
+2722;FOUR TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2723;FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2724;HEAVY FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2725;FOUR CLUB-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2726;BLACK FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
+2727;WHITE FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
+2728;SPARKLES;So;0;ON;;;;;N;;;;;
+2729;STRESS OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+272A;CIRCLED WHITE STAR;So;0;ON;;;;;N;;;;;
+272B;OPEN CENTRE BLACK STAR;So;0;ON;;;;;N;OPEN CENTER BLACK STAR;;;;
+272C;BLACK CENTRE WHITE STAR;So;0;ON;;;;;N;BLACK CENTER WHITE STAR;;;;
+272D;OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
+272E;HEAVY OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
+272F;PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+2730;SHADOWED WHITE STAR;So;0;ON;;;;;N;;;;;
+2731;HEAVY ASTERISK;So;0;ON;;;;;N;;;;;
+2732;OPEN CENTRE ASTERISK;So;0;ON;;;;;N;OPEN CENTER ASTERISK;;;;
+2733;EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2734;EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+2735;EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+2736;SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+2737;EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
+2738;HEAVY EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
+2739;TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+273A;SIXTEEN POINTED ASTERISK;So;0;ON;;;;;N;;;;;
+273B;TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+273C;OPEN CENTRE TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;OPEN CENTER TEARDROP-SPOKED ASTERISK;;;;
+273D;HEAVY TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+273E;SIX PETALLED BLACK AND WHITE FLORETTE;So;0;ON;;;;;N;;;;;
+273F;BLACK FLORETTE;So;0;ON;;;;;N;;;;;
+2740;WHITE FLORETTE;So;0;ON;;;;;N;;;;;
+2741;EIGHT PETALLED OUTLINED BLACK FLORETTE;So;0;ON;;;;;N;;;;;
+2742;CIRCLED OPEN CENTRE EIGHT POINTED STAR;So;0;ON;;;;;N;CIRCLED OPEN CENTER EIGHT POINTED STAR;;;;
+2743;HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK;So;0;ON;;;;;N;;;;;
+2744;SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2745;TIGHT TRIFOLIATE SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2746;HEAVY CHEVRON SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2747;SPARKLE;So;0;ON;;;;;N;;;;;
+2748;HEAVY SPARKLE;So;0;ON;;;;;N;;;;;
+2749;BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+274A;EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
+274B;HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
+274C;CROSS MARK;So;0;ON;;;;;N;;;;;
+274D;SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+274E;NEGATIVE SQUARED CROSS MARK;So;0;ON;;;;;N;;;;;
+274F;LOWER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2750;UPPER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2751;LOWER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2753;BLACK QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2754;WHITE QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2755;WHITE EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;;
+2757;HEAVY EXCLAMATION MARK SYMBOL;So;0;ON;;;;;N;;;;;
+2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;;
+2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;;
+275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;;
+275B;HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275C;HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275D;HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275E;HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275F;HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2760;HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2761;CURVED STEM PARAGRAPH SIGN ORNAMENT;So;0;ON;;;;;N;;;;;
+2762;HEAVY EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2763;HEAVY HEART EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2764;HEAVY BLACK HEART;So;0;ON;;;;;N;;;;;
+2765;ROTATED HEAVY BLACK HEART BULLET;So;0;ON;;;;;N;;;;;
+2766;FLORAL HEART;So;0;ON;;;;;N;;;;;
+2767;ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
+2768;MEDIUM LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2769;MEDIUM RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276A;MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276B;MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276C;MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276D;MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276E;HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276F;HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2770;HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2771;HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2772;LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2773;LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2774;MEDIUM LEFT CURLY BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2775;MEDIUM RIGHT CURLY BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2776;DINGBAT NEGATIVE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED DIGIT ONE;;;;
+2777;DINGBAT NEGATIVE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED DIGIT TWO;;;;
+2778;DINGBAT NEGATIVE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED DIGIT THREE;;;;
+2779;DINGBAT NEGATIVE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED DIGIT FOUR;;;;
+277A;DINGBAT NEGATIVE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED DIGIT FIVE;;;;
+277B;DINGBAT NEGATIVE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED DIGIT SIX;;;;
+277C;DINGBAT NEGATIVE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED DIGIT SEVEN;;;;
+277D;DINGBAT NEGATIVE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED DIGIT EIGHT;;;;
+277E;DINGBAT NEGATIVE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED DIGIT NINE;;;;
+277F;DINGBAT NEGATIVE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED NUMBER TEN;;;;
+2780;DINGBAT CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;CIRCLED SANS-SERIF DIGIT ONE;;;;
+2781;DINGBAT CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;CIRCLED SANS-SERIF DIGIT TWO;;;;
+2782;DINGBAT CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;CIRCLED SANS-SERIF DIGIT THREE;;;;
+2783;DINGBAT CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;CIRCLED SANS-SERIF DIGIT FOUR;;;;
+2784;DINGBAT CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;CIRCLED SANS-SERIF DIGIT FIVE;;;;
+2785;DINGBAT CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;CIRCLED SANS-SERIF DIGIT SIX;;;;
+2786;DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;CIRCLED SANS-SERIF DIGIT SEVEN;;;;
+2787;DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;CIRCLED SANS-SERIF DIGIT EIGHT;;;;
+2788;DINGBAT CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;CIRCLED SANS-SERIF DIGIT NINE;;;;
+2789;DINGBAT CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;CIRCLED SANS-SERIF NUMBER TEN;;;;
+278A;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED SANS-SERIF DIGIT ONE;;;;
+278B;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED SANS-SERIF DIGIT TWO;;;;
+278C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED SANS-SERIF DIGIT THREE;;;;
+278D;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED SANS-SERIF DIGIT FOUR;;;;
+278E;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED SANS-SERIF DIGIT FIVE;;;;
+278F;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED SANS-SERIF DIGIT SIX;;;;
+2790;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED SANS-SERIF DIGIT SEVEN;;;;
+2791;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED SANS-SERIF DIGIT EIGHT;;;;
+2792;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED SANS-SERIF DIGIT NINE;;;;
+2793;DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED SANS-SERIF NUMBER TEN;;;;
+2794;HEAVY WIDE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WIDE-HEADED RIGHT ARROW;;;;
+2795;HEAVY PLUS SIGN;So;0;ON;;;;;N;;;;;
+2796;HEAVY MINUS SIGN;So;0;ON;;;;;N;;;;;
+2797;HEAVY DIVISION SIGN;So;0;ON;;;;;N;;;;;
+2798;HEAVY SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT ARROW;;;;
+2799;HEAVY RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY RIGHT ARROW;;;;
+279A;HEAVY NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT ARROW;;;;
+279B;DRAFTING POINT RIGHTWARDS ARROW;So;0;ON;;;;;N;DRAFTING POINT RIGHT ARROW;;;;
+279C;HEAVY ROUND-TIPPED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY ROUND-TIPPED RIGHT ARROW;;;;
+279D;TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;TRIANGLE-HEADED RIGHT ARROW;;;;
+279E;HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TRIANGLE-HEADED RIGHT ARROW;;;;
+279F;DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
+27A0;HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
+27A1;BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK RIGHT ARROW;;;;
+27A2;THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D TOP-LIGHTED RIGHT ARROWHEAD;;;;
+27A3;THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D BOTTOM-LIGHTED RIGHT ARROWHEAD;;;;
+27A4;BLACK RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;BLACK RIGHT ARROWHEAD;;;;
+27A5;HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED DOWN AND RIGHT ARROW;;;;
+27A6;HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED UP AND RIGHT ARROW;;;;
+27A7;SQUAT BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;SQUAT BLACK RIGHT ARROW;;;;
+27A8;HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY CONCAVE-POINTED BLACK RIGHT ARROW;;;;
+27A9;RIGHT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;RIGHT-SHADED WHITE RIGHT ARROW;;;;
+27AA;LEFT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT-SHADED WHITE RIGHT ARROW;;;;
+27AB;BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;BACK-TILTED SHADOWED WHITE RIGHT ARROW;;;;
+27AC;FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;FRONT-TILTED SHADOWED WHITE RIGHT ARROW;;;;
+27AD;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27AE;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27AF;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27B0;CURLY LOOP;So;0;ON;;;;;N;;;;;
+27B1;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27B2;CIRCLED HEAVY WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;CIRCLED HEAVY WHITE RIGHT ARROW;;;;
+27B3;WHITE-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;WHITE-FEATHERED RIGHT ARROW;;;;
+27B4;BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED LOWER RIGHT ARROW;;;;
+27B5;BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK-FEATHERED RIGHT ARROW;;;;
+27B6;BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED UPPER RIGHT ARROW;;;;
+27B7;HEAVY BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED LOWER RIGHT ARROW;;;;
+27B8;HEAVY BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED RIGHT ARROW;;;;
+27B9;HEAVY BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED UPPER RIGHT ARROW;;;;
+27BA;TEARDROP-BARBED RIGHTWARDS ARROW;So;0;ON;;;;;N;TEARDROP-BARBED RIGHT ARROW;;;;
+27BB;HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TEARDROP-SHANKED RIGHT ARROW;;;;
+27BC;WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;WEDGE-TAILED RIGHT ARROW;;;;
+27BD;HEAVY WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WEDGE-TAILED RIGHT ARROW;;;;
+27BE;OPEN-OUTLINED RIGHTWARDS ARROW;So;0;ON;;;;;N;OPEN-OUTLINED RIGHT ARROW;;;;
+27BF;DOUBLE CURLY LOOP;So;0;ON;;;;;N;;;;;
+27C0;THREE DIMENSIONAL ANGLE;Sm;0;ON;;;;;Y;;;;;
+27C1;WHITE TRIANGLE CONTAINING SMALL WHITE TRIANGLE;Sm;0;ON;;;;;N;;;;;
+27C2;PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
+27C3;OPEN SUBSET;Sm;0;ON;;;;;Y;;;;;
+27C4;OPEN SUPERSET;Sm;0;ON;;;;;Y;;;;;
+27C5;LEFT S-SHAPED BAG DELIMITER;Ps;0;ON;;;;;Y;;;;;
+27C6;RIGHT S-SHAPED BAG DELIMITER;Pe;0;ON;;;;;Y;;;;;
+27C7;OR WITH DOT INSIDE;Sm;0;ON;;;;;N;;;;;
+27C8;REVERSE SOLIDUS PRECEDING SUBSET;Sm;0;ON;;;;;Y;;;;;
+27C9;SUPERSET PRECEDING SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+27CA;VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+27CB;MATHEMATICAL RISING DIAGONAL;Sm;0;ON;;;;;Y;;;;;
+27CC;LONG DIVISION;Sm;0;ON;;;;;Y;;;;;
+27CD;MATHEMATICAL FALLING DIAGONAL;Sm;0;ON;;;;;Y;;;;;
+27CE;SQUARED LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+27CF;SQUARED LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+27D0;WHITE DIAMOND WITH CENTRED DOT;Sm;0;ON;;;;;N;;;;;
+27D1;AND WITH DOT;Sm;0;ON;;;;;N;;;;;
+27D2;ELEMENT OF OPENING UPWARDS;Sm;0;ON;;;;;N;;;;;
+27D3;LOWER RIGHT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
+27D4;UPPER LEFT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
+27D5;LEFT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
+27D6;RIGHT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
+27D7;FULL OUTER JOIN;Sm;0;ON;;;;;N;;;;;
+27D8;LARGE UP TACK;Sm;0;ON;;;;;N;;;;;
+27D9;LARGE DOWN TACK;Sm;0;ON;;;;;N;;;;;
+27DA;LEFT AND RIGHT DOUBLE TURNSTILE;Sm;0;ON;;;;;N;;;;;
+27DB;LEFT AND RIGHT TACK;Sm;0;ON;;;;;N;;;;;
+27DC;LEFT MULTIMAP;Sm;0;ON;;;;;Y;;;;;
+27DD;LONG RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
+27DE;LONG LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+27DF;UP TACK WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+27E0;LOZENGE DIVIDED BY HORIZONTAL RULE;Sm;0;ON;;;;;N;;;;;
+27E1;WHITE CONCAVE-SIDED DIAMOND;Sm;0;ON;;;;;N;;;;;
+27E2;WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E3;WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E4;WHITE SQUARE WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E5;WHITE SQUARE WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E6;MATHEMATICAL LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27E7;MATHEMATICAL RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27E8;MATHEMATICAL LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27E9;MATHEMATICAL RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EA;MATHEMATICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27EB;MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EC;MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
+27ED;MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EE;MATHEMATICAL LEFT FLATTENED PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+27EF;MATHEMATICAL RIGHT FLATTENED PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+27F0;UPWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F1;DOWNWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F2;ANTICLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F3;CLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F4;RIGHT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+27F5;LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+27F6;LONG RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+27F7;LONG LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
+27F8;LONG LEFTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F9;LONG RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27FA;LONG LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27FB;LONG LEFTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FC;LONG RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FD;LONG LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FE;LONG RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FF;LONG RIGHTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
+2800;BRAILLE PATTERN BLANK;So;0;L;;;;;N;;;;;
+2801;BRAILLE PATTERN DOTS-1;So;0;L;;;;;N;;;;;
+2802;BRAILLE PATTERN DOTS-2;So;0;L;;;;;N;;;;;
+2803;BRAILLE PATTERN DOTS-12;So;0;L;;;;;N;;;;;
+2804;BRAILLE PATTERN DOTS-3;So;0;L;;;;;N;;;;;
+2805;BRAILLE PATTERN DOTS-13;So;0;L;;;;;N;;;;;
+2806;BRAILLE PATTERN DOTS-23;So;0;L;;;;;N;;;;;
+2807;BRAILLE PATTERN DOTS-123;So;0;L;;;;;N;;;;;
+2808;BRAILLE PATTERN DOTS-4;So;0;L;;;;;N;;;;;
+2809;BRAILLE PATTERN DOTS-14;So;0;L;;;;;N;;;;;
+280A;BRAILLE PATTERN DOTS-24;So;0;L;;;;;N;;;;;
+280B;BRAILLE PATTERN DOTS-124;So;0;L;;;;;N;;;;;
+280C;BRAILLE PATTERN DOTS-34;So;0;L;;;;;N;;;;;
+280D;BRAILLE PATTERN DOTS-134;So;0;L;;;;;N;;;;;
+280E;BRAILLE PATTERN DOTS-234;So;0;L;;;;;N;;;;;
+280F;BRAILLE PATTERN DOTS-1234;So;0;L;;;;;N;;;;;
+2810;BRAILLE PATTERN DOTS-5;So;0;L;;;;;N;;;;;
+2811;BRAILLE PATTERN DOTS-15;So;0;L;;;;;N;;;;;
+2812;BRAILLE PATTERN DOTS-25;So;0;L;;;;;N;;;;;
+2813;BRAILLE PATTERN DOTS-125;So;0;L;;;;;N;;;;;
+2814;BRAILLE PATTERN DOTS-35;So;0;L;;;;;N;;;;;
+2815;BRAILLE PATTERN DOTS-135;So;0;L;;;;;N;;;;;
+2816;BRAILLE PATTERN DOTS-235;So;0;L;;;;;N;;;;;
+2817;BRAILLE PATTERN DOTS-1235;So;0;L;;;;;N;;;;;
+2818;BRAILLE PATTERN DOTS-45;So;0;L;;;;;N;;;;;
+2819;BRAILLE PATTERN DOTS-145;So;0;L;;;;;N;;;;;
+281A;BRAILLE PATTERN DOTS-245;So;0;L;;;;;N;;;;;
+281B;BRAILLE PATTERN DOTS-1245;So;0;L;;;;;N;;;;;
+281C;BRAILLE PATTERN DOTS-345;So;0;L;;;;;N;;;;;
+281D;BRAILLE PATTERN DOTS-1345;So;0;L;;;;;N;;;;;
+281E;BRAILLE PATTERN DOTS-2345;So;0;L;;;;;N;;;;;
+281F;BRAILLE PATTERN DOTS-12345;So;0;L;;;;;N;;;;;
+2820;BRAILLE PATTERN DOTS-6;So;0;L;;;;;N;;;;;
+2821;BRAILLE PATTERN DOTS-16;So;0;L;;;;;N;;;;;
+2822;BRAILLE PATTERN DOTS-26;So;0;L;;;;;N;;;;;
+2823;BRAILLE PATTERN DOTS-126;So;0;L;;;;;N;;;;;
+2824;BRAILLE PATTERN DOTS-36;So;0;L;;;;;N;;;;;
+2825;BRAILLE PATTERN DOTS-136;So;0;L;;;;;N;;;;;
+2826;BRAILLE PATTERN DOTS-236;So;0;L;;;;;N;;;;;
+2827;BRAILLE PATTERN DOTS-1236;So;0;L;;;;;N;;;;;
+2828;BRAILLE PATTERN DOTS-46;So;0;L;;;;;N;;;;;
+2829;BRAILLE PATTERN DOTS-146;So;0;L;;;;;N;;;;;
+282A;BRAILLE PATTERN DOTS-246;So;0;L;;;;;N;;;;;
+282B;BRAILLE PATTERN DOTS-1246;So;0;L;;;;;N;;;;;
+282C;BRAILLE PATTERN DOTS-346;So;0;L;;;;;N;;;;;
+282D;BRAILLE PATTERN DOTS-1346;So;0;L;;;;;N;;;;;
+282E;BRAILLE PATTERN DOTS-2346;So;0;L;;;;;N;;;;;
+282F;BRAILLE PATTERN DOTS-12346;So;0;L;;;;;N;;;;;
+2830;BRAILLE PATTERN DOTS-56;So;0;L;;;;;N;;;;;
+2831;BRAILLE PATTERN DOTS-156;So;0;L;;;;;N;;;;;
+2832;BRAILLE PATTERN DOTS-256;So;0;L;;;;;N;;;;;
+2833;BRAILLE PATTERN DOTS-1256;So;0;L;;;;;N;;;;;
+2834;BRAILLE PATTERN DOTS-356;So;0;L;;;;;N;;;;;
+2835;BRAILLE PATTERN DOTS-1356;So;0;L;;;;;N;;;;;
+2836;BRAILLE PATTERN DOTS-2356;So;0;L;;;;;N;;;;;
+2837;BRAILLE PATTERN DOTS-12356;So;0;L;;;;;N;;;;;
+2838;BRAILLE PATTERN DOTS-456;So;0;L;;;;;N;;;;;
+2839;BRAILLE PATTERN DOTS-1456;So;0;L;;;;;N;;;;;
+283A;BRAILLE PATTERN DOTS-2456;So;0;L;;;;;N;;;;;
+283B;BRAILLE PATTERN DOTS-12456;So;0;L;;;;;N;;;;;
+283C;BRAILLE PATTERN DOTS-3456;So;0;L;;;;;N;;;;;
+283D;BRAILLE PATTERN DOTS-13456;So;0;L;;;;;N;;;;;
+283E;BRAILLE PATTERN DOTS-23456;So;0;L;;;;;N;;;;;
+283F;BRAILLE PATTERN DOTS-123456;So;0;L;;;;;N;;;;;
+2840;BRAILLE PATTERN DOTS-7;So;0;L;;;;;N;;;;;
+2841;BRAILLE PATTERN DOTS-17;So;0;L;;;;;N;;;;;
+2842;BRAILLE PATTERN DOTS-27;So;0;L;;;;;N;;;;;
+2843;BRAILLE PATTERN DOTS-127;So;0;L;;;;;N;;;;;
+2844;BRAILLE PATTERN DOTS-37;So;0;L;;;;;N;;;;;
+2845;BRAILLE PATTERN DOTS-137;So;0;L;;;;;N;;;;;
+2846;BRAILLE PATTERN DOTS-237;So;0;L;;;;;N;;;;;
+2847;BRAILLE PATTERN DOTS-1237;So;0;L;;;;;N;;;;;
+2848;BRAILLE PATTERN DOTS-47;So;0;L;;;;;N;;;;;
+2849;BRAILLE PATTERN DOTS-147;So;0;L;;;;;N;;;;;
+284A;BRAILLE PATTERN DOTS-247;So;0;L;;;;;N;;;;;
+284B;BRAILLE PATTERN DOTS-1247;So;0;L;;;;;N;;;;;
+284C;BRAILLE PATTERN DOTS-347;So;0;L;;;;;N;;;;;
+284D;BRAILLE PATTERN DOTS-1347;So;0;L;;;;;N;;;;;
+284E;BRAILLE PATTERN DOTS-2347;So;0;L;;;;;N;;;;;
+284F;BRAILLE PATTERN DOTS-12347;So;0;L;;;;;N;;;;;
+2850;BRAILLE PATTERN DOTS-57;So;0;L;;;;;N;;;;;
+2851;BRAILLE PATTERN DOTS-157;So;0;L;;;;;N;;;;;
+2852;BRAILLE PATTERN DOTS-257;So;0;L;;;;;N;;;;;
+2853;BRAILLE PATTERN DOTS-1257;So;0;L;;;;;N;;;;;
+2854;BRAILLE PATTERN DOTS-357;So;0;L;;;;;N;;;;;
+2855;BRAILLE PATTERN DOTS-1357;So;0;L;;;;;N;;;;;
+2856;BRAILLE PATTERN DOTS-2357;So;0;L;;;;;N;;;;;
+2857;BRAILLE PATTERN DOTS-12357;So;0;L;;;;;N;;;;;
+2858;BRAILLE PATTERN DOTS-457;So;0;L;;;;;N;;;;;
+2859;BRAILLE PATTERN DOTS-1457;So;0;L;;;;;N;;;;;
+285A;BRAILLE PATTERN DOTS-2457;So;0;L;;;;;N;;;;;
+285B;BRAILLE PATTERN DOTS-12457;So;0;L;;;;;N;;;;;
+285C;BRAILLE PATTERN DOTS-3457;So;0;L;;;;;N;;;;;
+285D;BRAILLE PATTERN DOTS-13457;So;0;L;;;;;N;;;;;
+285E;BRAILLE PATTERN DOTS-23457;So;0;L;;;;;N;;;;;
+285F;BRAILLE PATTERN DOTS-123457;So;0;L;;;;;N;;;;;
+2860;BRAILLE PATTERN DOTS-67;So;0;L;;;;;N;;;;;
+2861;BRAILLE PATTERN DOTS-167;So;0;L;;;;;N;;;;;
+2862;BRAILLE PATTERN DOTS-267;So;0;L;;;;;N;;;;;
+2863;BRAILLE PATTERN DOTS-1267;So;0;L;;;;;N;;;;;
+2864;BRAILLE PATTERN DOTS-367;So;0;L;;;;;N;;;;;
+2865;BRAILLE PATTERN DOTS-1367;So;0;L;;;;;N;;;;;
+2866;BRAILLE PATTERN DOTS-2367;So;0;L;;;;;N;;;;;
+2867;BRAILLE PATTERN DOTS-12367;So;0;L;;;;;N;;;;;
+2868;BRAILLE PATTERN DOTS-467;So;0;L;;;;;N;;;;;
+2869;BRAILLE PATTERN DOTS-1467;So;0;L;;;;;N;;;;;
+286A;BRAILLE PATTERN DOTS-2467;So;0;L;;;;;N;;;;;
+286B;BRAILLE PATTERN DOTS-12467;So;0;L;;;;;N;;;;;
+286C;BRAILLE PATTERN DOTS-3467;So;0;L;;;;;N;;;;;
+286D;BRAILLE PATTERN DOTS-13467;So;0;L;;;;;N;;;;;
+286E;BRAILLE PATTERN DOTS-23467;So;0;L;;;;;N;;;;;
+286F;BRAILLE PATTERN DOTS-123467;So;0;L;;;;;N;;;;;
+2870;BRAILLE PATTERN DOTS-567;So;0;L;;;;;N;;;;;
+2871;BRAILLE PATTERN DOTS-1567;So;0;L;;;;;N;;;;;
+2872;BRAILLE PATTERN DOTS-2567;So;0;L;;;;;N;;;;;
+2873;BRAILLE PATTERN DOTS-12567;So;0;L;;;;;N;;;;;
+2874;BRAILLE PATTERN DOTS-3567;So;0;L;;;;;N;;;;;
+2875;BRAILLE PATTERN DOTS-13567;So;0;L;;;;;N;;;;;
+2876;BRAILLE PATTERN DOTS-23567;So;0;L;;;;;N;;;;;
+2877;BRAILLE PATTERN DOTS-123567;So;0;L;;;;;N;;;;;
+2878;BRAILLE PATTERN DOTS-4567;So;0;L;;;;;N;;;;;
+2879;BRAILLE PATTERN DOTS-14567;So;0;L;;;;;N;;;;;
+287A;BRAILLE PATTERN DOTS-24567;So;0;L;;;;;N;;;;;
+287B;BRAILLE PATTERN DOTS-124567;So;0;L;;;;;N;;;;;
+287C;BRAILLE PATTERN DOTS-34567;So;0;L;;;;;N;;;;;
+287D;BRAILLE PATTERN DOTS-134567;So;0;L;;;;;N;;;;;
+287E;BRAILLE PATTERN DOTS-234567;So;0;L;;;;;N;;;;;
+287F;BRAILLE PATTERN DOTS-1234567;So;0;L;;;;;N;;;;;
+2880;BRAILLE PATTERN DOTS-8;So;0;L;;;;;N;;;;;
+2881;BRAILLE PATTERN DOTS-18;So;0;L;;;;;N;;;;;
+2882;BRAILLE PATTERN DOTS-28;So;0;L;;;;;N;;;;;
+2883;BRAILLE PATTERN DOTS-128;So;0;L;;;;;N;;;;;
+2884;BRAILLE PATTERN DOTS-38;So;0;L;;;;;N;;;;;
+2885;BRAILLE PATTERN DOTS-138;So;0;L;;;;;N;;;;;
+2886;BRAILLE PATTERN DOTS-238;So;0;L;;;;;N;;;;;
+2887;BRAILLE PATTERN DOTS-1238;So;0;L;;;;;N;;;;;
+2888;BRAILLE PATTERN DOTS-48;So;0;L;;;;;N;;;;;
+2889;BRAILLE PATTERN DOTS-148;So;0;L;;;;;N;;;;;
+288A;BRAILLE PATTERN DOTS-248;So;0;L;;;;;N;;;;;
+288B;BRAILLE PATTERN DOTS-1248;So;0;L;;;;;N;;;;;
+288C;BRAILLE PATTERN DOTS-348;So;0;L;;;;;N;;;;;
+288D;BRAILLE PATTERN DOTS-1348;So;0;L;;;;;N;;;;;
+288E;BRAILLE PATTERN DOTS-2348;So;0;L;;;;;N;;;;;
+288F;BRAILLE PATTERN DOTS-12348;So;0;L;;;;;N;;;;;
+2890;BRAILLE PATTERN DOTS-58;So;0;L;;;;;N;;;;;
+2891;BRAILLE PATTERN DOTS-158;So;0;L;;;;;N;;;;;
+2892;BRAILLE PATTERN DOTS-258;So;0;L;;;;;N;;;;;
+2893;BRAILLE PATTERN DOTS-1258;So;0;L;;;;;N;;;;;
+2894;BRAILLE PATTERN DOTS-358;So;0;L;;;;;N;;;;;
+2895;BRAILLE PATTERN DOTS-1358;So;0;L;;;;;N;;;;;
+2896;BRAILLE PATTERN DOTS-2358;So;0;L;;;;;N;;;;;
+2897;BRAILLE PATTERN DOTS-12358;So;0;L;;;;;N;;;;;
+2898;BRAILLE PATTERN DOTS-458;So;0;L;;;;;N;;;;;
+2899;BRAILLE PATTERN DOTS-1458;So;0;L;;;;;N;;;;;
+289A;BRAILLE PATTERN DOTS-2458;So;0;L;;;;;N;;;;;
+289B;BRAILLE PATTERN DOTS-12458;So;0;L;;;;;N;;;;;
+289C;BRAILLE PATTERN DOTS-3458;So;0;L;;;;;N;;;;;
+289D;BRAILLE PATTERN DOTS-13458;So;0;L;;;;;N;;;;;
+289E;BRAILLE PATTERN DOTS-23458;So;0;L;;;;;N;;;;;
+289F;BRAILLE PATTERN DOTS-123458;So;0;L;;;;;N;;;;;
+28A0;BRAILLE PATTERN DOTS-68;So;0;L;;;;;N;;;;;
+28A1;BRAILLE PATTERN DOTS-168;So;0;L;;;;;N;;;;;
+28A2;BRAILLE PATTERN DOTS-268;So;0;L;;;;;N;;;;;
+28A3;BRAILLE PATTERN DOTS-1268;So;0;L;;;;;N;;;;;
+28A4;BRAILLE PATTERN DOTS-368;So;0;L;;;;;N;;;;;
+28A5;BRAILLE PATTERN DOTS-1368;So;0;L;;;;;N;;;;;
+28A6;BRAILLE PATTERN DOTS-2368;So;0;L;;;;;N;;;;;
+28A7;BRAILLE PATTERN DOTS-12368;So;0;L;;;;;N;;;;;
+28A8;BRAILLE PATTERN DOTS-468;So;0;L;;;;;N;;;;;
+28A9;BRAILLE PATTERN DOTS-1468;So;0;L;;;;;N;;;;;
+28AA;BRAILLE PATTERN DOTS-2468;So;0;L;;;;;N;;;;;
+28AB;BRAILLE PATTERN DOTS-12468;So;0;L;;;;;N;;;;;
+28AC;BRAILLE PATTERN DOTS-3468;So;0;L;;;;;N;;;;;
+28AD;BRAILLE PATTERN DOTS-13468;So;0;L;;;;;N;;;;;
+28AE;BRAILLE PATTERN DOTS-23468;So;0;L;;;;;N;;;;;
+28AF;BRAILLE PATTERN DOTS-123468;So;0;L;;;;;N;;;;;
+28B0;BRAILLE PATTERN DOTS-568;So;0;L;;;;;N;;;;;
+28B1;BRAILLE PATTERN DOTS-1568;So;0;L;;;;;N;;;;;
+28B2;BRAILLE PATTERN DOTS-2568;So;0;L;;;;;N;;;;;
+28B3;BRAILLE PATTERN DOTS-12568;So;0;L;;;;;N;;;;;
+28B4;BRAILLE PATTERN DOTS-3568;So;0;L;;;;;N;;;;;
+28B5;BRAILLE PATTERN DOTS-13568;So;0;L;;;;;N;;;;;
+28B6;BRAILLE PATTERN DOTS-23568;So;0;L;;;;;N;;;;;
+28B7;BRAILLE PATTERN DOTS-123568;So;0;L;;;;;N;;;;;
+28B8;BRAILLE PATTERN DOTS-4568;So;0;L;;;;;N;;;;;
+28B9;BRAILLE PATTERN DOTS-14568;So;0;L;;;;;N;;;;;
+28BA;BRAILLE PATTERN DOTS-24568;So;0;L;;;;;N;;;;;
+28BB;BRAILLE PATTERN DOTS-124568;So;0;L;;;;;N;;;;;
+28BC;BRAILLE PATTERN DOTS-34568;So;0;L;;;;;N;;;;;
+28BD;BRAILLE PATTERN DOTS-134568;So;0;L;;;;;N;;;;;
+28BE;BRAILLE PATTERN DOTS-234568;So;0;L;;;;;N;;;;;
+28BF;BRAILLE PATTERN DOTS-1234568;So;0;L;;;;;N;;;;;
+28C0;BRAILLE PATTERN DOTS-78;So;0;L;;;;;N;;;;;
+28C1;BRAILLE PATTERN DOTS-178;So;0;L;;;;;N;;;;;
+28C2;BRAILLE PATTERN DOTS-278;So;0;L;;;;;N;;;;;
+28C3;BRAILLE PATTERN DOTS-1278;So;0;L;;;;;N;;;;;
+28C4;BRAILLE PATTERN DOTS-378;So;0;L;;;;;N;;;;;
+28C5;BRAILLE PATTERN DOTS-1378;So;0;L;;;;;N;;;;;
+28C6;BRAILLE PATTERN DOTS-2378;So;0;L;;;;;N;;;;;
+28C7;BRAILLE PATTERN DOTS-12378;So;0;L;;;;;N;;;;;
+28C8;BRAILLE PATTERN DOTS-478;So;0;L;;;;;N;;;;;
+28C9;BRAILLE PATTERN DOTS-1478;So;0;L;;;;;N;;;;;
+28CA;BRAILLE PATTERN DOTS-2478;So;0;L;;;;;N;;;;;
+28CB;BRAILLE PATTERN DOTS-12478;So;0;L;;;;;N;;;;;
+28CC;BRAILLE PATTERN DOTS-3478;So;0;L;;;;;N;;;;;
+28CD;BRAILLE PATTERN DOTS-13478;So;0;L;;;;;N;;;;;
+28CE;BRAILLE PATTERN DOTS-23478;So;0;L;;;;;N;;;;;
+28CF;BRAILLE PATTERN DOTS-123478;So;0;L;;;;;N;;;;;
+28D0;BRAILLE PATTERN DOTS-578;So;0;L;;;;;N;;;;;
+28D1;BRAILLE PATTERN DOTS-1578;So;0;L;;;;;N;;;;;
+28D2;BRAILLE PATTERN DOTS-2578;So;0;L;;;;;N;;;;;
+28D3;BRAILLE PATTERN DOTS-12578;So;0;L;;;;;N;;;;;
+28D4;BRAILLE PATTERN DOTS-3578;So;0;L;;;;;N;;;;;
+28D5;BRAILLE PATTERN DOTS-13578;So;0;L;;;;;N;;;;;
+28D6;BRAILLE PATTERN DOTS-23578;So;0;L;;;;;N;;;;;
+28D7;BRAILLE PATTERN DOTS-123578;So;0;L;;;;;N;;;;;
+28D8;BRAILLE PATTERN DOTS-4578;So;0;L;;;;;N;;;;;
+28D9;BRAILLE PATTERN DOTS-14578;So;0;L;;;;;N;;;;;
+28DA;BRAILLE PATTERN DOTS-24578;So;0;L;;;;;N;;;;;
+28DB;BRAILLE PATTERN DOTS-124578;So;0;L;;;;;N;;;;;
+28DC;BRAILLE PATTERN DOTS-34578;So;0;L;;;;;N;;;;;
+28DD;BRAILLE PATTERN DOTS-134578;So;0;L;;;;;N;;;;;
+28DE;BRAILLE PATTERN DOTS-234578;So;0;L;;;;;N;;;;;
+28DF;BRAILLE PATTERN DOTS-1234578;So;0;L;;;;;N;;;;;
+28E0;BRAILLE PATTERN DOTS-678;So;0;L;;;;;N;;;;;
+28E1;BRAILLE PATTERN DOTS-1678;So;0;L;;;;;N;;;;;
+28E2;BRAILLE PATTERN DOTS-2678;So;0;L;;;;;N;;;;;
+28E3;BRAILLE PATTERN DOTS-12678;So;0;L;;;;;N;;;;;
+28E4;BRAILLE PATTERN DOTS-3678;So;0;L;;;;;N;;;;;
+28E5;BRAILLE PATTERN DOTS-13678;So;0;L;;;;;N;;;;;
+28E6;BRAILLE PATTERN DOTS-23678;So;0;L;;;;;N;;;;;
+28E7;BRAILLE PATTERN DOTS-123678;So;0;L;;;;;N;;;;;
+28E8;BRAILLE PATTERN DOTS-4678;So;0;L;;;;;N;;;;;
+28E9;BRAILLE PATTERN DOTS-14678;So;0;L;;;;;N;;;;;
+28EA;BRAILLE PATTERN DOTS-24678;So;0;L;;;;;N;;;;;
+28EB;BRAILLE PATTERN DOTS-124678;So;0;L;;;;;N;;;;;
+28EC;BRAILLE PATTERN DOTS-34678;So;0;L;;;;;N;;;;;
+28ED;BRAILLE PATTERN DOTS-134678;So;0;L;;;;;N;;;;;
+28EE;BRAILLE PATTERN DOTS-234678;So;0;L;;;;;N;;;;;
+28EF;BRAILLE PATTERN DOTS-1234678;So;0;L;;;;;N;;;;;
+28F0;BRAILLE PATTERN DOTS-5678;So;0;L;;;;;N;;;;;
+28F1;BRAILLE PATTERN DOTS-15678;So;0;L;;;;;N;;;;;
+28F2;BRAILLE PATTERN DOTS-25678;So;0;L;;;;;N;;;;;
+28F3;BRAILLE PATTERN DOTS-125678;So;0;L;;;;;N;;;;;
+28F4;BRAILLE PATTERN DOTS-35678;So;0;L;;;;;N;;;;;
+28F5;BRAILLE PATTERN DOTS-135678;So;0;L;;;;;N;;;;;
+28F6;BRAILLE PATTERN DOTS-235678;So;0;L;;;;;N;;;;;
+28F7;BRAILLE PATTERN DOTS-1235678;So;0;L;;;;;N;;;;;
+28F8;BRAILLE PATTERN DOTS-45678;So;0;L;;;;;N;;;;;
+28F9;BRAILLE PATTERN DOTS-145678;So;0;L;;;;;N;;;;;
+28FA;BRAILLE PATTERN DOTS-245678;So;0;L;;;;;N;;;;;
+28FB;BRAILLE PATTERN DOTS-1245678;So;0;L;;;;;N;;;;;
+28FC;BRAILLE PATTERN DOTS-345678;So;0;L;;;;;N;;;;;
+28FD;BRAILLE PATTERN DOTS-1345678;So;0;L;;;;;N;;;;;
+28FE;BRAILLE PATTERN DOTS-2345678;So;0;L;;;;;N;;;;;
+28FF;BRAILLE PATTERN DOTS-12345678;So;0;L;;;;;N;;;;;
+2900;RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2901;RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2902;LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2903;RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2904;LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2905;RIGHTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2906;LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2907;RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2908;DOWNWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2909;UPWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+290A;UPWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
+290B;DOWNWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
+290C;LEFTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290D;RIGHTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290E;LEFTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290F;RIGHTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2910;RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2911;RIGHTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
+2912;UPWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
+2913;DOWNWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
+2914;RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2915;RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2916;RIGHTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
+2917;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2918;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2919;LEFTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291A;RIGHTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291B;LEFTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291C;RIGHTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291D;LEFTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+291E;RIGHTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+291F;LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+2920;RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+2921;NORTH WEST AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2922;NORTH EAST AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+2923;NORTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2924;NORTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2925;SOUTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2926;SOUTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2927;NORTH WEST ARROW AND NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2928;NORTH EAST ARROW AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2929;SOUTH EAST ARROW AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+292A;SOUTH WEST ARROW AND NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+292B;RISING DIAGONAL CROSSING FALLING DIAGONAL;Sm;0;ON;;;;;N;;;;;
+292C;FALLING DIAGONAL CROSSING RISING DIAGONAL;Sm;0;ON;;;;;N;;;;;
+292D;SOUTH EAST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+292E;NORTH EAST ARROW CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+292F;FALLING DIAGONAL CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2930;RISING DIAGONAL CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2931;NORTH EAST ARROW CROSSING NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+2932;NORTH WEST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2933;WAVE ARROW POINTING DIRECTLY RIGHT;Sm;0;ON;;;;;N;;;;;
+2934;ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS;Sm;0;ON;;;;;N;;;;;
+2935;ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
+2936;ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS;Sm;0;ON;;;;;N;;;;;
+2937;ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS;Sm;0;ON;;;;;N;;;;;
+2938;RIGHT-SIDE ARC CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+2939;LEFT-SIDE ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293A;TOP ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293B;BOTTOM ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293C;TOP ARC CLOCKWISE ARROW WITH MINUS;Sm;0;ON;;;;;N;;;;;
+293D;TOP ARC ANTICLOCKWISE ARROW WITH PLUS;Sm;0;ON;;;;;N;;;;;
+293E;LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293F;LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+2940;ANTICLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+2941;CLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+2942;RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2943;LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2944;SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2945;RIGHTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
+2946;LEFTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
+2947;RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+2948;LEFT RIGHT ARROW THROUGH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+2949;UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+294A;LEFT BARB UP RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
+294B;LEFT BARB DOWN RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
+294C;UP BARB RIGHT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
+294D;UP BARB LEFT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
+294E;LEFT BARB UP RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
+294F;UP BARB RIGHT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
+2950;LEFT BARB DOWN RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
+2951;UP BARB LEFT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
+2952;LEFTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
+2953;RIGHTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
+2954;UPWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
+2955;DOWNWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
+2956;LEFTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
+2957;RIGHTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
+2958;UPWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
+2959;DOWNWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
+295A;LEFTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
+295B;RIGHTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
+295C;UPWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
+295D;DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
+295E;LEFTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
+295F;RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
+2960;UPWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
+2961;DOWNWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
+2962;LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2963;UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2964;RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2965;DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2966;LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
+2967;LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2968;RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
+2969;RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+296A;LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
+296B;LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
+296C;RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
+296D;RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
+296E;UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+296F;DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2970;RIGHT DOUBLE ARROW WITH ROUNDED HEAD;Sm;0;ON;;;;;N;;;;;
+2971;EQUALS SIGN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2972;TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2973;LEFTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2974;RIGHTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2975;RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2976;LESS-THAN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2977;LEFTWARDS ARROW THROUGH LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2978;GREATER-THAN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2979;SUBSET ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+297A;LEFTWARDS ARROW THROUGH SUBSET;Sm;0;ON;;;;;N;;;;;
+297B;SUPERSET ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+297C;LEFT FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297D;RIGHT FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297E;UP FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297F;DOWN FISH TAIL;Sm;0;ON;;;;;N;;;;;
+2980;TRIPLE VERTICAL BAR DELIMITER;Sm;0;ON;;;;;N;;;;;
+2981;Z NOTATION SPOT;Sm;0;ON;;;;;N;;;;;
+2982;Z NOTATION TYPE COLON;Sm;0;ON;;;;;N;;;;;
+2983;LEFT WHITE CURLY BRACKET;Ps;0;ON;;;;;Y;;;;;
+2984;RIGHT WHITE CURLY BRACKET;Pe;0;ON;;;;;Y;;;;;
+2985;LEFT WHITE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2986;RIGHT WHITE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2987;Z NOTATION LEFT IMAGE BRACKET;Ps;0;ON;;;;;Y;;;;;
+2988;Z NOTATION RIGHT IMAGE BRACKET;Pe;0;ON;;;;;Y;;;;;
+2989;Z NOTATION LEFT BINDING BRACKET;Ps;0;ON;;;;;Y;;;;;
+298A;Z NOTATION RIGHT BINDING BRACKET;Pe;0;ON;;;;;Y;;;;;
+298B;LEFT SQUARE BRACKET WITH UNDERBAR;Ps;0;ON;;;;;Y;;;;;
+298C;RIGHT SQUARE BRACKET WITH UNDERBAR;Pe;0;ON;;;;;Y;;;;;
+298D;LEFT SQUARE BRACKET WITH TICK IN TOP CORNER;Ps;0;ON;;;;;Y;;;;;
+298E;RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Pe;0;ON;;;;;Y;;;;;
+298F;LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Ps;0;ON;;;;;Y;;;;;
+2990;RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER;Pe;0;ON;;;;;Y;;;;;
+2991;LEFT ANGLE BRACKET WITH DOT;Ps;0;ON;;;;;Y;;;;;
+2992;RIGHT ANGLE BRACKET WITH DOT;Pe;0;ON;;;;;Y;;;;;
+2993;LEFT ARC LESS-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
+2994;RIGHT ARC GREATER-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
+2995;DOUBLE LEFT ARC GREATER-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
+2996;DOUBLE RIGHT ARC LESS-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
+2997;LEFT BLACK TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
+2998;RIGHT BLACK TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
+2999;DOTTED FENCE;Sm;0;ON;;;;;N;;;;;
+299A;VERTICAL ZIGZAG LINE;Sm;0;ON;;;;;N;;;;;
+299B;MEASURED ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
+299C;RIGHT ANGLE VARIANT WITH SQUARE;Sm;0;ON;;;;;Y;;;;;
+299D;MEASURED RIGHT ANGLE WITH DOT;Sm;0;ON;;;;;Y;;;;;
+299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;;
+299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
+29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;N;;;;;
+29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+29A5;REVERSED ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+29A6;OBLIQUE ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A7;OBLIQUE ANGLE OPENING DOWN;Sm;0;ON;;;;;Y;;;;;
+29A8;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT;Sm;0;ON;;;;;Y;;;;;
+29A9;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT;Sm;0;ON;;;;;Y;;;;;
+29AA;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT;Sm;0;ON;;;;;Y;;;;;
+29AB;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT;Sm;0;ON;;;;;Y;;;;;
+29AC;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP;Sm;0;ON;;;;;Y;;;;;
+29AD;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP;Sm;0;ON;;;;;Y;;;;;
+29AE;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN;Sm;0;ON;;;;;Y;;;;;
+29AF;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN;Sm;0;ON;;;;;Y;;;;;
+29B0;REVERSED EMPTY SET;Sm;0;ON;;;;;N;;;;;
+29B1;EMPTY SET WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+29B2;EMPTY SET WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+29B3;EMPTY SET WITH RIGHT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
+29B4;EMPTY SET WITH LEFT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
+29B5;CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;;
+29B6;CIRCLED VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29B7;CIRCLED PARALLEL;Sm;0;ON;;;;;N;;;;;
+29B8;CIRCLED REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29B9;CIRCLED PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
+29BA;CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29BB;CIRCLE WITH SUPERIMPOSED X;Sm;0;ON;;;;;N;;;;;
+29BC;CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+29BD;UP ARROW THROUGH CIRCLE;Sm;0;ON;;;;;N;;;;;
+29BE;CIRCLED WHITE BULLET;Sm;0;ON;;;;;N;;;;;
+29BF;CIRCLED BULLET;Sm;0;ON;;;;;N;;;;;
+29C0;CIRCLED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+29C1;CIRCLED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+29C2;CIRCLE WITH SMALL CIRCLE TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
+29C3;CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
+29C4;SQUARED RISING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
+29C5;SQUARED FALLING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
+29C6;SQUARED ASTERISK;Sm;0;ON;;;;;N;;;;;
+29C7;SQUARED SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+29C8;SQUARED SQUARE;Sm;0;ON;;;;;N;;;;;
+29C9;TWO JOINED SQUARES;Sm;0;ON;;;;;Y;;;;;
+29CA;TRIANGLE WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+29CB;TRIANGLE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+29CC;S IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+29CD;TRIANGLE WITH SERIFS AT BOTTOM;Sm;0;ON;;;;;N;;;;;
+29CE;RIGHT TRIANGLE ABOVE LEFT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+29CF;LEFT TRIANGLE BESIDE VERTICAL BAR;Sm;0;ON;;;;;Y;;;;;
+29D0;VERTICAL BAR BESIDE RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+29D1;BOWTIE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D2;BOWTIE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D3;BLACK BOWTIE;Sm;0;ON;;;;;N;;;;;
+29D4;TIMES WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D5;TIMES WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D6;WHITE HOURGLASS;Sm;0;ON;;;;;N;;;;;
+29D7;BLACK HOURGLASS;Sm;0;ON;;;;;N;;;;;
+29D8;LEFT WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
+29D9;RIGHT WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
+29DA;LEFT DOUBLE WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
+29DB;RIGHT DOUBLE WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
+29DC;INCOMPLETE INFINITY;Sm;0;ON;;;;;Y;;;;;
+29DD;TIE OVER INFINITY;Sm;0;ON;;;;;N;;;;;
+29DE;INFINITY NEGATED WITH VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29DF;DOUBLE-ENDED MULTIMAP;Sm;0;ON;;;;;N;;;;;
+29E0;SQUARE WITH CONTOURED OUTLINE;Sm;0;ON;;;;;N;;;;;
+29E1;INCREASES AS;Sm;0;ON;;;;;Y;;;;;
+29E2;SHUFFLE PRODUCT;Sm;0;ON;;;;;N;;;;;
+29E3;EQUALS SIGN AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
+29E4;EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
+29E5;IDENTICAL TO AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
+29E6;GLEICH STARK;Sm;0;ON;;;;;N;;;;;
+29E7;THERMODYNAMIC;Sm;0;ON;;;;;N;;;;;
+29E8;DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29E9;DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29EA;BLACK DIAMOND WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29EB;BLACK LOZENGE;Sm;0;ON;;;;;N;;;;;
+29EC;WHITE CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29ED;BLACK CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29EE;ERROR-BARRED WHITE SQUARE;Sm;0;ON;;;;;N;;;;;
+29EF;ERROR-BARRED BLACK SQUARE;Sm;0;ON;;;;;N;;;;;
+29F0;ERROR-BARRED WHITE DIAMOND;Sm;0;ON;;;;;N;;;;;
+29F1;ERROR-BARRED BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+29F2;ERROR-BARRED WHITE CIRCLE;Sm;0;ON;;;;;N;;;;;
+29F3;ERROR-BARRED BLACK CIRCLE;Sm;0;ON;;;;;N;;;;;
+29F4;RULE-DELAYED;Sm;0;ON;;;;;Y;;;;;
+29F5;REVERSE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
+29F6;SOLIDUS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+29F7;REVERSE SOLIDUS WITH HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+29F8;BIG SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29F9;BIG REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29FA;DOUBLE PLUS;Sm;0;ON;;;;;N;;;;;
+29FB;TRIPLE PLUS;Sm;0;ON;;;;;N;;;;;
+29FC;LEFT-POINTING CURVED ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+29FD;RIGHT-POINTING CURVED ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+29FE;TINY;Sm;0;ON;;;;;N;;;;;
+29FF;MINY;Sm;0;ON;;;;;N;;;;;
+2A00;N-ARY CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A01;N-ARY CIRCLED PLUS OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A02;N-ARY CIRCLED TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A03;N-ARY UNION OPERATOR WITH DOT;Sm;0;ON;;;;;N;;;;;
+2A04;N-ARY UNION OPERATOR WITH PLUS;Sm;0;ON;;;;;N;;;;;
+2A05;N-ARY SQUARE INTERSECTION OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A06;N-ARY SQUARE UNION OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A07;TWO LOGICAL AND OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A08;TWO LOGICAL OR OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A09;N-ARY TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A0A;MODULO TWO SUM;Sm;0;ON;;;;;Y;;;;;
+2A0B;SUMMATION WITH INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2A0C;QUADRUPLE INTEGRAL OPERATOR;Sm;0;ON;<compat> 222B 222B 222B 222B;;;;Y;;;;;
+2A0D;FINITE PART INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2A0E;INTEGRAL WITH DOUBLE STROKE;Sm;0;ON;;;;;Y;;;;;
+2A0F;INTEGRAL AVERAGE WITH SLASH;Sm;0;ON;;;;;Y;;;;;
+2A10;CIRCULATION FUNCTION;Sm;0;ON;;;;;Y;;;;;
+2A11;ANTICLOCKWISE INTEGRATION;Sm;0;ON;;;;;Y;;;;;
+2A12;LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
+2A13;LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
+2A14;LINE INTEGRATION NOT INCLUDING THE POLE;Sm;0;ON;;;;;Y;;;;;
+2A15;INTEGRAL AROUND A POINT OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A16;QUATERNION INTEGRAL OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A17;INTEGRAL WITH LEFTWARDS ARROW WITH HOOK;Sm;0;ON;;;;;Y;;;;;
+2A18;INTEGRAL WITH TIMES SIGN;Sm;0;ON;;;;;Y;;;;;
+2A19;INTEGRAL WITH INTERSECTION;Sm;0;ON;;;;;Y;;;;;
+2A1A;INTEGRAL WITH UNION;Sm;0;ON;;;;;Y;;;;;
+2A1B;INTEGRAL WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+2A1C;INTEGRAL WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+2A1D;JOIN;Sm;0;ON;;;;;N;;;;;
+2A1E;LARGE LEFT TRIANGLE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A1F;Z NOTATION SCHEMA COMPOSITION;Sm;0;ON;;;;;Y;;;;;
+2A20;Z NOTATION SCHEMA PIPING;Sm;0;ON;;;;;Y;;;;;
+2A21;Z NOTATION SCHEMA PROJECTION;Sm;0;ON;;;;;Y;;;;;
+2A22;PLUS SIGN WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+2A23;PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A24;PLUS SIGN WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A25;PLUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A26;PLUS SIGN WITH TILDE BELOW;Sm;0;ON;;;;;Y;;;;;
+2A27;PLUS SIGN WITH SUBSCRIPT TWO;Sm;0;ON;;;;;N;;;;;
+2A28;PLUS SIGN WITH BLACK TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A29;MINUS SIGN WITH COMMA ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A2A;MINUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A2B;MINUS SIGN WITH FALLING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A2C;MINUS SIGN WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A2D;PLUS SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A2E;PLUS SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A2F;VECTOR OR CROSS PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A30;MULTIPLICATION SIGN WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A31;MULTIPLICATION SIGN WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A32;SEMIDIRECT PRODUCT WITH BOTTOM CLOSED;Sm;0;ON;;;;;N;;;;;
+2A33;SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A34;MULTIPLICATION SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A35;MULTIPLICATION SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A36;CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;N;;;;;
+2A37;MULTIPLICATION SIGN IN DOUBLE CIRCLE;Sm;0;ON;;;;;N;;;;;
+2A38;CIRCLED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+2A39;PLUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3A;MINUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3B;MULTIPLICATION SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3C;INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2A3D;RIGHTHAND INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2A3E;Z NOTATION RELATIONAL COMPOSITION;Sm;0;ON;;;;;Y;;;;;
+2A3F;AMALGAMATION OR COPRODUCT;Sm;0;ON;;;;;N;;;;;
+2A40;INTERSECTION WITH DOT;Sm;0;ON;;;;;N;;;;;
+2A41;UNION WITH MINUS SIGN;Sm;0;ON;;;;;N;;;;;
+2A42;UNION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A43;INTERSECTION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A44;INTERSECTION WITH LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A45;UNION WITH LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A46;UNION ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A47;INTERSECTION ABOVE UNION;Sm;0;ON;;;;;N;;;;;
+2A48;UNION ABOVE BAR ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A49;INTERSECTION ABOVE BAR ABOVE UNION;Sm;0;ON;;;;;N;;;;;
+2A4A;UNION BESIDE AND JOINED WITH UNION;Sm;0;ON;;;;;N;;;;;
+2A4B;INTERSECTION BESIDE AND JOINED WITH INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A4C;CLOSED UNION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
+2A4D;CLOSED INTERSECTION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
+2A4E;DOUBLE SQUARE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A4F;DOUBLE SQUARE UNION;Sm;0;ON;;;;;N;;;;;
+2A50;CLOSED UNION WITH SERIFS AND SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A51;LOGICAL AND WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A52;LOGICAL OR WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A53;DOUBLE LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A54;DOUBLE LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A55;TWO INTERSECTING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A56;TWO INTERSECTING LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A57;SLOPING LARGE OR;Sm;0;ON;;;;;Y;;;;;
+2A58;SLOPING LARGE AND;Sm;0;ON;;;;;Y;;;;;
+2A59;LOGICAL OR OVERLAPPING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A5A;LOGICAL AND WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
+2A5B;LOGICAL OR WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
+2A5C;LOGICAL AND WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
+2A5D;LOGICAL OR WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
+2A5E;LOGICAL AND WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A5F;LOGICAL AND WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A60;LOGICAL AND WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A61;SMALL VEE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A62;LOGICAL OR WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A63;LOGICAL OR WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A64;Z NOTATION DOMAIN ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
+2A65;Z NOTATION RANGE ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
+2A66;EQUALS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A67;IDENTICAL WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A68;TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2A69;TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2A6A;TILDE OPERATOR WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A6B;TILDE OPERATOR WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A6C;SIMILAR MINUS SIMILAR;Sm;0;ON;;;;;Y;;;;;
+2A6D;CONGRUENT WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A6E;EQUALS WITH ASTERISK;Sm;0;ON;;;;;N;;;;;
+2A6F;ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;Y;;;;;
+2A70;APPROXIMATELY EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A71;EQUALS SIGN ABOVE PLUS SIGN;Sm;0;ON;;;;;N;;;;;
+2A72;PLUS SIGN ABOVE EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
+2A73;EQUALS SIGN ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A74;DOUBLE COLON EQUAL;Sm;0;ON;<compat> 003A 003A 003D;;;;Y;;;;;
+2A75;TWO CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D;;;;N;;;;;
+2A76;THREE CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D 003D;;;;N;;;;;
+2A77;EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW;Sm;0;ON;;;;;N;;;;;
+2A78;EQUIVALENT WITH FOUR DOTS ABOVE;Sm;0;ON;;;;;N;;;;;
+2A79;LESS-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A7A;GREATER-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A7B;LESS-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A7C;GREATER-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A7D;LESS-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A7E;GREATER-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A7F;LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A80;GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A81;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A82;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A83;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT;Sm;0;ON;;;;;Y;;;;;
+2A84;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT;Sm;0;ON;;;;;Y;;;;;
+2A85;LESS-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A86;GREATER-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A87;LESS-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A88;GREATER-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A89;LESS-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A8A;GREATER-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A8B;LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A8C;GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A8D;LESS-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A8E;GREATER-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A8F;LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A90;GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A91;LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A92;GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A93;LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A94;GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A95;SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A96;SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A97;SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A98;SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A99;DOUBLE-LINE EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9A;DOUBLE-LINE EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9B;DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9C;DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9D;SIMILAR OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9E;SIMILAR OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9F;SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AA0;SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AA1;DOUBLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2AA2;DOUBLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2AA3;DOUBLE NESTED LESS-THAN WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+2AA4;GREATER-THAN OVERLAPPING LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2AA5;GREATER-THAN BESIDE LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2AA6;LESS-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
+2AA7;GREATER-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
+2AA8;LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2AA9;GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2AAA;SMALLER THAN;Sm;0;ON;;;;;Y;;;;;
+2AAB;LARGER THAN;Sm;0;ON;;;;;Y;;;;;
+2AAC;SMALLER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AAD;LARGER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AAE;EQUALS SIGN WITH BUMPY ABOVE;Sm;0;ON;;;;;N;;;;;
+2AAF;PRECEDES ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB0;SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB1;PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB2;SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB3;PRECEDES ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB4;SUCCEEDS ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB5;PRECEDES ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB6;SUCCEEDS ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB7;PRECEDES ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB8;SUCCEEDS ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB9;PRECEDES ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ABA;SUCCEEDS ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ABB;DOUBLE PRECEDES;Sm;0;ON;;;;;Y;;;;;
+2ABC;DOUBLE SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+2ABD;SUBSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
+2ABE;SUPERSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
+2ABF;SUBSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC0;SUPERSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC1;SUBSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC2;SUPERSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC3;SUBSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2AC4;SUPERSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2AC5;SUBSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AC6;SUPERSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AC7;SUBSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AC8;SUPERSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AC9;SUBSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACA;SUPERSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACB;SUBSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACC;SUPERSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACD;SQUARE LEFT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2ACE;SQUARE RIGHT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2ACF;CLOSED SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD0;CLOSED SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD1;CLOSED SUBSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AD2;CLOSED SUPERSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AD3;SUBSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD4;SUPERSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD5;SUBSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD6;SUPERSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD7;SUPERSET BESIDE SUBSET;Sm;0;ON;;;;;N;;;;;
+2AD8;SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET;Sm;0;ON;;;;;N;;;;;
+2AD9;ELEMENT OF OPENING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
+2ADA;PITCHFORK WITH TEE TOP;Sm;0;ON;;;;;N;;;;;
+2ADB;TRANSVERSAL INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;;;;
+2ADD;NONFORKING;Sm;0;ON;;;;;N;;;;;
+2ADE;SHORT LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+2ADF;SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AE0;SHORT UP TACK;Sm;0;ON;;;;;N;;;;;
+2AE1;PERPENDICULAR WITH S;Sm;0;ON;;;;;N;;;;;
+2AE2;VERTICAL BAR TRIPLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE3;DOUBLE VERTICAL BAR LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE4;VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE5;DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE6;LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL;Sm;0;ON;;;;;Y;;;;;
+2AE7;SHORT DOWN TACK WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2AE8;SHORT UP TACK WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2AE9;SHORT UP TACK ABOVE SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AEA;DOUBLE DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AEB;DOUBLE UP TACK;Sm;0;ON;;;;;N;;;;;
+2AEC;DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
+2AED;REVERSED DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
+2AEE;DOES NOT DIVIDE WITH REVERSED NEGATION SLASH;Sm;0;ON;;;;;Y;;;;;
+2AEF;VERTICAL LINE WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+2AF0;VERTICAL LINE WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
+2AF1;DOWN TACK WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
+2AF2;PARALLEL WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2AF3;PARALLEL WITH TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AF4;TRIPLE VERTICAL BAR BINARY RELATION;Sm;0;ON;;;;;N;;;;;
+2AF5;TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2AF6;TRIPLE COLON OPERATOR;Sm;0;ON;;;;;N;;;;;
+2AF7;TRIPLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2AF8;TRIPLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2AF9;DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AFA;DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AFB;TRIPLE SOLIDUS BINARY RELATION;Sm;0;ON;;;;;Y;;;;;
+2AFC;LARGE TRIPLE VERTICAL BAR OPERATOR;Sm;0;ON;;;;;N;;;;;
+2AFD;DOUBLE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AFE;WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+2AFF;N-ARY WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+2B00;NORTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B01;NORTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B02;SOUTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B03;SOUTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B04;LEFT RIGHT WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B05;LEFTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B06;UPWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B07;DOWNWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B08;NORTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B09;NORTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0A;SOUTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0B;SOUTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0C;LEFT RIGHT BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0D;UP DOWN BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0E;RIGHTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2B0F;RIGHTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2B10;LEFTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2B11;LEFTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2B12;SQUARE WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
+2B13;SQUARE WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
+2B14;SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+2B15;SQUARE WITH LOWER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+2B16;DIAMOND WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+2B17;DIAMOND WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+2B18;DIAMOND WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
+2B19;DIAMOND WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
+2B1A;DOTTED SQUARE;So;0;ON;;;;;N;;;;;
+2B1B;BLACK LARGE SQUARE;So;0;ON;;;;;N;;;;;
+2B1C;WHITE LARGE SQUARE;So;0;ON;;;;;N;;;;;
+2B1D;BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+2B1E;WHITE VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+2B1F;BLACK PENTAGON;So;0;ON;;;;;N;;;;;
+2B20;WHITE PENTAGON;So;0;ON;;;;;N;;;;;
+2B21;WHITE HEXAGON;So;0;ON;;;;;N;;;;;
+2B22;BLACK HEXAGON;So;0;ON;;;;;N;;;;;
+2B23;HORIZONTAL BLACK HEXAGON;So;0;ON;;;;;N;;;;;
+2B24;BLACK LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+2B25;BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+2B26;WHITE MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+2B27;BLACK MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
+2B28;WHITE MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
+2B29;BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+2B2A;BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+2B2B;WHITE SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+2B2C;BLACK HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2D;WHITE HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2E;BLACK VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2F;WHITE VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B30;LEFT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+2B31;THREE LEFTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
+2B32;LEFT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+2B33;LONG LEFTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
+2B34;LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B35;LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B36;LEFTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2B37;LEFTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2B38;LEFTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
+2B39;LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3A;LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3B;LEFTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
+2B3C;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3D;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3E;LEFTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+2B3F;WAVE ARROW POINTING DIRECTLY LEFT;Sm;0;ON;;;;;N;;;;;
+2B40;EQUALS SIGN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B41;REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B42;LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B43;RIGHTWARDS ARROW THROUGH GREATER-THAN;Sm;0;ON;;;;;N;;;;;
+2B44;RIGHTWARDS ARROW THROUGH SUPERSET;Sm;0;ON;;;;;N;;;;;
+2B45;LEFTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
+2B46;RIGHTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
+2B47;REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B48;RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B49;TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B4A;LEFTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B4B;LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2B4C;RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2B4D;DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW;So;0;ON;;;;;N;;;;;
+2B4E;SHORT SLANTED NORTH ARROW;So;0;ON;;;;;N;;;;;
+2B4F;SHORT BACKSLANTED SOUTH ARROW;So;0;ON;;;;;N;;;;;
+2B50;WHITE MEDIUM STAR;So;0;ON;;;;;N;;;;;
+2B51;BLACK SMALL STAR;So;0;ON;;;;;N;;;;;
+2B52;WHITE SMALL STAR;So;0;ON;;;;;N;;;;;
+2B53;BLACK RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2B54;WHITE RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2B55;HEAVY LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+2B56;HEAVY OVAL WITH OVAL INSIDE;So;0;ON;;;;;N;;;;;
+2B57;HEAVY CIRCLE WITH CIRCLE INSIDE;So;0;ON;;;;;N;;;;;
+2B58;HEAVY CIRCLE;So;0;ON;;;;;N;;;;;
+2B59;HEAVY CIRCLED SALTIRE;So;0;ON;;;;;N;;;;;
+2B5A;SLANTED NORTH ARROW WITH HOOKED HEAD;So;0;ON;;;;;N;;;;;
+2B5B;BACKSLANTED SOUTH ARROW WITH HOOKED TAIL;So;0;ON;;;;;N;;;;;
+2B5C;SLANTED NORTH ARROW WITH HORIZONTAL TAIL;So;0;ON;;;;;N;;;;;
+2B5D;BACKSLANTED SOUTH ARROW WITH HORIZONTAL TAIL;So;0;ON;;;;;N;;;;;
+2B5E;BENT ARROW POINTING DOWNWARDS THEN NORTH EAST;So;0;ON;;;;;N;;;;;
+2B5F;SHORT BENT ARROW POINTING DOWNWARDS THEN NORTH EAST;So;0;ON;;;;;N;;;;;
+2B60;LEFTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B61;UPWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B62;RIGHTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B63;DOWNWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B64;LEFT RIGHT TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B65;UP DOWN TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B66;NORTH WEST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B67;NORTH EAST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B68;SOUTH EAST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B69;SOUTH WEST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B6A;LEFTWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6B;UPWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6C;RIGHTWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6D;DOWNWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6E;CLOCKWISE TRIANGLE-HEADED OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+2B6F;ANTICLOCKWISE TRIANGLE-HEADED OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+2B70;LEFTWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B71;UPWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B72;RIGHTWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B73;DOWNWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B76;NORTH WEST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B77;NORTH EAST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B78;SOUTH EAST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B79;SOUTH WEST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B7A;LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7B;UPWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7C;RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7D;DOWNWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7E;HORIZONTAL TAB KEY;So;0;ON;;;;;N;;;;;
+2B7F;VERTICAL TAB KEY;So;0;ON;;;;;N;;;;;
+2B80;LEFTWARDS TRIANGLE-HEADED ARROW OVER RIGHTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B81;UPWARDS TRIANGLE-HEADED ARROW LEFTWARDS OF DOWNWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B82;RIGHTWARDS TRIANGLE-HEADED ARROW OVER LEFTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B83;DOWNWARDS TRIANGLE-HEADED ARROW LEFTWARDS OF UPWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B84;LEFTWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B85;UPWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B86;RIGHTWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B87;DOWNWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B88;LEFTWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B89;UPWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B8A;RIGHTWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B8B;DOWNWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B8C;ANTICLOCKWISE TRIANGLE-HEADED RIGHT U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B8D;ANTICLOCKWISE TRIANGLE-HEADED BOTTOM U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B8E;ANTICLOCKWISE TRIANGLE-HEADED LEFT U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B8F;ANTICLOCKWISE TRIANGLE-HEADED TOP U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B90;RETURN LEFT;So;0;ON;;;;;N;;;;;
+2B91;RETURN RIGHT;So;0;ON;;;;;N;;;;;
+2B92;NEWLINE LEFT;So;0;ON;;;;;N;;;;;
+2B93;NEWLINE RIGHT;So;0;ON;;;;;N;;;;;
+2B94;FOUR CORNER ARROWS CIRCLING ANTICLOCKWISE;So;0;ON;;;;;N;;;;;
+2B95;RIGHTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B97;SYMBOL FOR TYPE A ELECTRONICS;So;0;ON;;;;;N;;;;;
+2B98;THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B99;THREE-D RIGHT-LIGHTED UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9A;THREE-D TOP-LIGHTED RIGHTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9B;THREE-D LEFT-LIGHTED DOWNWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9C;BLACK LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9D;BLACK UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9E;BLACK RIGHTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9F;BLACK DOWNWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2BA0;DOWNWARDS TRIANGLE-HEADED ARROW WITH LONG TIP LEFTWARDS;So;0;ON;;;;;N;;;;;
+2BA1;DOWNWARDS TRIANGLE-HEADED ARROW WITH LONG TIP RIGHTWARDS;So;0;ON;;;;;N;;;;;
+2BA2;UPWARDS TRIANGLE-HEADED ARROW WITH LONG TIP LEFTWARDS;So;0;ON;;;;;N;;;;;
+2BA3;UPWARDS TRIANGLE-HEADED ARROW WITH LONG TIP RIGHTWARDS;So;0;ON;;;;;N;;;;;
+2BA4;LEFTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2BA5;RIGHTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2BA6;LEFTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2BA7;RIGHTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2BA8;BLACK CURVED DOWNWARDS AND LEFTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BA9;BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAA;BLACK CURVED UPWARDS AND LEFTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAB;BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAC;BLACK CURVED LEFTWARDS AND UPWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAD;BLACK CURVED RIGHTWARDS AND UPWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAE;BLACK CURVED LEFTWARDS AND DOWNWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAF;BLACK CURVED RIGHTWARDS AND DOWNWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BB0;RIBBON ARROW DOWN LEFT;So;0;ON;;;;;N;;;;;
+2BB1;RIBBON ARROW DOWN RIGHT;So;0;ON;;;;;N;;;;;
+2BB2;RIBBON ARROW UP LEFT;So;0;ON;;;;;N;;;;;
+2BB3;RIBBON ARROW UP RIGHT;So;0;ON;;;;;N;;;;;
+2BB4;RIBBON ARROW LEFT UP;So;0;ON;;;;;N;;;;;
+2BB5;RIBBON ARROW RIGHT UP;So;0;ON;;;;;N;;;;;
+2BB6;RIBBON ARROW LEFT DOWN;So;0;ON;;;;;N;;;;;
+2BB7;RIBBON ARROW RIGHT DOWN;So;0;ON;;;;;N;;;;;
+2BB8;UPWARDS WHITE ARROW FROM BAR WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
+2BB9;UP ARROWHEAD IN A RECTANGLE BOX;So;0;ON;;;;;N;;;;;
+2BBA;OVERLAPPING WHITE SQUARES;So;0;ON;;;;;N;;;;;
+2BBB;OVERLAPPING WHITE AND BLACK SQUARES;So;0;ON;;;;;N;;;;;
+2BBC;OVERLAPPING BLACK SQUARES;So;0;ON;;;;;N;;;;;
+2BBD;BALLOT BOX WITH LIGHT X;So;0;ON;;;;;N;;;;;
+2BBE;CIRCLED X;So;0;ON;;;;;N;;;;;
+2BBF;CIRCLED BOLD X;So;0;ON;;;;;N;;;;;
+2BC0;BLACK SQUARE CENTRED;So;0;ON;;;;;N;;;;;
+2BC1;BLACK DIAMOND CENTRED;So;0;ON;;;;;N;;;;;
+2BC2;TURNED BLACK PENTAGON;So;0;ON;;;;;N;;;;;
+2BC3;HORIZONTAL BLACK OCTAGON;So;0;ON;;;;;N;;;;;
+2BC4;BLACK OCTAGON;So;0;ON;;;;;N;;;;;
+2BC5;BLACK MEDIUM UP-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC6;BLACK MEDIUM DOWN-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC7;BLACK MEDIUM LEFT-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC8;BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC9;NEPTUNE FORM TWO;So;0;ON;;;;;N;;;;;
+2BCA;TOP HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+2BCB;BOTTOM HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+2BCC;LIGHT FOUR POINTED BLACK CUSP;So;0;ON;;;;;N;;;;;
+2BCD;ROTATED LIGHT FOUR POINTED BLACK CUSP;So;0;ON;;;;;N;;;;;
+2BCE;WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;;
+2BCF;ROTATED WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;;
+2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;;
+2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;;
+2BD2;GROUP MARK;So;0;ON;;;;;N;;;;;
+2BD3;PLUTO FORM TWO;So;0;ON;;;;;N;;;;;
+2BD4;PLUTO FORM THREE;So;0;ON;;;;;N;;;;;
+2BD5;PLUTO FORM FOUR;So;0;ON;;;;;N;;;;;
+2BD6;PLUTO FORM FIVE;So;0;ON;;;;;N;;;;;
+2BD7;TRANSPLUTO;So;0;ON;;;;;N;;;;;
+2BD8;PROSERPINA;So;0;ON;;;;;N;;;;;
+2BD9;ASTRAEA;So;0;ON;;;;;N;;;;;
+2BDA;HYGIEA;So;0;ON;;;;;N;;;;;
+2BDB;PHOLUS;So;0;ON;;;;;N;;;;;
+2BDC;NESSUS;So;0;ON;;;;;N;;;;;
+2BDD;WHITE MOON SELENA;So;0;ON;;;;;N;;;;;
+2BDE;BLACK DIAMOND ON CROSS;So;0;ON;;;;;N;;;;;
+2BDF;TRUE LIGHT MOON ARTA;So;0;ON;;;;;N;;;;;
+2BE0;CUPIDO;So;0;ON;;;;;N;;;;;
+2BE1;HADES;So;0;ON;;;;;N;;;;;
+2BE2;ZEUS;So;0;ON;;;;;N;;;;;
+2BE3;KRONOS;So;0;ON;;;;;N;;;;;
+2BE4;APOLLON;So;0;ON;;;;;N;;;;;
+2BE5;ADMETOS;So;0;ON;;;;;N;;;;;
+2BE6;VULCANUS;So;0;ON;;;;;N;;;;;
+2BE7;POSEIDON;So;0;ON;;;;;N;;;;;
+2BE8;LEFT HALF BLACK STAR;So;0;ON;;;;;N;;;;;
+2BE9;RIGHT HALF BLACK STAR;So;0;ON;;;;;N;;;;;
+2BEA;STAR WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+2BEB;STAR WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BEF;DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BF0;ERIS FORM ONE;So;0;ON;;;;;N;;;;;
+2BF1;ERIS FORM TWO;So;0;ON;;;;;N;;;;;
+2BF2;SEDNA;So;0;ON;;;;;N;;;;;
+2BF3;RUSSIAN ASTROLOGICAL SYMBOL VIGINTILE;So;0;ON;;;;;N;;;;;
+2BF4;RUSSIAN ASTROLOGICAL SYMBOL NOVILE;So;0;ON;;;;;N;;;;;
+2BF5;RUSSIAN ASTROLOGICAL SYMBOL QUINTILE;So;0;ON;;;;;N;;;;;
+2BF6;RUSSIAN ASTROLOGICAL SYMBOL BINOVILE;So;0;ON;;;;;N;;;;;
+2BF7;RUSSIAN ASTROLOGICAL SYMBOL SENTAGON;So;0;ON;;;;;N;;;;;
+2BF8;RUSSIAN ASTROLOGICAL SYMBOL TREDECILE;So;0;ON;;;;;N;;;;;
+2BF9;EQUALS SIGN WITH INFINITY BELOW;So;0;ON;;;;;N;;;;;
+2BFA;UNITED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFB;SEPARATED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFC;DOUBLED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFD;PASSED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFE;REVERSED RIGHT ANGLE;So;0;ON;;;;;Y;;;;;
+2BFF;HELLSCHREIBER PAUSE SYMBOL;So;0;ON;;;;;N;;;;;
+2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
+2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
+2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
+2C03;GLAGOLITIC CAPITAL LETTER GLAGOLI;Lu;0;L;;;;;N;;;;2C33;
+2C04;GLAGOLITIC CAPITAL LETTER DOBRO;Lu;0;L;;;;;N;;;;2C34;
+2C05;GLAGOLITIC CAPITAL LETTER YESTU;Lu;0;L;;;;;N;;;;2C35;
+2C06;GLAGOLITIC CAPITAL LETTER ZHIVETE;Lu;0;L;;;;;N;;;;2C36;
+2C07;GLAGOLITIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;2C37;
+2C08;GLAGOLITIC CAPITAL LETTER ZEMLJA;Lu;0;L;;;;;N;;;;2C38;
+2C09;GLAGOLITIC CAPITAL LETTER IZHE;Lu;0;L;;;;;N;;;;2C39;
+2C0A;GLAGOLITIC CAPITAL LETTER INITIAL IZHE;Lu;0;L;;;;;N;;;;2C3A;
+2C0B;GLAGOLITIC CAPITAL LETTER I;Lu;0;L;;;;;N;;;;2C3B;
+2C0C;GLAGOLITIC CAPITAL LETTER DJERVI;Lu;0;L;;;;;N;;;;2C3C;
+2C0D;GLAGOLITIC CAPITAL LETTER KAKO;Lu;0;L;;;;;N;;;;2C3D;
+2C0E;GLAGOLITIC CAPITAL LETTER LJUDIJE;Lu;0;L;;;;;N;;;;2C3E;
+2C0F;GLAGOLITIC CAPITAL LETTER MYSLITE;Lu;0;L;;;;;N;;;;2C3F;
+2C10;GLAGOLITIC CAPITAL LETTER NASHI;Lu;0;L;;;;;N;;;;2C40;
+2C11;GLAGOLITIC CAPITAL LETTER ONU;Lu;0;L;;;;;N;;;;2C41;
+2C12;GLAGOLITIC CAPITAL LETTER POKOJI;Lu;0;L;;;;;N;;;;2C42;
+2C13;GLAGOLITIC CAPITAL LETTER RITSI;Lu;0;L;;;;;N;;;;2C43;
+2C14;GLAGOLITIC CAPITAL LETTER SLOVO;Lu;0;L;;;;;N;;;;2C44;
+2C15;GLAGOLITIC CAPITAL LETTER TVRIDO;Lu;0;L;;;;;N;;;;2C45;
+2C16;GLAGOLITIC CAPITAL LETTER UKU;Lu;0;L;;;;;N;;;;2C46;
+2C17;GLAGOLITIC CAPITAL LETTER FRITU;Lu;0;L;;;;;N;;;;2C47;
+2C18;GLAGOLITIC CAPITAL LETTER HERU;Lu;0;L;;;;;N;;;;2C48;
+2C19;GLAGOLITIC CAPITAL LETTER OTU;Lu;0;L;;;;;N;;;;2C49;
+2C1A;GLAGOLITIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;2C4A;
+2C1B;GLAGOLITIC CAPITAL LETTER SHTA;Lu;0;L;;;;;N;;;;2C4B;
+2C1C;GLAGOLITIC CAPITAL LETTER TSI;Lu;0;L;;;;;N;;;;2C4C;
+2C1D;GLAGOLITIC CAPITAL LETTER CHRIVI;Lu;0;L;;;;;N;;;;2C4D;
+2C1E;GLAGOLITIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;2C4E;
+2C1F;GLAGOLITIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;;;;2C4F;
+2C20;GLAGOLITIC CAPITAL LETTER YERI;Lu;0;L;;;;;N;;;;2C50;
+2C21;GLAGOLITIC CAPITAL LETTER YATI;Lu;0;L;;;;;N;;;;2C51;
+2C22;GLAGOLITIC CAPITAL LETTER SPIDERY HA;Lu;0;L;;;;;N;;;;2C52;
+2C23;GLAGOLITIC CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;2C53;
+2C24;GLAGOLITIC CAPITAL LETTER SMALL YUS;Lu;0;L;;;;;N;;;;2C54;
+2C25;GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL;Lu;0;L;;;;;N;;;;2C55;
+2C26;GLAGOLITIC CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;2C56;
+2C27;GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS;Lu;0;L;;;;;N;;;;2C57;
+2C28;GLAGOLITIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;2C58;
+2C29;GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS;Lu;0;L;;;;;N;;;;2C59;
+2C2A;GLAGOLITIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;2C5A;
+2C2B;GLAGOLITIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;2C5B;
+2C2C;GLAGOLITIC CAPITAL LETTER SHTAPIC;Lu;0;L;;;;;N;;;;2C5C;
+2C2D;GLAGOLITIC CAPITAL LETTER TROKUTASTI A;Lu;0;L;;;;;N;;;;2C5D;
+2C2E;GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE;Lu;0;L;;;;;N;;;;2C5E;
+2C30;GLAGOLITIC SMALL LETTER AZU;Ll;0;L;;;;;N;;;2C00;;2C00
+2C31;GLAGOLITIC SMALL LETTER BUKY;Ll;0;L;;;;;N;;;2C01;;2C01
+2C32;GLAGOLITIC SMALL LETTER VEDE;Ll;0;L;;;;;N;;;2C02;;2C02
+2C33;GLAGOLITIC SMALL LETTER GLAGOLI;Ll;0;L;;;;;N;;;2C03;;2C03
+2C34;GLAGOLITIC SMALL LETTER DOBRO;Ll;0;L;;;;;N;;;2C04;;2C04
+2C35;GLAGOLITIC SMALL LETTER YESTU;Ll;0;L;;;;;N;;;2C05;;2C05
+2C36;GLAGOLITIC SMALL LETTER ZHIVETE;Ll;0;L;;;;;N;;;2C06;;2C06
+2C37;GLAGOLITIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;2C07;;2C07
+2C38;GLAGOLITIC SMALL LETTER ZEMLJA;Ll;0;L;;;;;N;;;2C08;;2C08
+2C39;GLAGOLITIC SMALL LETTER IZHE;Ll;0;L;;;;;N;;;2C09;;2C09
+2C3A;GLAGOLITIC SMALL LETTER INITIAL IZHE;Ll;0;L;;;;;N;;;2C0A;;2C0A
+2C3B;GLAGOLITIC SMALL LETTER I;Ll;0;L;;;;;N;;;2C0B;;2C0B
+2C3C;GLAGOLITIC SMALL LETTER DJERVI;Ll;0;L;;;;;N;;;2C0C;;2C0C
+2C3D;GLAGOLITIC SMALL LETTER KAKO;Ll;0;L;;;;;N;;;2C0D;;2C0D
+2C3E;GLAGOLITIC SMALL LETTER LJUDIJE;Ll;0;L;;;;;N;;;2C0E;;2C0E
+2C3F;GLAGOLITIC SMALL LETTER MYSLITE;Ll;0;L;;;;;N;;;2C0F;;2C0F
+2C40;GLAGOLITIC SMALL LETTER NASHI;Ll;0;L;;;;;N;;;2C10;;2C10
+2C41;GLAGOLITIC SMALL LETTER ONU;Ll;0;L;;;;;N;;;2C11;;2C11
+2C42;GLAGOLITIC SMALL LETTER POKOJI;Ll;0;L;;;;;N;;;2C12;;2C12
+2C43;GLAGOLITIC SMALL LETTER RITSI;Ll;0;L;;;;;N;;;2C13;;2C13
+2C44;GLAGOLITIC SMALL LETTER SLOVO;Ll;0;L;;;;;N;;;2C14;;2C14
+2C45;GLAGOLITIC SMALL LETTER TVRIDO;Ll;0;L;;;;;N;;;2C15;;2C15
+2C46;GLAGOLITIC SMALL LETTER UKU;Ll;0;L;;;;;N;;;2C16;;2C16
+2C47;GLAGOLITIC SMALL LETTER FRITU;Ll;0;L;;;;;N;;;2C17;;2C17
+2C48;GLAGOLITIC SMALL LETTER HERU;Ll;0;L;;;;;N;;;2C18;;2C18
+2C49;GLAGOLITIC SMALL LETTER OTU;Ll;0;L;;;;;N;;;2C19;;2C19
+2C4A;GLAGOLITIC SMALL LETTER PE;Ll;0;L;;;;;N;;;2C1A;;2C1A
+2C4B;GLAGOLITIC SMALL LETTER SHTA;Ll;0;L;;;;;N;;;2C1B;;2C1B
+2C4C;GLAGOLITIC SMALL LETTER TSI;Ll;0;L;;;;;N;;;2C1C;;2C1C
+2C4D;GLAGOLITIC SMALL LETTER CHRIVI;Ll;0;L;;;;;N;;;2C1D;;2C1D
+2C4E;GLAGOLITIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;2C1E;;2C1E
+2C4F;GLAGOLITIC SMALL LETTER YERU;Ll;0;L;;;;;N;;;2C1F;;2C1F
+2C50;GLAGOLITIC SMALL LETTER YERI;Ll;0;L;;;;;N;;;2C20;;2C20
+2C51;GLAGOLITIC SMALL LETTER YATI;Ll;0;L;;;;;N;;;2C21;;2C21
+2C52;GLAGOLITIC SMALL LETTER SPIDERY HA;Ll;0;L;;;;;N;;;2C22;;2C22
+2C53;GLAGOLITIC SMALL LETTER YU;Ll;0;L;;;;;N;;;2C23;;2C23
+2C54;GLAGOLITIC SMALL LETTER SMALL YUS;Ll;0;L;;;;;N;;;2C24;;2C24
+2C55;GLAGOLITIC SMALL LETTER SMALL YUS WITH TAIL;Ll;0;L;;;;;N;;;2C25;;2C25
+2C56;GLAGOLITIC SMALL LETTER YO;Ll;0;L;;;;;N;;;2C26;;2C26
+2C57;GLAGOLITIC SMALL LETTER IOTATED SMALL YUS;Ll;0;L;;;;;N;;;2C27;;2C27
+2C58;GLAGOLITIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;2C28;;2C28
+2C59;GLAGOLITIC SMALL LETTER IOTATED BIG YUS;Ll;0;L;;;;;N;;;2C29;;2C29
+2C5A;GLAGOLITIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;2C2A;;2C2A
+2C5B;GLAGOLITIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;2C2B;;2C2B
+2C5C;GLAGOLITIC SMALL LETTER SHTAPIC;Ll;0;L;;;;;N;;;2C2C;;2C2C
+2C5D;GLAGOLITIC SMALL LETTER TROKUTASTI A;Ll;0;L;;;;;N;;;2C2D;;2C2D
+2C5E;GLAGOLITIC SMALL LETTER LATINATE MYSLITE;Ll;0;L;;;;;N;;;2C2E;;2C2E
+2C60;LATIN CAPITAL LETTER L WITH DOUBLE BAR;Lu;0;L;;;;;N;;;;2C61;
+2C61;LATIN SMALL LETTER L WITH DOUBLE BAR;Ll;0;L;;;;;N;;;2C60;;2C60
+2C62;LATIN CAPITAL LETTER L WITH MIDDLE TILDE;Lu;0;L;;;;;N;;;;026B;
+2C63;LATIN CAPITAL LETTER P WITH STROKE;Lu;0;L;;;;;N;;;;1D7D;
+2C64;LATIN CAPITAL LETTER R WITH TAIL;Lu;0;L;;;;;N;;;;027D;
+2C65;LATIN SMALL LETTER A WITH STROKE;Ll;0;L;;;;;N;;;023A;;023A
+2C66;LATIN SMALL LETTER T WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;023E;;023E
+2C67;LATIN CAPITAL LETTER H WITH DESCENDER;Lu;0;L;;;;;N;;;;2C68;
+2C68;LATIN SMALL LETTER H WITH DESCENDER;Ll;0;L;;;;;N;;;2C67;;2C67
+2C69;LATIN CAPITAL LETTER K WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6A;
+2C6A;LATIN SMALL LETTER K WITH DESCENDER;Ll;0;L;;;;;N;;;2C69;;2C69
+2C6B;LATIN CAPITAL LETTER Z WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6C;
+2C6C;LATIN SMALL LETTER Z WITH DESCENDER;Ll;0;L;;;;;N;;;2C6B;;2C6B
+2C6D;LATIN CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;0251;
+2C6E;LATIN CAPITAL LETTER M WITH HOOK;Lu;0;L;;;;;N;;;;0271;
+2C6F;LATIN CAPITAL LETTER TURNED A;Lu;0;L;;;;;N;;;;0250;
+2C70;LATIN CAPITAL LETTER TURNED ALPHA;Lu;0;L;;;;;N;;;;0252;
+2C71;LATIN SMALL LETTER V WITH RIGHT HOOK;Ll;0;L;;;;;N;;;;;
+2C72;LATIN CAPITAL LETTER W WITH HOOK;Lu;0;L;;;;;N;;;;2C73;
+2C73;LATIN SMALL LETTER W WITH HOOK;Ll;0;L;;;;;N;;;2C72;;2C72
+2C74;LATIN SMALL LETTER V WITH CURL;Ll;0;L;;;;;N;;;;;
+2C75;LATIN CAPITAL LETTER HALF H;Lu;0;L;;;;;N;;;;2C76;
+2C76;LATIN SMALL LETTER HALF H;Ll;0;L;;;;;N;;;2C75;;2C75
+2C77;LATIN SMALL LETTER TAILLESS PHI;Ll;0;L;;;;;N;;;;;
+2C78;LATIN SMALL LETTER E WITH NOTCH;Ll;0;L;;;;;N;;;;;
+2C79;LATIN SMALL LETTER TURNED R WITH TAIL;Ll;0;L;;;;;N;;;;;
+2C7A;LATIN SMALL LETTER O WITH LOW RING INSIDE;Ll;0;L;;;;;N;;;;;
+2C7B;LATIN LETTER SMALL CAPITAL TURNED E;Ll;0;L;;;;;N;;;;;
+2C7C;LATIN SUBSCRIPT SMALL LETTER J;Lm;0;L;<sub> 006A;;;;N;;;;;
+2C7D;MODIFIER LETTER CAPITAL V;Lm;0;L;<super> 0056;;;;N;;;;;
+2C7E;LATIN CAPITAL LETTER S WITH SWASH TAIL;Lu;0;L;;;;;N;;;;023F;
+2C7F;LATIN CAPITAL LETTER Z WITH SWASH TAIL;Lu;0;L;;;;;N;;;;0240;
+2C80;COPTIC CAPITAL LETTER ALFA;Lu;0;L;;;;;N;;;;2C81;
+2C81;COPTIC SMALL LETTER ALFA;Ll;0;L;;;;;N;;;2C80;;2C80
+2C82;COPTIC CAPITAL LETTER VIDA;Lu;0;L;;;;;N;;;;2C83;
+2C83;COPTIC SMALL LETTER VIDA;Ll;0;L;;;;;N;;;2C82;;2C82
+2C84;COPTIC CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;2C85;
+2C85;COPTIC SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;2C84;;2C84
+2C86;COPTIC CAPITAL LETTER DALDA;Lu;0;L;;;;;N;;;;2C87;
+2C87;COPTIC SMALL LETTER DALDA;Ll;0;L;;;;;N;;;2C86;;2C86
+2C88;COPTIC CAPITAL LETTER EIE;Lu;0;L;;;;;N;;;;2C89;
+2C89;COPTIC SMALL LETTER EIE;Ll;0;L;;;;;N;;;2C88;;2C88
+2C8A;COPTIC CAPITAL LETTER SOU;Lu;0;L;;;;;N;;;;2C8B;
+2C8B;COPTIC SMALL LETTER SOU;Ll;0;L;;;;;N;;;2C8A;;2C8A
+2C8C;COPTIC CAPITAL LETTER ZATA;Lu;0;L;;;;;N;;;;2C8D;
+2C8D;COPTIC SMALL LETTER ZATA;Ll;0;L;;;;;N;;;2C8C;;2C8C
+2C8E;COPTIC CAPITAL LETTER HATE;Lu;0;L;;;;;N;;;;2C8F;
+2C8F;COPTIC SMALL LETTER HATE;Ll;0;L;;;;;N;;;2C8E;;2C8E
+2C90;COPTIC CAPITAL LETTER THETHE;Lu;0;L;;;;;N;;;;2C91;
+2C91;COPTIC SMALL LETTER THETHE;Ll;0;L;;;;;N;;;2C90;;2C90
+2C92;COPTIC CAPITAL LETTER IAUDA;Lu;0;L;;;;;N;;;;2C93;
+2C93;COPTIC SMALL LETTER IAUDA;Ll;0;L;;;;;N;;;2C92;;2C92
+2C94;COPTIC CAPITAL LETTER KAPA;Lu;0;L;;;;;N;;;;2C95;
+2C95;COPTIC SMALL LETTER KAPA;Ll;0;L;;;;;N;;;2C94;;2C94
+2C96;COPTIC CAPITAL LETTER LAULA;Lu;0;L;;;;;N;;;;2C97;
+2C97;COPTIC SMALL LETTER LAULA;Ll;0;L;;;;;N;;;2C96;;2C96
+2C98;COPTIC CAPITAL LETTER MI;Lu;0;L;;;;;N;;;;2C99;
+2C99;COPTIC SMALL LETTER MI;Ll;0;L;;;;;N;;;2C98;;2C98
+2C9A;COPTIC CAPITAL LETTER NI;Lu;0;L;;;;;N;;;;2C9B;
+2C9B;COPTIC SMALL LETTER NI;Ll;0;L;;;;;N;;;2C9A;;2C9A
+2C9C;COPTIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;2C9D;
+2C9D;COPTIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;2C9C;;2C9C
+2C9E;COPTIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;2C9F;
+2C9F;COPTIC SMALL LETTER O;Ll;0;L;;;;;N;;;2C9E;;2C9E
+2CA0;COPTIC CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;2CA1;
+2CA1;COPTIC SMALL LETTER PI;Ll;0;L;;;;;N;;;2CA0;;2CA0
+2CA2;COPTIC CAPITAL LETTER RO;Lu;0;L;;;;;N;;;;2CA3;
+2CA3;COPTIC SMALL LETTER RO;Ll;0;L;;;;;N;;;2CA2;;2CA2
+2CA4;COPTIC CAPITAL LETTER SIMA;Lu;0;L;;;;;N;;;;2CA5;
+2CA5;COPTIC SMALL LETTER SIMA;Ll;0;L;;;;;N;;;2CA4;;2CA4
+2CA6;COPTIC CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;2CA7;
+2CA7;COPTIC SMALL LETTER TAU;Ll;0;L;;;;;N;;;2CA6;;2CA6
+2CA8;COPTIC CAPITAL LETTER UA;Lu;0;L;;;;;N;;;;2CA9;
+2CA9;COPTIC SMALL LETTER UA;Ll;0;L;;;;;N;;;2CA8;;2CA8
+2CAA;COPTIC CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;2CAB;
+2CAB;COPTIC SMALL LETTER FI;Ll;0;L;;;;;N;;;2CAA;;2CAA
+2CAC;COPTIC CAPITAL LETTER KHI;Lu;0;L;;;;;N;;;;2CAD;
+2CAD;COPTIC SMALL LETTER KHI;Ll;0;L;;;;;N;;;2CAC;;2CAC
+2CAE;COPTIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;2CAF;
+2CAF;COPTIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;2CAE;;2CAE
+2CB0;COPTIC CAPITAL LETTER OOU;Lu;0;L;;;;;N;;;;2CB1;
+2CB1;COPTIC SMALL LETTER OOU;Ll;0;L;;;;;N;;;2CB0;;2CB0
+2CB2;COPTIC CAPITAL LETTER DIALECT-P ALEF;Lu;0;L;;;;;N;;;;2CB3;
+2CB3;COPTIC SMALL LETTER DIALECT-P ALEF;Ll;0;L;;;;;N;;;2CB2;;2CB2
+2CB4;COPTIC CAPITAL LETTER OLD COPTIC AIN;Lu;0;L;;;;;N;;;;2CB5;
+2CB5;COPTIC SMALL LETTER OLD COPTIC AIN;Ll;0;L;;;;;N;;;2CB4;;2CB4
+2CB6;COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE;Lu;0;L;;;;;N;;;;2CB7;
+2CB7;COPTIC SMALL LETTER CRYPTOGRAMMIC EIE;Ll;0;L;;;;;N;;;2CB6;;2CB6
+2CB8;COPTIC CAPITAL LETTER DIALECT-P KAPA;Lu;0;L;;;;;N;;;;2CB9;
+2CB9;COPTIC SMALL LETTER DIALECT-P KAPA;Ll;0;L;;;;;N;;;2CB8;;2CB8
+2CBA;COPTIC CAPITAL LETTER DIALECT-P NI;Lu;0;L;;;;;N;;;;2CBB;
+2CBB;COPTIC SMALL LETTER DIALECT-P NI;Ll;0;L;;;;;N;;;2CBA;;2CBA
+2CBC;COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI;Lu;0;L;;;;;N;;;;2CBD;
+2CBD;COPTIC SMALL LETTER CRYPTOGRAMMIC NI;Ll;0;L;;;;;N;;;2CBC;;2CBC
+2CBE;COPTIC CAPITAL LETTER OLD COPTIC OOU;Lu;0;L;;;;;N;;;;2CBF;
+2CBF;COPTIC SMALL LETTER OLD COPTIC OOU;Ll;0;L;;;;;N;;;2CBE;;2CBE
+2CC0;COPTIC CAPITAL LETTER SAMPI;Lu;0;L;;;;;N;;;;2CC1;
+2CC1;COPTIC SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;2CC0;;2CC0
+2CC2;COPTIC CAPITAL LETTER CROSSED SHEI;Lu;0;L;;;;;N;;;;2CC3;
+2CC3;COPTIC SMALL LETTER CROSSED SHEI;Ll;0;L;;;;;N;;;2CC2;;2CC2
+2CC4;COPTIC CAPITAL LETTER OLD COPTIC SHEI;Lu;0;L;;;;;N;;;;2CC5;
+2CC5;COPTIC SMALL LETTER OLD COPTIC SHEI;Ll;0;L;;;;;N;;;2CC4;;2CC4
+2CC6;COPTIC CAPITAL LETTER OLD COPTIC ESH;Lu;0;L;;;;;N;;;;2CC7;
+2CC7;COPTIC SMALL LETTER OLD COPTIC ESH;Ll;0;L;;;;;N;;;2CC6;;2CC6
+2CC8;COPTIC CAPITAL LETTER AKHMIMIC KHEI;Lu;0;L;;;;;N;;;;2CC9;
+2CC9;COPTIC SMALL LETTER AKHMIMIC KHEI;Ll;0;L;;;;;N;;;2CC8;;2CC8
+2CCA;COPTIC CAPITAL LETTER DIALECT-P HORI;Lu;0;L;;;;;N;;;;2CCB;
+2CCB;COPTIC SMALL LETTER DIALECT-P HORI;Ll;0;L;;;;;N;;;2CCA;;2CCA
+2CCC;COPTIC CAPITAL LETTER OLD COPTIC HORI;Lu;0;L;;;;;N;;;;2CCD;
+2CCD;COPTIC SMALL LETTER OLD COPTIC HORI;Ll;0;L;;;;;N;;;2CCC;;2CCC
+2CCE;COPTIC CAPITAL LETTER OLD COPTIC HA;Lu;0;L;;;;;N;;;;2CCF;
+2CCF;COPTIC SMALL LETTER OLD COPTIC HA;Ll;0;L;;;;;N;;;2CCE;;2CCE
+2CD0;COPTIC CAPITAL LETTER L-SHAPED HA;Lu;0;L;;;;;N;;;;2CD1;
+2CD1;COPTIC SMALL LETTER L-SHAPED HA;Ll;0;L;;;;;N;;;2CD0;;2CD0
+2CD2;COPTIC CAPITAL LETTER OLD COPTIC HEI;Lu;0;L;;;;;N;;;;2CD3;
+2CD3;COPTIC SMALL LETTER OLD COPTIC HEI;Ll;0;L;;;;;N;;;2CD2;;2CD2
+2CD4;COPTIC CAPITAL LETTER OLD COPTIC HAT;Lu;0;L;;;;;N;;;;2CD5;
+2CD5;COPTIC SMALL LETTER OLD COPTIC HAT;Ll;0;L;;;;;N;;;2CD4;;2CD4
+2CD6;COPTIC CAPITAL LETTER OLD COPTIC GANGIA;Lu;0;L;;;;;N;;;;2CD7;
+2CD7;COPTIC SMALL LETTER OLD COPTIC GANGIA;Ll;0;L;;;;;N;;;2CD6;;2CD6
+2CD8;COPTIC CAPITAL LETTER OLD COPTIC DJA;Lu;0;L;;;;;N;;;;2CD9;
+2CD9;COPTIC SMALL LETTER OLD COPTIC DJA;Ll;0;L;;;;;N;;;2CD8;;2CD8
+2CDA;COPTIC CAPITAL LETTER OLD COPTIC SHIMA;Lu;0;L;;;;;N;;;;2CDB;
+2CDB;COPTIC SMALL LETTER OLD COPTIC SHIMA;Ll;0;L;;;;;N;;;2CDA;;2CDA
+2CDC;COPTIC CAPITAL LETTER OLD NUBIAN SHIMA;Lu;0;L;;;;;N;;;;2CDD;
+2CDD;COPTIC SMALL LETTER OLD NUBIAN SHIMA;Ll;0;L;;;;;N;;;2CDC;;2CDC
+2CDE;COPTIC CAPITAL LETTER OLD NUBIAN NGI;Lu;0;L;;;;;N;;;;2CDF;
+2CDF;COPTIC SMALL LETTER OLD NUBIAN NGI;Ll;0;L;;;;;N;;;2CDE;;2CDE
+2CE0;COPTIC CAPITAL LETTER OLD NUBIAN NYI;Lu;0;L;;;;;N;;;;2CE1;
+2CE1;COPTIC SMALL LETTER OLD NUBIAN NYI;Ll;0;L;;;;;N;;;2CE0;;2CE0
+2CE2;COPTIC CAPITAL LETTER OLD NUBIAN WAU;Lu;0;L;;;;;N;;;;2CE3;
+2CE3;COPTIC SMALL LETTER OLD NUBIAN WAU;Ll;0;L;;;;;N;;;2CE2;;2CE2
+2CE4;COPTIC SYMBOL KAI;Ll;0;L;;;;;N;;;;;
+2CE5;COPTIC SYMBOL MI RO;So;0;ON;;;;;N;;;;;
+2CE6;COPTIC SYMBOL PI RO;So;0;ON;;;;;N;;;;;
+2CE7;COPTIC SYMBOL STAUROS;So;0;ON;;;;;N;;;;;
+2CE8;COPTIC SYMBOL TAU RO;So;0;ON;;;;;N;;;;;
+2CE9;COPTIC SYMBOL KHI RO;So;0;ON;;;;;N;;;;;
+2CEA;COPTIC SYMBOL SHIMA SIMA;So;0;ON;;;;;N;;;;;
+2CEB;COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI;Lu;0;L;;;;;N;;;;2CEC;
+2CEC;COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI;Ll;0;L;;;;;N;;;2CEB;;2CEB
+2CED;COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA;Lu;0;L;;;;;N;;;;2CEE;
+2CEE;COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA;Ll;0;L;;;;;N;;;2CED;;2CED
+2CEF;COPTIC COMBINING NI ABOVE;Mn;230;NSM;;;;;N;;;;;
+2CF0;COPTIC COMBINING SPIRITUS ASPER;Mn;230;NSM;;;;;N;;;;;
+2CF1;COPTIC COMBINING SPIRITUS LENIS;Mn;230;NSM;;;;;N;;;;;
+2CF2;COPTIC CAPITAL LETTER BOHAIRIC KHEI;Lu;0;L;;;;;N;;;;2CF3;
+2CF3;COPTIC SMALL LETTER BOHAIRIC KHEI;Ll;0;L;;;;;N;;;2CF2;;2CF2
+2CF9;COPTIC OLD NUBIAN FULL STOP;Po;0;ON;;;;;N;;;;;
+2CFA;COPTIC OLD NUBIAN DIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2CFB;COPTIC OLD NUBIAN INDIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2CFC;COPTIC OLD NUBIAN VERSE DIVIDER;Po;0;ON;;;;;N;;;;;
+2CFD;COPTIC FRACTION ONE HALF;No;0;ON;;;;1/2;N;;;;;
+2CFE;COPTIC FULL STOP;Po;0;ON;;;;;N;;;;;
+2CFF;COPTIC MORPHOLOGICAL DIVIDER;Po;0;ON;;;;;N;;;;;
+2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;;10A0;;10A0
+2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;;10A1;;10A1
+2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;;10A2;;10A2
+2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;;10A3;;10A3
+2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;;10A4;;10A4
+2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;;10A5;;10A5
+2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;;10A6;;10A6
+2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;;10A7;;10A7
+2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;;10A8;;10A8
+2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;;10A9;;10A9
+2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;;10AA;;10AA
+2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;;10AB;;10AB
+2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;;10AC;;10AC
+2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;;10AD;;10AD
+2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;;10AE;;10AE
+2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;;10AF;;10AF
+2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;;10B0;;10B0
+2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;;10B1;;10B1
+2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;;10B2;;10B2
+2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;;10B3;;10B3
+2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;;10B4;;10B4
+2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;;10B5;;10B5
+2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;;10B6;;10B6
+2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;;10B7;;10B7
+2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;;10B8;;10B8
+2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;;10B9;;10B9
+2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;;10BA;;10BA
+2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;;10BB;;10BB
+2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;;10BC;;10BC
+2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;;10BD;;10BD
+2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;;10BE;;10BE
+2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;;10BF;;10BF
+2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;;10C0;;10C0
+2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;;10C1;;10C1
+2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;;10C2;;10C2
+2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;;10C3;;10C3
+2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;;10C4;;10C4
+2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;;10C5;;10C5
+2D27;GEORGIAN SMALL LETTER YN;Ll;0;L;;;;;N;;;10C7;;10C7
+2D2D;GEORGIAN SMALL LETTER AEN;Ll;0;L;;;;;N;;;10CD;;10CD
+2D30;TIFINAGH LETTER YA;Lo;0;L;;;;;N;;;;;
+2D31;TIFINAGH LETTER YAB;Lo;0;L;;;;;N;;;;;
+2D32;TIFINAGH LETTER YABH;Lo;0;L;;;;;N;;;;;
+2D33;TIFINAGH LETTER YAG;Lo;0;L;;;;;N;;;;;
+2D34;TIFINAGH LETTER YAGHH;Lo;0;L;;;;;N;;;;;
+2D35;TIFINAGH LETTER BERBER ACADEMY YAJ;Lo;0;L;;;;;N;;;;;
+2D36;TIFINAGH LETTER YAJ;Lo;0;L;;;;;N;;;;;
+2D37;TIFINAGH LETTER YAD;Lo;0;L;;;;;N;;;;;
+2D38;TIFINAGH LETTER YADH;Lo;0;L;;;;;N;;;;;
+2D39;TIFINAGH LETTER YADD;Lo;0;L;;;;;N;;;;;
+2D3A;TIFINAGH LETTER YADDH;Lo;0;L;;;;;N;;;;;
+2D3B;TIFINAGH LETTER YEY;Lo;0;L;;;;;N;;;;;
+2D3C;TIFINAGH LETTER YAF;Lo;0;L;;;;;N;;;;;
+2D3D;TIFINAGH LETTER YAK;Lo;0;L;;;;;N;;;;;
+2D3E;TIFINAGH LETTER TUAREG YAK;Lo;0;L;;;;;N;;;;;
+2D3F;TIFINAGH LETTER YAKHH;Lo;0;L;;;;;N;;;;;
+2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;;;;
+2D41;TIFINAGH LETTER BERBER ACADEMY YAH;Lo;0;L;;;;;N;;;;;
+2D42;TIFINAGH LETTER TUAREG YAH;Lo;0;L;;;;;N;;;;;
+2D43;TIFINAGH LETTER YAHH;Lo;0;L;;;;;N;;;;;
+2D44;TIFINAGH LETTER YAA;Lo;0;L;;;;;N;;;;;
+2D45;TIFINAGH LETTER YAKH;Lo;0;L;;;;;N;;;;;
+2D46;TIFINAGH LETTER TUAREG YAKH;Lo;0;L;;;;;N;;;;;
+2D47;TIFINAGH LETTER YAQ;Lo;0;L;;;;;N;;;;;
+2D48;TIFINAGH LETTER TUAREG YAQ;Lo;0;L;;;;;N;;;;;
+2D49;TIFINAGH LETTER YI;Lo;0;L;;;;;N;;;;;
+2D4A;TIFINAGH LETTER YAZH;Lo;0;L;;;;;N;;;;;
+2D4B;TIFINAGH LETTER AHAGGAR YAZH;Lo;0;L;;;;;N;;;;;
+2D4C;TIFINAGH LETTER TUAREG YAZH;Lo;0;L;;;;;N;;;;;
+2D4D;TIFINAGH LETTER YAL;Lo;0;L;;;;;N;;;;;
+2D4E;TIFINAGH LETTER YAM;Lo;0;L;;;;;N;;;;;
+2D4F;TIFINAGH LETTER YAN;Lo;0;L;;;;;N;;;;;
+2D50;TIFINAGH LETTER TUAREG YAGN;Lo;0;L;;;;;N;;;;;
+2D51;TIFINAGH LETTER TUAREG YANG;Lo;0;L;;;;;N;;;;;
+2D52;TIFINAGH LETTER YAP;Lo;0;L;;;;;N;;;;;
+2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;;;;
+2D54;TIFINAGH LETTER YAR;Lo;0;L;;;;;N;;;;;
+2D55;TIFINAGH LETTER YARR;Lo;0;L;;;;;N;;;;;
+2D56;TIFINAGH LETTER YAGH;Lo;0;L;;;;;N;;;;;
+2D57;TIFINAGH LETTER TUAREG YAGH;Lo;0;L;;;;;N;;;;;
+2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;;;;
+2D59;TIFINAGH LETTER YAS;Lo;0;L;;;;;N;;;;;
+2D5A;TIFINAGH LETTER YASS;Lo;0;L;;;;;N;;;;;
+2D5B;TIFINAGH LETTER YASH;Lo;0;L;;;;;N;;;;;
+2D5C;TIFINAGH LETTER YAT;Lo;0;L;;;;;N;;;;;
+2D5D;TIFINAGH LETTER YATH;Lo;0;L;;;;;N;;;;;
+2D5E;TIFINAGH LETTER YACH;Lo;0;L;;;;;N;;;;;
+2D5F;TIFINAGH LETTER YATT;Lo;0;L;;;;;N;;;;;
+2D60;TIFINAGH LETTER YAV;Lo;0;L;;;;;N;;;;;
+2D61;TIFINAGH LETTER YAW;Lo;0;L;;;;;N;;;;;
+2D62;TIFINAGH LETTER YAY;Lo;0;L;;;;;N;;;;;
+2D63;TIFINAGH LETTER YAZ;Lo;0;L;;;;;N;;;;;
+2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;;;;
+2D65;TIFINAGH LETTER YAZZ;Lo;0;L;;;;;N;;;;;
+2D66;TIFINAGH LETTER YE;Lo;0;L;;;;;N;;;;;
+2D67;TIFINAGH LETTER YO;Lo;0;L;;;;;N;;;;;
+2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L;<super> 2D61;;;;N;;;;;
+2D70;TIFINAGH SEPARATOR MARK;Po;0;L;;;;;N;;;;;
+2D7F;TIFINAGH CONSONANT JOINER;Mn;9;NSM;;;;;N;;;;;
+2D80;ETHIOPIC SYLLABLE LOA;Lo;0;L;;;;;N;;;;;
+2D81;ETHIOPIC SYLLABLE MOA;Lo;0;L;;;;;N;;;;;
+2D82;ETHIOPIC SYLLABLE ROA;Lo;0;L;;;;;N;;;;;
+2D83;ETHIOPIC SYLLABLE SOA;Lo;0;L;;;;;N;;;;;
+2D84;ETHIOPIC SYLLABLE SHOA;Lo;0;L;;;;;N;;;;;
+2D85;ETHIOPIC SYLLABLE BOA;Lo;0;L;;;;;N;;;;;
+2D86;ETHIOPIC SYLLABLE TOA;Lo;0;L;;;;;N;;;;;
+2D87;ETHIOPIC SYLLABLE COA;Lo;0;L;;;;;N;;;;;
+2D88;ETHIOPIC SYLLABLE NOA;Lo;0;L;;;;;N;;;;;
+2D89;ETHIOPIC SYLLABLE NYOA;Lo;0;L;;;;;N;;;;;
+2D8A;ETHIOPIC SYLLABLE GLOTTAL OA;Lo;0;L;;;;;N;;;;;
+2D8B;ETHIOPIC SYLLABLE ZOA;Lo;0;L;;;;;N;;;;;
+2D8C;ETHIOPIC SYLLABLE DOA;Lo;0;L;;;;;N;;;;;
+2D8D;ETHIOPIC SYLLABLE DDOA;Lo;0;L;;;;;N;;;;;
+2D8E;ETHIOPIC SYLLABLE JOA;Lo;0;L;;;;;N;;;;;
+2D8F;ETHIOPIC SYLLABLE THOA;Lo;0;L;;;;;N;;;;;
+2D90;ETHIOPIC SYLLABLE CHOA;Lo;0;L;;;;;N;;;;;
+2D91;ETHIOPIC SYLLABLE PHOA;Lo;0;L;;;;;N;;;;;
+2D92;ETHIOPIC SYLLABLE POA;Lo;0;L;;;;;N;;;;;
+2D93;ETHIOPIC SYLLABLE GGWA;Lo;0;L;;;;;N;;;;;
+2D94;ETHIOPIC SYLLABLE GGWI;Lo;0;L;;;;;N;;;;;
+2D95;ETHIOPIC SYLLABLE GGWEE;Lo;0;L;;;;;N;;;;;
+2D96;ETHIOPIC SYLLABLE GGWE;Lo;0;L;;;;;N;;;;;
+2DA0;ETHIOPIC SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
+2DA1;ETHIOPIC SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
+2DA2;ETHIOPIC SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
+2DA3;ETHIOPIC SYLLABLE SSAA;Lo;0;L;;;;;N;;;;;
+2DA4;ETHIOPIC SYLLABLE SSEE;Lo;0;L;;;;;N;;;;;
+2DA5;ETHIOPIC SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
+2DA6;ETHIOPIC SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
+2DA8;ETHIOPIC SYLLABLE CCA;Lo;0;L;;;;;N;;;;;
+2DA9;ETHIOPIC SYLLABLE CCU;Lo;0;L;;;;;N;;;;;
+2DAA;ETHIOPIC SYLLABLE CCI;Lo;0;L;;;;;N;;;;;
+2DAB;ETHIOPIC SYLLABLE CCAA;Lo;0;L;;;;;N;;;;;
+2DAC;ETHIOPIC SYLLABLE CCEE;Lo;0;L;;;;;N;;;;;
+2DAD;ETHIOPIC SYLLABLE CCE;Lo;0;L;;;;;N;;;;;
+2DAE;ETHIOPIC SYLLABLE CCO;Lo;0;L;;;;;N;;;;;
+2DB0;ETHIOPIC SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
+2DB1;ETHIOPIC SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
+2DB2;ETHIOPIC SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
+2DB3;ETHIOPIC SYLLABLE ZZAA;Lo;0;L;;;;;N;;;;;
+2DB4;ETHIOPIC SYLLABLE ZZEE;Lo;0;L;;;;;N;;;;;
+2DB5;ETHIOPIC SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
+2DB6;ETHIOPIC SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
+2DB8;ETHIOPIC SYLLABLE CCHA;Lo;0;L;;;;;N;;;;;
+2DB9;ETHIOPIC SYLLABLE CCHU;Lo;0;L;;;;;N;;;;;
+2DBA;ETHIOPIC SYLLABLE CCHI;Lo;0;L;;;;;N;;;;;
+2DBB;ETHIOPIC SYLLABLE CCHAA;Lo;0;L;;;;;N;;;;;
+2DBC;ETHIOPIC SYLLABLE CCHEE;Lo;0;L;;;;;N;;;;;
+2DBD;ETHIOPIC SYLLABLE CCHE;Lo;0;L;;;;;N;;;;;
+2DBE;ETHIOPIC SYLLABLE CCHO;Lo;0;L;;;;;N;;;;;
+2DC0;ETHIOPIC SYLLABLE QYA;Lo;0;L;;;;;N;;;;;
+2DC1;ETHIOPIC SYLLABLE QYU;Lo;0;L;;;;;N;;;;;
+2DC2;ETHIOPIC SYLLABLE QYI;Lo;0;L;;;;;N;;;;;
+2DC3;ETHIOPIC SYLLABLE QYAA;Lo;0;L;;;;;N;;;;;
+2DC4;ETHIOPIC SYLLABLE QYEE;Lo;0;L;;;;;N;;;;;
+2DC5;ETHIOPIC SYLLABLE QYE;Lo;0;L;;;;;N;;;;;
+2DC6;ETHIOPIC SYLLABLE QYO;Lo;0;L;;;;;N;;;;;
+2DC8;ETHIOPIC SYLLABLE KYA;Lo;0;L;;;;;N;;;;;
+2DC9;ETHIOPIC SYLLABLE KYU;Lo;0;L;;;;;N;;;;;
+2DCA;ETHIOPIC SYLLABLE KYI;Lo;0;L;;;;;N;;;;;
+2DCB;ETHIOPIC SYLLABLE KYAA;Lo;0;L;;;;;N;;;;;
+2DCC;ETHIOPIC SYLLABLE KYEE;Lo;0;L;;;;;N;;;;;
+2DCD;ETHIOPIC SYLLABLE KYE;Lo;0;L;;;;;N;;;;;
+2DCE;ETHIOPIC SYLLABLE KYO;Lo;0;L;;;;;N;;;;;
+2DD0;ETHIOPIC SYLLABLE XYA;Lo;0;L;;;;;N;;;;;
+2DD1;ETHIOPIC SYLLABLE XYU;Lo;0;L;;;;;N;;;;;
+2DD2;ETHIOPIC SYLLABLE XYI;Lo;0;L;;;;;N;;;;;
+2DD3;ETHIOPIC SYLLABLE XYAA;Lo;0;L;;;;;N;;;;;
+2DD4;ETHIOPIC SYLLABLE XYEE;Lo;0;L;;;;;N;;;;;
+2DD5;ETHIOPIC SYLLABLE XYE;Lo;0;L;;;;;N;;;;;
+2DD6;ETHIOPIC SYLLABLE XYO;Lo;0;L;;;;;N;;;;;
+2DD8;ETHIOPIC SYLLABLE GYA;Lo;0;L;;;;;N;;;;;
+2DD9;ETHIOPIC SYLLABLE GYU;Lo;0;L;;;;;N;;;;;
+2DDA;ETHIOPIC SYLLABLE GYI;Lo;0;L;;;;;N;;;;;
+2DDB;ETHIOPIC SYLLABLE GYAA;Lo;0;L;;;;;N;;;;;
+2DDC;ETHIOPIC SYLLABLE GYEE;Lo;0;L;;;;;N;;;;;
+2DDD;ETHIOPIC SYLLABLE GYE;Lo;0;L;;;;;N;;;;;
+2DDE;ETHIOPIC SYLLABLE GYO;Lo;0;L;;;;;N;;;;;
+2DE0;COMBINING CYRILLIC LETTER BE;Mn;230;NSM;;;;;N;;;;;
+2DE1;COMBINING CYRILLIC LETTER VE;Mn;230;NSM;;;;;N;;;;;
+2DE2;COMBINING CYRILLIC LETTER GHE;Mn;230;NSM;;;;;N;;;;;
+2DE3;COMBINING CYRILLIC LETTER DE;Mn;230;NSM;;;;;N;;;;;
+2DE4;COMBINING CYRILLIC LETTER ZHE;Mn;230;NSM;;;;;N;;;;;
+2DE5;COMBINING CYRILLIC LETTER ZE;Mn;230;NSM;;;;;N;;;;;
+2DE6;COMBINING CYRILLIC LETTER KA;Mn;230;NSM;;;;;N;;;;;
+2DE7;COMBINING CYRILLIC LETTER EL;Mn;230;NSM;;;;;N;;;;;
+2DE8;COMBINING CYRILLIC LETTER EM;Mn;230;NSM;;;;;N;;;;;
+2DE9;COMBINING CYRILLIC LETTER EN;Mn;230;NSM;;;;;N;;;;;
+2DEA;COMBINING CYRILLIC LETTER O;Mn;230;NSM;;;;;N;;;;;
+2DEB;COMBINING CYRILLIC LETTER PE;Mn;230;NSM;;;;;N;;;;;
+2DEC;COMBINING CYRILLIC LETTER ER;Mn;230;NSM;;;;;N;;;;;
+2DED;COMBINING CYRILLIC LETTER ES;Mn;230;NSM;;;;;N;;;;;
+2DEE;COMBINING CYRILLIC LETTER TE;Mn;230;NSM;;;;;N;;;;;
+2DEF;COMBINING CYRILLIC LETTER HA;Mn;230;NSM;;;;;N;;;;;
+2DF0;COMBINING CYRILLIC LETTER TSE;Mn;230;NSM;;;;;N;;;;;
+2DF1;COMBINING CYRILLIC LETTER CHE;Mn;230;NSM;;;;;N;;;;;
+2DF2;COMBINING CYRILLIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
+2DF3;COMBINING CYRILLIC LETTER SHCHA;Mn;230;NSM;;;;;N;;;;;
+2DF4;COMBINING CYRILLIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
+2DF5;COMBINING CYRILLIC LETTER ES-TE;Mn;230;NSM;;;;;N;;;;;
+2DF6;COMBINING CYRILLIC LETTER A;Mn;230;NSM;;;;;N;;;;;
+2DF7;COMBINING CYRILLIC LETTER IE;Mn;230;NSM;;;;;N;;;;;
+2DF8;COMBINING CYRILLIC LETTER DJERV;Mn;230;NSM;;;;;N;;;;;
+2DF9;COMBINING CYRILLIC LETTER MONOGRAPH UK;Mn;230;NSM;;;;;N;;;;;
+2DFA;COMBINING CYRILLIC LETTER YAT;Mn;230;NSM;;;;;N;;;;;
+2DFB;COMBINING CYRILLIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
+2DFC;COMBINING CYRILLIC LETTER IOTIFIED A;Mn;230;NSM;;;;;N;;;;;
+2DFD;COMBINING CYRILLIC LETTER LITTLE YUS;Mn;230;NSM;;;;;N;;;;;
+2DFE;COMBINING CYRILLIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
+2DFF;COMBINING CYRILLIC LETTER IOTIFIED BIG YUS;Mn;230;NSM;;;;;N;;;;;
+2E00;RIGHT ANGLE SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
+2E01;RIGHT ANGLE DOTTED SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
+2E02;LEFT SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E03;RIGHT SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E04;LEFT DOTTED SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E05;RIGHT DOTTED SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E06;RAISED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
+2E07;RAISED DOTTED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
+2E08;DOTTED TRANSPOSITION MARKER;Po;0;ON;;;;;N;;;;;
+2E09;LEFT TRANSPOSITION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E0A;RIGHT TRANSPOSITION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E0B;RAISED SQUARE;Po;0;ON;;;;;N;;;;;
+2E0C;LEFT RAISED OMISSION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E0D;RIGHT RAISED OMISSION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E0E;EDITORIAL CORONIS;Po;0;ON;;;;;N;;;;;
+2E0F;PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E10;FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E11;REVERSED FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E12;HYPODIASTOLE;Po;0;ON;;;;;N;;;;;
+2E13;DOTTED OBELOS;Po;0;ON;;;;;N;;;;;
+2E14;DOWNWARDS ANCORA;Po;0;ON;;;;;N;;;;;
+2E15;UPWARDS ANCORA;Po;0;ON;;;;;N;;;;;
+2E16;DOTTED RIGHT-POINTING ANGLE;Po;0;ON;;;;;N;;;;;
+2E17;DOUBLE OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;;
+2E18;INVERTED INTERROBANG;Po;0;ON;;;;;N;;;;;
+2E19;PALM BRANCH;Po;0;ON;;;;;N;;;;;
+2E1A;HYPHEN WITH DIAERESIS;Pd;0;ON;;;;;N;;;;;
+2E1B;TILDE WITH RING ABOVE;Po;0;ON;;;;;N;;;;;
+2E1C;LEFT LOW PARAPHRASE BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E1D;RIGHT LOW PARAPHRASE BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E1E;TILDE WITH DOT ABOVE;Po;0;ON;;;;;N;;;;;
+2E1F;TILDE WITH DOT BELOW;Po;0;ON;;;;;N;;;;;
+2E20;LEFT VERTICAL BAR WITH QUILL;Pi;0;ON;;;;;Y;;;;;
+2E21;RIGHT VERTICAL BAR WITH QUILL;Pf;0;ON;;;;;Y;;;;;
+2E22;TOP LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E23;TOP RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E24;BOTTOM LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E25;BOTTOM RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E26;LEFT SIDEWAYS U BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E27;RIGHT SIDEWAYS U BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E28;LEFT DOUBLE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2E29;RIGHT DOUBLE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2E2A;TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2B;ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2C;SQUARED FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2D;FIVE DOT MARK;Po;0;ON;;;;;N;;;;;
+2E2E;REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2E2F;VERTICAL TILDE;Lm;0;ON;;;;;N;;;;;
+2E30;RING POINT;Po;0;ON;;;;;N;;;;;
+2E31;WORD SEPARATOR MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+2E32;TURNED COMMA;Po;0;ON;;;;;N;;;;;
+2E33;RAISED DOT;Po;0;ON;;;;;N;;;;;
+2E34;RAISED COMMA;Po;0;ON;;;;;N;;;;;
+2E35;TURNED SEMICOLON;Po;0;ON;;;;;N;;;;;
+2E36;DAGGER WITH LEFT GUARD;Po;0;ON;;;;;N;;;;;
+2E37;DAGGER WITH RIGHT GUARD;Po;0;ON;;;;;N;;;;;
+2E38;TURNED DAGGER;Po;0;ON;;;;;N;;;;;
+2E39;TOP HALF SECTION SIGN;Po;0;ON;;;;;N;;;;;
+2E3A;TWO-EM DASH;Pd;0;ON;;;;;N;;;;;
+2E3B;THREE-EM DASH;Pd;0;ON;;;;;N;;;;;
+2E3C;STENOGRAPHIC FULL STOP;Po;0;ON;;;;;N;;;;;
+2E3D;VERTICAL SIX DOTS;Po;0;ON;;;;;N;;;;;
+2E3E;WIGGLY VERTICAL LINE;Po;0;ON;;;;;N;;;;;
+2E3F;CAPITULUM;Po;0;ON;;;;;N;;;;;
+2E40;DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
+2E41;REVERSED COMMA;Po;0;ON;;;;;N;;;;;
+2E42;DOUBLE LOW-REVERSED-9 QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
+2E43;DASH WITH LEFT UPTURN;Po;0;ON;;;;;N;;;;;
+2E44;DOUBLE SUSPENSION MARK;Po;0;ON;;;;;N;;;;;
+2E45;INVERTED LOW KAVYKA;Po;0;ON;;;;;N;;;;;
+2E46;INVERTED LOW KAVYKA WITH KAVYKA ABOVE;Po;0;ON;;;;;N;;;;;
+2E47;LOW KAVYKA;Po;0;ON;;;;;N;;;;;
+2E48;LOW KAVYKA WITH DOT;Po;0;ON;;;;;N;;;;;
+2E49;DOUBLE STACKED COMMA;Po;0;ON;;;;;N;;;;;
+2E4A;DOTTED SOLIDUS;Po;0;ON;;;;;N;;;;;
+2E4B;TRIPLE DAGGER;Po;0;ON;;;;;N;;;;;
+2E4C;MEDIEVAL COMMA;Po;0;ON;;;;;N;;;;;
+2E4D;PARAGRAPHUS MARK;Po;0;ON;;;;;N;;;;;
+2E4E;PUNCTUS ELEVATUS MARK;Po;0;ON;;;;;N;;;;;
+2E4F;CORNISH VERSE DIVIDER;Po;0;ON;;;;;N;;;;;
+2E50;CROSS PATTY WITH RIGHT CROSSBAR;So;0;ON;;;;;N;;;;;
+2E51;CROSS PATTY WITH LEFT CROSSBAR;So;0;ON;;;;;N;;;;;
+2E52;TIRONIAN SIGN CAPITAL ET;Po;0;ON;;;;;N;;;;;
+2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
+2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
+2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
+2E83;CJK RADICAL SECOND TWO;So;0;ON;;;;;N;;;;;
+2E84;CJK RADICAL SECOND THREE;So;0;ON;;;;;N;;;;;
+2E85;CJK RADICAL PERSON;So;0;ON;;;;;N;;;;;
+2E86;CJK RADICAL BOX;So;0;ON;;;;;N;;;;;
+2E87;CJK RADICAL TABLE;So;0;ON;;;;;N;;;;;
+2E88;CJK RADICAL KNIFE ONE;So;0;ON;;;;;N;;;;;
+2E89;CJK RADICAL KNIFE TWO;So;0;ON;;;;;N;;;;;
+2E8A;CJK RADICAL DIVINATION;So;0;ON;;;;;N;;;;;
+2E8B;CJK RADICAL SEAL;So;0;ON;;;;;N;;;;;
+2E8C;CJK RADICAL SMALL ONE;So;0;ON;;;;;N;;;;;
+2E8D;CJK RADICAL SMALL TWO;So;0;ON;;;;;N;;;;;
+2E8E;CJK RADICAL LAME ONE;So;0;ON;;;;;N;;;;;
+2E8F;CJK RADICAL LAME TWO;So;0;ON;;;;;N;;;;;
+2E90;CJK RADICAL LAME THREE;So;0;ON;;;;;N;;;;;
+2E91;CJK RADICAL LAME FOUR;So;0;ON;;;;;N;;;;;
+2E92;CJK RADICAL SNAKE;So;0;ON;;;;;N;;;;;
+2E93;CJK RADICAL THREAD;So;0;ON;;;;;N;;;;;
+2E94;CJK RADICAL SNOUT ONE;So;0;ON;;;;;N;;;;;
+2E95;CJK RADICAL SNOUT TWO;So;0;ON;;;;;N;;;;;
+2E96;CJK RADICAL HEART ONE;So;0;ON;;;;;N;;;;;
+2E97;CJK RADICAL HEART TWO;So;0;ON;;;;;N;;;;;
+2E98;CJK RADICAL HAND;So;0;ON;;;;;N;;;;;
+2E99;CJK RADICAL RAP;So;0;ON;;;;;N;;;;;
+2E9B;CJK RADICAL CHOKE;So;0;ON;;;;;N;;;;;
+2E9C;CJK RADICAL SUN;So;0;ON;;;;;N;;;;;
+2E9D;CJK RADICAL MOON;So;0;ON;;;;;N;;;;;
+2E9E;CJK RADICAL DEATH;So;0;ON;;;;;N;;;;;
+2E9F;CJK RADICAL MOTHER;So;0;ON;<compat> 6BCD;;;;N;;;;;
+2EA0;CJK RADICAL CIVILIAN;So;0;ON;;;;;N;;;;;
+2EA1;CJK RADICAL WATER ONE;So;0;ON;;;;;N;;;;;
+2EA2;CJK RADICAL WATER TWO;So;0;ON;;;;;N;;;;;
+2EA3;CJK RADICAL FIRE;So;0;ON;;;;;N;;;;;
+2EA4;CJK RADICAL PAW ONE;So;0;ON;;;;;N;;;;;
+2EA5;CJK RADICAL PAW TWO;So;0;ON;;;;;N;;;;;
+2EA6;CJK RADICAL SIMPLIFIED HALF TREE TRUNK;So;0;ON;;;;;N;;;;;
+2EA7;CJK RADICAL COW;So;0;ON;;;;;N;;;;;
+2EA8;CJK RADICAL DOG;So;0;ON;;;;;N;;;;;
+2EA9;CJK RADICAL JADE;So;0;ON;;;;;N;;;;;
+2EAA;CJK RADICAL BOLT OF CLOTH;So;0;ON;;;;;N;;;;;
+2EAB;CJK RADICAL EYE;So;0;ON;;;;;N;;;;;
+2EAC;CJK RADICAL SPIRIT ONE;So;0;ON;;;;;N;;;;;
+2EAD;CJK RADICAL SPIRIT TWO;So;0;ON;;;;;N;;;;;
+2EAE;CJK RADICAL BAMBOO;So;0;ON;;;;;N;;;;;
+2EAF;CJK RADICAL SILK;So;0;ON;;;;;N;;;;;
+2EB0;CJK RADICAL C-SIMPLIFIED SILK;So;0;ON;;;;;N;;;;;
+2EB1;CJK RADICAL NET ONE;So;0;ON;;;;;N;;;;;
+2EB2;CJK RADICAL NET TWO;So;0;ON;;;;;N;;;;;
+2EB3;CJK RADICAL NET THREE;So;0;ON;;;;;N;;;;;
+2EB4;CJK RADICAL NET FOUR;So;0;ON;;;;;N;;;;;
+2EB5;CJK RADICAL MESH;So;0;ON;;;;;N;;;;;
+2EB6;CJK RADICAL SHEEP;So;0;ON;;;;;N;;;;;
+2EB7;CJK RADICAL RAM;So;0;ON;;;;;N;;;;;
+2EB8;CJK RADICAL EWE;So;0;ON;;;;;N;;;;;
+2EB9;CJK RADICAL OLD;So;0;ON;;;;;N;;;;;
+2EBA;CJK RADICAL BRUSH ONE;So;0;ON;;;;;N;;;;;
+2EBB;CJK RADICAL BRUSH TWO;So;0;ON;;;;;N;;;;;
+2EBC;CJK RADICAL MEAT;So;0;ON;;;;;N;;;;;
+2EBD;CJK RADICAL MORTAR;So;0;ON;;;;;N;;;;;
+2EBE;CJK RADICAL GRASS ONE;So;0;ON;;;;;N;;;;;
+2EBF;CJK RADICAL GRASS TWO;So;0;ON;;;;;N;;;;;
+2EC0;CJK RADICAL GRASS THREE;So;0;ON;;;;;N;;;;;
+2EC1;CJK RADICAL TIGER;So;0;ON;;;;;N;;;;;
+2EC2;CJK RADICAL CLOTHES;So;0;ON;;;;;N;;;;;
+2EC3;CJK RADICAL WEST ONE;So;0;ON;;;;;N;;;;;
+2EC4;CJK RADICAL WEST TWO;So;0;ON;;;;;N;;;;;
+2EC5;CJK RADICAL C-SIMPLIFIED SEE;So;0;ON;;;;;N;;;;;
+2EC6;CJK RADICAL SIMPLIFIED HORN;So;0;ON;;;;;N;;;;;
+2EC7;CJK RADICAL HORN;So;0;ON;;;;;N;;;;;
+2EC8;CJK RADICAL C-SIMPLIFIED SPEECH;So;0;ON;;;;;N;;;;;
+2EC9;CJK RADICAL C-SIMPLIFIED SHELL;So;0;ON;;;;;N;;;;;
+2ECA;CJK RADICAL FOOT;So;0;ON;;;;;N;;;;;
+2ECB;CJK RADICAL C-SIMPLIFIED CART;So;0;ON;;;;;N;;;;;
+2ECC;CJK RADICAL SIMPLIFIED WALK;So;0;ON;;;;;N;;;;;
+2ECD;CJK RADICAL WALK ONE;So;0;ON;;;;;N;;;;;
+2ECE;CJK RADICAL WALK TWO;So;0;ON;;;;;N;;;;;
+2ECF;CJK RADICAL CITY;So;0;ON;;;;;N;;;;;
+2ED0;CJK RADICAL C-SIMPLIFIED GOLD;So;0;ON;;;;;N;;;;;
+2ED1;CJK RADICAL LONG ONE;So;0;ON;;;;;N;;;;;
+2ED2;CJK RADICAL LONG TWO;So;0;ON;;;;;N;;;;;
+2ED3;CJK RADICAL C-SIMPLIFIED LONG;So;0;ON;;;;;N;;;;;
+2ED4;CJK RADICAL C-SIMPLIFIED GATE;So;0;ON;;;;;N;;;;;
+2ED5;CJK RADICAL MOUND ONE;So;0;ON;;;;;N;;;;;
+2ED6;CJK RADICAL MOUND TWO;So;0;ON;;;;;N;;;;;
+2ED7;CJK RADICAL RAIN;So;0;ON;;;;;N;;;;;
+2ED8;CJK RADICAL BLUE;So;0;ON;;;;;N;;;;;
+2ED9;CJK RADICAL C-SIMPLIFIED TANNED LEATHER;So;0;ON;;;;;N;;;;;
+2EDA;CJK RADICAL C-SIMPLIFIED LEAF;So;0;ON;;;;;N;;;;;
+2EDB;CJK RADICAL C-SIMPLIFIED WIND;So;0;ON;;;;;N;;;;;
+2EDC;CJK RADICAL C-SIMPLIFIED FLY;So;0;ON;;;;;N;;;;;
+2EDD;CJK RADICAL EAT ONE;So;0;ON;;;;;N;;;;;
+2EDE;CJK RADICAL EAT TWO;So;0;ON;;;;;N;;;;;
+2EDF;CJK RADICAL EAT THREE;So;0;ON;;;;;N;;;;;
+2EE0;CJK RADICAL C-SIMPLIFIED EAT;So;0;ON;;;;;N;;;;;
+2EE1;CJK RADICAL HEAD;So;0;ON;;;;;N;;;;;
+2EE2;CJK RADICAL C-SIMPLIFIED HORSE;So;0;ON;;;;;N;;;;;
+2EE3;CJK RADICAL BONE;So;0;ON;;;;;N;;;;;
+2EE4;CJK RADICAL GHOST;So;0;ON;;;;;N;;;;;
+2EE5;CJK RADICAL C-SIMPLIFIED FISH;So;0;ON;;;;;N;;;;;
+2EE6;CJK RADICAL C-SIMPLIFIED BIRD;So;0;ON;;;;;N;;;;;
+2EE7;CJK RADICAL C-SIMPLIFIED SALT;So;0;ON;;;;;N;;;;;
+2EE8;CJK RADICAL SIMPLIFIED WHEAT;So;0;ON;;;;;N;;;;;
+2EE9;CJK RADICAL SIMPLIFIED YELLOW;So;0;ON;;;;;N;;;;;
+2EEA;CJK RADICAL C-SIMPLIFIED FROG;So;0;ON;;;;;N;;;;;
+2EEB;CJK RADICAL J-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
+2EEC;CJK RADICAL C-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
+2EED;CJK RADICAL J-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
+2EEE;CJK RADICAL C-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
+2EEF;CJK RADICAL J-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
+2EF0;CJK RADICAL C-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
+2EF1;CJK RADICAL TURTLE;So;0;ON;;;;;N;;;;;
+2EF2;CJK RADICAL J-SIMPLIFIED TURTLE;So;0;ON;;;;;N;;;;;
+2EF3;CJK RADICAL C-SIMPLIFIED TURTLE;So;0;ON;<compat> 9F9F;;;;N;;;;;
+2F00;KANGXI RADICAL ONE;So;0;ON;<compat> 4E00;;;;N;;;;;
+2F01;KANGXI RADICAL LINE;So;0;ON;<compat> 4E28;;;;N;;;;;
+2F02;KANGXI RADICAL DOT;So;0;ON;<compat> 4E36;;;;N;;;;;
+2F03;KANGXI RADICAL SLASH;So;0;ON;<compat> 4E3F;;;;N;;;;;
+2F04;KANGXI RADICAL SECOND;So;0;ON;<compat> 4E59;;;;N;;;;;
+2F05;KANGXI RADICAL HOOK;So;0;ON;<compat> 4E85;;;;N;;;;;
+2F06;KANGXI RADICAL TWO;So;0;ON;<compat> 4E8C;;;;N;;;;;
+2F07;KANGXI RADICAL LID;So;0;ON;<compat> 4EA0;;;;N;;;;;
+2F08;KANGXI RADICAL MAN;So;0;ON;<compat> 4EBA;;;;N;;;;;
+2F09;KANGXI RADICAL LEGS;So;0;ON;<compat> 513F;;;;N;;;;;
+2F0A;KANGXI RADICAL ENTER;So;0;ON;<compat> 5165;;;;N;;;;;
+2F0B;KANGXI RADICAL EIGHT;So;0;ON;<compat> 516B;;;;N;;;;;
+2F0C;KANGXI RADICAL DOWN BOX;So;0;ON;<compat> 5182;;;;N;;;;;
+2F0D;KANGXI RADICAL COVER;So;0;ON;<compat> 5196;;;;N;;;;;
+2F0E;KANGXI RADICAL ICE;So;0;ON;<compat> 51AB;;;;N;;;;;
+2F0F;KANGXI RADICAL TABLE;So;0;ON;<compat> 51E0;;;;N;;;;;
+2F10;KANGXI RADICAL OPEN BOX;So;0;ON;<compat> 51F5;;;;N;;;;;
+2F11;KANGXI RADICAL KNIFE;So;0;ON;<compat> 5200;;;;N;;;;;
+2F12;KANGXI RADICAL POWER;So;0;ON;<compat> 529B;;;;N;;;;;
+2F13;KANGXI RADICAL WRAP;So;0;ON;<compat> 52F9;;;;N;;;;;
+2F14;KANGXI RADICAL SPOON;So;0;ON;<compat> 5315;;;;N;;;;;
+2F15;KANGXI RADICAL RIGHT OPEN BOX;So;0;ON;<compat> 531A;;;;N;;;;;
+2F16;KANGXI RADICAL HIDING ENCLOSURE;So;0;ON;<compat> 5338;;;;N;;;;;
+2F17;KANGXI RADICAL TEN;So;0;ON;<compat> 5341;;;;N;;;;;
+2F18;KANGXI RADICAL DIVINATION;So;0;ON;<compat> 535C;;;;N;;;;;
+2F19;KANGXI RADICAL SEAL;So;0;ON;<compat> 5369;;;;N;;;;;
+2F1A;KANGXI RADICAL CLIFF;So;0;ON;<compat> 5382;;;;N;;;;;
+2F1B;KANGXI RADICAL PRIVATE;So;0;ON;<compat> 53B6;;;;N;;;;;
+2F1C;KANGXI RADICAL AGAIN;So;0;ON;<compat> 53C8;;;;N;;;;;
+2F1D;KANGXI RADICAL MOUTH;So;0;ON;<compat> 53E3;;;;N;;;;;
+2F1E;KANGXI RADICAL ENCLOSURE;So;0;ON;<compat> 56D7;;;;N;;;;;
+2F1F;KANGXI RADICAL EARTH;So;0;ON;<compat> 571F;;;;N;;;;;
+2F20;KANGXI RADICAL SCHOLAR;So;0;ON;<compat> 58EB;;;;N;;;;;
+2F21;KANGXI RADICAL GO;So;0;ON;<compat> 5902;;;;N;;;;;
+2F22;KANGXI RADICAL GO SLOWLY;So;0;ON;<compat> 590A;;;;N;;;;;
+2F23;KANGXI RADICAL EVENING;So;0;ON;<compat> 5915;;;;N;;;;;
+2F24;KANGXI RADICAL BIG;So;0;ON;<compat> 5927;;;;N;;;;;
+2F25;KANGXI RADICAL WOMAN;So;0;ON;<compat> 5973;;;;N;;;;;
+2F26;KANGXI RADICAL CHILD;So;0;ON;<compat> 5B50;;;;N;;;;;
+2F27;KANGXI RADICAL ROOF;So;0;ON;<compat> 5B80;;;;N;;;;;
+2F28;KANGXI RADICAL INCH;So;0;ON;<compat> 5BF8;;;;N;;;;;
+2F29;KANGXI RADICAL SMALL;So;0;ON;<compat> 5C0F;;;;N;;;;;
+2F2A;KANGXI RADICAL LAME;So;0;ON;<compat> 5C22;;;;N;;;;;
+2F2B;KANGXI RADICAL CORPSE;So;0;ON;<compat> 5C38;;;;N;;;;;
+2F2C;KANGXI RADICAL SPROUT;So;0;ON;<compat> 5C6E;;;;N;;;;;
+2F2D;KANGXI RADICAL MOUNTAIN;So;0;ON;<compat> 5C71;;;;N;;;;;
+2F2E;KANGXI RADICAL RIVER;So;0;ON;<compat> 5DDB;;;;N;;;;;
+2F2F;KANGXI RADICAL WORK;So;0;ON;<compat> 5DE5;;;;N;;;;;
+2F30;KANGXI RADICAL ONESELF;So;0;ON;<compat> 5DF1;;;;N;;;;;
+2F31;KANGXI RADICAL TURBAN;So;0;ON;<compat> 5DFE;;;;N;;;;;
+2F32;KANGXI RADICAL DRY;So;0;ON;<compat> 5E72;;;;N;;;;;
+2F33;KANGXI RADICAL SHORT THREAD;So;0;ON;<compat> 5E7A;;;;N;;;;;
+2F34;KANGXI RADICAL DOTTED CLIFF;So;0;ON;<compat> 5E7F;;;;N;;;;;
+2F35;KANGXI RADICAL LONG STRIDE;So;0;ON;<compat> 5EF4;;;;N;;;;;
+2F36;KANGXI RADICAL TWO HANDS;So;0;ON;<compat> 5EFE;;;;N;;;;;
+2F37;KANGXI RADICAL SHOOT;So;0;ON;<compat> 5F0B;;;;N;;;;;
+2F38;KANGXI RADICAL BOW;So;0;ON;<compat> 5F13;;;;N;;;;;
+2F39;KANGXI RADICAL SNOUT;So;0;ON;<compat> 5F50;;;;N;;;;;
+2F3A;KANGXI RADICAL BRISTLE;So;0;ON;<compat> 5F61;;;;N;;;;;
+2F3B;KANGXI RADICAL STEP;So;0;ON;<compat> 5F73;;;;N;;;;;
+2F3C;KANGXI RADICAL HEART;So;0;ON;<compat> 5FC3;;;;N;;;;;
+2F3D;KANGXI RADICAL HALBERD;So;0;ON;<compat> 6208;;;;N;;;;;
+2F3E;KANGXI RADICAL DOOR;So;0;ON;<compat> 6236;;;;N;;;;;
+2F3F;KANGXI RADICAL HAND;So;0;ON;<compat> 624B;;;;N;;;;;
+2F40;KANGXI RADICAL BRANCH;So;0;ON;<compat> 652F;;;;N;;;;;
+2F41;KANGXI RADICAL RAP;So;0;ON;<compat> 6534;;;;N;;;;;
+2F42;KANGXI RADICAL SCRIPT;So;0;ON;<compat> 6587;;;;N;;;;;
+2F43;KANGXI RADICAL DIPPER;So;0;ON;<compat> 6597;;;;N;;;;;
+2F44;KANGXI RADICAL AXE;So;0;ON;<compat> 65A4;;;;N;;;;;
+2F45;KANGXI RADICAL SQUARE;So;0;ON;<compat> 65B9;;;;N;;;;;
+2F46;KANGXI RADICAL NOT;So;0;ON;<compat> 65E0;;;;N;;;;;
+2F47;KANGXI RADICAL SUN;So;0;ON;<compat> 65E5;;;;N;;;;;
+2F48;KANGXI RADICAL SAY;So;0;ON;<compat> 66F0;;;;N;;;;;
+2F49;KANGXI RADICAL MOON;So;0;ON;<compat> 6708;;;;N;;;;;
+2F4A;KANGXI RADICAL TREE;So;0;ON;<compat> 6728;;;;N;;;;;
+2F4B;KANGXI RADICAL LACK;So;0;ON;<compat> 6B20;;;;N;;;;;
+2F4C;KANGXI RADICAL STOP;So;0;ON;<compat> 6B62;;;;N;;;;;
+2F4D;KANGXI RADICAL DEATH;So;0;ON;<compat> 6B79;;;;N;;;;;
+2F4E;KANGXI RADICAL WEAPON;So;0;ON;<compat> 6BB3;;;;N;;;;;
+2F4F;KANGXI RADICAL DO NOT;So;0;ON;<compat> 6BCB;;;;N;;;;;
+2F50;KANGXI RADICAL COMPARE;So;0;ON;<compat> 6BD4;;;;N;;;;;
+2F51;KANGXI RADICAL FUR;So;0;ON;<compat> 6BDB;;;;N;;;;;
+2F52;KANGXI RADICAL CLAN;So;0;ON;<compat> 6C0F;;;;N;;;;;
+2F53;KANGXI RADICAL STEAM;So;0;ON;<compat> 6C14;;;;N;;;;;
+2F54;KANGXI RADICAL WATER;So;0;ON;<compat> 6C34;;;;N;;;;;
+2F55;KANGXI RADICAL FIRE;So;0;ON;<compat> 706B;;;;N;;;;;
+2F56;KANGXI RADICAL CLAW;So;0;ON;<compat> 722A;;;;N;;;;;
+2F57;KANGXI RADICAL FATHER;So;0;ON;<compat> 7236;;;;N;;;;;
+2F58;KANGXI RADICAL DOUBLE X;So;0;ON;<compat> 723B;;;;N;;;;;
+2F59;KANGXI RADICAL HALF TREE TRUNK;So;0;ON;<compat> 723F;;;;N;;;;;
+2F5A;KANGXI RADICAL SLICE;So;0;ON;<compat> 7247;;;;N;;;;;
+2F5B;KANGXI RADICAL FANG;So;0;ON;<compat> 7259;;;;N;;;;;
+2F5C;KANGXI RADICAL COW;So;0;ON;<compat> 725B;;;;N;;;;;
+2F5D;KANGXI RADICAL DOG;So;0;ON;<compat> 72AC;;;;N;;;;;
+2F5E;KANGXI RADICAL PROFOUND;So;0;ON;<compat> 7384;;;;N;;;;;
+2F5F;KANGXI RADICAL JADE;So;0;ON;<compat> 7389;;;;N;;;;;
+2F60;KANGXI RADICAL MELON;So;0;ON;<compat> 74DC;;;;N;;;;;
+2F61;KANGXI RADICAL TILE;So;0;ON;<compat> 74E6;;;;N;;;;;
+2F62;KANGXI RADICAL SWEET;So;0;ON;<compat> 7518;;;;N;;;;;
+2F63;KANGXI RADICAL LIFE;So;0;ON;<compat> 751F;;;;N;;;;;
+2F64;KANGXI RADICAL USE;So;0;ON;<compat> 7528;;;;N;;;;;
+2F65;KANGXI RADICAL FIELD;So;0;ON;<compat> 7530;;;;N;;;;;
+2F66;KANGXI RADICAL BOLT OF CLOTH;So;0;ON;<compat> 758B;;;;N;;;;;
+2F67;KANGXI RADICAL SICKNESS;So;0;ON;<compat> 7592;;;;N;;;;;
+2F68;KANGXI RADICAL DOTTED TENT;So;0;ON;<compat> 7676;;;;N;;;;;
+2F69;KANGXI RADICAL WHITE;So;0;ON;<compat> 767D;;;;N;;;;;
+2F6A;KANGXI RADICAL SKIN;So;0;ON;<compat> 76AE;;;;N;;;;;
+2F6B;KANGXI RADICAL DISH;So;0;ON;<compat> 76BF;;;;N;;;;;
+2F6C;KANGXI RADICAL EYE;So;0;ON;<compat> 76EE;;;;N;;;;;
+2F6D;KANGXI RADICAL SPEAR;So;0;ON;<compat> 77DB;;;;N;;;;;
+2F6E;KANGXI RADICAL ARROW;So;0;ON;<compat> 77E2;;;;N;;;;;
+2F6F;KANGXI RADICAL STONE;So;0;ON;<compat> 77F3;;;;N;;;;;
+2F70;KANGXI RADICAL SPIRIT;So;0;ON;<compat> 793A;;;;N;;;;;
+2F71;KANGXI RADICAL TRACK;So;0;ON;<compat> 79B8;;;;N;;;;;
+2F72;KANGXI RADICAL GRAIN;So;0;ON;<compat> 79BE;;;;N;;;;;
+2F73;KANGXI RADICAL CAVE;So;0;ON;<compat> 7A74;;;;N;;;;;
+2F74;KANGXI RADICAL STAND;So;0;ON;<compat> 7ACB;;;;N;;;;;
+2F75;KANGXI RADICAL BAMBOO;So;0;ON;<compat> 7AF9;;;;N;;;;;
+2F76;KANGXI RADICAL RICE;So;0;ON;<compat> 7C73;;;;N;;;;;
+2F77;KANGXI RADICAL SILK;So;0;ON;<compat> 7CF8;;;;N;;;;;
+2F78;KANGXI RADICAL JAR;So;0;ON;<compat> 7F36;;;;N;;;;;
+2F79;KANGXI RADICAL NET;So;0;ON;<compat> 7F51;;;;N;;;;;
+2F7A;KANGXI RADICAL SHEEP;So;0;ON;<compat> 7F8A;;;;N;;;;;
+2F7B;KANGXI RADICAL FEATHER;So;0;ON;<compat> 7FBD;;;;N;;;;;
+2F7C;KANGXI RADICAL OLD;So;0;ON;<compat> 8001;;;;N;;;;;
+2F7D;KANGXI RADICAL AND;So;0;ON;<compat> 800C;;;;N;;;;;
+2F7E;KANGXI RADICAL PLOW;So;0;ON;<compat> 8012;;;;N;;;;;
+2F7F;KANGXI RADICAL EAR;So;0;ON;<compat> 8033;;;;N;;;;;
+2F80;KANGXI RADICAL BRUSH;So;0;ON;<compat> 807F;;;;N;;;;;
+2F81;KANGXI RADICAL MEAT;So;0;ON;<compat> 8089;;;;N;;;;;
+2F82;KANGXI RADICAL MINISTER;So;0;ON;<compat> 81E3;;;;N;;;;;
+2F83;KANGXI RADICAL SELF;So;0;ON;<compat> 81EA;;;;N;;;;;
+2F84;KANGXI RADICAL ARRIVE;So;0;ON;<compat> 81F3;;;;N;;;;;
+2F85;KANGXI RADICAL MORTAR;So;0;ON;<compat> 81FC;;;;N;;;;;
+2F86;KANGXI RADICAL TONGUE;So;0;ON;<compat> 820C;;;;N;;;;;
+2F87;KANGXI RADICAL OPPOSE;So;0;ON;<compat> 821B;;;;N;;;;;
+2F88;KANGXI RADICAL BOAT;So;0;ON;<compat> 821F;;;;N;;;;;
+2F89;KANGXI RADICAL STOPPING;So;0;ON;<compat> 826E;;;;N;;;;;
+2F8A;KANGXI RADICAL COLOR;So;0;ON;<compat> 8272;;;;N;;;;;
+2F8B;KANGXI RADICAL GRASS;So;0;ON;<compat> 8278;;;;N;;;;;
+2F8C;KANGXI RADICAL TIGER;So;0;ON;<compat> 864D;;;;N;;;;;
+2F8D;KANGXI RADICAL INSECT;So;0;ON;<compat> 866B;;;;N;;;;;
+2F8E;KANGXI RADICAL BLOOD;So;0;ON;<compat> 8840;;;;N;;;;;
+2F8F;KANGXI RADICAL WALK ENCLOSURE;So;0;ON;<compat> 884C;;;;N;;;;;
+2F90;KANGXI RADICAL CLOTHES;So;0;ON;<compat> 8863;;;;N;;;;;
+2F91;KANGXI RADICAL WEST;So;0;ON;<compat> 897E;;;;N;;;;;
+2F92;KANGXI RADICAL SEE;So;0;ON;<compat> 898B;;;;N;;;;;
+2F93;KANGXI RADICAL HORN;So;0;ON;<compat> 89D2;;;;N;;;;;
+2F94;KANGXI RADICAL SPEECH;So;0;ON;<compat> 8A00;;;;N;;;;;
+2F95;KANGXI RADICAL VALLEY;So;0;ON;<compat> 8C37;;;;N;;;;;
+2F96;KANGXI RADICAL BEAN;So;0;ON;<compat> 8C46;;;;N;;;;;
+2F97;KANGXI RADICAL PIG;So;0;ON;<compat> 8C55;;;;N;;;;;
+2F98;KANGXI RADICAL BADGER;So;0;ON;<compat> 8C78;;;;N;;;;;
+2F99;KANGXI RADICAL SHELL;So;0;ON;<compat> 8C9D;;;;N;;;;;
+2F9A;KANGXI RADICAL RED;So;0;ON;<compat> 8D64;;;;N;;;;;
+2F9B;KANGXI RADICAL RUN;So;0;ON;<compat> 8D70;;;;N;;;;;
+2F9C;KANGXI RADICAL FOOT;So;0;ON;<compat> 8DB3;;;;N;;;;;
+2F9D;KANGXI RADICAL BODY;So;0;ON;<compat> 8EAB;;;;N;;;;;
+2F9E;KANGXI RADICAL CART;So;0;ON;<compat> 8ECA;;;;N;;;;;
+2F9F;KANGXI RADICAL BITTER;So;0;ON;<compat> 8F9B;;;;N;;;;;
+2FA0;KANGXI RADICAL MORNING;So;0;ON;<compat> 8FB0;;;;N;;;;;
+2FA1;KANGXI RADICAL WALK;So;0;ON;<compat> 8FB5;;;;N;;;;;
+2FA2;KANGXI RADICAL CITY;So;0;ON;<compat> 9091;;;;N;;;;;
+2FA3;KANGXI RADICAL WINE;So;0;ON;<compat> 9149;;;;N;;;;;
+2FA4;KANGXI RADICAL DISTINGUISH;So;0;ON;<compat> 91C6;;;;N;;;;;
+2FA5;KANGXI RADICAL VILLAGE;So;0;ON;<compat> 91CC;;;;N;;;;;
+2FA6;KANGXI RADICAL GOLD;So;0;ON;<compat> 91D1;;;;N;;;;;
+2FA7;KANGXI RADICAL LONG;So;0;ON;<compat> 9577;;;;N;;;;;
+2FA8;KANGXI RADICAL GATE;So;0;ON;<compat> 9580;;;;N;;;;;
+2FA9;KANGXI RADICAL MOUND;So;0;ON;<compat> 961C;;;;N;;;;;
+2FAA;KANGXI RADICAL SLAVE;So;0;ON;<compat> 96B6;;;;N;;;;;
+2FAB;KANGXI RADICAL SHORT TAILED BIRD;So;0;ON;<compat> 96B9;;;;N;;;;;
+2FAC;KANGXI RADICAL RAIN;So;0;ON;<compat> 96E8;;;;N;;;;;
+2FAD;KANGXI RADICAL BLUE;So;0;ON;<compat> 9751;;;;N;;;;;
+2FAE;KANGXI RADICAL WRONG;So;0;ON;<compat> 975E;;;;N;;;;;
+2FAF;KANGXI RADICAL FACE;So;0;ON;<compat> 9762;;;;N;;;;;
+2FB0;KANGXI RADICAL LEATHER;So;0;ON;<compat> 9769;;;;N;;;;;
+2FB1;KANGXI RADICAL TANNED LEATHER;So;0;ON;<compat> 97CB;;;;N;;;;;
+2FB2;KANGXI RADICAL LEEK;So;0;ON;<compat> 97ED;;;;N;;;;;
+2FB3;KANGXI RADICAL SOUND;So;0;ON;<compat> 97F3;;;;N;;;;;
+2FB4;KANGXI RADICAL LEAF;So;0;ON;<compat> 9801;;;;N;;;;;
+2FB5;KANGXI RADICAL WIND;So;0;ON;<compat> 98A8;;;;N;;;;;
+2FB6;KANGXI RADICAL FLY;So;0;ON;<compat> 98DB;;;;N;;;;;
+2FB7;KANGXI RADICAL EAT;So;0;ON;<compat> 98DF;;;;N;;;;;
+2FB8;KANGXI RADICAL HEAD;So;0;ON;<compat> 9996;;;;N;;;;;
+2FB9;KANGXI RADICAL FRAGRANT;So;0;ON;<compat> 9999;;;;N;;;;;
+2FBA;KANGXI RADICAL HORSE;So;0;ON;<compat> 99AC;;;;N;;;;;
+2FBB;KANGXI RADICAL BONE;So;0;ON;<compat> 9AA8;;;;N;;;;;
+2FBC;KANGXI RADICAL TALL;So;0;ON;<compat> 9AD8;;;;N;;;;;
+2FBD;KANGXI RADICAL HAIR;So;0;ON;<compat> 9ADF;;;;N;;;;;
+2FBE;KANGXI RADICAL FIGHT;So;0;ON;<compat> 9B25;;;;N;;;;;
+2FBF;KANGXI RADICAL SACRIFICIAL WINE;So;0;ON;<compat> 9B2F;;;;N;;;;;
+2FC0;KANGXI RADICAL CAULDRON;So;0;ON;<compat> 9B32;;;;N;;;;;
+2FC1;KANGXI RADICAL GHOST;So;0;ON;<compat> 9B3C;;;;N;;;;;
+2FC2;KANGXI RADICAL FISH;So;0;ON;<compat> 9B5A;;;;N;;;;;
+2FC3;KANGXI RADICAL BIRD;So;0;ON;<compat> 9CE5;;;;N;;;;;
+2FC4;KANGXI RADICAL SALT;So;0;ON;<compat> 9E75;;;;N;;;;;
+2FC5;KANGXI RADICAL DEER;So;0;ON;<compat> 9E7F;;;;N;;;;;
+2FC6;KANGXI RADICAL WHEAT;So;0;ON;<compat> 9EA5;;;;N;;;;;
+2FC7;KANGXI RADICAL HEMP;So;0;ON;<compat> 9EBB;;;;N;;;;;
+2FC8;KANGXI RADICAL YELLOW;So;0;ON;<compat> 9EC3;;;;N;;;;;
+2FC9;KANGXI RADICAL MILLET;So;0;ON;<compat> 9ECD;;;;N;;;;;
+2FCA;KANGXI RADICAL BLACK;So;0;ON;<compat> 9ED1;;;;N;;;;;
+2FCB;KANGXI RADICAL EMBROIDERY;So;0;ON;<compat> 9EF9;;;;N;;;;;
+2FCC;KANGXI RADICAL FROG;So;0;ON;<compat> 9EFD;;;;N;;;;;
+2FCD;KANGXI RADICAL TRIPOD;So;0;ON;<compat> 9F0E;;;;N;;;;;
+2FCE;KANGXI RADICAL DRUM;So;0;ON;<compat> 9F13;;;;N;;;;;
+2FCF;KANGXI RADICAL RAT;So;0;ON;<compat> 9F20;;;;N;;;;;
+2FD0;KANGXI RADICAL NOSE;So;0;ON;<compat> 9F3B;;;;N;;;;;
+2FD1;KANGXI RADICAL EVEN;So;0;ON;<compat> 9F4A;;;;N;;;;;
+2FD2;KANGXI RADICAL TOOTH;So;0;ON;<compat> 9F52;;;;N;;;;;
+2FD3;KANGXI RADICAL DRAGON;So;0;ON;<compat> 9F8D;;;;N;;;;;
+2FD4;KANGXI RADICAL TURTLE;So;0;ON;<compat> 9F9C;;;;N;;;;;
+2FD5;KANGXI RADICAL FLUTE;So;0;ON;<compat> 9FA0;;;;N;;;;;
+2FF0;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT;So;0;ON;;;;;N;;;;;
+2FF1;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW;So;0;ON;;;;;N;;;;;
+2FF2;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT;So;0;ON;;;;;N;;;;;
+2FF3;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW;So;0;ON;;;;;N;;;;;
+2FF4;IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND;So;0;ON;;;;;N;;;;;
+2FF5;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE;So;0;ON;;;;;N;;;;;
+2FF6;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW;So;0;ON;;;;;N;;;;;
+2FF7;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT;So;0;ON;;;;;N;;;;;
+2FF8;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT;So;0;ON;;;;;N;;;;;
+2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;;
+2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;;
+2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;;
+3000;IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
+3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;;
+3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;;
+3003;DITTO MARK;Po;0;ON;;;;;N;;;;;
+3004;JAPANESE INDUSTRIAL STANDARD SYMBOL;So;0;ON;;;;;N;;;;;
+3005;IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
+3006;IDEOGRAPHIC CLOSING MARK;Lo;0;L;;;;;N;;;;;
+3007;IDEOGRAPHIC NUMBER ZERO;Nl;0;L;;;;0;N;;;;;
+3008;LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING ANGLE BRACKET;;;;
+3009;RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING ANGLE BRACKET;;;;
+300A;LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING DOUBLE ANGLE BRACKET;;;;
+300B;RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING DOUBLE ANGLE BRACKET;;;;
+300C;LEFT CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING CORNER BRACKET;;;;
+300D;RIGHT CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING CORNER BRACKET;;;;
+300E;LEFT WHITE CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE CORNER BRACKET;;;;
+300F;RIGHT WHITE CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE CORNER BRACKET;;;;
+3010;LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING BLACK LENTICULAR BRACKET;;;;
+3011;RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING BLACK LENTICULAR BRACKET;;;;
+3012;POSTAL MARK;So;0;ON;;;;;N;;;;;
+3013;GETA MARK;So;0;ON;;;;;N;;;;;
+3014;LEFT TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING TORTOISE SHELL BRACKET;;;;
+3015;RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING TORTOISE SHELL BRACKET;;;;
+3016;LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE LENTICULAR BRACKET;;;;
+3017;RIGHT WHITE LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE LENTICULAR BRACKET;;;;
+3018;LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE TORTOISE SHELL BRACKET;;;;
+3019;RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE TORTOISE SHELL BRACKET;;;;
+301A;LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE SQUARE BRACKET;;;;
+301B;RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE SQUARE BRACKET;;;;
+301C;WAVE DASH;Pd;0;ON;;;;;N;;;;;
+301D;REVERSED DOUBLE PRIME QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
+301E;DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
+301F;LOW DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
+3020;POSTAL MARK FACE;So;0;ON;;;;;N;;;;;
+3021;HANGZHOU NUMERAL ONE;Nl;0;L;;;;1;N;;;;;
+3022;HANGZHOU NUMERAL TWO;Nl;0;L;;;;2;N;;;;;
+3023;HANGZHOU NUMERAL THREE;Nl;0;L;;;;3;N;;;;;
+3024;HANGZHOU NUMERAL FOUR;Nl;0;L;;;;4;N;;;;;
+3025;HANGZHOU NUMERAL FIVE;Nl;0;L;;;;5;N;;;;;
+3026;HANGZHOU NUMERAL SIX;Nl;0;L;;;;6;N;;;;;
+3027;HANGZHOU NUMERAL SEVEN;Nl;0;L;;;;7;N;;;;;
+3028;HANGZHOU NUMERAL EIGHT;Nl;0;L;;;;8;N;;;;;
+3029;HANGZHOU NUMERAL NINE;Nl;0;L;;;;9;N;;;;;
+302A;IDEOGRAPHIC LEVEL TONE MARK;Mn;218;NSM;;;;;N;;;;;
+302B;IDEOGRAPHIC RISING TONE MARK;Mn;228;NSM;;;;;N;;;;;
+302C;IDEOGRAPHIC DEPARTING TONE MARK;Mn;232;NSM;;;;;N;;;;;
+302D;IDEOGRAPHIC ENTERING TONE MARK;Mn;222;NSM;;;;;N;;;;;
+302E;HANGUL SINGLE DOT TONE MARK;Mc;224;L;;;;;N;;;;;
+302F;HANGUL DOUBLE DOT TONE MARK;Mc;224;L;;;;;N;;;;;
+3030;WAVY DASH;Pd;0;ON;;;;;N;;;;;
+3031;VERTICAL KANA REPEAT MARK;Lm;0;L;;;;;N;;;;;
+3032;VERTICAL KANA REPEAT WITH VOICED SOUND MARK;Lm;0;L;;;;;N;;;;;
+3033;VERTICAL KANA REPEAT MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
+3034;VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
+3035;VERTICAL KANA REPEAT MARK LOWER HALF;Lm;0;L;;;;;N;;;;;
+3036;CIRCLED POSTAL MARK;So;0;ON;<compat> 3012;;;;N;;;;;
+3037;IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL;So;0;ON;;;;;N;;;;;
+3038;HANGZHOU NUMERAL TEN;Nl;0;L;<compat> 5341;;;10;N;;;;;
+3039;HANGZHOU NUMERAL TWENTY;Nl;0;L;<compat> 5344;;;20;N;;;;;
+303A;HANGZHOU NUMERAL THIRTY;Nl;0;L;<compat> 5345;;;30;N;;;;;
+303B;VERTICAL IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
+303C;MASU MARK;Lo;0;L;;;;;N;;;;;
+303D;PART ALTERNATION MARK;Po;0;ON;;;;;N;;;;;
+303E;IDEOGRAPHIC VARIATION INDICATOR;So;0;ON;;;;;N;;;;;
+303F;IDEOGRAPHIC HALF FILL SPACE;So;0;ON;;;;;N;;;;;
+3041;HIRAGANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+3042;HIRAGANA LETTER A;Lo;0;L;;;;;N;;;;;
+3043;HIRAGANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
+3044;HIRAGANA LETTER I;Lo;0;L;;;;;N;;;;;
+3045;HIRAGANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
+3046;HIRAGANA LETTER U;Lo;0;L;;;;;N;;;;;
+3047;HIRAGANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
+3048;HIRAGANA LETTER E;Lo;0;L;;;;;N;;;;;
+3049;HIRAGANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
+304A;HIRAGANA LETTER O;Lo;0;L;;;;;N;;;;;
+304B;HIRAGANA LETTER KA;Lo;0;L;;;;;N;;;;;
+304C;HIRAGANA LETTER GA;Lo;0;L;304B 3099;;;;N;;;;;
+304D;HIRAGANA LETTER KI;Lo;0;L;;;;;N;;;;;
+304E;HIRAGANA LETTER GI;Lo;0;L;304D 3099;;;;N;;;;;
+304F;HIRAGANA LETTER KU;Lo;0;L;;;;;N;;;;;
+3050;HIRAGANA LETTER GU;Lo;0;L;304F 3099;;;;N;;;;;
+3051;HIRAGANA LETTER KE;Lo;0;L;;;;;N;;;;;
+3052;HIRAGANA LETTER GE;Lo;0;L;3051 3099;;;;N;;;;;
+3053;HIRAGANA LETTER KO;Lo;0;L;;;;;N;;;;;
+3054;HIRAGANA LETTER GO;Lo;0;L;3053 3099;;;;N;;;;;
+3055;HIRAGANA LETTER SA;Lo;0;L;;;;;N;;;;;
+3056;HIRAGANA LETTER ZA;Lo;0;L;3055 3099;;;;N;;;;;
+3057;HIRAGANA LETTER SI;Lo;0;L;;;;;N;;;;;
+3058;HIRAGANA LETTER ZI;Lo;0;L;3057 3099;;;;N;;;;;
+3059;HIRAGANA LETTER SU;Lo;0;L;;;;;N;;;;;
+305A;HIRAGANA LETTER ZU;Lo;0;L;3059 3099;;;;N;;;;;
+305B;HIRAGANA LETTER SE;Lo;0;L;;;;;N;;;;;
+305C;HIRAGANA LETTER ZE;Lo;0;L;305B 3099;;;;N;;;;;
+305D;HIRAGANA LETTER SO;Lo;0;L;;;;;N;;;;;
+305E;HIRAGANA LETTER ZO;Lo;0;L;305D 3099;;;;N;;;;;
+305F;HIRAGANA LETTER TA;Lo;0;L;;;;;N;;;;;
+3060;HIRAGANA LETTER DA;Lo;0;L;305F 3099;;;;N;;;;;
+3061;HIRAGANA LETTER TI;Lo;0;L;;;;;N;;;;;
+3062;HIRAGANA LETTER DI;Lo;0;L;3061 3099;;;;N;;;;;
+3063;HIRAGANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
+3064;HIRAGANA LETTER TU;Lo;0;L;;;;;N;;;;;
+3065;HIRAGANA LETTER DU;Lo;0;L;3064 3099;;;;N;;;;;
+3066;HIRAGANA LETTER TE;Lo;0;L;;;;;N;;;;;
+3067;HIRAGANA LETTER DE;Lo;0;L;3066 3099;;;;N;;;;;
+3068;HIRAGANA LETTER TO;Lo;0;L;;;;;N;;;;;
+3069;HIRAGANA LETTER DO;Lo;0;L;3068 3099;;;;N;;;;;
+306A;HIRAGANA LETTER NA;Lo;0;L;;;;;N;;;;;
+306B;HIRAGANA LETTER NI;Lo;0;L;;;;;N;;;;;
+306C;HIRAGANA LETTER NU;Lo;0;L;;;;;N;;;;;
+306D;HIRAGANA LETTER NE;Lo;0;L;;;;;N;;;;;
+306E;HIRAGANA LETTER NO;Lo;0;L;;;;;N;;;;;
+306F;HIRAGANA LETTER HA;Lo;0;L;;;;;N;;;;;
+3070;HIRAGANA LETTER BA;Lo;0;L;306F 3099;;;;N;;;;;
+3071;HIRAGANA LETTER PA;Lo;0;L;306F 309A;;;;N;;;;;
+3072;HIRAGANA LETTER HI;Lo;0;L;;;;;N;;;;;
+3073;HIRAGANA LETTER BI;Lo;0;L;3072 3099;;;;N;;;;;
+3074;HIRAGANA LETTER PI;Lo;0;L;3072 309A;;;;N;;;;;
+3075;HIRAGANA LETTER HU;Lo;0;L;;;;;N;;;;;
+3076;HIRAGANA LETTER BU;Lo;0;L;3075 3099;;;;N;;;;;
+3077;HIRAGANA LETTER PU;Lo;0;L;3075 309A;;;;N;;;;;
+3078;HIRAGANA LETTER HE;Lo;0;L;;;;;N;;;;;
+3079;HIRAGANA LETTER BE;Lo;0;L;3078 3099;;;;N;;;;;
+307A;HIRAGANA LETTER PE;Lo;0;L;3078 309A;;;;N;;;;;
+307B;HIRAGANA LETTER HO;Lo;0;L;;;;;N;;;;;
+307C;HIRAGANA LETTER BO;Lo;0;L;307B 3099;;;;N;;;;;
+307D;HIRAGANA LETTER PO;Lo;0;L;307B 309A;;;;N;;;;;
+307E;HIRAGANA LETTER MA;Lo;0;L;;;;;N;;;;;
+307F;HIRAGANA LETTER MI;Lo;0;L;;;;;N;;;;;
+3080;HIRAGANA LETTER MU;Lo;0;L;;;;;N;;;;;
+3081;HIRAGANA LETTER ME;Lo;0;L;;;;;N;;;;;
+3082;HIRAGANA LETTER MO;Lo;0;L;;;;;N;;;;;
+3083;HIRAGANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
+3084;HIRAGANA LETTER YA;Lo;0;L;;;;;N;;;;;
+3085;HIRAGANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
+3086;HIRAGANA LETTER YU;Lo;0;L;;;;;N;;;;;
+3087;HIRAGANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
+3088;HIRAGANA LETTER YO;Lo;0;L;;;;;N;;;;;
+3089;HIRAGANA LETTER RA;Lo;0;L;;;;;N;;;;;
+308A;HIRAGANA LETTER RI;Lo;0;L;;;;;N;;;;;
+308B;HIRAGANA LETTER RU;Lo;0;L;;;;;N;;;;;
+308C;HIRAGANA LETTER RE;Lo;0;L;;;;;N;;;;;
+308D;HIRAGANA LETTER RO;Lo;0;L;;;;;N;;;;;
+308E;HIRAGANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
+308F;HIRAGANA LETTER WA;Lo;0;L;;;;;N;;;;;
+3090;HIRAGANA LETTER WI;Lo;0;L;;;;;N;;;;;
+3091;HIRAGANA LETTER WE;Lo;0;L;;;;;N;;;;;
+3092;HIRAGANA LETTER WO;Lo;0;L;;;;;N;;;;;
+3093;HIRAGANA LETTER N;Lo;0;L;;;;;N;;;;;
+3094;HIRAGANA LETTER VU;Lo;0;L;3046 3099;;;;N;;;;;
+3095;HIRAGANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
+3096;HIRAGANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
+3099;COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA VOICED SOUND MARK;;;;
+309A;COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;;;;
+309B;KATAKANA-HIRAGANA VOICED SOUND MARK;Sk;0;ON;<compat> 0020 3099;;;;N;;;;;
+309C;KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Sk;0;ON;<compat> 0020 309A;;;;N;;;;;
+309D;HIRAGANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
+309E;HIRAGANA VOICED ITERATION MARK;Lm;0;L;309D 3099;;;;N;;;;;
+309F;HIRAGANA DIGRAPH YORI;Lo;0;L;<vertical> 3088 308A;;;;N;;;;;
+30A0;KATAKANA-HIRAGANA DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
+30A1;KATAKANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+30A2;KATAKANA LETTER A;Lo;0;L;;;;;N;;;;;
+30A3;KATAKANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
+30A4;KATAKANA LETTER I;Lo;0;L;;;;;N;;;;;
+30A5;KATAKANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
+30A6;KATAKANA LETTER U;Lo;0;L;;;;;N;;;;;
+30A7;KATAKANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
+30A8;KATAKANA LETTER E;Lo;0;L;;;;;N;;;;;
+30A9;KATAKANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
+30AA;KATAKANA LETTER O;Lo;0;L;;;;;N;;;;;
+30AB;KATAKANA LETTER KA;Lo;0;L;;;;;N;;;;;
+30AC;KATAKANA LETTER GA;Lo;0;L;30AB 3099;;;;N;;;;;
+30AD;KATAKANA LETTER KI;Lo;0;L;;;;;N;;;;;
+30AE;KATAKANA LETTER GI;Lo;0;L;30AD 3099;;;;N;;;;;
+30AF;KATAKANA LETTER KU;Lo;0;L;;;;;N;;;;;
+30B0;KATAKANA LETTER GU;Lo;0;L;30AF 3099;;;;N;;;;;
+30B1;KATAKANA LETTER KE;Lo;0;L;;;;;N;;;;;
+30B2;KATAKANA LETTER GE;Lo;0;L;30B1 3099;;;;N;;;;;
+30B3;KATAKANA LETTER KO;Lo;0;L;;;;;N;;;;;
+30B4;KATAKANA LETTER GO;Lo;0;L;30B3 3099;;;;N;;;;;
+30B5;KATAKANA LETTER SA;Lo;0;L;;;;;N;;;;;
+30B6;KATAKANA LETTER ZA;Lo;0;L;30B5 3099;;;;N;;;;;
+30B7;KATAKANA LETTER SI;Lo;0;L;;;;;N;;;;;
+30B8;KATAKANA LETTER ZI;Lo;0;L;30B7 3099;;;;N;;;;;
+30B9;KATAKANA LETTER SU;Lo;0;L;;;;;N;;;;;
+30BA;KATAKANA LETTER ZU;Lo;0;L;30B9 3099;;;;N;;;;;
+30BB;KATAKANA LETTER SE;Lo;0;L;;;;;N;;;;;
+30BC;KATAKANA LETTER ZE;Lo;0;L;30BB 3099;;;;N;;;;;
+30BD;KATAKANA LETTER SO;Lo;0;L;;;;;N;;;;;
+30BE;KATAKANA LETTER ZO;Lo;0;L;30BD 3099;;;;N;;;;;
+30BF;KATAKANA LETTER TA;Lo;0;L;;;;;N;;;;;
+30C0;KATAKANA LETTER DA;Lo;0;L;30BF 3099;;;;N;;;;;
+30C1;KATAKANA LETTER TI;Lo;0;L;;;;;N;;;;;
+30C2;KATAKANA LETTER DI;Lo;0;L;30C1 3099;;;;N;;;;;
+30C3;KATAKANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
+30C4;KATAKANA LETTER TU;Lo;0;L;;;;;N;;;;;
+30C5;KATAKANA LETTER DU;Lo;0;L;30C4 3099;;;;N;;;;;
+30C6;KATAKANA LETTER TE;Lo;0;L;;;;;N;;;;;
+30C7;KATAKANA LETTER DE;Lo;0;L;30C6 3099;;;;N;;;;;
+30C8;KATAKANA LETTER TO;Lo;0;L;;;;;N;;;;;
+30C9;KATAKANA LETTER DO;Lo;0;L;30C8 3099;;;;N;;;;;
+30CA;KATAKANA LETTER NA;Lo;0;L;;;;;N;;;;;
+30CB;KATAKANA LETTER NI;Lo;0;L;;;;;N;;;;;
+30CC;KATAKANA LETTER NU;Lo;0;L;;;;;N;;;;;
+30CD;KATAKANA LETTER NE;Lo;0;L;;;;;N;;;;;
+30CE;KATAKANA LETTER NO;Lo;0;L;;;;;N;;;;;
+30CF;KATAKANA LETTER HA;Lo;0;L;;;;;N;;;;;
+30D0;KATAKANA LETTER BA;Lo;0;L;30CF 3099;;;;N;;;;;
+30D1;KATAKANA LETTER PA;Lo;0;L;30CF 309A;;;;N;;;;;
+30D2;KATAKANA LETTER HI;Lo;0;L;;;;;N;;;;;
+30D3;KATAKANA LETTER BI;Lo;0;L;30D2 3099;;;;N;;;;;
+30D4;KATAKANA LETTER PI;Lo;0;L;30D2 309A;;;;N;;;;;
+30D5;KATAKANA LETTER HU;Lo;0;L;;;;;N;;;;;
+30D6;KATAKANA LETTER BU;Lo;0;L;30D5 3099;;;;N;;;;;
+30D7;KATAKANA LETTER PU;Lo;0;L;30D5 309A;;;;N;;;;;
+30D8;KATAKANA LETTER HE;Lo;0;L;;;;;N;;;;;
+30D9;KATAKANA LETTER BE;Lo;0;L;30D8 3099;;;;N;;;;;
+30DA;KATAKANA LETTER PE;Lo;0;L;30D8 309A;;;;N;;;;;
+30DB;KATAKANA LETTER HO;Lo;0;L;;;;;N;;;;;
+30DC;KATAKANA LETTER BO;Lo;0;L;30DB 3099;;;;N;;;;;
+30DD;KATAKANA LETTER PO;Lo;0;L;30DB 309A;;;;N;;;;;
+30DE;KATAKANA LETTER MA;Lo;0;L;;;;;N;;;;;
+30DF;KATAKANA LETTER MI;Lo;0;L;;;;;N;;;;;
+30E0;KATAKANA LETTER MU;Lo;0;L;;;;;N;;;;;
+30E1;KATAKANA LETTER ME;Lo;0;L;;;;;N;;;;;
+30E2;KATAKANA LETTER MO;Lo;0;L;;;;;N;;;;;
+30E3;KATAKANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
+30E4;KATAKANA LETTER YA;Lo;0;L;;;;;N;;;;;
+30E5;KATAKANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
+30E6;KATAKANA LETTER YU;Lo;0;L;;;;;N;;;;;
+30E7;KATAKANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
+30E8;KATAKANA LETTER YO;Lo;0;L;;;;;N;;;;;
+30E9;KATAKANA LETTER RA;Lo;0;L;;;;;N;;;;;
+30EA;KATAKANA LETTER RI;Lo;0;L;;;;;N;;;;;
+30EB;KATAKANA LETTER RU;Lo;0;L;;;;;N;;;;;
+30EC;KATAKANA LETTER RE;Lo;0;L;;;;;N;;;;;
+30ED;KATAKANA LETTER RO;Lo;0;L;;;;;N;;;;;
+30EE;KATAKANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
+30EF;KATAKANA LETTER WA;Lo;0;L;;;;;N;;;;;
+30F0;KATAKANA LETTER WI;Lo;0;L;;;;;N;;;;;
+30F1;KATAKANA LETTER WE;Lo;0;L;;;;;N;;;;;
+30F2;KATAKANA LETTER WO;Lo;0;L;;;;;N;;;;;
+30F3;KATAKANA LETTER N;Lo;0;L;;;;;N;;;;;
+30F4;KATAKANA LETTER VU;Lo;0;L;30A6 3099;;;;N;;;;;
+30F5;KATAKANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
+30F6;KATAKANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
+30F7;KATAKANA LETTER VA;Lo;0;L;30EF 3099;;;;N;;;;;
+30F8;KATAKANA LETTER VI;Lo;0;L;30F0 3099;;;;N;;;;;
+30F9;KATAKANA LETTER VE;Lo;0;L;30F1 3099;;;;N;;;;;
+30FA;KATAKANA LETTER VO;Lo;0;L;30F2 3099;;;;N;;;;;
+30FB;KATAKANA MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+30FC;KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;;;;;N;;;;;
+30FD;KATAKANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
+30FE;KATAKANA VOICED ITERATION MARK;Lm;0;L;30FD 3099;;;;N;;;;;
+30FF;KATAKANA DIGRAPH KOTO;Lo;0;L;<vertical> 30B3 30C8;;;;N;;;;;
+3105;BOPOMOFO LETTER B;Lo;0;L;;;;;N;;;;;
+3106;BOPOMOFO LETTER P;Lo;0;L;;;;;N;;;;;
+3107;BOPOMOFO LETTER M;Lo;0;L;;;;;N;;;;;
+3108;BOPOMOFO LETTER F;Lo;0;L;;;;;N;;;;;
+3109;BOPOMOFO LETTER D;Lo;0;L;;;;;N;;;;;
+310A;BOPOMOFO LETTER T;Lo;0;L;;;;;N;;;;;
+310B;BOPOMOFO LETTER N;Lo;0;L;;;;;N;;;;;
+310C;BOPOMOFO LETTER L;Lo;0;L;;;;;N;;;;;
+310D;BOPOMOFO LETTER G;Lo;0;L;;;;;N;;;;;
+310E;BOPOMOFO LETTER K;Lo;0;L;;;;;N;;;;;
+310F;BOPOMOFO LETTER H;Lo;0;L;;;;;N;;;;;
+3110;BOPOMOFO LETTER J;Lo;0;L;;;;;N;;;;;
+3111;BOPOMOFO LETTER Q;Lo;0;L;;;;;N;;;;;
+3112;BOPOMOFO LETTER X;Lo;0;L;;;;;N;;;;;
+3113;BOPOMOFO LETTER ZH;Lo;0;L;;;;;N;;;;;
+3114;BOPOMOFO LETTER CH;Lo;0;L;;;;;N;;;;;
+3115;BOPOMOFO LETTER SH;Lo;0;L;;;;;N;;;;;
+3116;BOPOMOFO LETTER R;Lo;0;L;;;;;N;;;;;
+3117;BOPOMOFO LETTER Z;Lo;0;L;;;;;N;;;;;
+3118;BOPOMOFO LETTER C;Lo;0;L;;;;;N;;;;;
+3119;BOPOMOFO LETTER S;Lo;0;L;;;;;N;;;;;
+311A;BOPOMOFO LETTER A;Lo;0;L;;;;;N;;;;;
+311B;BOPOMOFO LETTER O;Lo;0;L;;;;;N;;;;;
+311C;BOPOMOFO LETTER E;Lo;0;L;;;;;N;;;;;
+311D;BOPOMOFO LETTER EH;Lo;0;L;;;;;N;;;;;
+311E;BOPOMOFO LETTER AI;Lo;0;L;;;;;N;;;;;
+311F;BOPOMOFO LETTER EI;Lo;0;L;;;;;N;;;;;
+3120;BOPOMOFO LETTER AU;Lo;0;L;;;;;N;;;;;
+3121;BOPOMOFO LETTER OU;Lo;0;L;;;;;N;;;;;
+3122;BOPOMOFO LETTER AN;Lo;0;L;;;;;N;;;;;
+3123;BOPOMOFO LETTER EN;Lo;0;L;;;;;N;;;;;
+3124;BOPOMOFO LETTER ANG;Lo;0;L;;;;;N;;;;;
+3125;BOPOMOFO LETTER ENG;Lo;0;L;;;;;N;;;;;
+3126;BOPOMOFO LETTER ER;Lo;0;L;;;;;N;;;;;
+3127;BOPOMOFO LETTER I;Lo;0;L;;;;;N;;;;;
+3128;BOPOMOFO LETTER U;Lo;0;L;;;;;N;;;;;
+3129;BOPOMOFO LETTER IU;Lo;0;L;;;;;N;;;;;
+312A;BOPOMOFO LETTER V;Lo;0;L;;;;;N;;;;;
+312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;;
+312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
+312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
+312E;BOPOMOFO LETTER O WITH DOT ABOVE;Lo;0;L;;;;;N;;;;;
+312F;BOPOMOFO LETTER NN;Lo;0;L;;;;;N;;;;;
+3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
+3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
+3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
+3134;HANGUL LETTER NIEUN;Lo;0;L;<compat> 1102;;;;N;;;;;
+3135;HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<compat> 11AC;;;;N;HANGUL LETTER NIEUN JIEUJ;;;;
+3136;HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<compat> 11AD;;;;N;HANGUL LETTER NIEUN HIEUH;;;;
+3137;HANGUL LETTER TIKEUT;Lo;0;L;<compat> 1103;;;;N;HANGUL LETTER DIGEUD;;;;
+3138;HANGUL LETTER SSANGTIKEUT;Lo;0;L;<compat> 1104;;;;N;HANGUL LETTER SSANG DIGEUD;;;;
+3139;HANGUL LETTER RIEUL;Lo;0;L;<compat> 1105;;;;N;HANGUL LETTER LIEUL;;;;
+313A;HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<compat> 11B0;;;;N;HANGUL LETTER LIEUL GIYEOG;;;;
+313B;HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<compat> 11B1;;;;N;HANGUL LETTER LIEUL MIEUM;;;;
+313C;HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<compat> 11B2;;;;N;HANGUL LETTER LIEUL BIEUB;;;;
+313D;HANGUL LETTER RIEUL-SIOS;Lo;0;L;<compat> 11B3;;;;N;HANGUL LETTER LIEUL SIOS;;;;
+313E;HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<compat> 11B4;;;;N;HANGUL LETTER LIEUL TIEUT;;;;
+313F;HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<compat> 11B5;;;;N;HANGUL LETTER LIEUL PIEUP;;;;
+3140;HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<compat> 111A;;;;N;HANGUL LETTER LIEUL HIEUH;;;;
+3141;HANGUL LETTER MIEUM;Lo;0;L;<compat> 1106;;;;N;;;;;
+3142;HANGUL LETTER PIEUP;Lo;0;L;<compat> 1107;;;;N;HANGUL LETTER BIEUB;;;;
+3143;HANGUL LETTER SSANGPIEUP;Lo;0;L;<compat> 1108;;;;N;HANGUL LETTER SSANG BIEUB;;;;
+3144;HANGUL LETTER PIEUP-SIOS;Lo;0;L;<compat> 1121;;;;N;HANGUL LETTER BIEUB SIOS;;;;
+3145;HANGUL LETTER SIOS;Lo;0;L;<compat> 1109;;;;N;;;;;
+3146;HANGUL LETTER SSANGSIOS;Lo;0;L;<compat> 110A;;;;N;HANGUL LETTER SSANG SIOS;;;;
+3147;HANGUL LETTER IEUNG;Lo;0;L;<compat> 110B;;;;N;;;;;
+3148;HANGUL LETTER CIEUC;Lo;0;L;<compat> 110C;;;;N;HANGUL LETTER JIEUJ;;;;
+3149;HANGUL LETTER SSANGCIEUC;Lo;0;L;<compat> 110D;;;;N;HANGUL LETTER SSANG JIEUJ;;;;
+314A;HANGUL LETTER CHIEUCH;Lo;0;L;<compat> 110E;;;;N;HANGUL LETTER CIEUC;;;;
+314B;HANGUL LETTER KHIEUKH;Lo;0;L;<compat> 110F;;;;N;HANGUL LETTER KIYEOK;;;;
+314C;HANGUL LETTER THIEUTH;Lo;0;L;<compat> 1110;;;;N;HANGUL LETTER TIEUT;;;;
+314D;HANGUL LETTER PHIEUPH;Lo;0;L;<compat> 1111;;;;N;HANGUL LETTER PIEUP;;;;
+314E;HANGUL LETTER HIEUH;Lo;0;L;<compat> 1112;;;;N;;;;;
+314F;HANGUL LETTER A;Lo;0;L;<compat> 1161;;;;N;;;;;
+3150;HANGUL LETTER AE;Lo;0;L;<compat> 1162;;;;N;;;;;
+3151;HANGUL LETTER YA;Lo;0;L;<compat> 1163;;;;N;;;;;
+3152;HANGUL LETTER YAE;Lo;0;L;<compat> 1164;;;;N;;;;;
+3153;HANGUL LETTER EO;Lo;0;L;<compat> 1165;;;;N;;;;;
+3154;HANGUL LETTER E;Lo;0;L;<compat> 1166;;;;N;;;;;
+3155;HANGUL LETTER YEO;Lo;0;L;<compat> 1167;;;;N;;;;;
+3156;HANGUL LETTER YE;Lo;0;L;<compat> 1168;;;;N;;;;;
+3157;HANGUL LETTER O;Lo;0;L;<compat> 1169;;;;N;;;;;
+3158;HANGUL LETTER WA;Lo;0;L;<compat> 116A;;;;N;;;;;
+3159;HANGUL LETTER WAE;Lo;0;L;<compat> 116B;;;;N;;;;;
+315A;HANGUL LETTER OE;Lo;0;L;<compat> 116C;;;;N;;;;;
+315B;HANGUL LETTER YO;Lo;0;L;<compat> 116D;;;;N;;;;;
+315C;HANGUL LETTER U;Lo;0;L;<compat> 116E;;;;N;;;;;
+315D;HANGUL LETTER WEO;Lo;0;L;<compat> 116F;;;;N;;;;;
+315E;HANGUL LETTER WE;Lo;0;L;<compat> 1170;;;;N;;;;;
+315F;HANGUL LETTER WI;Lo;0;L;<compat> 1171;;;;N;;;;;
+3160;HANGUL LETTER YU;Lo;0;L;<compat> 1172;;;;N;;;;;
+3161;HANGUL LETTER EU;Lo;0;L;<compat> 1173;;;;N;;;;;
+3162;HANGUL LETTER YI;Lo;0;L;<compat> 1174;;;;N;;;;;
+3163;HANGUL LETTER I;Lo;0;L;<compat> 1175;;;;N;;;;;
+3164;HANGUL FILLER;Lo;0;L;<compat> 1160;;;;N;HANGUL CAE OM;;;;
+3165;HANGUL LETTER SSANGNIEUN;Lo;0;L;<compat> 1114;;;;N;HANGUL LETTER SSANG NIEUN;;;;
+3166;HANGUL LETTER NIEUN-TIKEUT;Lo;0;L;<compat> 1115;;;;N;HANGUL LETTER NIEUN DIGEUD;;;;
+3167;HANGUL LETTER NIEUN-SIOS;Lo;0;L;<compat> 11C7;;;;N;HANGUL LETTER NIEUN SIOS;;;;
+3168;HANGUL LETTER NIEUN-PANSIOS;Lo;0;L;<compat> 11C8;;;;N;HANGUL LETTER NIEUN BAN CHI EUM;;;;
+3169;HANGUL LETTER RIEUL-KIYEOK-SIOS;Lo;0;L;<compat> 11CC;;;;N;HANGUL LETTER LIEUL GIYEOG SIOS;;;;
+316A;HANGUL LETTER RIEUL-TIKEUT;Lo;0;L;<compat> 11CE;;;;N;HANGUL LETTER LIEUL DIGEUD;;;;
+316B;HANGUL LETTER RIEUL-PIEUP-SIOS;Lo;0;L;<compat> 11D3;;;;N;HANGUL LETTER LIEUL BIEUB SIOS;;;;
+316C;HANGUL LETTER RIEUL-PANSIOS;Lo;0;L;<compat> 11D7;;;;N;HANGUL LETTER LIEUL BAN CHI EUM;;;;
+316D;HANGUL LETTER RIEUL-YEORINHIEUH;Lo;0;L;<compat> 11D9;;;;N;HANGUL LETTER LIEUL YEOLIN HIEUH;;;;
+316E;HANGUL LETTER MIEUM-PIEUP;Lo;0;L;<compat> 111C;;;;N;HANGUL LETTER MIEUM BIEUB;;;;
+316F;HANGUL LETTER MIEUM-SIOS;Lo;0;L;<compat> 11DD;;;;N;HANGUL LETTER MIEUM SIOS;;;;
+3170;HANGUL LETTER MIEUM-PANSIOS;Lo;0;L;<compat> 11DF;;;;N;HANGUL LETTER BIEUB BAN CHI EUM;;;;
+3171;HANGUL LETTER KAPYEOUNMIEUM;Lo;0;L;<compat> 111D;;;;N;HANGUL LETTER MIEUM SUN GYEONG EUM;;;;
+3172;HANGUL LETTER PIEUP-KIYEOK;Lo;0;L;<compat> 111E;;;;N;HANGUL LETTER BIEUB GIYEOG;;;;
+3173;HANGUL LETTER PIEUP-TIKEUT;Lo;0;L;<compat> 1120;;;;N;HANGUL LETTER BIEUB DIGEUD;;;;
+3174;HANGUL LETTER PIEUP-SIOS-KIYEOK;Lo;0;L;<compat> 1122;;;;N;HANGUL LETTER BIEUB SIOS GIYEOG;;;;
+3175;HANGUL LETTER PIEUP-SIOS-TIKEUT;Lo;0;L;<compat> 1123;;;;N;HANGUL LETTER BIEUB SIOS DIGEUD;;;;
+3176;HANGUL LETTER PIEUP-CIEUC;Lo;0;L;<compat> 1127;;;;N;HANGUL LETTER BIEUB JIEUJ;;;;
+3177;HANGUL LETTER PIEUP-THIEUTH;Lo;0;L;<compat> 1129;;;;N;HANGUL LETTER BIEUB TIEUT;;;;
+3178;HANGUL LETTER KAPYEOUNPIEUP;Lo;0;L;<compat> 112B;;;;N;HANGUL LETTER BIEUB SUN GYEONG EUM;;;;
+3179;HANGUL LETTER KAPYEOUNSSANGPIEUP;Lo;0;L;<compat> 112C;;;;N;HANGUL LETTER SSANG BIEUB SUN GYEONG EUM;;;;
+317A;HANGUL LETTER SIOS-KIYEOK;Lo;0;L;<compat> 112D;;;;N;HANGUL LETTER SIOS GIYEOG;;;;
+317B;HANGUL LETTER SIOS-NIEUN;Lo;0;L;<compat> 112E;;;;N;HANGUL LETTER SIOS NIEUN;;;;
+317C;HANGUL LETTER SIOS-TIKEUT;Lo;0;L;<compat> 112F;;;;N;HANGUL LETTER SIOS DIGEUD;;;;
+317D;HANGUL LETTER SIOS-PIEUP;Lo;0;L;<compat> 1132;;;;N;HANGUL LETTER SIOS BIEUB;;;;
+317E;HANGUL LETTER SIOS-CIEUC;Lo;0;L;<compat> 1136;;;;N;HANGUL LETTER SIOS JIEUJ;;;;
+317F;HANGUL LETTER PANSIOS;Lo;0;L;<compat> 1140;;;;N;HANGUL LETTER BAN CHI EUM;;;;
+3180;HANGUL LETTER SSANGIEUNG;Lo;0;L;<compat> 1147;;;;N;HANGUL LETTER SSANG IEUNG;;;;
+3181;HANGUL LETTER YESIEUNG;Lo;0;L;<compat> 114C;;;;N;HANGUL LETTER NGIEUNG;;;;
+3182;HANGUL LETTER YESIEUNG-SIOS;Lo;0;L;<compat> 11F1;;;;N;HANGUL LETTER NGIEUNG SIOS;;;;
+3183;HANGUL LETTER YESIEUNG-PANSIOS;Lo;0;L;<compat> 11F2;;;;N;HANGUL LETTER NGIEUNG BAN CHI EUM;;;;
+3184;HANGUL LETTER KAPYEOUNPHIEUPH;Lo;0;L;<compat> 1157;;;;N;HANGUL LETTER PIEUP SUN GYEONG EUM;;;;
+3185;HANGUL LETTER SSANGHIEUH;Lo;0;L;<compat> 1158;;;;N;HANGUL LETTER SSANG HIEUH;;;;
+3186;HANGUL LETTER YEORINHIEUH;Lo;0;L;<compat> 1159;;;;N;HANGUL LETTER YEOLIN HIEUH;;;;
+3187;HANGUL LETTER YO-YA;Lo;0;L;<compat> 1184;;;;N;HANGUL LETTER YOYA;;;;
+3188;HANGUL LETTER YO-YAE;Lo;0;L;<compat> 1185;;;;N;HANGUL LETTER YOYAE;;;;
+3189;HANGUL LETTER YO-I;Lo;0;L;<compat> 1188;;;;N;HANGUL LETTER YOI;;;;
+318A;HANGUL LETTER YU-YEO;Lo;0;L;<compat> 1191;;;;N;HANGUL LETTER YUYEO;;;;
+318B;HANGUL LETTER YU-YE;Lo;0;L;<compat> 1192;;;;N;HANGUL LETTER YUYE;;;;
+318C;HANGUL LETTER YU-I;Lo;0;L;<compat> 1194;;;;N;HANGUL LETTER YUI;;;;
+318D;HANGUL LETTER ARAEA;Lo;0;L;<compat> 119E;;;;N;HANGUL LETTER ALAE A;;;;
+318E;HANGUL LETTER ARAEAE;Lo;0;L;<compat> 11A1;;;;N;HANGUL LETTER ALAE AE;;;;
+3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;;;;
+3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;;;;
+3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L;<super> 4E00;;;1;N;KAERITEN ITI;;;;
+3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L;<super> 4E8C;;;2;N;KAERITEN NI;;;;
+3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L;<super> 4E09;;;3;N;KAERITEN SAN;;;;
+3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L;<super> 56DB;;;4;N;KAERITEN SI;;;;
+3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L;<super> 4E0A;;;;N;KAERITEN ZYOU;;;;
+3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L;<super> 4E2D;;;;N;KAERITEN TYUU;;;;
+3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L;<super> 4E0B;;;;N;KAERITEN GE;;;;
+3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L;<super> 7532;;;;N;KAERITEN KOU;;;;
+319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L;<super> 4E59;;;;N;KAERITEN OTU;;;;
+319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L;<super> 4E19;;;;N;KAERITEN HEI;;;;
+319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L;<super> 4E01;;;;N;KAERITEN TEI;;;;
+319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L;<super> 5929;;;;N;KAERITEN TEN;;;;
+319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L;<super> 5730;;;;N;KAERITEN TI;;;;
+319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L;<super> 4EBA;;;;N;KAERITEN ZIN;;;;
+31A0;BOPOMOFO LETTER BU;Lo;0;L;;;;;N;;;;;
+31A1;BOPOMOFO LETTER ZI;Lo;0;L;;;;;N;;;;;
+31A2;BOPOMOFO LETTER JI;Lo;0;L;;;;;N;;;;;
+31A3;BOPOMOFO LETTER GU;Lo;0;L;;;;;N;;;;;
+31A4;BOPOMOFO LETTER EE;Lo;0;L;;;;;N;;;;;
+31A5;BOPOMOFO LETTER ENN;Lo;0;L;;;;;N;;;;;
+31A6;BOPOMOFO LETTER OO;Lo;0;L;;;;;N;;;;;
+31A7;BOPOMOFO LETTER ONN;Lo;0;L;;;;;N;;;;;
+31A8;BOPOMOFO LETTER IR;Lo;0;L;;;;;N;;;;;
+31A9;BOPOMOFO LETTER ANN;Lo;0;L;;;;;N;;;;;
+31AA;BOPOMOFO LETTER INN;Lo;0;L;;;;;N;;;;;
+31AB;BOPOMOFO LETTER UNN;Lo;0;L;;;;;N;;;;;
+31AC;BOPOMOFO LETTER IM;Lo;0;L;;;;;N;;;;;
+31AD;BOPOMOFO LETTER NGG;Lo;0;L;;;;;N;;;;;
+31AE;BOPOMOFO LETTER AINN;Lo;0;L;;;;;N;;;;;
+31AF;BOPOMOFO LETTER AUNN;Lo;0;L;;;;;N;;;;;
+31B0;BOPOMOFO LETTER AM;Lo;0;L;;;;;N;;;;;
+31B1;BOPOMOFO LETTER OM;Lo;0;L;;;;;N;;;;;
+31B2;BOPOMOFO LETTER ONG;Lo;0;L;;;;;N;;;;;
+31B3;BOPOMOFO LETTER INNN;Lo;0;L;;;;;N;;;;;
+31B4;BOPOMOFO FINAL LETTER P;Lo;0;L;;;;;N;;;;;
+31B5;BOPOMOFO FINAL LETTER T;Lo;0;L;;;;;N;;;;;
+31B6;BOPOMOFO FINAL LETTER K;Lo;0;L;;;;;N;;;;;
+31B7;BOPOMOFO FINAL LETTER H;Lo;0;L;;;;;N;;;;;
+31B8;BOPOMOFO LETTER GH;Lo;0;L;;;;;N;;;;;
+31B9;BOPOMOFO LETTER LH;Lo;0;L;;;;;N;;;;;
+31BA;BOPOMOFO LETTER ZY;Lo;0;L;;;;;N;;;;;
+31BB;BOPOMOFO FINAL LETTER G;Lo;0;L;;;;;N;;;;;
+31BC;BOPOMOFO LETTER GW;Lo;0;L;;;;;N;;;;;
+31BD;BOPOMOFO LETTER KW;Lo;0;L;;;;;N;;;;;
+31BE;BOPOMOFO LETTER OE;Lo;0;L;;;;;N;;;;;
+31BF;BOPOMOFO LETTER AH;Lo;0;L;;;;;N;;;;;
+31C0;CJK STROKE T;So;0;ON;;;;;N;;;;;
+31C1;CJK STROKE WG;So;0;ON;;;;;N;;;;;
+31C2;CJK STROKE XG;So;0;ON;;;;;N;;;;;
+31C3;CJK STROKE BXG;So;0;ON;;;;;N;;;;;
+31C4;CJK STROKE SW;So;0;ON;;;;;N;;;;;
+31C5;CJK STROKE HZZ;So;0;ON;;;;;N;;;;;
+31C6;CJK STROKE HZG;So;0;ON;;;;;N;;;;;
+31C7;CJK STROKE HP;So;0;ON;;;;;N;;;;;
+31C8;CJK STROKE HZWG;So;0;ON;;;;;N;;;;;
+31C9;CJK STROKE SZWG;So;0;ON;;;;;N;;;;;
+31CA;CJK STROKE HZT;So;0;ON;;;;;N;;;;;
+31CB;CJK STROKE HZZP;So;0;ON;;;;;N;;;;;
+31CC;CJK STROKE HPWG;So;0;ON;;;;;N;;;;;
+31CD;CJK STROKE HZW;So;0;ON;;;;;N;;;;;
+31CE;CJK STROKE HZZZ;So;0;ON;;;;;N;;;;;
+31CF;CJK STROKE N;So;0;ON;;;;;N;;;;;
+31D0;CJK STROKE H;So;0;ON;;;;;N;;;;;
+31D1;CJK STROKE S;So;0;ON;;;;;N;;;;;
+31D2;CJK STROKE P;So;0;ON;;;;;N;;;;;
+31D3;CJK STROKE SP;So;0;ON;;;;;N;;;;;
+31D4;CJK STROKE D;So;0;ON;;;;;N;;;;;
+31D5;CJK STROKE HZ;So;0;ON;;;;;N;;;;;
+31D6;CJK STROKE HG;So;0;ON;;;;;N;;;;;
+31D7;CJK STROKE SZ;So;0;ON;;;;;N;;;;;
+31D8;CJK STROKE SWZ;So;0;ON;;;;;N;;;;;
+31D9;CJK STROKE ST;So;0;ON;;;;;N;;;;;
+31DA;CJK STROKE SG;So;0;ON;;;;;N;;;;;
+31DB;CJK STROKE PD;So;0;ON;;;;;N;;;;;
+31DC;CJK STROKE PZ;So;0;ON;;;;;N;;;;;
+31DD;CJK STROKE TN;So;0;ON;;;;;N;;;;;
+31DE;CJK STROKE SZZ;So;0;ON;;;;;N;;;;;
+31DF;CJK STROKE SWG;So;0;ON;;;;;N;;;;;
+31E0;CJK STROKE HXWG;So;0;ON;;;;;N;;;;;
+31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;;
+31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;;
+31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;;
+31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;;
+31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;;
+31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;;
+31F3;KATAKANA LETTER SMALL TO;Lo;0;L;;;;;N;;;;;
+31F4;KATAKANA LETTER SMALL NU;Lo;0;L;;;;;N;;;;;
+31F5;KATAKANA LETTER SMALL HA;Lo;0;L;;;;;N;;;;;
+31F6;KATAKANA LETTER SMALL HI;Lo;0;L;;;;;N;;;;;
+31F7;KATAKANA LETTER SMALL HU;Lo;0;L;;;;;N;;;;;
+31F8;KATAKANA LETTER SMALL HE;Lo;0;L;;;;;N;;;;;
+31F9;KATAKANA LETTER SMALL HO;Lo;0;L;;;;;N;;;;;
+31FA;KATAKANA LETTER SMALL MU;Lo;0;L;;;;;N;;;;;
+31FB;KATAKANA LETTER SMALL RA;Lo;0;L;;;;;N;;;;;
+31FC;KATAKANA LETTER SMALL RI;Lo;0;L;;;;;N;;;;;
+31FD;KATAKANA LETTER SMALL RU;Lo;0;L;;;;;N;;;;;
+31FE;KATAKANA LETTER SMALL RE;Lo;0;L;;;;;N;;;;;
+31FF;KATAKANA LETTER SMALL RO;Lo;0;L;;;;;N;;;;;
+3200;PARENTHESIZED HANGUL KIYEOK;So;0;L;<compat> 0028 1100 0029;;;;N;PARENTHESIZED HANGUL GIYEOG;;;;
+3201;PARENTHESIZED HANGUL NIEUN;So;0;L;<compat> 0028 1102 0029;;;;N;;;;;
+3202;PARENTHESIZED HANGUL TIKEUT;So;0;L;<compat> 0028 1103 0029;;;;N;PARENTHESIZED HANGUL DIGEUD;;;;
+3203;PARENTHESIZED HANGUL RIEUL;So;0;L;<compat> 0028 1105 0029;;;;N;PARENTHESIZED HANGUL LIEUL;;;;
+3204;PARENTHESIZED HANGUL MIEUM;So;0;L;<compat> 0028 1106 0029;;;;N;;;;;
+3205;PARENTHESIZED HANGUL PIEUP;So;0;L;<compat> 0028 1107 0029;;;;N;PARENTHESIZED HANGUL BIEUB;;;;
+3206;PARENTHESIZED HANGUL SIOS;So;0;L;<compat> 0028 1109 0029;;;;N;;;;;
+3207;PARENTHESIZED HANGUL IEUNG;So;0;L;<compat> 0028 110B 0029;;;;N;;;;;
+3208;PARENTHESIZED HANGUL CIEUC;So;0;L;<compat> 0028 110C 0029;;;;N;PARENTHESIZED HANGUL JIEUJ;;;;
+3209;PARENTHESIZED HANGUL CHIEUCH;So;0;L;<compat> 0028 110E 0029;;;;N;PARENTHESIZED HANGUL CIEUC;;;;
+320A;PARENTHESIZED HANGUL KHIEUKH;So;0;L;<compat> 0028 110F 0029;;;;N;PARENTHESIZED HANGUL KIYEOK;;;;
+320B;PARENTHESIZED HANGUL THIEUTH;So;0;L;<compat> 0028 1110 0029;;;;N;PARENTHESIZED HANGUL TIEUT;;;;
+320C;PARENTHESIZED HANGUL PHIEUPH;So;0;L;<compat> 0028 1111 0029;;;;N;PARENTHESIZED HANGUL PIEUP;;;;
+320D;PARENTHESIZED HANGUL HIEUH;So;0;L;<compat> 0028 1112 0029;;;;N;;;;;
+320E;PARENTHESIZED HANGUL KIYEOK A;So;0;L;<compat> 0028 1100 1161 0029;;;;N;PARENTHESIZED HANGUL GA;;;;
+320F;PARENTHESIZED HANGUL NIEUN A;So;0;L;<compat> 0028 1102 1161 0029;;;;N;PARENTHESIZED HANGUL NA;;;;
+3210;PARENTHESIZED HANGUL TIKEUT A;So;0;L;<compat> 0028 1103 1161 0029;;;;N;PARENTHESIZED HANGUL DA;;;;
+3211;PARENTHESIZED HANGUL RIEUL A;So;0;L;<compat> 0028 1105 1161 0029;;;;N;PARENTHESIZED HANGUL LA;;;;
+3212;PARENTHESIZED HANGUL MIEUM A;So;0;L;<compat> 0028 1106 1161 0029;;;;N;PARENTHESIZED HANGUL MA;;;;
+3213;PARENTHESIZED HANGUL PIEUP A;So;0;L;<compat> 0028 1107 1161 0029;;;;N;PARENTHESIZED HANGUL BA;;;;
+3214;PARENTHESIZED HANGUL SIOS A;So;0;L;<compat> 0028 1109 1161 0029;;;;N;PARENTHESIZED HANGUL SA;;;;
+3215;PARENTHESIZED HANGUL IEUNG A;So;0;L;<compat> 0028 110B 1161 0029;;;;N;PARENTHESIZED HANGUL A;;;;
+3216;PARENTHESIZED HANGUL CIEUC A;So;0;L;<compat> 0028 110C 1161 0029;;;;N;PARENTHESIZED HANGUL JA;;;;
+3217;PARENTHESIZED HANGUL CHIEUCH A;So;0;L;<compat> 0028 110E 1161 0029;;;;N;PARENTHESIZED HANGUL CA;;;;
+3218;PARENTHESIZED HANGUL KHIEUKH A;So;0;L;<compat> 0028 110F 1161 0029;;;;N;PARENTHESIZED HANGUL KA;;;;
+3219;PARENTHESIZED HANGUL THIEUTH A;So;0;L;<compat> 0028 1110 1161 0029;;;;N;PARENTHESIZED HANGUL TA;;;;
+321A;PARENTHESIZED HANGUL PHIEUPH A;So;0;L;<compat> 0028 1111 1161 0029;;;;N;PARENTHESIZED HANGUL PA;;;;
+321B;PARENTHESIZED HANGUL HIEUH A;So;0;L;<compat> 0028 1112 1161 0029;;;;N;PARENTHESIZED HANGUL HA;;;;
+321C;PARENTHESIZED HANGUL CIEUC U;So;0;L;<compat> 0028 110C 116E 0029;;;;N;PARENTHESIZED HANGUL JU;;;;
+321D;PARENTHESIZED KOREAN CHARACTER OJEON;So;0;ON;<compat> 0028 110B 1169 110C 1165 11AB 0029;;;;N;;;;;
+321E;PARENTHESIZED KOREAN CHARACTER O HU;So;0;ON;<compat> 0028 110B 1169 1112 116E 0029;;;;N;;;;;
+3220;PARENTHESIZED IDEOGRAPH ONE;No;0;L;<compat> 0028 4E00 0029;;;1;N;;;;;
+3221;PARENTHESIZED IDEOGRAPH TWO;No;0;L;<compat> 0028 4E8C 0029;;;2;N;;;;;
+3222;PARENTHESIZED IDEOGRAPH THREE;No;0;L;<compat> 0028 4E09 0029;;;3;N;;;;;
+3223;PARENTHESIZED IDEOGRAPH FOUR;No;0;L;<compat> 0028 56DB 0029;;;4;N;;;;;
+3224;PARENTHESIZED IDEOGRAPH FIVE;No;0;L;<compat> 0028 4E94 0029;;;5;N;;;;;
+3225;PARENTHESIZED IDEOGRAPH SIX;No;0;L;<compat> 0028 516D 0029;;;6;N;;;;;
+3226;PARENTHESIZED IDEOGRAPH SEVEN;No;0;L;<compat> 0028 4E03 0029;;;7;N;;;;;
+3227;PARENTHESIZED IDEOGRAPH EIGHT;No;0;L;<compat> 0028 516B 0029;;;8;N;;;;;
+3228;PARENTHESIZED IDEOGRAPH NINE;No;0;L;<compat> 0028 4E5D 0029;;;9;N;;;;;
+3229;PARENTHESIZED IDEOGRAPH TEN;No;0;L;<compat> 0028 5341 0029;;;10;N;;;;;
+322A;PARENTHESIZED IDEOGRAPH MOON;So;0;L;<compat> 0028 6708 0029;;;;N;;;;;
+322B;PARENTHESIZED IDEOGRAPH FIRE;So;0;L;<compat> 0028 706B 0029;;;;N;;;;;
+322C;PARENTHESIZED IDEOGRAPH WATER;So;0;L;<compat> 0028 6C34 0029;;;;N;;;;;
+322D;PARENTHESIZED IDEOGRAPH WOOD;So;0;L;<compat> 0028 6728 0029;;;;N;;;;;
+322E;PARENTHESIZED IDEOGRAPH METAL;So;0;L;<compat> 0028 91D1 0029;;;;N;;;;;
+322F;PARENTHESIZED IDEOGRAPH EARTH;So;0;L;<compat> 0028 571F 0029;;;;N;;;;;
+3230;PARENTHESIZED IDEOGRAPH SUN;So;0;L;<compat> 0028 65E5 0029;;;;N;;;;;
+3231;PARENTHESIZED IDEOGRAPH STOCK;So;0;L;<compat> 0028 682A 0029;;;;N;;;;;
+3232;PARENTHESIZED IDEOGRAPH HAVE;So;0;L;<compat> 0028 6709 0029;;;;N;;;;;
+3233;PARENTHESIZED IDEOGRAPH SOCIETY;So;0;L;<compat> 0028 793E 0029;;;;N;;;;;
+3234;PARENTHESIZED IDEOGRAPH NAME;So;0;L;<compat> 0028 540D 0029;;;;N;;;;;
+3235;PARENTHESIZED IDEOGRAPH SPECIAL;So;0;L;<compat> 0028 7279 0029;;;;N;;;;;
+3236;PARENTHESIZED IDEOGRAPH FINANCIAL;So;0;L;<compat> 0028 8CA1 0029;;;;N;;;;;
+3237;PARENTHESIZED IDEOGRAPH CONGRATULATION;So;0;L;<compat> 0028 795D 0029;;;;N;;;;;
+3238;PARENTHESIZED IDEOGRAPH LABOR;So;0;L;<compat> 0028 52B4 0029;;;;N;;;;;
+3239;PARENTHESIZED IDEOGRAPH REPRESENT;So;0;L;<compat> 0028 4EE3 0029;;;;N;;;;;
+323A;PARENTHESIZED IDEOGRAPH CALL;So;0;L;<compat> 0028 547C 0029;;;;N;;;;;
+323B;PARENTHESIZED IDEOGRAPH STUDY;So;0;L;<compat> 0028 5B66 0029;;;;N;;;;;
+323C;PARENTHESIZED IDEOGRAPH SUPERVISE;So;0;L;<compat> 0028 76E3 0029;;;;N;;;;;
+323D;PARENTHESIZED IDEOGRAPH ENTERPRISE;So;0;L;<compat> 0028 4F01 0029;;;;N;;;;;
+323E;PARENTHESIZED IDEOGRAPH RESOURCE;So;0;L;<compat> 0028 8CC7 0029;;;;N;;;;;
+323F;PARENTHESIZED IDEOGRAPH ALLIANCE;So;0;L;<compat> 0028 5354 0029;;;;N;;;;;
+3240;PARENTHESIZED IDEOGRAPH FESTIVAL;So;0;L;<compat> 0028 796D 0029;;;;N;;;;;
+3241;PARENTHESIZED IDEOGRAPH REST;So;0;L;<compat> 0028 4F11 0029;;;;N;;;;;
+3242;PARENTHESIZED IDEOGRAPH SELF;So;0;L;<compat> 0028 81EA 0029;;;;N;;;;;
+3243;PARENTHESIZED IDEOGRAPH REACH;So;0;L;<compat> 0028 81F3 0029;;;;N;;;;;
+3244;CIRCLED IDEOGRAPH QUESTION;So;0;L;<circle> 554F;;;;N;;;;;
+3245;CIRCLED IDEOGRAPH KINDERGARTEN;So;0;L;<circle> 5E7C;;;;N;;;;;
+3246;CIRCLED IDEOGRAPH SCHOOL;So;0;L;<circle> 6587;;;;N;;;;;
+3247;CIRCLED IDEOGRAPH KOTO;So;0;L;<circle> 7B8F;;;;N;;;;;
+3248;CIRCLED NUMBER TEN ON BLACK SQUARE;No;0;L;;;;10;N;;;;;
+3249;CIRCLED NUMBER TWENTY ON BLACK SQUARE;No;0;L;;;;20;N;;;;;
+324A;CIRCLED NUMBER THIRTY ON BLACK SQUARE;No;0;L;;;;30;N;;;;;
+324B;CIRCLED NUMBER FORTY ON BLACK SQUARE;No;0;L;;;;40;N;;;;;
+324C;CIRCLED NUMBER FIFTY ON BLACK SQUARE;No;0;L;;;;50;N;;;;;
+324D;CIRCLED NUMBER SIXTY ON BLACK SQUARE;No;0;L;;;;60;N;;;;;
+324E;CIRCLED NUMBER SEVENTY ON BLACK SQUARE;No;0;L;;;;70;N;;;;;
+324F;CIRCLED NUMBER EIGHTY ON BLACK SQUARE;No;0;L;;;;80;N;;;;;
+3250;PARTNERSHIP SIGN;So;0;ON;<square> 0050 0054 0045;;;;N;;;;;
+3251;CIRCLED NUMBER TWENTY ONE;No;0;ON;<circle> 0032 0031;;;21;N;;;;;
+3252;CIRCLED NUMBER TWENTY TWO;No;0;ON;<circle> 0032 0032;;;22;N;;;;;
+3253;CIRCLED NUMBER TWENTY THREE;No;0;ON;<circle> 0032 0033;;;23;N;;;;;
+3254;CIRCLED NUMBER TWENTY FOUR;No;0;ON;<circle> 0032 0034;;;24;N;;;;;
+3255;CIRCLED NUMBER TWENTY FIVE;No;0;ON;<circle> 0032 0035;;;25;N;;;;;
+3256;CIRCLED NUMBER TWENTY SIX;No;0;ON;<circle> 0032 0036;;;26;N;;;;;
+3257;CIRCLED NUMBER TWENTY SEVEN;No;0;ON;<circle> 0032 0037;;;27;N;;;;;
+3258;CIRCLED NUMBER TWENTY EIGHT;No;0;ON;<circle> 0032 0038;;;28;N;;;;;
+3259;CIRCLED NUMBER TWENTY NINE;No;0;ON;<circle> 0032 0039;;;29;N;;;;;
+325A;CIRCLED NUMBER THIRTY;No;0;ON;<circle> 0033 0030;;;30;N;;;;;
+325B;CIRCLED NUMBER THIRTY ONE;No;0;ON;<circle> 0033 0031;;;31;N;;;;;
+325C;CIRCLED NUMBER THIRTY TWO;No;0;ON;<circle> 0033 0032;;;32;N;;;;;
+325D;CIRCLED NUMBER THIRTY THREE;No;0;ON;<circle> 0033 0033;;;33;N;;;;;
+325E;CIRCLED NUMBER THIRTY FOUR;No;0;ON;<circle> 0033 0034;;;34;N;;;;;
+325F;CIRCLED NUMBER THIRTY FIVE;No;0;ON;<circle> 0033 0035;;;35;N;;;;;
+3260;CIRCLED HANGUL KIYEOK;So;0;L;<circle> 1100;;;;N;CIRCLED HANGUL GIYEOG;;;;
+3261;CIRCLED HANGUL NIEUN;So;0;L;<circle> 1102;;;;N;;;;;
+3262;CIRCLED HANGUL TIKEUT;So;0;L;<circle> 1103;;;;N;CIRCLED HANGUL DIGEUD;;;;
+3263;CIRCLED HANGUL RIEUL;So;0;L;<circle> 1105;;;;N;CIRCLED HANGUL LIEUL;;;;
+3264;CIRCLED HANGUL MIEUM;So;0;L;<circle> 1106;;;;N;;;;;
+3265;CIRCLED HANGUL PIEUP;So;0;L;<circle> 1107;;;;N;CIRCLED HANGUL BIEUB;;;;
+3266;CIRCLED HANGUL SIOS;So;0;L;<circle> 1109;;;;N;;;;;
+3267;CIRCLED HANGUL IEUNG;So;0;L;<circle> 110B;;;;N;;;;;
+3268;CIRCLED HANGUL CIEUC;So;0;L;<circle> 110C;;;;N;CIRCLED HANGUL JIEUJ;;;;
+3269;CIRCLED HANGUL CHIEUCH;So;0;L;<circle> 110E;;;;N;CIRCLED HANGUL CIEUC;;;;
+326A;CIRCLED HANGUL KHIEUKH;So;0;L;<circle> 110F;;;;N;CIRCLED HANGUL KIYEOK;;;;
+326B;CIRCLED HANGUL THIEUTH;So;0;L;<circle> 1110;;;;N;CIRCLED HANGUL TIEUT;;;;
+326C;CIRCLED HANGUL PHIEUPH;So;0;L;<circle> 1111;;;;N;CIRCLED HANGUL PIEUP;;;;
+326D;CIRCLED HANGUL HIEUH;So;0;L;<circle> 1112;;;;N;;;;;
+326E;CIRCLED HANGUL KIYEOK A;So;0;L;<circle> 1100 1161;;;;N;CIRCLED HANGUL GA;;;;
+326F;CIRCLED HANGUL NIEUN A;So;0;L;<circle> 1102 1161;;;;N;CIRCLED HANGUL NA;;;;
+3270;CIRCLED HANGUL TIKEUT A;So;0;L;<circle> 1103 1161;;;;N;CIRCLED HANGUL DA;;;;
+3271;CIRCLED HANGUL RIEUL A;So;0;L;<circle> 1105 1161;;;;N;CIRCLED HANGUL LA;;;;
+3272;CIRCLED HANGUL MIEUM A;So;0;L;<circle> 1106 1161;;;;N;CIRCLED HANGUL MA;;;;
+3273;CIRCLED HANGUL PIEUP A;So;0;L;<circle> 1107 1161;;;;N;CIRCLED HANGUL BA;;;;
+3274;CIRCLED HANGUL SIOS A;So;0;L;<circle> 1109 1161;;;;N;CIRCLED HANGUL SA;;;;
+3275;CIRCLED HANGUL IEUNG A;So;0;L;<circle> 110B 1161;;;;N;CIRCLED HANGUL A;;;;
+3276;CIRCLED HANGUL CIEUC A;So;0;L;<circle> 110C 1161;;;;N;CIRCLED HANGUL JA;;;;
+3277;CIRCLED HANGUL CHIEUCH A;So;0;L;<circle> 110E 1161;;;;N;CIRCLED HANGUL CA;;;;
+3278;CIRCLED HANGUL KHIEUKH A;So;0;L;<circle> 110F 1161;;;;N;CIRCLED HANGUL KA;;;;
+3279;CIRCLED HANGUL THIEUTH A;So;0;L;<circle> 1110 1161;;;;N;CIRCLED HANGUL TA;;;;
+327A;CIRCLED HANGUL PHIEUPH A;So;0;L;<circle> 1111 1161;;;;N;CIRCLED HANGUL PA;;;;
+327B;CIRCLED HANGUL HIEUH A;So;0;L;<circle> 1112 1161;;;;N;CIRCLED HANGUL HA;;;;
+327C;CIRCLED KOREAN CHARACTER CHAMKO;So;0;ON;<circle> 110E 1161 11B7 1100 1169;;;;N;;;;;
+327D;CIRCLED KOREAN CHARACTER JUEUI;So;0;ON;<circle> 110C 116E 110B 1174;;;;N;;;;;
+327E;CIRCLED HANGUL IEUNG U;So;0;ON;<circle> 110B 116E;;;;N;;;;;
+327F;KOREAN STANDARD SYMBOL;So;0;L;;;;;N;;;;;
+3280;CIRCLED IDEOGRAPH ONE;No;0;L;<circle> 4E00;;;1;N;;;;;
+3281;CIRCLED IDEOGRAPH TWO;No;0;L;<circle> 4E8C;;;2;N;;;;;
+3282;CIRCLED IDEOGRAPH THREE;No;0;L;<circle> 4E09;;;3;N;;;;;
+3283;CIRCLED IDEOGRAPH FOUR;No;0;L;<circle> 56DB;;;4;N;;;;;
+3284;CIRCLED IDEOGRAPH FIVE;No;0;L;<circle> 4E94;;;5;N;;;;;
+3285;CIRCLED IDEOGRAPH SIX;No;0;L;<circle> 516D;;;6;N;;;;;
+3286;CIRCLED IDEOGRAPH SEVEN;No;0;L;<circle> 4E03;;;7;N;;;;;
+3287;CIRCLED IDEOGRAPH EIGHT;No;0;L;<circle> 516B;;;8;N;;;;;
+3288;CIRCLED IDEOGRAPH NINE;No;0;L;<circle> 4E5D;;;9;N;;;;;
+3289;CIRCLED IDEOGRAPH TEN;No;0;L;<circle> 5341;;;10;N;;;;;
+328A;CIRCLED IDEOGRAPH MOON;So;0;L;<circle> 6708;;;;N;;;;;
+328B;CIRCLED IDEOGRAPH FIRE;So;0;L;<circle> 706B;;;;N;;;;;
+328C;CIRCLED IDEOGRAPH WATER;So;0;L;<circle> 6C34;;;;N;;;;;
+328D;CIRCLED IDEOGRAPH WOOD;So;0;L;<circle> 6728;;;;N;;;;;
+328E;CIRCLED IDEOGRAPH METAL;So;0;L;<circle> 91D1;;;;N;;;;;
+328F;CIRCLED IDEOGRAPH EARTH;So;0;L;<circle> 571F;;;;N;;;;;
+3290;CIRCLED IDEOGRAPH SUN;So;0;L;<circle> 65E5;;;;N;;;;;
+3291;CIRCLED IDEOGRAPH STOCK;So;0;L;<circle> 682A;;;;N;;;;;
+3292;CIRCLED IDEOGRAPH HAVE;So;0;L;<circle> 6709;;;;N;;;;;
+3293;CIRCLED IDEOGRAPH SOCIETY;So;0;L;<circle> 793E;;;;N;;;;;
+3294;CIRCLED IDEOGRAPH NAME;So;0;L;<circle> 540D;;;;N;;;;;
+3295;CIRCLED IDEOGRAPH SPECIAL;So;0;L;<circle> 7279;;;;N;;;;;
+3296;CIRCLED IDEOGRAPH FINANCIAL;So;0;L;<circle> 8CA1;;;;N;;;;;
+3297;CIRCLED IDEOGRAPH CONGRATULATION;So;0;L;<circle> 795D;;;;N;;;;;
+3298;CIRCLED IDEOGRAPH LABOR;So;0;L;<circle> 52B4;;;;N;;;;;
+3299;CIRCLED IDEOGRAPH SECRET;So;0;L;<circle> 79D8;;;;N;;;;;
+329A;CIRCLED IDEOGRAPH MALE;So;0;L;<circle> 7537;;;;N;;;;;
+329B;CIRCLED IDEOGRAPH FEMALE;So;0;L;<circle> 5973;;;;N;;;;;
+329C;CIRCLED IDEOGRAPH SUITABLE;So;0;L;<circle> 9069;;;;N;;;;;
+329D;CIRCLED IDEOGRAPH EXCELLENT;So;0;L;<circle> 512A;;;;N;;;;;
+329E;CIRCLED IDEOGRAPH PRINT;So;0;L;<circle> 5370;;;;N;;;;;
+329F;CIRCLED IDEOGRAPH ATTENTION;So;0;L;<circle> 6CE8;;;;N;;;;;
+32A0;CIRCLED IDEOGRAPH ITEM;So;0;L;<circle> 9805;;;;N;;;;;
+32A1;CIRCLED IDEOGRAPH REST;So;0;L;<circle> 4F11;;;;N;;;;;
+32A2;CIRCLED IDEOGRAPH COPY;So;0;L;<circle> 5199;;;;N;;;;;
+32A3;CIRCLED IDEOGRAPH CORRECT;So;0;L;<circle> 6B63;;;;N;;;;;
+32A4;CIRCLED IDEOGRAPH HIGH;So;0;L;<circle> 4E0A;;;;N;;;;;
+32A5;CIRCLED IDEOGRAPH CENTRE;So;0;L;<circle> 4E2D;;;;N;CIRCLED IDEOGRAPH CENTER;;;;
+32A6;CIRCLED IDEOGRAPH LOW;So;0;L;<circle> 4E0B;;;;N;;;;;
+32A7;CIRCLED IDEOGRAPH LEFT;So;0;L;<circle> 5DE6;;;;N;;;;;
+32A8;CIRCLED IDEOGRAPH RIGHT;So;0;L;<circle> 53F3;;;;N;;;;;
+32A9;CIRCLED IDEOGRAPH MEDICINE;So;0;L;<circle> 533B;;;;N;;;;;
+32AA;CIRCLED IDEOGRAPH RELIGION;So;0;L;<circle> 5B97;;;;N;;;;;
+32AB;CIRCLED IDEOGRAPH STUDY;So;0;L;<circle> 5B66;;;;N;;;;;
+32AC;CIRCLED IDEOGRAPH SUPERVISE;So;0;L;<circle> 76E3;;;;N;;;;;
+32AD;CIRCLED IDEOGRAPH ENTERPRISE;So;0;L;<circle> 4F01;;;;N;;;;;
+32AE;CIRCLED IDEOGRAPH RESOURCE;So;0;L;<circle> 8CC7;;;;N;;;;;
+32AF;CIRCLED IDEOGRAPH ALLIANCE;So;0;L;<circle> 5354;;;;N;;;;;
+32B0;CIRCLED IDEOGRAPH NIGHT;So;0;L;<circle> 591C;;;;N;;;;;
+32B1;CIRCLED NUMBER THIRTY SIX;No;0;ON;<circle> 0033 0036;;;36;N;;;;;
+32B2;CIRCLED NUMBER THIRTY SEVEN;No;0;ON;<circle> 0033 0037;;;37;N;;;;;
+32B3;CIRCLED NUMBER THIRTY EIGHT;No;0;ON;<circle> 0033 0038;;;38;N;;;;;
+32B4;CIRCLED NUMBER THIRTY NINE;No;0;ON;<circle> 0033 0039;;;39;N;;;;;
+32B5;CIRCLED NUMBER FORTY;No;0;ON;<circle> 0034 0030;;;40;N;;;;;
+32B6;CIRCLED NUMBER FORTY ONE;No;0;ON;<circle> 0034 0031;;;41;N;;;;;
+32B7;CIRCLED NUMBER FORTY TWO;No;0;ON;<circle> 0034 0032;;;42;N;;;;;
+32B8;CIRCLED NUMBER FORTY THREE;No;0;ON;<circle> 0034 0033;;;43;N;;;;;
+32B9;CIRCLED NUMBER FORTY FOUR;No;0;ON;<circle> 0034 0034;;;44;N;;;;;
+32BA;CIRCLED NUMBER FORTY FIVE;No;0;ON;<circle> 0034 0035;;;45;N;;;;;
+32BB;CIRCLED NUMBER FORTY SIX;No;0;ON;<circle> 0034 0036;;;46;N;;;;;
+32BC;CIRCLED NUMBER FORTY SEVEN;No;0;ON;<circle> 0034 0037;;;47;N;;;;;
+32BD;CIRCLED NUMBER FORTY EIGHT;No;0;ON;<circle> 0034 0038;;;48;N;;;;;
+32BE;CIRCLED NUMBER FORTY NINE;No;0;ON;<circle> 0034 0039;;;49;N;;;;;
+32BF;CIRCLED NUMBER FIFTY;No;0;ON;<circle> 0035 0030;;;50;N;;;;;
+32C0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY;So;0;L;<compat> 0031 6708;;;;N;;;;;
+32C1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY;So;0;L;<compat> 0032 6708;;;;N;;;;;
+32C2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH;So;0;L;<compat> 0033 6708;;;;N;;;;;
+32C3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL;So;0;L;<compat> 0034 6708;;;;N;;;;;
+32C4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY;So;0;L;<compat> 0035 6708;;;;N;;;;;
+32C5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE;So;0;L;<compat> 0036 6708;;;;N;;;;;
+32C6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY;So;0;L;<compat> 0037 6708;;;;N;;;;;
+32C7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST;So;0;L;<compat> 0038 6708;;;;N;;;;;
+32C8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER;So;0;L;<compat> 0039 6708;;;;N;;;;;
+32C9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER;So;0;L;<compat> 0031 0030 6708;;;;N;;;;;
+32CA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER;So;0;L;<compat> 0031 0031 6708;;;;N;;;;;
+32CB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER;So;0;L;<compat> 0031 0032 6708;;;;N;;;;;
+32CC;SQUARE HG;So;0;ON;<square> 0048 0067;;;;N;;;;;
+32CD;SQUARE ERG;So;0;ON;<square> 0065 0072 0067;;;;N;;;;;
+32CE;SQUARE EV;So;0;ON;<square> 0065 0056;;;;N;;;;;
+32CF;LIMITED LIABILITY SIGN;So;0;ON;<square> 004C 0054 0044;;;;N;;;;;
+32D0;CIRCLED KATAKANA A;So;0;L;<circle> 30A2;;;;N;;;;;
+32D1;CIRCLED KATAKANA I;So;0;L;<circle> 30A4;;;;N;;;;;
+32D2;CIRCLED KATAKANA U;So;0;L;<circle> 30A6;;;;N;;;;;
+32D3;CIRCLED KATAKANA E;So;0;L;<circle> 30A8;;;;N;;;;;
+32D4;CIRCLED KATAKANA O;So;0;L;<circle> 30AA;;;;N;;;;;
+32D5;CIRCLED KATAKANA KA;So;0;L;<circle> 30AB;;;;N;;;;;
+32D6;CIRCLED KATAKANA KI;So;0;L;<circle> 30AD;;;;N;;;;;
+32D7;CIRCLED KATAKANA KU;So;0;L;<circle> 30AF;;;;N;;;;;
+32D8;CIRCLED KATAKANA KE;So;0;L;<circle> 30B1;;;;N;;;;;
+32D9;CIRCLED KATAKANA KO;So;0;L;<circle> 30B3;;;;N;;;;;
+32DA;CIRCLED KATAKANA SA;So;0;L;<circle> 30B5;;;;N;;;;;
+32DB;CIRCLED KATAKANA SI;So;0;L;<circle> 30B7;;;;N;;;;;
+32DC;CIRCLED KATAKANA SU;So;0;L;<circle> 30B9;;;;N;;;;;
+32DD;CIRCLED KATAKANA SE;So;0;L;<circle> 30BB;;;;N;;;;;
+32DE;CIRCLED KATAKANA SO;So;0;L;<circle> 30BD;;;;N;;;;;
+32DF;CIRCLED KATAKANA TA;So;0;L;<circle> 30BF;;;;N;;;;;
+32E0;CIRCLED KATAKANA TI;So;0;L;<circle> 30C1;;;;N;;;;;
+32E1;CIRCLED KATAKANA TU;So;0;L;<circle> 30C4;;;;N;;;;;
+32E2;CIRCLED KATAKANA TE;So;0;L;<circle> 30C6;;;;N;;;;;
+32E3;CIRCLED KATAKANA TO;So;0;L;<circle> 30C8;;;;N;;;;;
+32E4;CIRCLED KATAKANA NA;So;0;L;<circle> 30CA;;;;N;;;;;
+32E5;CIRCLED KATAKANA NI;So;0;L;<circle> 30CB;;;;N;;;;;
+32E6;CIRCLED KATAKANA NU;So;0;L;<circle> 30CC;;;;N;;;;;
+32E7;CIRCLED KATAKANA NE;So;0;L;<circle> 30CD;;;;N;;;;;
+32E8;CIRCLED KATAKANA NO;So;0;L;<circle> 30CE;;;;N;;;;;
+32E9;CIRCLED KATAKANA HA;So;0;L;<circle> 30CF;;;;N;;;;;
+32EA;CIRCLED KATAKANA HI;So;0;L;<circle> 30D2;;;;N;;;;;
+32EB;CIRCLED KATAKANA HU;So;0;L;<circle> 30D5;;;;N;;;;;
+32EC;CIRCLED KATAKANA HE;So;0;L;<circle> 30D8;;;;N;;;;;
+32ED;CIRCLED KATAKANA HO;So;0;L;<circle> 30DB;;;;N;;;;;
+32EE;CIRCLED KATAKANA MA;So;0;L;<circle> 30DE;;;;N;;;;;
+32EF;CIRCLED KATAKANA MI;So;0;L;<circle> 30DF;;;;N;;;;;
+32F0;CIRCLED KATAKANA MU;So;0;L;<circle> 30E0;;;;N;;;;;
+32F1;CIRCLED KATAKANA ME;So;0;L;<circle> 30E1;;;;N;;;;;
+32F2;CIRCLED KATAKANA MO;So;0;L;<circle> 30E2;;;;N;;;;;
+32F3;CIRCLED KATAKANA YA;So;0;L;<circle> 30E4;;;;N;;;;;
+32F4;CIRCLED KATAKANA YU;So;0;L;<circle> 30E6;;;;N;;;;;
+32F5;CIRCLED KATAKANA YO;So;0;L;<circle> 30E8;;;;N;;;;;
+32F6;CIRCLED KATAKANA RA;So;0;L;<circle> 30E9;;;;N;;;;;
+32F7;CIRCLED KATAKANA RI;So;0;L;<circle> 30EA;;;;N;;;;;
+32F8;CIRCLED KATAKANA RU;So;0;L;<circle> 30EB;;;;N;;;;;
+32F9;CIRCLED KATAKANA RE;So;0;L;<circle> 30EC;;;;N;;;;;
+32FA;CIRCLED KATAKANA RO;So;0;L;<circle> 30ED;;;;N;;;;;
+32FB;CIRCLED KATAKANA WA;So;0;L;<circle> 30EF;;;;N;;;;;
+32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
+32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
+32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;;;;;
+3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
+3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
+3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
+3303;SQUARE AARU;So;0;L;<square> 30A2 30FC 30EB;;;;N;SQUARED AARU;;;;
+3304;SQUARE ININGU;So;0;L;<square> 30A4 30CB 30F3 30B0;;;;N;SQUARED ININGU;;;;
+3305;SQUARE INTI;So;0;L;<square> 30A4 30F3 30C1;;;;N;SQUARED INTI;;;;
+3306;SQUARE UON;So;0;L;<square> 30A6 30A9 30F3;;;;N;SQUARED UON;;;;
+3307;SQUARE ESUKUUDO;So;0;L;<square> 30A8 30B9 30AF 30FC 30C9;;;;N;SQUARED ESUKUUDO;;;;
+3308;SQUARE EEKAA;So;0;L;<square> 30A8 30FC 30AB 30FC;;;;N;SQUARED EEKAA;;;;
+3309;SQUARE ONSU;So;0;L;<square> 30AA 30F3 30B9;;;;N;SQUARED ONSU;;;;
+330A;SQUARE OOMU;So;0;L;<square> 30AA 30FC 30E0;;;;N;SQUARED OOMU;;;;
+330B;SQUARE KAIRI;So;0;L;<square> 30AB 30A4 30EA;;;;N;SQUARED KAIRI;;;;
+330C;SQUARE KARATTO;So;0;L;<square> 30AB 30E9 30C3 30C8;;;;N;SQUARED KARATTO;;;;
+330D;SQUARE KARORII;So;0;L;<square> 30AB 30ED 30EA 30FC;;;;N;SQUARED KARORII;;;;
+330E;SQUARE GARON;So;0;L;<square> 30AC 30ED 30F3;;;;N;SQUARED GARON;;;;
+330F;SQUARE GANMA;So;0;L;<square> 30AC 30F3 30DE;;;;N;SQUARED GANMA;;;;
+3310;SQUARE GIGA;So;0;L;<square> 30AE 30AC;;;;N;SQUARED GIGA;;;;
+3311;SQUARE GINII;So;0;L;<square> 30AE 30CB 30FC;;;;N;SQUARED GINII;;;;
+3312;SQUARE KYURII;So;0;L;<square> 30AD 30E5 30EA 30FC;;;;N;SQUARED KYURII;;;;
+3313;SQUARE GIRUDAA;So;0;L;<square> 30AE 30EB 30C0 30FC;;;;N;SQUARED GIRUDAA;;;;
+3314;SQUARE KIRO;So;0;L;<square> 30AD 30ED;;;;N;SQUARED KIRO;;;;
+3315;SQUARE KIROGURAMU;So;0;L;<square> 30AD 30ED 30B0 30E9 30E0;;;;N;SQUARED KIROGURAMU;;;;
+3316;SQUARE KIROMEETORU;So;0;L;<square> 30AD 30ED 30E1 30FC 30C8 30EB;;;;N;SQUARED KIROMEETORU;;;;
+3317;SQUARE KIROWATTO;So;0;L;<square> 30AD 30ED 30EF 30C3 30C8;;;;N;SQUARED KIROWATTO;;;;
+3318;SQUARE GURAMU;So;0;L;<square> 30B0 30E9 30E0;;;;N;SQUARED GURAMU;;;;
+3319;SQUARE GURAMUTON;So;0;L;<square> 30B0 30E9 30E0 30C8 30F3;;;;N;SQUARED GURAMUTON;;;;
+331A;SQUARE KURUZEIRO;So;0;L;<square> 30AF 30EB 30BC 30A4 30ED;;;;N;SQUARED KURUZEIRO;;;;
+331B;SQUARE KUROONE;So;0;L;<square> 30AF 30ED 30FC 30CD;;;;N;SQUARED KUROONE;;;;
+331C;SQUARE KEESU;So;0;L;<square> 30B1 30FC 30B9;;;;N;SQUARED KEESU;;;;
+331D;SQUARE KORUNA;So;0;L;<square> 30B3 30EB 30CA;;;;N;SQUARED KORUNA;;;;
+331E;SQUARE KOOPO;So;0;L;<square> 30B3 30FC 30DD;;;;N;SQUARED KOOPO;;;;
+331F;SQUARE SAIKURU;So;0;L;<square> 30B5 30A4 30AF 30EB;;;;N;SQUARED SAIKURU;;;;
+3320;SQUARE SANTIIMU;So;0;L;<square> 30B5 30F3 30C1 30FC 30E0;;;;N;SQUARED SANTIIMU;;;;
+3321;SQUARE SIRINGU;So;0;L;<square> 30B7 30EA 30F3 30B0;;;;N;SQUARED SIRINGU;;;;
+3322;SQUARE SENTI;So;0;L;<square> 30BB 30F3 30C1;;;;N;SQUARED SENTI;;;;
+3323;SQUARE SENTO;So;0;L;<square> 30BB 30F3 30C8;;;;N;SQUARED SENTO;;;;
+3324;SQUARE DAASU;So;0;L;<square> 30C0 30FC 30B9;;;;N;SQUARED DAASU;;;;
+3325;SQUARE DESI;So;0;L;<square> 30C7 30B7;;;;N;SQUARED DESI;;;;
+3326;SQUARE DORU;So;0;L;<square> 30C9 30EB;;;;N;SQUARED DORU;;;;
+3327;SQUARE TON;So;0;L;<square> 30C8 30F3;;;;N;SQUARED TON;;;;
+3328;SQUARE NANO;So;0;L;<square> 30CA 30CE;;;;N;SQUARED NANO;;;;
+3329;SQUARE NOTTO;So;0;L;<square> 30CE 30C3 30C8;;;;N;SQUARED NOTTO;;;;
+332A;SQUARE HAITU;So;0;L;<square> 30CF 30A4 30C4;;;;N;SQUARED HAITU;;;;
+332B;SQUARE PAASENTO;So;0;L;<square> 30D1 30FC 30BB 30F3 30C8;;;;N;SQUARED PAASENTO;;;;
+332C;SQUARE PAATU;So;0;L;<square> 30D1 30FC 30C4;;;;N;SQUARED PAATU;;;;
+332D;SQUARE BAARERU;So;0;L;<square> 30D0 30FC 30EC 30EB;;;;N;SQUARED BAARERU;;;;
+332E;SQUARE PIASUTORU;So;0;L;<square> 30D4 30A2 30B9 30C8 30EB;;;;N;SQUARED PIASUTORU;;;;
+332F;SQUARE PIKURU;So;0;L;<square> 30D4 30AF 30EB;;;;N;SQUARED PIKURU;;;;
+3330;SQUARE PIKO;So;0;L;<square> 30D4 30B3;;;;N;SQUARED PIKO;;;;
+3331;SQUARE BIRU;So;0;L;<square> 30D3 30EB;;;;N;SQUARED BIRU;;;;
+3332;SQUARE HUARADDO;So;0;L;<square> 30D5 30A1 30E9 30C3 30C9;;;;N;SQUARED HUARADDO;;;;
+3333;SQUARE HUIITO;So;0;L;<square> 30D5 30A3 30FC 30C8;;;;N;SQUARED HUIITO;;;;
+3334;SQUARE BUSSYERU;So;0;L;<square> 30D6 30C3 30B7 30A7 30EB;;;;N;SQUARED BUSSYERU;;;;
+3335;SQUARE HURAN;So;0;L;<square> 30D5 30E9 30F3;;;;N;SQUARED HURAN;;;;
+3336;SQUARE HEKUTAARU;So;0;L;<square> 30D8 30AF 30BF 30FC 30EB;;;;N;SQUARED HEKUTAARU;;;;
+3337;SQUARE PESO;So;0;L;<square> 30DA 30BD;;;;N;SQUARED PESO;;;;
+3338;SQUARE PENIHI;So;0;L;<square> 30DA 30CB 30D2;;;;N;SQUARED PENIHI;;;;
+3339;SQUARE HERUTU;So;0;L;<square> 30D8 30EB 30C4;;;;N;SQUARED HERUTU;;;;
+333A;SQUARE PENSU;So;0;L;<square> 30DA 30F3 30B9;;;;N;SQUARED PENSU;;;;
+333B;SQUARE PEEZI;So;0;L;<square> 30DA 30FC 30B8;;;;N;SQUARED PEEZI;;;;
+333C;SQUARE BEETA;So;0;L;<square> 30D9 30FC 30BF;;;;N;SQUARED BEETA;;;;
+333D;SQUARE POINTO;So;0;L;<square> 30DD 30A4 30F3 30C8;;;;N;SQUARED POINTO;;;;
+333E;SQUARE BORUTO;So;0;L;<square> 30DC 30EB 30C8;;;;N;SQUARED BORUTO;;;;
+333F;SQUARE HON;So;0;L;<square> 30DB 30F3;;;;N;SQUARED HON;;;;
+3340;SQUARE PONDO;So;0;L;<square> 30DD 30F3 30C9;;;;N;SQUARED PONDO;;;;
+3341;SQUARE HOORU;So;0;L;<square> 30DB 30FC 30EB;;;;N;SQUARED HOORU;;;;
+3342;SQUARE HOON;So;0;L;<square> 30DB 30FC 30F3;;;;N;SQUARED HOON;;;;
+3343;SQUARE MAIKURO;So;0;L;<square> 30DE 30A4 30AF 30ED;;;;N;SQUARED MAIKURO;;;;
+3344;SQUARE MAIRU;So;0;L;<square> 30DE 30A4 30EB;;;;N;SQUARED MAIRU;;;;
+3345;SQUARE MAHHA;So;0;L;<square> 30DE 30C3 30CF;;;;N;SQUARED MAHHA;;;;
+3346;SQUARE MARUKU;So;0;L;<square> 30DE 30EB 30AF;;;;N;SQUARED MARUKU;;;;
+3347;SQUARE MANSYON;So;0;L;<square> 30DE 30F3 30B7 30E7 30F3;;;;N;SQUARED MANSYON;;;;
+3348;SQUARE MIKURON;So;0;L;<square> 30DF 30AF 30ED 30F3;;;;N;SQUARED MIKURON;;;;
+3349;SQUARE MIRI;So;0;L;<square> 30DF 30EA;;;;N;SQUARED MIRI;;;;
+334A;SQUARE MIRIBAARU;So;0;L;<square> 30DF 30EA 30D0 30FC 30EB;;;;N;SQUARED MIRIBAARU;;;;
+334B;SQUARE MEGA;So;0;L;<square> 30E1 30AC;;;;N;SQUARED MEGA;;;;
+334C;SQUARE MEGATON;So;0;L;<square> 30E1 30AC 30C8 30F3;;;;N;SQUARED MEGATON;;;;
+334D;SQUARE MEETORU;So;0;L;<square> 30E1 30FC 30C8 30EB;;;;N;SQUARED MEETORU;;;;
+334E;SQUARE YAADO;So;0;L;<square> 30E4 30FC 30C9;;;;N;SQUARED YAADO;;;;
+334F;SQUARE YAARU;So;0;L;<square> 30E4 30FC 30EB;;;;N;SQUARED YAARU;;;;
+3350;SQUARE YUAN;So;0;L;<square> 30E6 30A2 30F3;;;;N;SQUARED YUAN;;;;
+3351;SQUARE RITTORU;So;0;L;<square> 30EA 30C3 30C8 30EB;;;;N;SQUARED RITTORU;;;;
+3352;SQUARE RIRA;So;0;L;<square> 30EA 30E9;;;;N;SQUARED RIRA;;;;
+3353;SQUARE RUPII;So;0;L;<square> 30EB 30D4 30FC;;;;N;SQUARED RUPII;;;;
+3354;SQUARE RUUBURU;So;0;L;<square> 30EB 30FC 30D6 30EB;;;;N;SQUARED RUUBURU;;;;
+3355;SQUARE REMU;So;0;L;<square> 30EC 30E0;;;;N;SQUARED REMU;;;;
+3356;SQUARE RENTOGEN;So;0;L;<square> 30EC 30F3 30C8 30B2 30F3;;;;N;SQUARED RENTOGEN;;;;
+3357;SQUARE WATTO;So;0;L;<square> 30EF 30C3 30C8;;;;N;SQUARED WATTO;;;;
+3358;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO;So;0;L;<compat> 0030 70B9;;;;N;;;;;
+3359;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE;So;0;L;<compat> 0031 70B9;;;;N;;;;;
+335A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO;So;0;L;<compat> 0032 70B9;;;;N;;;;;
+335B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE;So;0;L;<compat> 0033 70B9;;;;N;;;;;
+335C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR;So;0;L;<compat> 0034 70B9;;;;N;;;;;
+335D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE;So;0;L;<compat> 0035 70B9;;;;N;;;;;
+335E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX;So;0;L;<compat> 0036 70B9;;;;N;;;;;
+335F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN;So;0;L;<compat> 0037 70B9;;;;N;;;;;
+3360;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT;So;0;L;<compat> 0038 70B9;;;;N;;;;;
+3361;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE;So;0;L;<compat> 0039 70B9;;;;N;;;;;
+3362;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN;So;0;L;<compat> 0031 0030 70B9;;;;N;;;;;
+3363;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN;So;0;L;<compat> 0031 0031 70B9;;;;N;;;;;
+3364;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE;So;0;L;<compat> 0031 0032 70B9;;;;N;;;;;
+3365;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN;So;0;L;<compat> 0031 0033 70B9;;;;N;;;;;
+3366;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN;So;0;L;<compat> 0031 0034 70B9;;;;N;;;;;
+3367;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN;So;0;L;<compat> 0031 0035 70B9;;;;N;;;;;
+3368;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN;So;0;L;<compat> 0031 0036 70B9;;;;N;;;;;
+3369;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN;So;0;L;<compat> 0031 0037 70B9;;;;N;;;;;
+336A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN;So;0;L;<compat> 0031 0038 70B9;;;;N;;;;;
+336B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN;So;0;L;<compat> 0031 0039 70B9;;;;N;;;;;
+336C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY;So;0;L;<compat> 0032 0030 70B9;;;;N;;;;;
+336D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE;So;0;L;<compat> 0032 0031 70B9;;;;N;;;;;
+336E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO;So;0;L;<compat> 0032 0032 70B9;;;;N;;;;;
+336F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE;So;0;L;<compat> 0032 0033 70B9;;;;N;;;;;
+3370;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR;So;0;L;<compat> 0032 0034 70B9;;;;N;;;;;
+3371;SQUARE HPA;So;0;L;<square> 0068 0050 0061;;;;N;;;;;
+3372;SQUARE DA;So;0;L;<square> 0064 0061;;;;N;;;;;
+3373;SQUARE AU;So;0;L;<square> 0041 0055;;;;N;;;;;
+3374;SQUARE BAR;So;0;L;<square> 0062 0061 0072;;;;N;;;;;
+3375;SQUARE OV;So;0;L;<square> 006F 0056;;;;N;;;;;
+3376;SQUARE PC;So;0;L;<square> 0070 0063;;;;N;;;;;
+3377;SQUARE DM;So;0;ON;<square> 0064 006D;;;;N;;;;;
+3378;SQUARE DM SQUARED;So;0;ON;<square> 0064 006D 00B2;;;;N;;;;;
+3379;SQUARE DM CUBED;So;0;ON;<square> 0064 006D 00B3;;;;N;;;;;
+337A;SQUARE IU;So;0;ON;<square> 0049 0055;;;;N;;;;;
+337B;SQUARE ERA NAME HEISEI;So;0;L;<square> 5E73 6210;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME HEISEI;;;;
+337C;SQUARE ERA NAME SYOUWA;So;0;L;<square> 662D 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME SYOUWA;;;;
+337D;SQUARE ERA NAME TAISYOU;So;0;L;<square> 5927 6B63;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME TAISYOU;;;;
+337E;SQUARE ERA NAME MEIZI;So;0;L;<square> 660E 6CBB;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME MEIZI;;;;
+337F;SQUARE CORPORATION;So;0;L;<square> 682A 5F0F 4F1A 793E;;;;N;SQUARED FOUR IDEOGRAPHS CORPORATION;;;;
+3380;SQUARE PA AMPS;So;0;L;<square> 0070 0041;;;;N;SQUARED PA AMPS;;;;
+3381;SQUARE NA;So;0;L;<square> 006E 0041;;;;N;SQUARED NA;;;;
+3382;SQUARE MU A;So;0;L;<square> 03BC 0041;;;;N;SQUARED MU A;;;;
+3383;SQUARE MA;So;0;L;<square> 006D 0041;;;;N;SQUARED MA;;;;
+3384;SQUARE KA;So;0;L;<square> 006B 0041;;;;N;SQUARED KA;;;;
+3385;SQUARE KB;So;0;L;<square> 004B 0042;;;;N;SQUARED KB;;;;
+3386;SQUARE MB;So;0;L;<square> 004D 0042;;;;N;SQUARED MB;;;;
+3387;SQUARE GB;So;0;L;<square> 0047 0042;;;;N;SQUARED GB;;;;
+3388;SQUARE CAL;So;0;L;<square> 0063 0061 006C;;;;N;SQUARED CAL;;;;
+3389;SQUARE KCAL;So;0;L;<square> 006B 0063 0061 006C;;;;N;SQUARED KCAL;;;;
+338A;SQUARE PF;So;0;L;<square> 0070 0046;;;;N;SQUARED PF;;;;
+338B;SQUARE NF;So;0;L;<square> 006E 0046;;;;N;SQUARED NF;;;;
+338C;SQUARE MU F;So;0;L;<square> 03BC 0046;;;;N;SQUARED MU F;;;;
+338D;SQUARE MU G;So;0;L;<square> 03BC 0067;;;;N;SQUARED MU G;;;;
+338E;SQUARE MG;So;0;L;<square> 006D 0067;;;;N;SQUARED MG;;;;
+338F;SQUARE KG;So;0;L;<square> 006B 0067;;;;N;SQUARED KG;;;;
+3390;SQUARE HZ;So;0;L;<square> 0048 007A;;;;N;SQUARED HZ;;;;
+3391;SQUARE KHZ;So;0;L;<square> 006B 0048 007A;;;;N;SQUARED KHZ;;;;
+3392;SQUARE MHZ;So;0;L;<square> 004D 0048 007A;;;;N;SQUARED MHZ;;;;
+3393;SQUARE GHZ;So;0;L;<square> 0047 0048 007A;;;;N;SQUARED GHZ;;;;
+3394;SQUARE THZ;So;0;L;<square> 0054 0048 007A;;;;N;SQUARED THZ;;;;
+3395;SQUARE MU L;So;0;L;<square> 03BC 2113;;;;N;SQUARED MU L;;;;
+3396;SQUARE ML;So;0;L;<square> 006D 2113;;;;N;SQUARED ML;;;;
+3397;SQUARE DL;So;0;L;<square> 0064 2113;;;;N;SQUARED DL;;;;
+3398;SQUARE KL;So;0;L;<square> 006B 2113;;;;N;SQUARED KL;;;;
+3399;SQUARE FM;So;0;L;<square> 0066 006D;;;;N;SQUARED FM;;;;
+339A;SQUARE NM;So;0;L;<square> 006E 006D;;;;N;SQUARED NM;;;;
+339B;SQUARE MU M;So;0;L;<square> 03BC 006D;;;;N;SQUARED MU M;;;;
+339C;SQUARE MM;So;0;L;<square> 006D 006D;;;;N;SQUARED MM;;;;
+339D;SQUARE CM;So;0;L;<square> 0063 006D;;;;N;SQUARED CM;;;;
+339E;SQUARE KM;So;0;L;<square> 006B 006D;;;;N;SQUARED KM;;;;
+339F;SQUARE MM SQUARED;So;0;L;<square> 006D 006D 00B2;;;;N;SQUARED MM SQUARED;;;;
+33A0;SQUARE CM SQUARED;So;0;L;<square> 0063 006D 00B2;;;;N;SQUARED CM SQUARED;;;;
+33A1;SQUARE M SQUARED;So;0;L;<square> 006D 00B2;;;;N;SQUARED M SQUARED;;;;
+33A2;SQUARE KM SQUARED;So;0;L;<square> 006B 006D 00B2;;;;N;SQUARED KM SQUARED;;;;
+33A3;SQUARE MM CUBED;So;0;L;<square> 006D 006D 00B3;;;;N;SQUARED MM CUBED;;;;
+33A4;SQUARE CM CUBED;So;0;L;<square> 0063 006D 00B3;;;;N;SQUARED CM CUBED;;;;
+33A5;SQUARE M CUBED;So;0;L;<square> 006D 00B3;;;;N;SQUARED M CUBED;;;;
+33A6;SQUARE KM CUBED;So;0;L;<square> 006B 006D 00B3;;;;N;SQUARED KM CUBED;;;;
+33A7;SQUARE M OVER S;So;0;L;<square> 006D 2215 0073;;;;N;SQUARED M OVER S;;;;
+33A8;SQUARE M OVER S SQUARED;So;0;L;<square> 006D 2215 0073 00B2;;;;N;SQUARED M OVER S SQUARED;;;;
+33A9;SQUARE PA;So;0;L;<square> 0050 0061;;;;N;SQUARED PA;;;;
+33AA;SQUARE KPA;So;0;L;<square> 006B 0050 0061;;;;N;SQUARED KPA;;;;
+33AB;SQUARE MPA;So;0;L;<square> 004D 0050 0061;;;;N;SQUARED MPA;;;;
+33AC;SQUARE GPA;So;0;L;<square> 0047 0050 0061;;;;N;SQUARED GPA;;;;
+33AD;SQUARE RAD;So;0;L;<square> 0072 0061 0064;;;;N;SQUARED RAD;;;;
+33AE;SQUARE RAD OVER S;So;0;L;<square> 0072 0061 0064 2215 0073;;;;N;SQUARED RAD OVER S;;;;
+33AF;SQUARE RAD OVER S SQUARED;So;0;L;<square> 0072 0061 0064 2215 0073 00B2;;;;N;SQUARED RAD OVER S SQUARED;;;;
+33B0;SQUARE PS;So;0;L;<square> 0070 0073;;;;N;SQUARED PS;;;;
+33B1;SQUARE NS;So;0;L;<square> 006E 0073;;;;N;SQUARED NS;;;;
+33B2;SQUARE MU S;So;0;L;<square> 03BC 0073;;;;N;SQUARED MU S;;;;
+33B3;SQUARE MS;So;0;L;<square> 006D 0073;;;;N;SQUARED MS;;;;
+33B4;SQUARE PV;So;0;L;<square> 0070 0056;;;;N;SQUARED PV;;;;
+33B5;SQUARE NV;So;0;L;<square> 006E 0056;;;;N;SQUARED NV;;;;
+33B6;SQUARE MU V;So;0;L;<square> 03BC 0056;;;;N;SQUARED MU V;;;;
+33B7;SQUARE MV;So;0;L;<square> 006D 0056;;;;N;SQUARED MV;;;;
+33B8;SQUARE KV;So;0;L;<square> 006B 0056;;;;N;SQUARED KV;;;;
+33B9;SQUARE MV MEGA;So;0;L;<square> 004D 0056;;;;N;SQUARED MV MEGA;;;;
+33BA;SQUARE PW;So;0;L;<square> 0070 0057;;;;N;SQUARED PW;;;;
+33BB;SQUARE NW;So;0;L;<square> 006E 0057;;;;N;SQUARED NW;;;;
+33BC;SQUARE MU W;So;0;L;<square> 03BC 0057;;;;N;SQUARED MU W;;;;
+33BD;SQUARE MW;So;0;L;<square> 006D 0057;;;;N;SQUARED MW;;;;
+33BE;SQUARE KW;So;0;L;<square> 006B 0057;;;;N;SQUARED KW;;;;
+33BF;SQUARE MW MEGA;So;0;L;<square> 004D 0057;;;;N;SQUARED MW MEGA;;;;
+33C0;SQUARE K OHM;So;0;L;<square> 006B 03A9;;;;N;SQUARED K OHM;;;;
+33C1;SQUARE M OHM;So;0;L;<square> 004D 03A9;;;;N;SQUARED M OHM;;;;
+33C2;SQUARE AM;So;0;L;<square> 0061 002E 006D 002E;;;;N;SQUARED AM;;;;
+33C3;SQUARE BQ;So;0;L;<square> 0042 0071;;;;N;SQUARED BQ;;;;
+33C4;SQUARE CC;So;0;L;<square> 0063 0063;;;;N;SQUARED CC;;;;
+33C5;SQUARE CD;So;0;L;<square> 0063 0064;;;;N;SQUARED CD;;;;
+33C6;SQUARE C OVER KG;So;0;L;<square> 0043 2215 006B 0067;;;;N;SQUARED C OVER KG;;;;
+33C7;SQUARE CO;So;0;L;<square> 0043 006F 002E;;;;N;SQUARED CO;;;;
+33C8;SQUARE DB;So;0;L;<square> 0064 0042;;;;N;SQUARED DB;;;;
+33C9;SQUARE GY;So;0;L;<square> 0047 0079;;;;N;SQUARED GY;;;;
+33CA;SQUARE HA;So;0;L;<square> 0068 0061;;;;N;SQUARED HA;;;;
+33CB;SQUARE HP;So;0;L;<square> 0048 0050;;;;N;SQUARED HP;;;;
+33CC;SQUARE IN;So;0;L;<square> 0069 006E;;;;N;SQUARED IN;;;;
+33CD;SQUARE KK;So;0;L;<square> 004B 004B;;;;N;SQUARED KK;;;;
+33CE;SQUARE KM CAPITAL;So;0;L;<square> 004B 004D;;;;N;SQUARED KM CAPITAL;;;;
+33CF;SQUARE KT;So;0;L;<square> 006B 0074;;;;N;SQUARED KT;;;;
+33D0;SQUARE LM;So;0;L;<square> 006C 006D;;;;N;SQUARED LM;;;;
+33D1;SQUARE LN;So;0;L;<square> 006C 006E;;;;N;SQUARED LN;;;;
+33D2;SQUARE LOG;So;0;L;<square> 006C 006F 0067;;;;N;SQUARED LOG;;;;
+33D3;SQUARE LX;So;0;L;<square> 006C 0078;;;;N;SQUARED LX;;;;
+33D4;SQUARE MB SMALL;So;0;L;<square> 006D 0062;;;;N;SQUARED MB SMALL;;;;
+33D5;SQUARE MIL;So;0;L;<square> 006D 0069 006C;;;;N;SQUARED MIL;;;;
+33D6;SQUARE MOL;So;0;L;<square> 006D 006F 006C;;;;N;SQUARED MOL;;;;
+33D7;SQUARE PH;So;0;L;<square> 0050 0048;;;;N;SQUARED PH;;;;
+33D8;SQUARE PM;So;0;L;<square> 0070 002E 006D 002E;;;;N;SQUARED PM;;;;
+33D9;SQUARE PPM;So;0;L;<square> 0050 0050 004D;;;;N;SQUARED PPM;;;;
+33DA;SQUARE PR;So;0;L;<square> 0050 0052;;;;N;SQUARED PR;;;;
+33DB;SQUARE SR;So;0;L;<square> 0073 0072;;;;N;SQUARED SR;;;;
+33DC;SQUARE SV;So;0;L;<square> 0053 0076;;;;N;SQUARED SV;;;;
+33DD;SQUARE WB;So;0;L;<square> 0057 0062;;;;N;SQUARED WB;;;;
+33DE;SQUARE V OVER M;So;0;ON;<square> 0056 2215 006D;;;;N;;;;;
+33DF;SQUARE A OVER M;So;0;ON;<square> 0041 2215 006D;;;;N;;;;;
+33E0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE;So;0;L;<compat> 0031 65E5;;;;N;;;;;
+33E1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO;So;0;L;<compat> 0032 65E5;;;;N;;;;;
+33E2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE;So;0;L;<compat> 0033 65E5;;;;N;;;;;
+33E3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR;So;0;L;<compat> 0034 65E5;;;;N;;;;;
+33E4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE;So;0;L;<compat> 0035 65E5;;;;N;;;;;
+33E5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX;So;0;L;<compat> 0036 65E5;;;;N;;;;;
+33E6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN;So;0;L;<compat> 0037 65E5;;;;N;;;;;
+33E7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT;So;0;L;<compat> 0038 65E5;;;;N;;;;;
+33E8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE;So;0;L;<compat> 0039 65E5;;;;N;;;;;
+33E9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN;So;0;L;<compat> 0031 0030 65E5;;;;N;;;;;
+33EA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN;So;0;L;<compat> 0031 0031 65E5;;;;N;;;;;
+33EB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE;So;0;L;<compat> 0031 0032 65E5;;;;N;;;;;
+33EC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN;So;0;L;<compat> 0031 0033 65E5;;;;N;;;;;
+33ED;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN;So;0;L;<compat> 0031 0034 65E5;;;;N;;;;;
+33EE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN;So;0;L;<compat> 0031 0035 65E5;;;;N;;;;;
+33EF;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN;So;0;L;<compat> 0031 0036 65E5;;;;N;;;;;
+33F0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN;So;0;L;<compat> 0031 0037 65E5;;;;N;;;;;
+33F1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN;So;0;L;<compat> 0031 0038 65E5;;;;N;;;;;
+33F2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN;So;0;L;<compat> 0031 0039 65E5;;;;N;;;;;
+33F3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY;So;0;L;<compat> 0032 0030 65E5;;;;N;;;;;
+33F4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE;So;0;L;<compat> 0032 0031 65E5;;;;N;;;;;
+33F5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO;So;0;L;<compat> 0032 0032 65E5;;;;N;;;;;
+33F6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE;So;0;L;<compat> 0032 0033 65E5;;;;N;;;;;
+33F7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR;So;0;L;<compat> 0032 0034 65E5;;;;N;;;;;
+33F8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE;So;0;L;<compat> 0032 0035 65E5;;;;N;;;;;
+33F9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX;So;0;L;<compat> 0032 0036 65E5;;;;N;;;;;
+33FA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN;So;0;L;<compat> 0032 0037 65E5;;;;N;;;;;
+33FB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT;So;0;L;<compat> 0032 0038 65E5;;;;N;;;;;
+33FC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE;So;0;L;<compat> 0032 0039 65E5;;;;N;;;;;
+33FD;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY;So;0;L;<compat> 0033 0030 65E5;;;;N;;;;;
+33FE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE;So;0;L;<compat> 0033 0031 65E5;;;;N;;;;;
+33FF;SQUARE GAL;So;0;ON;<square> 0067 0061 006C;;;;N;;;;;
+3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
+4DBF;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
+4DC0;HEXAGRAM FOR THE CREATIVE HEAVEN;So;0;ON;;;;;N;;;;;
+4DC1;HEXAGRAM FOR THE RECEPTIVE EARTH;So;0;ON;;;;;N;;;;;
+4DC2;HEXAGRAM FOR DIFFICULTY AT THE BEGINNING;So;0;ON;;;;;N;;;;;
+4DC3;HEXAGRAM FOR YOUTHFUL FOLLY;So;0;ON;;;;;N;;;;;
+4DC4;HEXAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
+4DC5;HEXAGRAM FOR CONFLICT;So;0;ON;;;;;N;;;;;
+4DC6;HEXAGRAM FOR THE ARMY;So;0;ON;;;;;N;;;;;
+4DC7;HEXAGRAM FOR HOLDING TOGETHER;So;0;ON;;;;;N;;;;;
+4DC8;HEXAGRAM FOR SMALL TAMING;So;0;ON;;;;;N;;;;;
+4DC9;HEXAGRAM FOR TREADING;So;0;ON;;;;;N;;;;;
+4DCA;HEXAGRAM FOR PEACE;So;0;ON;;;;;N;;;;;
+4DCB;HEXAGRAM FOR STANDSTILL;So;0;ON;;;;;N;;;;;
+4DCC;HEXAGRAM FOR FELLOWSHIP;So;0;ON;;;;;N;;;;;
+4DCD;HEXAGRAM FOR GREAT POSSESSION;So;0;ON;;;;;N;;;;;
+4DCE;HEXAGRAM FOR MODESTY;So;0;ON;;;;;N;;;;;
+4DCF;HEXAGRAM FOR ENTHUSIASM;So;0;ON;;;;;N;;;;;
+4DD0;HEXAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
+4DD1;HEXAGRAM FOR WORK ON THE DECAYED;So;0;ON;;;;;N;;;;;
+4DD2;HEXAGRAM FOR APPROACH;So;0;ON;;;;;N;;;;;
+4DD3;HEXAGRAM FOR CONTEMPLATION;So;0;ON;;;;;N;;;;;
+4DD4;HEXAGRAM FOR BITING THROUGH;So;0;ON;;;;;N;;;;;
+4DD5;HEXAGRAM FOR GRACE;So;0;ON;;;;;N;;;;;
+4DD6;HEXAGRAM FOR SPLITTING APART;So;0;ON;;;;;N;;;;;
+4DD7;HEXAGRAM FOR RETURN;So;0;ON;;;;;N;;;;;
+4DD8;HEXAGRAM FOR INNOCENCE;So;0;ON;;;;;N;;;;;
+4DD9;HEXAGRAM FOR GREAT TAMING;So;0;ON;;;;;N;;;;;
+4DDA;HEXAGRAM FOR MOUTH CORNERS;So;0;ON;;;;;N;;;;;
+4DDB;HEXAGRAM FOR GREAT PREPONDERANCE;So;0;ON;;;;;N;;;;;
+4DDC;HEXAGRAM FOR THE ABYSMAL WATER;So;0;ON;;;;;N;;;;;
+4DDD;HEXAGRAM FOR THE CLINGING FIRE;So;0;ON;;;;;N;;;;;
+4DDE;HEXAGRAM FOR INFLUENCE;So;0;ON;;;;;N;;;;;
+4DDF;HEXAGRAM FOR DURATION;So;0;ON;;;;;N;;;;;
+4DE0;HEXAGRAM FOR RETREAT;So;0;ON;;;;;N;;;;;
+4DE1;HEXAGRAM FOR GREAT POWER;So;0;ON;;;;;N;;;;;
+4DE2;HEXAGRAM FOR PROGRESS;So;0;ON;;;;;N;;;;;
+4DE3;HEXAGRAM FOR DARKENING OF THE LIGHT;So;0;ON;;;;;N;;;;;
+4DE4;HEXAGRAM FOR THE FAMILY;So;0;ON;;;;;N;;;;;
+4DE5;HEXAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
+4DE6;HEXAGRAM FOR OBSTRUCTION;So;0;ON;;;;;N;;;;;
+4DE7;HEXAGRAM FOR DELIVERANCE;So;0;ON;;;;;N;;;;;
+4DE8;HEXAGRAM FOR DECREASE;So;0;ON;;;;;N;;;;;
+4DE9;HEXAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
+4DEA;HEXAGRAM FOR BREAKTHROUGH;So;0;ON;;;;;N;;;;;
+4DEB;HEXAGRAM FOR COMING TO MEET;So;0;ON;;;;;N;;;;;
+4DEC;HEXAGRAM FOR GATHERING TOGETHER;So;0;ON;;;;;N;;;;;
+4DED;HEXAGRAM FOR PUSHING UPWARD;So;0;ON;;;;;N;;;;;
+4DEE;HEXAGRAM FOR OPPRESSION;So;0;ON;;;;;N;;;;;
+4DEF;HEXAGRAM FOR THE WELL;So;0;ON;;;;;N;;;;;
+4DF0;HEXAGRAM FOR REVOLUTION;So;0;ON;;;;;N;;;;;
+4DF1;HEXAGRAM FOR THE CAULDRON;So;0;ON;;;;;N;;;;;
+4DF2;HEXAGRAM FOR THE AROUSING THUNDER;So;0;ON;;;;;N;;;;;
+4DF3;HEXAGRAM FOR THE KEEPING STILL MOUNTAIN;So;0;ON;;;;;N;;;;;
+4DF4;HEXAGRAM FOR DEVELOPMENT;So;0;ON;;;;;N;;;;;
+4DF5;HEXAGRAM FOR THE MARRYING MAIDEN;So;0;ON;;;;;N;;;;;
+4DF6;HEXAGRAM FOR ABUNDANCE;So;0;ON;;;;;N;;;;;
+4DF7;HEXAGRAM FOR THE WANDERER;So;0;ON;;;;;N;;;;;
+4DF8;HEXAGRAM FOR THE GENTLE WIND;So;0;ON;;;;;N;;;;;
+4DF9;HEXAGRAM FOR THE JOYOUS LAKE;So;0;ON;;;;;N;;;;;
+4DFA;HEXAGRAM FOR DISPERSION;So;0;ON;;;;;N;;;;;
+4DFB;HEXAGRAM FOR LIMITATION;So;0;ON;;;;;N;;;;;
+4DFC;HEXAGRAM FOR INNER TRUTH;So;0;ON;;;;;N;;;;;
+4DFD;HEXAGRAM FOR SMALL PREPONDERANCE;So;0;ON;;;;;N;;;;;
+4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
+4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
+4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
+9FFC;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
+A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
+A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
+A003;YI SYLLABLE IP;Lo;0;L;;;;;N;;;;;
+A004;YI SYLLABLE IET;Lo;0;L;;;;;N;;;;;
+A005;YI SYLLABLE IEX;Lo;0;L;;;;;N;;;;;
+A006;YI SYLLABLE IE;Lo;0;L;;;;;N;;;;;
+A007;YI SYLLABLE IEP;Lo;0;L;;;;;N;;;;;
+A008;YI SYLLABLE AT;Lo;0;L;;;;;N;;;;;
+A009;YI SYLLABLE AX;Lo;0;L;;;;;N;;;;;
+A00A;YI SYLLABLE A;Lo;0;L;;;;;N;;;;;
+A00B;YI SYLLABLE AP;Lo;0;L;;;;;N;;;;;
+A00C;YI SYLLABLE UOX;Lo;0;L;;;;;N;;;;;
+A00D;YI SYLLABLE UO;Lo;0;L;;;;;N;;;;;
+A00E;YI SYLLABLE UOP;Lo;0;L;;;;;N;;;;;
+A00F;YI SYLLABLE OT;Lo;0;L;;;;;N;;;;;
+A010;YI SYLLABLE OX;Lo;0;L;;;;;N;;;;;
+A011;YI SYLLABLE O;Lo;0;L;;;;;N;;;;;
+A012;YI SYLLABLE OP;Lo;0;L;;;;;N;;;;;
+A013;YI SYLLABLE EX;Lo;0;L;;;;;N;;;;;
+A014;YI SYLLABLE E;Lo;0;L;;;;;N;;;;;
+A015;YI SYLLABLE WU;Lm;0;L;;;;;N;;;;;
+A016;YI SYLLABLE BIT;Lo;0;L;;;;;N;;;;;
+A017;YI SYLLABLE BIX;Lo;0;L;;;;;N;;;;;
+A018;YI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+A019;YI SYLLABLE BIP;Lo;0;L;;;;;N;;;;;
+A01A;YI SYLLABLE BIET;Lo;0;L;;;;;N;;;;;
+A01B;YI SYLLABLE BIEX;Lo;0;L;;;;;N;;;;;
+A01C;YI SYLLABLE BIE;Lo;0;L;;;;;N;;;;;
+A01D;YI SYLLABLE BIEP;Lo;0;L;;;;;N;;;;;
+A01E;YI SYLLABLE BAT;Lo;0;L;;;;;N;;;;;
+A01F;YI SYLLABLE BAX;Lo;0;L;;;;;N;;;;;
+A020;YI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+A021;YI SYLLABLE BAP;Lo;0;L;;;;;N;;;;;
+A022;YI SYLLABLE BUOX;Lo;0;L;;;;;N;;;;;
+A023;YI SYLLABLE BUO;Lo;0;L;;;;;N;;;;;
+A024;YI SYLLABLE BUOP;Lo;0;L;;;;;N;;;;;
+A025;YI SYLLABLE BOT;Lo;0;L;;;;;N;;;;;
+A026;YI SYLLABLE BOX;Lo;0;L;;;;;N;;;;;
+A027;YI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+A028;YI SYLLABLE BOP;Lo;0;L;;;;;N;;;;;
+A029;YI SYLLABLE BEX;Lo;0;L;;;;;N;;;;;
+A02A;YI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+A02B;YI SYLLABLE BEP;Lo;0;L;;;;;N;;;;;
+A02C;YI SYLLABLE BUT;Lo;0;L;;;;;N;;;;;
+A02D;YI SYLLABLE BUX;Lo;0;L;;;;;N;;;;;
+A02E;YI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+A02F;YI SYLLABLE BUP;Lo;0;L;;;;;N;;;;;
+A030;YI SYLLABLE BURX;Lo;0;L;;;;;N;;;;;
+A031;YI SYLLABLE BUR;Lo;0;L;;;;;N;;;;;
+A032;YI SYLLABLE BYT;Lo;0;L;;;;;N;;;;;
+A033;YI SYLLABLE BYX;Lo;0;L;;;;;N;;;;;
+A034;YI SYLLABLE BY;Lo;0;L;;;;;N;;;;;
+A035;YI SYLLABLE BYP;Lo;0;L;;;;;N;;;;;
+A036;YI SYLLABLE BYRX;Lo;0;L;;;;;N;;;;;
+A037;YI SYLLABLE BYR;Lo;0;L;;;;;N;;;;;
+A038;YI SYLLABLE PIT;Lo;0;L;;;;;N;;;;;
+A039;YI SYLLABLE PIX;Lo;0;L;;;;;N;;;;;
+A03A;YI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+A03B;YI SYLLABLE PIP;Lo;0;L;;;;;N;;;;;
+A03C;YI SYLLABLE PIEX;Lo;0;L;;;;;N;;;;;
+A03D;YI SYLLABLE PIE;Lo;0;L;;;;;N;;;;;
+A03E;YI SYLLABLE PIEP;Lo;0;L;;;;;N;;;;;
+A03F;YI SYLLABLE PAT;Lo;0;L;;;;;N;;;;;
+A040;YI SYLLABLE PAX;Lo;0;L;;;;;N;;;;;
+A041;YI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+A042;YI SYLLABLE PAP;Lo;0;L;;;;;N;;;;;
+A043;YI SYLLABLE PUOX;Lo;0;L;;;;;N;;;;;
+A044;YI SYLLABLE PUO;Lo;0;L;;;;;N;;;;;
+A045;YI SYLLABLE PUOP;Lo;0;L;;;;;N;;;;;
+A046;YI SYLLABLE POT;Lo;0;L;;;;;N;;;;;
+A047;YI SYLLABLE POX;Lo;0;L;;;;;N;;;;;
+A048;YI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+A049;YI SYLLABLE POP;Lo;0;L;;;;;N;;;;;
+A04A;YI SYLLABLE PUT;Lo;0;L;;;;;N;;;;;
+A04B;YI SYLLABLE PUX;Lo;0;L;;;;;N;;;;;
+A04C;YI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+A04D;YI SYLLABLE PUP;Lo;0;L;;;;;N;;;;;
+A04E;YI SYLLABLE PURX;Lo;0;L;;;;;N;;;;;
+A04F;YI SYLLABLE PUR;Lo;0;L;;;;;N;;;;;
+A050;YI SYLLABLE PYT;Lo;0;L;;;;;N;;;;;
+A051;YI SYLLABLE PYX;Lo;0;L;;;;;N;;;;;
+A052;YI SYLLABLE PY;Lo;0;L;;;;;N;;;;;
+A053;YI SYLLABLE PYP;Lo;0;L;;;;;N;;;;;
+A054;YI SYLLABLE PYRX;Lo;0;L;;;;;N;;;;;
+A055;YI SYLLABLE PYR;Lo;0;L;;;;;N;;;;;
+A056;YI SYLLABLE BBIT;Lo;0;L;;;;;N;;;;;
+A057;YI SYLLABLE BBIX;Lo;0;L;;;;;N;;;;;
+A058;YI SYLLABLE BBI;Lo;0;L;;;;;N;;;;;
+A059;YI SYLLABLE BBIP;Lo;0;L;;;;;N;;;;;
+A05A;YI SYLLABLE BBIET;Lo;0;L;;;;;N;;;;;
+A05B;YI SYLLABLE BBIEX;Lo;0;L;;;;;N;;;;;
+A05C;YI SYLLABLE BBIE;Lo;0;L;;;;;N;;;;;
+A05D;YI SYLLABLE BBIEP;Lo;0;L;;;;;N;;;;;
+A05E;YI SYLLABLE BBAT;Lo;0;L;;;;;N;;;;;
+A05F;YI SYLLABLE BBAX;Lo;0;L;;;;;N;;;;;
+A060;YI SYLLABLE BBA;Lo;0;L;;;;;N;;;;;
+A061;YI SYLLABLE BBAP;Lo;0;L;;;;;N;;;;;
+A062;YI SYLLABLE BBUOX;Lo;0;L;;;;;N;;;;;
+A063;YI SYLLABLE BBUO;Lo;0;L;;;;;N;;;;;
+A064;YI SYLLABLE BBUOP;Lo;0;L;;;;;N;;;;;
+A065;YI SYLLABLE BBOT;Lo;0;L;;;;;N;;;;;
+A066;YI SYLLABLE BBOX;Lo;0;L;;;;;N;;;;;
+A067;YI SYLLABLE BBO;Lo;0;L;;;;;N;;;;;
+A068;YI SYLLABLE BBOP;Lo;0;L;;;;;N;;;;;
+A069;YI SYLLABLE BBEX;Lo;0;L;;;;;N;;;;;
+A06A;YI SYLLABLE BBE;Lo;0;L;;;;;N;;;;;
+A06B;YI SYLLABLE BBEP;Lo;0;L;;;;;N;;;;;
+A06C;YI SYLLABLE BBUT;Lo;0;L;;;;;N;;;;;
+A06D;YI SYLLABLE BBUX;Lo;0;L;;;;;N;;;;;
+A06E;YI SYLLABLE BBU;Lo;0;L;;;;;N;;;;;
+A06F;YI SYLLABLE BBUP;Lo;0;L;;;;;N;;;;;
+A070;YI SYLLABLE BBURX;Lo;0;L;;;;;N;;;;;
+A071;YI SYLLABLE BBUR;Lo;0;L;;;;;N;;;;;
+A072;YI SYLLABLE BBYT;Lo;0;L;;;;;N;;;;;
+A073;YI SYLLABLE BBYX;Lo;0;L;;;;;N;;;;;
+A074;YI SYLLABLE BBY;Lo;0;L;;;;;N;;;;;
+A075;YI SYLLABLE BBYP;Lo;0;L;;;;;N;;;;;
+A076;YI SYLLABLE NBIT;Lo;0;L;;;;;N;;;;;
+A077;YI SYLLABLE NBIX;Lo;0;L;;;;;N;;;;;
+A078;YI SYLLABLE NBI;Lo;0;L;;;;;N;;;;;
+A079;YI SYLLABLE NBIP;Lo;0;L;;;;;N;;;;;
+A07A;YI SYLLABLE NBIEX;Lo;0;L;;;;;N;;;;;
+A07B;YI SYLLABLE NBIE;Lo;0;L;;;;;N;;;;;
+A07C;YI SYLLABLE NBIEP;Lo;0;L;;;;;N;;;;;
+A07D;YI SYLLABLE NBAT;Lo;0;L;;;;;N;;;;;
+A07E;YI SYLLABLE NBAX;Lo;0;L;;;;;N;;;;;
+A07F;YI SYLLABLE NBA;Lo;0;L;;;;;N;;;;;
+A080;YI SYLLABLE NBAP;Lo;0;L;;;;;N;;;;;
+A081;YI SYLLABLE NBOT;Lo;0;L;;;;;N;;;;;
+A082;YI SYLLABLE NBOX;Lo;0;L;;;;;N;;;;;
+A083;YI SYLLABLE NBO;Lo;0;L;;;;;N;;;;;
+A084;YI SYLLABLE NBOP;Lo;0;L;;;;;N;;;;;
+A085;YI SYLLABLE NBUT;Lo;0;L;;;;;N;;;;;
+A086;YI SYLLABLE NBUX;Lo;0;L;;;;;N;;;;;
+A087;YI SYLLABLE NBU;Lo;0;L;;;;;N;;;;;
+A088;YI SYLLABLE NBUP;Lo;0;L;;;;;N;;;;;
+A089;YI SYLLABLE NBURX;Lo;0;L;;;;;N;;;;;
+A08A;YI SYLLABLE NBUR;Lo;0;L;;;;;N;;;;;
+A08B;YI SYLLABLE NBYT;Lo;0;L;;;;;N;;;;;
+A08C;YI SYLLABLE NBYX;Lo;0;L;;;;;N;;;;;
+A08D;YI SYLLABLE NBY;Lo;0;L;;;;;N;;;;;
+A08E;YI SYLLABLE NBYP;Lo;0;L;;;;;N;;;;;
+A08F;YI SYLLABLE NBYRX;Lo;0;L;;;;;N;;;;;
+A090;YI SYLLABLE NBYR;Lo;0;L;;;;;N;;;;;
+A091;YI SYLLABLE HMIT;Lo;0;L;;;;;N;;;;;
+A092;YI SYLLABLE HMIX;Lo;0;L;;;;;N;;;;;
+A093;YI SYLLABLE HMI;Lo;0;L;;;;;N;;;;;
+A094;YI SYLLABLE HMIP;Lo;0;L;;;;;N;;;;;
+A095;YI SYLLABLE HMIEX;Lo;0;L;;;;;N;;;;;
+A096;YI SYLLABLE HMIE;Lo;0;L;;;;;N;;;;;
+A097;YI SYLLABLE HMIEP;Lo;0;L;;;;;N;;;;;
+A098;YI SYLLABLE HMAT;Lo;0;L;;;;;N;;;;;
+A099;YI SYLLABLE HMAX;Lo;0;L;;;;;N;;;;;
+A09A;YI SYLLABLE HMA;Lo;0;L;;;;;N;;;;;
+A09B;YI SYLLABLE HMAP;Lo;0;L;;;;;N;;;;;
+A09C;YI SYLLABLE HMUOX;Lo;0;L;;;;;N;;;;;
+A09D;YI SYLLABLE HMUO;Lo;0;L;;;;;N;;;;;
+A09E;YI SYLLABLE HMUOP;Lo;0;L;;;;;N;;;;;
+A09F;YI SYLLABLE HMOT;Lo;0;L;;;;;N;;;;;
+A0A0;YI SYLLABLE HMOX;Lo;0;L;;;;;N;;;;;
+A0A1;YI SYLLABLE HMO;Lo;0;L;;;;;N;;;;;
+A0A2;YI SYLLABLE HMOP;Lo;0;L;;;;;N;;;;;
+A0A3;YI SYLLABLE HMUT;Lo;0;L;;;;;N;;;;;
+A0A4;YI SYLLABLE HMUX;Lo;0;L;;;;;N;;;;;
+A0A5;YI SYLLABLE HMU;Lo;0;L;;;;;N;;;;;
+A0A6;YI SYLLABLE HMUP;Lo;0;L;;;;;N;;;;;
+A0A7;YI SYLLABLE HMURX;Lo;0;L;;;;;N;;;;;
+A0A8;YI SYLLABLE HMUR;Lo;0;L;;;;;N;;;;;
+A0A9;YI SYLLABLE HMYX;Lo;0;L;;;;;N;;;;;
+A0AA;YI SYLLABLE HMY;Lo;0;L;;;;;N;;;;;
+A0AB;YI SYLLABLE HMYP;Lo;0;L;;;;;N;;;;;
+A0AC;YI SYLLABLE HMYRX;Lo;0;L;;;;;N;;;;;
+A0AD;YI SYLLABLE HMYR;Lo;0;L;;;;;N;;;;;
+A0AE;YI SYLLABLE MIT;Lo;0;L;;;;;N;;;;;
+A0AF;YI SYLLABLE MIX;Lo;0;L;;;;;N;;;;;
+A0B0;YI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+A0B1;YI SYLLABLE MIP;Lo;0;L;;;;;N;;;;;
+A0B2;YI SYLLABLE MIEX;Lo;0;L;;;;;N;;;;;
+A0B3;YI SYLLABLE MIE;Lo;0;L;;;;;N;;;;;
+A0B4;YI SYLLABLE MIEP;Lo;0;L;;;;;N;;;;;
+A0B5;YI SYLLABLE MAT;Lo;0;L;;;;;N;;;;;
+A0B6;YI SYLLABLE MAX;Lo;0;L;;;;;N;;;;;
+A0B7;YI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+A0B8;YI SYLLABLE MAP;Lo;0;L;;;;;N;;;;;
+A0B9;YI SYLLABLE MUOT;Lo;0;L;;;;;N;;;;;
+A0BA;YI SYLLABLE MUOX;Lo;0;L;;;;;N;;;;;
+A0BB;YI SYLLABLE MUO;Lo;0;L;;;;;N;;;;;
+A0BC;YI SYLLABLE MUOP;Lo;0;L;;;;;N;;;;;
+A0BD;YI SYLLABLE MOT;Lo;0;L;;;;;N;;;;;
+A0BE;YI SYLLABLE MOX;Lo;0;L;;;;;N;;;;;
+A0BF;YI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+A0C0;YI SYLLABLE MOP;Lo;0;L;;;;;N;;;;;
+A0C1;YI SYLLABLE MEX;Lo;0;L;;;;;N;;;;;
+A0C2;YI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+A0C3;YI SYLLABLE MUT;Lo;0;L;;;;;N;;;;;
+A0C4;YI SYLLABLE MUX;Lo;0;L;;;;;N;;;;;
+A0C5;YI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+A0C6;YI SYLLABLE MUP;Lo;0;L;;;;;N;;;;;
+A0C7;YI SYLLABLE MURX;Lo;0;L;;;;;N;;;;;
+A0C8;YI SYLLABLE MUR;Lo;0;L;;;;;N;;;;;
+A0C9;YI SYLLABLE MYT;Lo;0;L;;;;;N;;;;;
+A0CA;YI SYLLABLE MYX;Lo;0;L;;;;;N;;;;;
+A0CB;YI SYLLABLE MY;Lo;0;L;;;;;N;;;;;
+A0CC;YI SYLLABLE MYP;Lo;0;L;;;;;N;;;;;
+A0CD;YI SYLLABLE FIT;Lo;0;L;;;;;N;;;;;
+A0CE;YI SYLLABLE FIX;Lo;0;L;;;;;N;;;;;
+A0CF;YI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+A0D0;YI SYLLABLE FIP;Lo;0;L;;;;;N;;;;;
+A0D1;YI SYLLABLE FAT;Lo;0;L;;;;;N;;;;;
+A0D2;YI SYLLABLE FAX;Lo;0;L;;;;;N;;;;;
+A0D3;YI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+A0D4;YI SYLLABLE FAP;Lo;0;L;;;;;N;;;;;
+A0D5;YI SYLLABLE FOX;Lo;0;L;;;;;N;;;;;
+A0D6;YI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+A0D7;YI SYLLABLE FOP;Lo;0;L;;;;;N;;;;;
+A0D8;YI SYLLABLE FUT;Lo;0;L;;;;;N;;;;;
+A0D9;YI SYLLABLE FUX;Lo;0;L;;;;;N;;;;;
+A0DA;YI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+A0DB;YI SYLLABLE FUP;Lo;0;L;;;;;N;;;;;
+A0DC;YI SYLLABLE FURX;Lo;0;L;;;;;N;;;;;
+A0DD;YI SYLLABLE FUR;Lo;0;L;;;;;N;;;;;
+A0DE;YI SYLLABLE FYT;Lo;0;L;;;;;N;;;;;
+A0DF;YI SYLLABLE FYX;Lo;0;L;;;;;N;;;;;
+A0E0;YI SYLLABLE FY;Lo;0;L;;;;;N;;;;;
+A0E1;YI SYLLABLE FYP;Lo;0;L;;;;;N;;;;;
+A0E2;YI SYLLABLE VIT;Lo;0;L;;;;;N;;;;;
+A0E3;YI SYLLABLE VIX;Lo;0;L;;;;;N;;;;;
+A0E4;YI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+A0E5;YI SYLLABLE VIP;Lo;0;L;;;;;N;;;;;
+A0E6;YI SYLLABLE VIET;Lo;0;L;;;;;N;;;;;
+A0E7;YI SYLLABLE VIEX;Lo;0;L;;;;;N;;;;;
+A0E8;YI SYLLABLE VIE;Lo;0;L;;;;;N;;;;;
+A0E9;YI SYLLABLE VIEP;Lo;0;L;;;;;N;;;;;
+A0EA;YI SYLLABLE VAT;Lo;0;L;;;;;N;;;;;
+A0EB;YI SYLLABLE VAX;Lo;0;L;;;;;N;;;;;
+A0EC;YI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+A0ED;YI SYLLABLE VAP;Lo;0;L;;;;;N;;;;;
+A0EE;YI SYLLABLE VOT;Lo;0;L;;;;;N;;;;;
+A0EF;YI SYLLABLE VOX;Lo;0;L;;;;;N;;;;;
+A0F0;YI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+A0F1;YI SYLLABLE VOP;Lo;0;L;;;;;N;;;;;
+A0F2;YI SYLLABLE VEX;Lo;0;L;;;;;N;;;;;
+A0F3;YI SYLLABLE VEP;Lo;0;L;;;;;N;;;;;
+A0F4;YI SYLLABLE VUT;Lo;0;L;;;;;N;;;;;
+A0F5;YI SYLLABLE VUX;Lo;0;L;;;;;N;;;;;
+A0F6;YI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+A0F7;YI SYLLABLE VUP;Lo;0;L;;;;;N;;;;;
+A0F8;YI SYLLABLE VURX;Lo;0;L;;;;;N;;;;;
+A0F9;YI SYLLABLE VUR;Lo;0;L;;;;;N;;;;;
+A0FA;YI SYLLABLE VYT;Lo;0;L;;;;;N;;;;;
+A0FB;YI SYLLABLE VYX;Lo;0;L;;;;;N;;;;;
+A0FC;YI SYLLABLE VY;Lo;0;L;;;;;N;;;;;
+A0FD;YI SYLLABLE VYP;Lo;0;L;;;;;N;;;;;
+A0FE;YI SYLLABLE VYRX;Lo;0;L;;;;;N;;;;;
+A0FF;YI SYLLABLE VYR;Lo;0;L;;;;;N;;;;;
+A100;YI SYLLABLE DIT;Lo;0;L;;;;;N;;;;;
+A101;YI SYLLABLE DIX;Lo;0;L;;;;;N;;;;;
+A102;YI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+A103;YI SYLLABLE DIP;Lo;0;L;;;;;N;;;;;
+A104;YI SYLLABLE DIEX;Lo;0;L;;;;;N;;;;;
+A105;YI SYLLABLE DIE;Lo;0;L;;;;;N;;;;;
+A106;YI SYLLABLE DIEP;Lo;0;L;;;;;N;;;;;
+A107;YI SYLLABLE DAT;Lo;0;L;;;;;N;;;;;
+A108;YI SYLLABLE DAX;Lo;0;L;;;;;N;;;;;
+A109;YI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+A10A;YI SYLLABLE DAP;Lo;0;L;;;;;N;;;;;
+A10B;YI SYLLABLE DUOX;Lo;0;L;;;;;N;;;;;
+A10C;YI SYLLABLE DUO;Lo;0;L;;;;;N;;;;;
+A10D;YI SYLLABLE DOT;Lo;0;L;;;;;N;;;;;
+A10E;YI SYLLABLE DOX;Lo;0;L;;;;;N;;;;;
+A10F;YI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+A110;YI SYLLABLE DOP;Lo;0;L;;;;;N;;;;;
+A111;YI SYLLABLE DEX;Lo;0;L;;;;;N;;;;;
+A112;YI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+A113;YI SYLLABLE DEP;Lo;0;L;;;;;N;;;;;
+A114;YI SYLLABLE DUT;Lo;0;L;;;;;N;;;;;
+A115;YI SYLLABLE DUX;Lo;0;L;;;;;N;;;;;
+A116;YI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+A117;YI SYLLABLE DUP;Lo;0;L;;;;;N;;;;;
+A118;YI SYLLABLE DURX;Lo;0;L;;;;;N;;;;;
+A119;YI SYLLABLE DUR;Lo;0;L;;;;;N;;;;;
+A11A;YI SYLLABLE TIT;Lo;0;L;;;;;N;;;;;
+A11B;YI SYLLABLE TIX;Lo;0;L;;;;;N;;;;;
+A11C;YI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+A11D;YI SYLLABLE TIP;Lo;0;L;;;;;N;;;;;
+A11E;YI SYLLABLE TIEX;Lo;0;L;;;;;N;;;;;
+A11F;YI SYLLABLE TIE;Lo;0;L;;;;;N;;;;;
+A120;YI SYLLABLE TIEP;Lo;0;L;;;;;N;;;;;
+A121;YI SYLLABLE TAT;Lo;0;L;;;;;N;;;;;
+A122;YI SYLLABLE TAX;Lo;0;L;;;;;N;;;;;
+A123;YI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+A124;YI SYLLABLE TAP;Lo;0;L;;;;;N;;;;;
+A125;YI SYLLABLE TUOT;Lo;0;L;;;;;N;;;;;
+A126;YI SYLLABLE TUOX;Lo;0;L;;;;;N;;;;;
+A127;YI SYLLABLE TUO;Lo;0;L;;;;;N;;;;;
+A128;YI SYLLABLE TUOP;Lo;0;L;;;;;N;;;;;
+A129;YI SYLLABLE TOT;Lo;0;L;;;;;N;;;;;
+A12A;YI SYLLABLE TOX;Lo;0;L;;;;;N;;;;;
+A12B;YI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+A12C;YI SYLLABLE TOP;Lo;0;L;;;;;N;;;;;
+A12D;YI SYLLABLE TEX;Lo;0;L;;;;;N;;;;;
+A12E;YI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+A12F;YI SYLLABLE TEP;Lo;0;L;;;;;N;;;;;
+A130;YI SYLLABLE TUT;Lo;0;L;;;;;N;;;;;
+A131;YI SYLLABLE TUX;Lo;0;L;;;;;N;;;;;
+A132;YI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+A133;YI SYLLABLE TUP;Lo;0;L;;;;;N;;;;;
+A134;YI SYLLABLE TURX;Lo;0;L;;;;;N;;;;;
+A135;YI SYLLABLE TUR;Lo;0;L;;;;;N;;;;;
+A136;YI SYLLABLE DDIT;Lo;0;L;;;;;N;;;;;
+A137;YI SYLLABLE DDIX;Lo;0;L;;;;;N;;;;;
+A138;YI SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
+A139;YI SYLLABLE DDIP;Lo;0;L;;;;;N;;;;;
+A13A;YI SYLLABLE DDIEX;Lo;0;L;;;;;N;;;;;
+A13B;YI SYLLABLE DDIE;Lo;0;L;;;;;N;;;;;
+A13C;YI SYLLABLE DDIEP;Lo;0;L;;;;;N;;;;;
+A13D;YI SYLLABLE DDAT;Lo;0;L;;;;;N;;;;;
+A13E;YI SYLLABLE DDAX;Lo;0;L;;;;;N;;;;;
+A13F;YI SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
+A140;YI SYLLABLE DDAP;Lo;0;L;;;;;N;;;;;
+A141;YI SYLLABLE DDUOX;Lo;0;L;;;;;N;;;;;
+A142;YI SYLLABLE DDUO;Lo;0;L;;;;;N;;;;;
+A143;YI SYLLABLE DDUOP;Lo;0;L;;;;;N;;;;;
+A144;YI SYLLABLE DDOT;Lo;0;L;;;;;N;;;;;
+A145;YI SYLLABLE DDOX;Lo;0;L;;;;;N;;;;;
+A146;YI SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
+A147;YI SYLLABLE DDOP;Lo;0;L;;;;;N;;;;;
+A148;YI SYLLABLE DDEX;Lo;0;L;;;;;N;;;;;
+A149;YI SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
+A14A;YI SYLLABLE DDEP;Lo;0;L;;;;;N;;;;;
+A14B;YI SYLLABLE DDUT;Lo;0;L;;;;;N;;;;;
+A14C;YI SYLLABLE DDUX;Lo;0;L;;;;;N;;;;;
+A14D;YI SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
+A14E;YI SYLLABLE DDUP;Lo;0;L;;;;;N;;;;;
+A14F;YI SYLLABLE DDURX;Lo;0;L;;;;;N;;;;;
+A150;YI SYLLABLE DDUR;Lo;0;L;;;;;N;;;;;
+A151;YI SYLLABLE NDIT;Lo;0;L;;;;;N;;;;;
+A152;YI SYLLABLE NDIX;Lo;0;L;;;;;N;;;;;
+A153;YI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
+A154;YI SYLLABLE NDIP;Lo;0;L;;;;;N;;;;;
+A155;YI SYLLABLE NDIEX;Lo;0;L;;;;;N;;;;;
+A156;YI SYLLABLE NDIE;Lo;0;L;;;;;N;;;;;
+A157;YI SYLLABLE NDAT;Lo;0;L;;;;;N;;;;;
+A158;YI SYLLABLE NDAX;Lo;0;L;;;;;N;;;;;
+A159;YI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
+A15A;YI SYLLABLE NDAP;Lo;0;L;;;;;N;;;;;
+A15B;YI SYLLABLE NDOT;Lo;0;L;;;;;N;;;;;
+A15C;YI SYLLABLE NDOX;Lo;0;L;;;;;N;;;;;
+A15D;YI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
+A15E;YI SYLLABLE NDOP;Lo;0;L;;;;;N;;;;;
+A15F;YI SYLLABLE NDEX;Lo;0;L;;;;;N;;;;;
+A160;YI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
+A161;YI SYLLABLE NDEP;Lo;0;L;;;;;N;;;;;
+A162;YI SYLLABLE NDUT;Lo;0;L;;;;;N;;;;;
+A163;YI SYLLABLE NDUX;Lo;0;L;;;;;N;;;;;
+A164;YI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
+A165;YI SYLLABLE NDUP;Lo;0;L;;;;;N;;;;;
+A166;YI SYLLABLE NDURX;Lo;0;L;;;;;N;;;;;
+A167;YI SYLLABLE NDUR;Lo;0;L;;;;;N;;;;;
+A168;YI SYLLABLE HNIT;Lo;0;L;;;;;N;;;;;
+A169;YI SYLLABLE HNIX;Lo;0;L;;;;;N;;;;;
+A16A;YI SYLLABLE HNI;Lo;0;L;;;;;N;;;;;
+A16B;YI SYLLABLE HNIP;Lo;0;L;;;;;N;;;;;
+A16C;YI SYLLABLE HNIET;Lo;0;L;;;;;N;;;;;
+A16D;YI SYLLABLE HNIEX;Lo;0;L;;;;;N;;;;;
+A16E;YI SYLLABLE HNIE;Lo;0;L;;;;;N;;;;;
+A16F;YI SYLLABLE HNIEP;Lo;0;L;;;;;N;;;;;
+A170;YI SYLLABLE HNAT;Lo;0;L;;;;;N;;;;;
+A171;YI SYLLABLE HNAX;Lo;0;L;;;;;N;;;;;
+A172;YI SYLLABLE HNA;Lo;0;L;;;;;N;;;;;
+A173;YI SYLLABLE HNAP;Lo;0;L;;;;;N;;;;;
+A174;YI SYLLABLE HNUOX;Lo;0;L;;;;;N;;;;;
+A175;YI SYLLABLE HNUO;Lo;0;L;;;;;N;;;;;
+A176;YI SYLLABLE HNOT;Lo;0;L;;;;;N;;;;;
+A177;YI SYLLABLE HNOX;Lo;0;L;;;;;N;;;;;
+A178;YI SYLLABLE HNOP;Lo;0;L;;;;;N;;;;;
+A179;YI SYLLABLE HNEX;Lo;0;L;;;;;N;;;;;
+A17A;YI SYLLABLE HNE;Lo;0;L;;;;;N;;;;;
+A17B;YI SYLLABLE HNEP;Lo;0;L;;;;;N;;;;;
+A17C;YI SYLLABLE HNUT;Lo;0;L;;;;;N;;;;;
+A17D;YI SYLLABLE NIT;Lo;0;L;;;;;N;;;;;
+A17E;YI SYLLABLE NIX;Lo;0;L;;;;;N;;;;;
+A17F;YI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+A180;YI SYLLABLE NIP;Lo;0;L;;;;;N;;;;;
+A181;YI SYLLABLE NIEX;Lo;0;L;;;;;N;;;;;
+A182;YI SYLLABLE NIE;Lo;0;L;;;;;N;;;;;
+A183;YI SYLLABLE NIEP;Lo;0;L;;;;;N;;;;;
+A184;YI SYLLABLE NAX;Lo;0;L;;;;;N;;;;;
+A185;YI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+A186;YI SYLLABLE NAP;Lo;0;L;;;;;N;;;;;
+A187;YI SYLLABLE NUOX;Lo;0;L;;;;;N;;;;;
+A188;YI SYLLABLE NUO;Lo;0;L;;;;;N;;;;;
+A189;YI SYLLABLE NUOP;Lo;0;L;;;;;N;;;;;
+A18A;YI SYLLABLE NOT;Lo;0;L;;;;;N;;;;;
+A18B;YI SYLLABLE NOX;Lo;0;L;;;;;N;;;;;
+A18C;YI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+A18D;YI SYLLABLE NOP;Lo;0;L;;;;;N;;;;;
+A18E;YI SYLLABLE NEX;Lo;0;L;;;;;N;;;;;
+A18F;YI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+A190;YI SYLLABLE NEP;Lo;0;L;;;;;N;;;;;
+A191;YI SYLLABLE NUT;Lo;0;L;;;;;N;;;;;
+A192;YI SYLLABLE NUX;Lo;0;L;;;;;N;;;;;
+A193;YI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+A194;YI SYLLABLE NUP;Lo;0;L;;;;;N;;;;;
+A195;YI SYLLABLE NURX;Lo;0;L;;;;;N;;;;;
+A196;YI SYLLABLE NUR;Lo;0;L;;;;;N;;;;;
+A197;YI SYLLABLE HLIT;Lo;0;L;;;;;N;;;;;
+A198;YI SYLLABLE HLIX;Lo;0;L;;;;;N;;;;;
+A199;YI SYLLABLE HLI;Lo;0;L;;;;;N;;;;;
+A19A;YI SYLLABLE HLIP;Lo;0;L;;;;;N;;;;;
+A19B;YI SYLLABLE HLIEX;Lo;0;L;;;;;N;;;;;
+A19C;YI SYLLABLE HLIE;Lo;0;L;;;;;N;;;;;
+A19D;YI SYLLABLE HLIEP;Lo;0;L;;;;;N;;;;;
+A19E;YI SYLLABLE HLAT;Lo;0;L;;;;;N;;;;;
+A19F;YI SYLLABLE HLAX;Lo;0;L;;;;;N;;;;;
+A1A0;YI SYLLABLE HLA;Lo;0;L;;;;;N;;;;;
+A1A1;YI SYLLABLE HLAP;Lo;0;L;;;;;N;;;;;
+A1A2;YI SYLLABLE HLUOX;Lo;0;L;;;;;N;;;;;
+A1A3;YI SYLLABLE HLUO;Lo;0;L;;;;;N;;;;;
+A1A4;YI SYLLABLE HLUOP;Lo;0;L;;;;;N;;;;;
+A1A5;YI SYLLABLE HLOX;Lo;0;L;;;;;N;;;;;
+A1A6;YI SYLLABLE HLO;Lo;0;L;;;;;N;;;;;
+A1A7;YI SYLLABLE HLOP;Lo;0;L;;;;;N;;;;;
+A1A8;YI SYLLABLE HLEX;Lo;0;L;;;;;N;;;;;
+A1A9;YI SYLLABLE HLE;Lo;0;L;;;;;N;;;;;
+A1AA;YI SYLLABLE HLEP;Lo;0;L;;;;;N;;;;;
+A1AB;YI SYLLABLE HLUT;Lo;0;L;;;;;N;;;;;
+A1AC;YI SYLLABLE HLUX;Lo;0;L;;;;;N;;;;;
+A1AD;YI SYLLABLE HLU;Lo;0;L;;;;;N;;;;;
+A1AE;YI SYLLABLE HLUP;Lo;0;L;;;;;N;;;;;
+A1AF;YI SYLLABLE HLURX;Lo;0;L;;;;;N;;;;;
+A1B0;YI SYLLABLE HLUR;Lo;0;L;;;;;N;;;;;
+A1B1;YI SYLLABLE HLYT;Lo;0;L;;;;;N;;;;;
+A1B2;YI SYLLABLE HLYX;Lo;0;L;;;;;N;;;;;
+A1B3;YI SYLLABLE HLY;Lo;0;L;;;;;N;;;;;
+A1B4;YI SYLLABLE HLYP;Lo;0;L;;;;;N;;;;;
+A1B5;YI SYLLABLE HLYRX;Lo;0;L;;;;;N;;;;;
+A1B6;YI SYLLABLE HLYR;Lo;0;L;;;;;N;;;;;
+A1B7;YI SYLLABLE LIT;Lo;0;L;;;;;N;;;;;
+A1B8;YI SYLLABLE LIX;Lo;0;L;;;;;N;;;;;
+A1B9;YI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+A1BA;YI SYLLABLE LIP;Lo;0;L;;;;;N;;;;;
+A1BB;YI SYLLABLE LIET;Lo;0;L;;;;;N;;;;;
+A1BC;YI SYLLABLE LIEX;Lo;0;L;;;;;N;;;;;
+A1BD;YI SYLLABLE LIE;Lo;0;L;;;;;N;;;;;
+A1BE;YI SYLLABLE LIEP;Lo;0;L;;;;;N;;;;;
+A1BF;YI SYLLABLE LAT;Lo;0;L;;;;;N;;;;;
+A1C0;YI SYLLABLE LAX;Lo;0;L;;;;;N;;;;;
+A1C1;YI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+A1C2;YI SYLLABLE LAP;Lo;0;L;;;;;N;;;;;
+A1C3;YI SYLLABLE LUOT;Lo;0;L;;;;;N;;;;;
+A1C4;YI SYLLABLE LUOX;Lo;0;L;;;;;N;;;;;
+A1C5;YI SYLLABLE LUO;Lo;0;L;;;;;N;;;;;
+A1C6;YI SYLLABLE LUOP;Lo;0;L;;;;;N;;;;;
+A1C7;YI SYLLABLE LOT;Lo;0;L;;;;;N;;;;;
+A1C8;YI SYLLABLE LOX;Lo;0;L;;;;;N;;;;;
+A1C9;YI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+A1CA;YI SYLLABLE LOP;Lo;0;L;;;;;N;;;;;
+A1CB;YI SYLLABLE LEX;Lo;0;L;;;;;N;;;;;
+A1CC;YI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+A1CD;YI SYLLABLE LEP;Lo;0;L;;;;;N;;;;;
+A1CE;YI SYLLABLE LUT;Lo;0;L;;;;;N;;;;;
+A1CF;YI SYLLABLE LUX;Lo;0;L;;;;;N;;;;;
+A1D0;YI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+A1D1;YI SYLLABLE LUP;Lo;0;L;;;;;N;;;;;
+A1D2;YI SYLLABLE LURX;Lo;0;L;;;;;N;;;;;
+A1D3;YI SYLLABLE LUR;Lo;0;L;;;;;N;;;;;
+A1D4;YI SYLLABLE LYT;Lo;0;L;;;;;N;;;;;
+A1D5;YI SYLLABLE LYX;Lo;0;L;;;;;N;;;;;
+A1D6;YI SYLLABLE LY;Lo;0;L;;;;;N;;;;;
+A1D7;YI SYLLABLE LYP;Lo;0;L;;;;;N;;;;;
+A1D8;YI SYLLABLE LYRX;Lo;0;L;;;;;N;;;;;
+A1D9;YI SYLLABLE LYR;Lo;0;L;;;;;N;;;;;
+A1DA;YI SYLLABLE GIT;Lo;0;L;;;;;N;;;;;
+A1DB;YI SYLLABLE GIX;Lo;0;L;;;;;N;;;;;
+A1DC;YI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+A1DD;YI SYLLABLE GIP;Lo;0;L;;;;;N;;;;;
+A1DE;YI SYLLABLE GIET;Lo;0;L;;;;;N;;;;;
+A1DF;YI SYLLABLE GIEX;Lo;0;L;;;;;N;;;;;
+A1E0;YI SYLLABLE GIE;Lo;0;L;;;;;N;;;;;
+A1E1;YI SYLLABLE GIEP;Lo;0;L;;;;;N;;;;;
+A1E2;YI SYLLABLE GAT;Lo;0;L;;;;;N;;;;;
+A1E3;YI SYLLABLE GAX;Lo;0;L;;;;;N;;;;;
+A1E4;YI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+A1E5;YI SYLLABLE GAP;Lo;0;L;;;;;N;;;;;
+A1E6;YI SYLLABLE GUOT;Lo;0;L;;;;;N;;;;;
+A1E7;YI SYLLABLE GUOX;Lo;0;L;;;;;N;;;;;
+A1E8;YI SYLLABLE GUO;Lo;0;L;;;;;N;;;;;
+A1E9;YI SYLLABLE GUOP;Lo;0;L;;;;;N;;;;;
+A1EA;YI SYLLABLE GOT;Lo;0;L;;;;;N;;;;;
+A1EB;YI SYLLABLE GOX;Lo;0;L;;;;;N;;;;;
+A1EC;YI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+A1ED;YI SYLLABLE GOP;Lo;0;L;;;;;N;;;;;
+A1EE;YI SYLLABLE GET;Lo;0;L;;;;;N;;;;;
+A1EF;YI SYLLABLE GEX;Lo;0;L;;;;;N;;;;;
+A1F0;YI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+A1F1;YI SYLLABLE GEP;Lo;0;L;;;;;N;;;;;
+A1F2;YI SYLLABLE GUT;Lo;0;L;;;;;N;;;;;
+A1F3;YI SYLLABLE GUX;Lo;0;L;;;;;N;;;;;
+A1F4;YI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+A1F5;YI SYLLABLE GUP;Lo;0;L;;;;;N;;;;;
+A1F6;YI SYLLABLE GURX;Lo;0;L;;;;;N;;;;;
+A1F7;YI SYLLABLE GUR;Lo;0;L;;;;;N;;;;;
+A1F8;YI SYLLABLE KIT;Lo;0;L;;;;;N;;;;;
+A1F9;YI SYLLABLE KIX;Lo;0;L;;;;;N;;;;;
+A1FA;YI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+A1FB;YI SYLLABLE KIP;Lo;0;L;;;;;N;;;;;
+A1FC;YI SYLLABLE KIEX;Lo;0;L;;;;;N;;;;;
+A1FD;YI SYLLABLE KIE;Lo;0;L;;;;;N;;;;;
+A1FE;YI SYLLABLE KIEP;Lo;0;L;;;;;N;;;;;
+A1FF;YI SYLLABLE KAT;Lo;0;L;;;;;N;;;;;
+A200;YI SYLLABLE KAX;Lo;0;L;;;;;N;;;;;
+A201;YI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+A202;YI SYLLABLE KAP;Lo;0;L;;;;;N;;;;;
+A203;YI SYLLABLE KUOX;Lo;0;L;;;;;N;;;;;
+A204;YI SYLLABLE KUO;Lo;0;L;;;;;N;;;;;
+A205;YI SYLLABLE KUOP;Lo;0;L;;;;;N;;;;;
+A206;YI SYLLABLE KOT;Lo;0;L;;;;;N;;;;;
+A207;YI SYLLABLE KOX;Lo;0;L;;;;;N;;;;;
+A208;YI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+A209;YI SYLLABLE KOP;Lo;0;L;;;;;N;;;;;
+A20A;YI SYLLABLE KET;Lo;0;L;;;;;N;;;;;
+A20B;YI SYLLABLE KEX;Lo;0;L;;;;;N;;;;;
+A20C;YI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+A20D;YI SYLLABLE KEP;Lo;0;L;;;;;N;;;;;
+A20E;YI SYLLABLE KUT;Lo;0;L;;;;;N;;;;;
+A20F;YI SYLLABLE KUX;Lo;0;L;;;;;N;;;;;
+A210;YI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+A211;YI SYLLABLE KUP;Lo;0;L;;;;;N;;;;;
+A212;YI SYLLABLE KURX;Lo;0;L;;;;;N;;;;;
+A213;YI SYLLABLE KUR;Lo;0;L;;;;;N;;;;;
+A214;YI SYLLABLE GGIT;Lo;0;L;;;;;N;;;;;
+A215;YI SYLLABLE GGIX;Lo;0;L;;;;;N;;;;;
+A216;YI SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
+A217;YI SYLLABLE GGIEX;Lo;0;L;;;;;N;;;;;
+A218;YI SYLLABLE GGIE;Lo;0;L;;;;;N;;;;;
+A219;YI SYLLABLE GGIEP;Lo;0;L;;;;;N;;;;;
+A21A;YI SYLLABLE GGAT;Lo;0;L;;;;;N;;;;;
+A21B;YI SYLLABLE GGAX;Lo;0;L;;;;;N;;;;;
+A21C;YI SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
+A21D;YI SYLLABLE GGAP;Lo;0;L;;;;;N;;;;;
+A21E;YI SYLLABLE GGUOT;Lo;0;L;;;;;N;;;;;
+A21F;YI SYLLABLE GGUOX;Lo;0;L;;;;;N;;;;;
+A220;YI SYLLABLE GGUO;Lo;0;L;;;;;N;;;;;
+A221;YI SYLLABLE GGUOP;Lo;0;L;;;;;N;;;;;
+A222;YI SYLLABLE GGOT;Lo;0;L;;;;;N;;;;;
+A223;YI SYLLABLE GGOX;Lo;0;L;;;;;N;;;;;
+A224;YI SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
+A225;YI SYLLABLE GGOP;Lo;0;L;;;;;N;;;;;
+A226;YI SYLLABLE GGET;Lo;0;L;;;;;N;;;;;
+A227;YI SYLLABLE GGEX;Lo;0;L;;;;;N;;;;;
+A228;YI SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
+A229;YI SYLLABLE GGEP;Lo;0;L;;;;;N;;;;;
+A22A;YI SYLLABLE GGUT;Lo;0;L;;;;;N;;;;;
+A22B;YI SYLLABLE GGUX;Lo;0;L;;;;;N;;;;;
+A22C;YI SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
+A22D;YI SYLLABLE GGUP;Lo;0;L;;;;;N;;;;;
+A22E;YI SYLLABLE GGURX;Lo;0;L;;;;;N;;;;;
+A22F;YI SYLLABLE GGUR;Lo;0;L;;;;;N;;;;;
+A230;YI SYLLABLE MGIEX;Lo;0;L;;;;;N;;;;;
+A231;YI SYLLABLE MGIE;Lo;0;L;;;;;N;;;;;
+A232;YI SYLLABLE MGAT;Lo;0;L;;;;;N;;;;;
+A233;YI SYLLABLE MGAX;Lo;0;L;;;;;N;;;;;
+A234;YI SYLLABLE MGA;Lo;0;L;;;;;N;;;;;
+A235;YI SYLLABLE MGAP;Lo;0;L;;;;;N;;;;;
+A236;YI SYLLABLE MGUOX;Lo;0;L;;;;;N;;;;;
+A237;YI SYLLABLE MGUO;Lo;0;L;;;;;N;;;;;
+A238;YI SYLLABLE MGUOP;Lo;0;L;;;;;N;;;;;
+A239;YI SYLLABLE MGOT;Lo;0;L;;;;;N;;;;;
+A23A;YI SYLLABLE MGOX;Lo;0;L;;;;;N;;;;;
+A23B;YI SYLLABLE MGO;Lo;0;L;;;;;N;;;;;
+A23C;YI SYLLABLE MGOP;Lo;0;L;;;;;N;;;;;
+A23D;YI SYLLABLE MGEX;Lo;0;L;;;;;N;;;;;
+A23E;YI SYLLABLE MGE;Lo;0;L;;;;;N;;;;;
+A23F;YI SYLLABLE MGEP;Lo;0;L;;;;;N;;;;;
+A240;YI SYLLABLE MGUT;Lo;0;L;;;;;N;;;;;
+A241;YI SYLLABLE MGUX;Lo;0;L;;;;;N;;;;;
+A242;YI SYLLABLE MGU;Lo;0;L;;;;;N;;;;;
+A243;YI SYLLABLE MGUP;Lo;0;L;;;;;N;;;;;
+A244;YI SYLLABLE MGURX;Lo;0;L;;;;;N;;;;;
+A245;YI SYLLABLE MGUR;Lo;0;L;;;;;N;;;;;
+A246;YI SYLLABLE HXIT;Lo;0;L;;;;;N;;;;;
+A247;YI SYLLABLE HXIX;Lo;0;L;;;;;N;;;;;
+A248;YI SYLLABLE HXI;Lo;0;L;;;;;N;;;;;
+A249;YI SYLLABLE HXIP;Lo;0;L;;;;;N;;;;;
+A24A;YI SYLLABLE HXIET;Lo;0;L;;;;;N;;;;;
+A24B;YI SYLLABLE HXIEX;Lo;0;L;;;;;N;;;;;
+A24C;YI SYLLABLE HXIE;Lo;0;L;;;;;N;;;;;
+A24D;YI SYLLABLE HXIEP;Lo;0;L;;;;;N;;;;;
+A24E;YI SYLLABLE HXAT;Lo;0;L;;;;;N;;;;;
+A24F;YI SYLLABLE HXAX;Lo;0;L;;;;;N;;;;;
+A250;YI SYLLABLE HXA;Lo;0;L;;;;;N;;;;;
+A251;YI SYLLABLE HXAP;Lo;0;L;;;;;N;;;;;
+A252;YI SYLLABLE HXUOT;Lo;0;L;;;;;N;;;;;
+A253;YI SYLLABLE HXUOX;Lo;0;L;;;;;N;;;;;
+A254;YI SYLLABLE HXUO;Lo;0;L;;;;;N;;;;;
+A255;YI SYLLABLE HXUOP;Lo;0;L;;;;;N;;;;;
+A256;YI SYLLABLE HXOT;Lo;0;L;;;;;N;;;;;
+A257;YI SYLLABLE HXOX;Lo;0;L;;;;;N;;;;;
+A258;YI SYLLABLE HXO;Lo;0;L;;;;;N;;;;;
+A259;YI SYLLABLE HXOP;Lo;0;L;;;;;N;;;;;
+A25A;YI SYLLABLE HXEX;Lo;0;L;;;;;N;;;;;
+A25B;YI SYLLABLE HXE;Lo;0;L;;;;;N;;;;;
+A25C;YI SYLLABLE HXEP;Lo;0;L;;;;;N;;;;;
+A25D;YI SYLLABLE NGIEX;Lo;0;L;;;;;N;;;;;
+A25E;YI SYLLABLE NGIE;Lo;0;L;;;;;N;;;;;
+A25F;YI SYLLABLE NGIEP;Lo;0;L;;;;;N;;;;;
+A260;YI SYLLABLE NGAT;Lo;0;L;;;;;N;;;;;
+A261;YI SYLLABLE NGAX;Lo;0;L;;;;;N;;;;;
+A262;YI SYLLABLE NGA;Lo;0;L;;;;;N;;;;;
+A263;YI SYLLABLE NGAP;Lo;0;L;;;;;N;;;;;
+A264;YI SYLLABLE NGUOT;Lo;0;L;;;;;N;;;;;
+A265;YI SYLLABLE NGUOX;Lo;0;L;;;;;N;;;;;
+A266;YI SYLLABLE NGUO;Lo;0;L;;;;;N;;;;;
+A267;YI SYLLABLE NGOT;Lo;0;L;;;;;N;;;;;
+A268;YI SYLLABLE NGOX;Lo;0;L;;;;;N;;;;;
+A269;YI SYLLABLE NGO;Lo;0;L;;;;;N;;;;;
+A26A;YI SYLLABLE NGOP;Lo;0;L;;;;;N;;;;;
+A26B;YI SYLLABLE NGEX;Lo;0;L;;;;;N;;;;;
+A26C;YI SYLLABLE NGE;Lo;0;L;;;;;N;;;;;
+A26D;YI SYLLABLE NGEP;Lo;0;L;;;;;N;;;;;
+A26E;YI SYLLABLE HIT;Lo;0;L;;;;;N;;;;;
+A26F;YI SYLLABLE HIEX;Lo;0;L;;;;;N;;;;;
+A270;YI SYLLABLE HIE;Lo;0;L;;;;;N;;;;;
+A271;YI SYLLABLE HAT;Lo;0;L;;;;;N;;;;;
+A272;YI SYLLABLE HAX;Lo;0;L;;;;;N;;;;;
+A273;YI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+A274;YI SYLLABLE HAP;Lo;0;L;;;;;N;;;;;
+A275;YI SYLLABLE HUOT;Lo;0;L;;;;;N;;;;;
+A276;YI SYLLABLE HUOX;Lo;0;L;;;;;N;;;;;
+A277;YI SYLLABLE HUO;Lo;0;L;;;;;N;;;;;
+A278;YI SYLLABLE HUOP;Lo;0;L;;;;;N;;;;;
+A279;YI SYLLABLE HOT;Lo;0;L;;;;;N;;;;;
+A27A;YI SYLLABLE HOX;Lo;0;L;;;;;N;;;;;
+A27B;YI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+A27C;YI SYLLABLE HOP;Lo;0;L;;;;;N;;;;;
+A27D;YI SYLLABLE HEX;Lo;0;L;;;;;N;;;;;
+A27E;YI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+A27F;YI SYLLABLE HEP;Lo;0;L;;;;;N;;;;;
+A280;YI SYLLABLE WAT;Lo;0;L;;;;;N;;;;;
+A281;YI SYLLABLE WAX;Lo;0;L;;;;;N;;;;;
+A282;YI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+A283;YI SYLLABLE WAP;Lo;0;L;;;;;N;;;;;
+A284;YI SYLLABLE WUOX;Lo;0;L;;;;;N;;;;;
+A285;YI SYLLABLE WUO;Lo;0;L;;;;;N;;;;;
+A286;YI SYLLABLE WUOP;Lo;0;L;;;;;N;;;;;
+A287;YI SYLLABLE WOX;Lo;0;L;;;;;N;;;;;
+A288;YI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+A289;YI SYLLABLE WOP;Lo;0;L;;;;;N;;;;;
+A28A;YI SYLLABLE WEX;Lo;0;L;;;;;N;;;;;
+A28B;YI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+A28C;YI SYLLABLE WEP;Lo;0;L;;;;;N;;;;;
+A28D;YI SYLLABLE ZIT;Lo;0;L;;;;;N;;;;;
+A28E;YI SYLLABLE ZIX;Lo;0;L;;;;;N;;;;;
+A28F;YI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+A290;YI SYLLABLE ZIP;Lo;0;L;;;;;N;;;;;
+A291;YI SYLLABLE ZIEX;Lo;0;L;;;;;N;;;;;
+A292;YI SYLLABLE ZIE;Lo;0;L;;;;;N;;;;;
+A293;YI SYLLABLE ZIEP;Lo;0;L;;;;;N;;;;;
+A294;YI SYLLABLE ZAT;Lo;0;L;;;;;N;;;;;
+A295;YI SYLLABLE ZAX;Lo;0;L;;;;;N;;;;;
+A296;YI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+A297;YI SYLLABLE ZAP;Lo;0;L;;;;;N;;;;;
+A298;YI SYLLABLE ZUOX;Lo;0;L;;;;;N;;;;;
+A299;YI SYLLABLE ZUO;Lo;0;L;;;;;N;;;;;
+A29A;YI SYLLABLE ZUOP;Lo;0;L;;;;;N;;;;;
+A29B;YI SYLLABLE ZOT;Lo;0;L;;;;;N;;;;;
+A29C;YI SYLLABLE ZOX;Lo;0;L;;;;;N;;;;;
+A29D;YI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+A29E;YI SYLLABLE ZOP;Lo;0;L;;;;;N;;;;;
+A29F;YI SYLLABLE ZEX;Lo;0;L;;;;;N;;;;;
+A2A0;YI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+A2A1;YI SYLLABLE ZEP;Lo;0;L;;;;;N;;;;;
+A2A2;YI SYLLABLE ZUT;Lo;0;L;;;;;N;;;;;
+A2A3;YI SYLLABLE ZUX;Lo;0;L;;;;;N;;;;;
+A2A4;YI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+A2A5;YI SYLLABLE ZUP;Lo;0;L;;;;;N;;;;;
+A2A6;YI SYLLABLE ZURX;Lo;0;L;;;;;N;;;;;
+A2A7;YI SYLLABLE ZUR;Lo;0;L;;;;;N;;;;;
+A2A8;YI SYLLABLE ZYT;Lo;0;L;;;;;N;;;;;
+A2A9;YI SYLLABLE ZYX;Lo;0;L;;;;;N;;;;;
+A2AA;YI SYLLABLE ZY;Lo;0;L;;;;;N;;;;;
+A2AB;YI SYLLABLE ZYP;Lo;0;L;;;;;N;;;;;
+A2AC;YI SYLLABLE ZYRX;Lo;0;L;;;;;N;;;;;
+A2AD;YI SYLLABLE ZYR;Lo;0;L;;;;;N;;;;;
+A2AE;YI SYLLABLE CIT;Lo;0;L;;;;;N;;;;;
+A2AF;YI SYLLABLE CIX;Lo;0;L;;;;;N;;;;;
+A2B0;YI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+A2B1;YI SYLLABLE CIP;Lo;0;L;;;;;N;;;;;
+A2B2;YI SYLLABLE CIET;Lo;0;L;;;;;N;;;;;
+A2B3;YI SYLLABLE CIEX;Lo;0;L;;;;;N;;;;;
+A2B4;YI SYLLABLE CIE;Lo;0;L;;;;;N;;;;;
+A2B5;YI SYLLABLE CIEP;Lo;0;L;;;;;N;;;;;
+A2B6;YI SYLLABLE CAT;Lo;0;L;;;;;N;;;;;
+A2B7;YI SYLLABLE CAX;Lo;0;L;;;;;N;;;;;
+A2B8;YI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+A2B9;YI SYLLABLE CAP;Lo;0;L;;;;;N;;;;;
+A2BA;YI SYLLABLE CUOX;Lo;0;L;;;;;N;;;;;
+A2BB;YI SYLLABLE CUO;Lo;0;L;;;;;N;;;;;
+A2BC;YI SYLLABLE CUOP;Lo;0;L;;;;;N;;;;;
+A2BD;YI SYLLABLE COT;Lo;0;L;;;;;N;;;;;
+A2BE;YI SYLLABLE COX;Lo;0;L;;;;;N;;;;;
+A2BF;YI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+A2C0;YI SYLLABLE COP;Lo;0;L;;;;;N;;;;;
+A2C1;YI SYLLABLE CEX;Lo;0;L;;;;;N;;;;;
+A2C2;YI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+A2C3;YI SYLLABLE CEP;Lo;0;L;;;;;N;;;;;
+A2C4;YI SYLLABLE CUT;Lo;0;L;;;;;N;;;;;
+A2C5;YI SYLLABLE CUX;Lo;0;L;;;;;N;;;;;
+A2C6;YI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+A2C7;YI SYLLABLE CUP;Lo;0;L;;;;;N;;;;;
+A2C8;YI SYLLABLE CURX;Lo;0;L;;;;;N;;;;;
+A2C9;YI SYLLABLE CUR;Lo;0;L;;;;;N;;;;;
+A2CA;YI SYLLABLE CYT;Lo;0;L;;;;;N;;;;;
+A2CB;YI SYLLABLE CYX;Lo;0;L;;;;;N;;;;;
+A2CC;YI SYLLABLE CY;Lo;0;L;;;;;N;;;;;
+A2CD;YI SYLLABLE CYP;Lo;0;L;;;;;N;;;;;
+A2CE;YI SYLLABLE CYRX;Lo;0;L;;;;;N;;;;;
+A2CF;YI SYLLABLE CYR;Lo;0;L;;;;;N;;;;;
+A2D0;YI SYLLABLE ZZIT;Lo;0;L;;;;;N;;;;;
+A2D1;YI SYLLABLE ZZIX;Lo;0;L;;;;;N;;;;;
+A2D2;YI SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
+A2D3;YI SYLLABLE ZZIP;Lo;0;L;;;;;N;;;;;
+A2D4;YI SYLLABLE ZZIET;Lo;0;L;;;;;N;;;;;
+A2D5;YI SYLLABLE ZZIEX;Lo;0;L;;;;;N;;;;;
+A2D6;YI SYLLABLE ZZIE;Lo;0;L;;;;;N;;;;;
+A2D7;YI SYLLABLE ZZIEP;Lo;0;L;;;;;N;;;;;
+A2D8;YI SYLLABLE ZZAT;Lo;0;L;;;;;N;;;;;
+A2D9;YI SYLLABLE ZZAX;Lo;0;L;;;;;N;;;;;
+A2DA;YI SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
+A2DB;YI SYLLABLE ZZAP;Lo;0;L;;;;;N;;;;;
+A2DC;YI SYLLABLE ZZOX;Lo;0;L;;;;;N;;;;;
+A2DD;YI SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
+A2DE;YI SYLLABLE ZZOP;Lo;0;L;;;;;N;;;;;
+A2DF;YI SYLLABLE ZZEX;Lo;0;L;;;;;N;;;;;
+A2E0;YI SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
+A2E1;YI SYLLABLE ZZEP;Lo;0;L;;;;;N;;;;;
+A2E2;YI SYLLABLE ZZUX;Lo;0;L;;;;;N;;;;;
+A2E3;YI SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
+A2E4;YI SYLLABLE ZZUP;Lo;0;L;;;;;N;;;;;
+A2E5;YI SYLLABLE ZZURX;Lo;0;L;;;;;N;;;;;
+A2E6;YI SYLLABLE ZZUR;Lo;0;L;;;;;N;;;;;
+A2E7;YI SYLLABLE ZZYT;Lo;0;L;;;;;N;;;;;
+A2E8;YI SYLLABLE ZZYX;Lo;0;L;;;;;N;;;;;
+A2E9;YI SYLLABLE ZZY;Lo;0;L;;;;;N;;;;;
+A2EA;YI SYLLABLE ZZYP;Lo;0;L;;;;;N;;;;;
+A2EB;YI SYLLABLE ZZYRX;Lo;0;L;;;;;N;;;;;
+A2EC;YI SYLLABLE ZZYR;Lo;0;L;;;;;N;;;;;
+A2ED;YI SYLLABLE NZIT;Lo;0;L;;;;;N;;;;;
+A2EE;YI SYLLABLE NZIX;Lo;0;L;;;;;N;;;;;
+A2EF;YI SYLLABLE NZI;Lo;0;L;;;;;N;;;;;
+A2F0;YI SYLLABLE NZIP;Lo;0;L;;;;;N;;;;;
+A2F1;YI SYLLABLE NZIEX;Lo;0;L;;;;;N;;;;;
+A2F2;YI SYLLABLE NZIE;Lo;0;L;;;;;N;;;;;
+A2F3;YI SYLLABLE NZIEP;Lo;0;L;;;;;N;;;;;
+A2F4;YI SYLLABLE NZAT;Lo;0;L;;;;;N;;;;;
+A2F5;YI SYLLABLE NZAX;Lo;0;L;;;;;N;;;;;
+A2F6;YI SYLLABLE NZA;Lo;0;L;;;;;N;;;;;
+A2F7;YI SYLLABLE NZAP;Lo;0;L;;;;;N;;;;;
+A2F8;YI SYLLABLE NZUOX;Lo;0;L;;;;;N;;;;;
+A2F9;YI SYLLABLE NZUO;Lo;0;L;;;;;N;;;;;
+A2FA;YI SYLLABLE NZOX;Lo;0;L;;;;;N;;;;;
+A2FB;YI SYLLABLE NZOP;Lo;0;L;;;;;N;;;;;
+A2FC;YI SYLLABLE NZEX;Lo;0;L;;;;;N;;;;;
+A2FD;YI SYLLABLE NZE;Lo;0;L;;;;;N;;;;;
+A2FE;YI SYLLABLE NZUX;Lo;0;L;;;;;N;;;;;
+A2FF;YI SYLLABLE NZU;Lo;0;L;;;;;N;;;;;
+A300;YI SYLLABLE NZUP;Lo;0;L;;;;;N;;;;;
+A301;YI SYLLABLE NZURX;Lo;0;L;;;;;N;;;;;
+A302;YI SYLLABLE NZUR;Lo;0;L;;;;;N;;;;;
+A303;YI SYLLABLE NZYT;Lo;0;L;;;;;N;;;;;
+A304;YI SYLLABLE NZYX;Lo;0;L;;;;;N;;;;;
+A305;YI SYLLABLE NZY;Lo;0;L;;;;;N;;;;;
+A306;YI SYLLABLE NZYP;Lo;0;L;;;;;N;;;;;
+A307;YI SYLLABLE NZYRX;Lo;0;L;;;;;N;;;;;
+A308;YI SYLLABLE NZYR;Lo;0;L;;;;;N;;;;;
+A309;YI SYLLABLE SIT;Lo;0;L;;;;;N;;;;;
+A30A;YI SYLLABLE SIX;Lo;0;L;;;;;N;;;;;
+A30B;YI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+A30C;YI SYLLABLE SIP;Lo;0;L;;;;;N;;;;;
+A30D;YI SYLLABLE SIEX;Lo;0;L;;;;;N;;;;;
+A30E;YI SYLLABLE SIE;Lo;0;L;;;;;N;;;;;
+A30F;YI SYLLABLE SIEP;Lo;0;L;;;;;N;;;;;
+A310;YI SYLLABLE SAT;Lo;0;L;;;;;N;;;;;
+A311;YI SYLLABLE SAX;Lo;0;L;;;;;N;;;;;
+A312;YI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+A313;YI SYLLABLE SAP;Lo;0;L;;;;;N;;;;;
+A314;YI SYLLABLE SUOX;Lo;0;L;;;;;N;;;;;
+A315;YI SYLLABLE SUO;Lo;0;L;;;;;N;;;;;
+A316;YI SYLLABLE SUOP;Lo;0;L;;;;;N;;;;;
+A317;YI SYLLABLE SOT;Lo;0;L;;;;;N;;;;;
+A318;YI SYLLABLE SOX;Lo;0;L;;;;;N;;;;;
+A319;YI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+A31A;YI SYLLABLE SOP;Lo;0;L;;;;;N;;;;;
+A31B;YI SYLLABLE SEX;Lo;0;L;;;;;N;;;;;
+A31C;YI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+A31D;YI SYLLABLE SEP;Lo;0;L;;;;;N;;;;;
+A31E;YI SYLLABLE SUT;Lo;0;L;;;;;N;;;;;
+A31F;YI SYLLABLE SUX;Lo;0;L;;;;;N;;;;;
+A320;YI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+A321;YI SYLLABLE SUP;Lo;0;L;;;;;N;;;;;
+A322;YI SYLLABLE SURX;Lo;0;L;;;;;N;;;;;
+A323;YI SYLLABLE SUR;Lo;0;L;;;;;N;;;;;
+A324;YI SYLLABLE SYT;Lo;0;L;;;;;N;;;;;
+A325;YI SYLLABLE SYX;Lo;0;L;;;;;N;;;;;
+A326;YI SYLLABLE SY;Lo;0;L;;;;;N;;;;;
+A327;YI SYLLABLE SYP;Lo;0;L;;;;;N;;;;;
+A328;YI SYLLABLE SYRX;Lo;0;L;;;;;N;;;;;
+A329;YI SYLLABLE SYR;Lo;0;L;;;;;N;;;;;
+A32A;YI SYLLABLE SSIT;Lo;0;L;;;;;N;;;;;
+A32B;YI SYLLABLE SSIX;Lo;0;L;;;;;N;;;;;
+A32C;YI SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
+A32D;YI SYLLABLE SSIP;Lo;0;L;;;;;N;;;;;
+A32E;YI SYLLABLE SSIEX;Lo;0;L;;;;;N;;;;;
+A32F;YI SYLLABLE SSIE;Lo;0;L;;;;;N;;;;;
+A330;YI SYLLABLE SSIEP;Lo;0;L;;;;;N;;;;;
+A331;YI SYLLABLE SSAT;Lo;0;L;;;;;N;;;;;
+A332;YI SYLLABLE SSAX;Lo;0;L;;;;;N;;;;;
+A333;YI SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
+A334;YI SYLLABLE SSAP;Lo;0;L;;;;;N;;;;;
+A335;YI SYLLABLE SSOT;Lo;0;L;;;;;N;;;;;
+A336;YI SYLLABLE SSOX;Lo;0;L;;;;;N;;;;;
+A337;YI SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
+A338;YI SYLLABLE SSOP;Lo;0;L;;;;;N;;;;;
+A339;YI SYLLABLE SSEX;Lo;0;L;;;;;N;;;;;
+A33A;YI SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
+A33B;YI SYLLABLE SSEP;Lo;0;L;;;;;N;;;;;
+A33C;YI SYLLABLE SSUT;Lo;0;L;;;;;N;;;;;
+A33D;YI SYLLABLE SSUX;Lo;0;L;;;;;N;;;;;
+A33E;YI SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
+A33F;YI SYLLABLE SSUP;Lo;0;L;;;;;N;;;;;
+A340;YI SYLLABLE SSYT;Lo;0;L;;;;;N;;;;;
+A341;YI SYLLABLE SSYX;Lo;0;L;;;;;N;;;;;
+A342;YI SYLLABLE SSY;Lo;0;L;;;;;N;;;;;
+A343;YI SYLLABLE SSYP;Lo;0;L;;;;;N;;;;;
+A344;YI SYLLABLE SSYRX;Lo;0;L;;;;;N;;;;;
+A345;YI SYLLABLE SSYR;Lo;0;L;;;;;N;;;;;
+A346;YI SYLLABLE ZHAT;Lo;0;L;;;;;N;;;;;
+A347;YI SYLLABLE ZHAX;Lo;0;L;;;;;N;;;;;
+A348;YI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+A349;YI SYLLABLE ZHAP;Lo;0;L;;;;;N;;;;;
+A34A;YI SYLLABLE ZHUOX;Lo;0;L;;;;;N;;;;;
+A34B;YI SYLLABLE ZHUO;Lo;0;L;;;;;N;;;;;
+A34C;YI SYLLABLE ZHUOP;Lo;0;L;;;;;N;;;;;
+A34D;YI SYLLABLE ZHOT;Lo;0;L;;;;;N;;;;;
+A34E;YI SYLLABLE ZHOX;Lo;0;L;;;;;N;;;;;
+A34F;YI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+A350;YI SYLLABLE ZHOP;Lo;0;L;;;;;N;;;;;
+A351;YI SYLLABLE ZHET;Lo;0;L;;;;;N;;;;;
+A352;YI SYLLABLE ZHEX;Lo;0;L;;;;;N;;;;;
+A353;YI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+A354;YI SYLLABLE ZHEP;Lo;0;L;;;;;N;;;;;
+A355;YI SYLLABLE ZHUT;Lo;0;L;;;;;N;;;;;
+A356;YI SYLLABLE ZHUX;Lo;0;L;;;;;N;;;;;
+A357;YI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+A358;YI SYLLABLE ZHUP;Lo;0;L;;;;;N;;;;;
+A359;YI SYLLABLE ZHURX;Lo;0;L;;;;;N;;;;;
+A35A;YI SYLLABLE ZHUR;Lo;0;L;;;;;N;;;;;
+A35B;YI SYLLABLE ZHYT;Lo;0;L;;;;;N;;;;;
+A35C;YI SYLLABLE ZHYX;Lo;0;L;;;;;N;;;;;
+A35D;YI SYLLABLE ZHY;Lo;0;L;;;;;N;;;;;
+A35E;YI SYLLABLE ZHYP;Lo;0;L;;;;;N;;;;;
+A35F;YI SYLLABLE ZHYRX;Lo;0;L;;;;;N;;;;;
+A360;YI SYLLABLE ZHYR;Lo;0;L;;;;;N;;;;;
+A361;YI SYLLABLE CHAT;Lo;0;L;;;;;N;;;;;
+A362;YI SYLLABLE CHAX;Lo;0;L;;;;;N;;;;;
+A363;YI SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
+A364;YI SYLLABLE CHAP;Lo;0;L;;;;;N;;;;;
+A365;YI SYLLABLE CHUOT;Lo;0;L;;;;;N;;;;;
+A366;YI SYLLABLE CHUOX;Lo;0;L;;;;;N;;;;;
+A367;YI SYLLABLE CHUO;Lo;0;L;;;;;N;;;;;
+A368;YI SYLLABLE CHUOP;Lo;0;L;;;;;N;;;;;
+A369;YI SYLLABLE CHOT;Lo;0;L;;;;;N;;;;;
+A36A;YI SYLLABLE CHOX;Lo;0;L;;;;;N;;;;;
+A36B;YI SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
+A36C;YI SYLLABLE CHOP;Lo;0;L;;;;;N;;;;;
+A36D;YI SYLLABLE CHET;Lo;0;L;;;;;N;;;;;
+A36E;YI SYLLABLE CHEX;Lo;0;L;;;;;N;;;;;
+A36F;YI SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
+A370;YI SYLLABLE CHEP;Lo;0;L;;;;;N;;;;;
+A371;YI SYLLABLE CHUX;Lo;0;L;;;;;N;;;;;
+A372;YI SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
+A373;YI SYLLABLE CHUP;Lo;0;L;;;;;N;;;;;
+A374;YI SYLLABLE CHURX;Lo;0;L;;;;;N;;;;;
+A375;YI SYLLABLE CHUR;Lo;0;L;;;;;N;;;;;
+A376;YI SYLLABLE CHYT;Lo;0;L;;;;;N;;;;;
+A377;YI SYLLABLE CHYX;Lo;0;L;;;;;N;;;;;
+A378;YI SYLLABLE CHY;Lo;0;L;;;;;N;;;;;
+A379;YI SYLLABLE CHYP;Lo;0;L;;;;;N;;;;;
+A37A;YI SYLLABLE CHYRX;Lo;0;L;;;;;N;;;;;
+A37B;YI SYLLABLE CHYR;Lo;0;L;;;;;N;;;;;
+A37C;YI SYLLABLE RRAX;Lo;0;L;;;;;N;;;;;
+A37D;YI SYLLABLE RRA;Lo;0;L;;;;;N;;;;;
+A37E;YI SYLLABLE RRUOX;Lo;0;L;;;;;N;;;;;
+A37F;YI SYLLABLE RRUO;Lo;0;L;;;;;N;;;;;
+A380;YI SYLLABLE RROT;Lo;0;L;;;;;N;;;;;
+A381;YI SYLLABLE RROX;Lo;0;L;;;;;N;;;;;
+A382;YI SYLLABLE RRO;Lo;0;L;;;;;N;;;;;
+A383;YI SYLLABLE RROP;Lo;0;L;;;;;N;;;;;
+A384;YI SYLLABLE RRET;Lo;0;L;;;;;N;;;;;
+A385;YI SYLLABLE RREX;Lo;0;L;;;;;N;;;;;
+A386;YI SYLLABLE RRE;Lo;0;L;;;;;N;;;;;
+A387;YI SYLLABLE RREP;Lo;0;L;;;;;N;;;;;
+A388;YI SYLLABLE RRUT;Lo;0;L;;;;;N;;;;;
+A389;YI SYLLABLE RRUX;Lo;0;L;;;;;N;;;;;
+A38A;YI SYLLABLE RRU;Lo;0;L;;;;;N;;;;;
+A38B;YI SYLLABLE RRUP;Lo;0;L;;;;;N;;;;;
+A38C;YI SYLLABLE RRURX;Lo;0;L;;;;;N;;;;;
+A38D;YI SYLLABLE RRUR;Lo;0;L;;;;;N;;;;;
+A38E;YI SYLLABLE RRYT;Lo;0;L;;;;;N;;;;;
+A38F;YI SYLLABLE RRYX;Lo;0;L;;;;;N;;;;;
+A390;YI SYLLABLE RRY;Lo;0;L;;;;;N;;;;;
+A391;YI SYLLABLE RRYP;Lo;0;L;;;;;N;;;;;
+A392;YI SYLLABLE RRYRX;Lo;0;L;;;;;N;;;;;
+A393;YI SYLLABLE RRYR;Lo;0;L;;;;;N;;;;;
+A394;YI SYLLABLE NRAT;Lo;0;L;;;;;N;;;;;
+A395;YI SYLLABLE NRAX;Lo;0;L;;;;;N;;;;;
+A396;YI SYLLABLE NRA;Lo;0;L;;;;;N;;;;;
+A397;YI SYLLABLE NRAP;Lo;0;L;;;;;N;;;;;
+A398;YI SYLLABLE NROX;Lo;0;L;;;;;N;;;;;
+A399;YI SYLLABLE NRO;Lo;0;L;;;;;N;;;;;
+A39A;YI SYLLABLE NROP;Lo;0;L;;;;;N;;;;;
+A39B;YI SYLLABLE NRET;Lo;0;L;;;;;N;;;;;
+A39C;YI SYLLABLE NREX;Lo;0;L;;;;;N;;;;;
+A39D;YI SYLLABLE NRE;Lo;0;L;;;;;N;;;;;
+A39E;YI SYLLABLE NREP;Lo;0;L;;;;;N;;;;;
+A39F;YI SYLLABLE NRUT;Lo;0;L;;;;;N;;;;;
+A3A0;YI SYLLABLE NRUX;Lo;0;L;;;;;N;;;;;
+A3A1;YI SYLLABLE NRU;Lo;0;L;;;;;N;;;;;
+A3A2;YI SYLLABLE NRUP;Lo;0;L;;;;;N;;;;;
+A3A3;YI SYLLABLE NRURX;Lo;0;L;;;;;N;;;;;
+A3A4;YI SYLLABLE NRUR;Lo;0;L;;;;;N;;;;;
+A3A5;YI SYLLABLE NRYT;Lo;0;L;;;;;N;;;;;
+A3A6;YI SYLLABLE NRYX;Lo;0;L;;;;;N;;;;;
+A3A7;YI SYLLABLE NRY;Lo;0;L;;;;;N;;;;;
+A3A8;YI SYLLABLE NRYP;Lo;0;L;;;;;N;;;;;
+A3A9;YI SYLLABLE NRYRX;Lo;0;L;;;;;N;;;;;
+A3AA;YI SYLLABLE NRYR;Lo;0;L;;;;;N;;;;;
+A3AB;YI SYLLABLE SHAT;Lo;0;L;;;;;N;;;;;
+A3AC;YI SYLLABLE SHAX;Lo;0;L;;;;;N;;;;;
+A3AD;YI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+A3AE;YI SYLLABLE SHAP;Lo;0;L;;;;;N;;;;;
+A3AF;YI SYLLABLE SHUOX;Lo;0;L;;;;;N;;;;;
+A3B0;YI SYLLABLE SHUO;Lo;0;L;;;;;N;;;;;
+A3B1;YI SYLLABLE SHUOP;Lo;0;L;;;;;N;;;;;
+A3B2;YI SYLLABLE SHOT;Lo;0;L;;;;;N;;;;;
+A3B3;YI SYLLABLE SHOX;Lo;0;L;;;;;N;;;;;
+A3B4;YI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+A3B5;YI SYLLABLE SHOP;Lo;0;L;;;;;N;;;;;
+A3B6;YI SYLLABLE SHET;Lo;0;L;;;;;N;;;;;
+A3B7;YI SYLLABLE SHEX;Lo;0;L;;;;;N;;;;;
+A3B8;YI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+A3B9;YI SYLLABLE SHEP;Lo;0;L;;;;;N;;;;;
+A3BA;YI SYLLABLE SHUT;Lo;0;L;;;;;N;;;;;
+A3BB;YI SYLLABLE SHUX;Lo;0;L;;;;;N;;;;;
+A3BC;YI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+A3BD;YI SYLLABLE SHUP;Lo;0;L;;;;;N;;;;;
+A3BE;YI SYLLABLE SHURX;Lo;0;L;;;;;N;;;;;
+A3BF;YI SYLLABLE SHUR;Lo;0;L;;;;;N;;;;;
+A3C0;YI SYLLABLE SHYT;Lo;0;L;;;;;N;;;;;
+A3C1;YI SYLLABLE SHYX;Lo;0;L;;;;;N;;;;;
+A3C2;YI SYLLABLE SHY;Lo;0;L;;;;;N;;;;;
+A3C3;YI SYLLABLE SHYP;Lo;0;L;;;;;N;;;;;
+A3C4;YI SYLLABLE SHYRX;Lo;0;L;;;;;N;;;;;
+A3C5;YI SYLLABLE SHYR;Lo;0;L;;;;;N;;;;;
+A3C6;YI SYLLABLE RAT;Lo;0;L;;;;;N;;;;;
+A3C7;YI SYLLABLE RAX;Lo;0;L;;;;;N;;;;;
+A3C8;YI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+A3C9;YI SYLLABLE RAP;Lo;0;L;;;;;N;;;;;
+A3CA;YI SYLLABLE RUOX;Lo;0;L;;;;;N;;;;;
+A3CB;YI SYLLABLE RUO;Lo;0;L;;;;;N;;;;;
+A3CC;YI SYLLABLE RUOP;Lo;0;L;;;;;N;;;;;
+A3CD;YI SYLLABLE ROT;Lo;0;L;;;;;N;;;;;
+A3CE;YI SYLLABLE ROX;Lo;0;L;;;;;N;;;;;
+A3CF;YI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+A3D0;YI SYLLABLE ROP;Lo;0;L;;;;;N;;;;;
+A3D1;YI SYLLABLE REX;Lo;0;L;;;;;N;;;;;
+A3D2;YI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+A3D3;YI SYLLABLE REP;Lo;0;L;;;;;N;;;;;
+A3D4;YI SYLLABLE RUT;Lo;0;L;;;;;N;;;;;
+A3D5;YI SYLLABLE RUX;Lo;0;L;;;;;N;;;;;
+A3D6;YI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+A3D7;YI SYLLABLE RUP;Lo;0;L;;;;;N;;;;;
+A3D8;YI SYLLABLE RURX;Lo;0;L;;;;;N;;;;;
+A3D9;YI SYLLABLE RUR;Lo;0;L;;;;;N;;;;;
+A3DA;YI SYLLABLE RYT;Lo;0;L;;;;;N;;;;;
+A3DB;YI SYLLABLE RYX;Lo;0;L;;;;;N;;;;;
+A3DC;YI SYLLABLE RY;Lo;0;L;;;;;N;;;;;
+A3DD;YI SYLLABLE RYP;Lo;0;L;;;;;N;;;;;
+A3DE;YI SYLLABLE RYRX;Lo;0;L;;;;;N;;;;;
+A3DF;YI SYLLABLE RYR;Lo;0;L;;;;;N;;;;;
+A3E0;YI SYLLABLE JIT;Lo;0;L;;;;;N;;;;;
+A3E1;YI SYLLABLE JIX;Lo;0;L;;;;;N;;;;;
+A3E2;YI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+A3E3;YI SYLLABLE JIP;Lo;0;L;;;;;N;;;;;
+A3E4;YI SYLLABLE JIET;Lo;0;L;;;;;N;;;;;
+A3E5;YI SYLLABLE JIEX;Lo;0;L;;;;;N;;;;;
+A3E6;YI SYLLABLE JIE;Lo;0;L;;;;;N;;;;;
+A3E7;YI SYLLABLE JIEP;Lo;0;L;;;;;N;;;;;
+A3E8;YI SYLLABLE JUOT;Lo;0;L;;;;;N;;;;;
+A3E9;YI SYLLABLE JUOX;Lo;0;L;;;;;N;;;;;
+A3EA;YI SYLLABLE JUO;Lo;0;L;;;;;N;;;;;
+A3EB;YI SYLLABLE JUOP;Lo;0;L;;;;;N;;;;;
+A3EC;YI SYLLABLE JOT;Lo;0;L;;;;;N;;;;;
+A3ED;YI SYLLABLE JOX;Lo;0;L;;;;;N;;;;;
+A3EE;YI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+A3EF;YI SYLLABLE JOP;Lo;0;L;;;;;N;;;;;
+A3F0;YI SYLLABLE JUT;Lo;0;L;;;;;N;;;;;
+A3F1;YI SYLLABLE JUX;Lo;0;L;;;;;N;;;;;
+A3F2;YI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+A3F3;YI SYLLABLE JUP;Lo;0;L;;;;;N;;;;;
+A3F4;YI SYLLABLE JURX;Lo;0;L;;;;;N;;;;;
+A3F5;YI SYLLABLE JUR;Lo;0;L;;;;;N;;;;;
+A3F6;YI SYLLABLE JYT;Lo;0;L;;;;;N;;;;;
+A3F7;YI SYLLABLE JYX;Lo;0;L;;;;;N;;;;;
+A3F8;YI SYLLABLE JY;Lo;0;L;;;;;N;;;;;
+A3F9;YI SYLLABLE JYP;Lo;0;L;;;;;N;;;;;
+A3FA;YI SYLLABLE JYRX;Lo;0;L;;;;;N;;;;;
+A3FB;YI SYLLABLE JYR;Lo;0;L;;;;;N;;;;;
+A3FC;YI SYLLABLE QIT;Lo;0;L;;;;;N;;;;;
+A3FD;YI SYLLABLE QIX;Lo;0;L;;;;;N;;;;;
+A3FE;YI SYLLABLE QI;Lo;0;L;;;;;N;;;;;
+A3FF;YI SYLLABLE QIP;Lo;0;L;;;;;N;;;;;
+A400;YI SYLLABLE QIET;Lo;0;L;;;;;N;;;;;
+A401;YI SYLLABLE QIEX;Lo;0;L;;;;;N;;;;;
+A402;YI SYLLABLE QIE;Lo;0;L;;;;;N;;;;;
+A403;YI SYLLABLE QIEP;Lo;0;L;;;;;N;;;;;
+A404;YI SYLLABLE QUOT;Lo;0;L;;;;;N;;;;;
+A405;YI SYLLABLE QUOX;Lo;0;L;;;;;N;;;;;
+A406;YI SYLLABLE QUO;Lo;0;L;;;;;N;;;;;
+A407;YI SYLLABLE QUOP;Lo;0;L;;;;;N;;;;;
+A408;YI SYLLABLE QOT;Lo;0;L;;;;;N;;;;;
+A409;YI SYLLABLE QOX;Lo;0;L;;;;;N;;;;;
+A40A;YI SYLLABLE QO;Lo;0;L;;;;;N;;;;;
+A40B;YI SYLLABLE QOP;Lo;0;L;;;;;N;;;;;
+A40C;YI SYLLABLE QUT;Lo;0;L;;;;;N;;;;;
+A40D;YI SYLLABLE QUX;Lo;0;L;;;;;N;;;;;
+A40E;YI SYLLABLE QU;Lo;0;L;;;;;N;;;;;
+A40F;YI SYLLABLE QUP;Lo;0;L;;;;;N;;;;;
+A410;YI SYLLABLE QURX;Lo;0;L;;;;;N;;;;;
+A411;YI SYLLABLE QUR;Lo;0;L;;;;;N;;;;;
+A412;YI SYLLABLE QYT;Lo;0;L;;;;;N;;;;;
+A413;YI SYLLABLE QYX;Lo;0;L;;;;;N;;;;;
+A414;YI SYLLABLE QY;Lo;0;L;;;;;N;;;;;
+A415;YI SYLLABLE QYP;Lo;0;L;;;;;N;;;;;
+A416;YI SYLLABLE QYRX;Lo;0;L;;;;;N;;;;;
+A417;YI SYLLABLE QYR;Lo;0;L;;;;;N;;;;;
+A418;YI SYLLABLE JJIT;Lo;0;L;;;;;N;;;;;
+A419;YI SYLLABLE JJIX;Lo;0;L;;;;;N;;;;;
+A41A;YI SYLLABLE JJI;Lo;0;L;;;;;N;;;;;
+A41B;YI SYLLABLE JJIP;Lo;0;L;;;;;N;;;;;
+A41C;YI SYLLABLE JJIET;Lo;0;L;;;;;N;;;;;
+A41D;YI SYLLABLE JJIEX;Lo;0;L;;;;;N;;;;;
+A41E;YI SYLLABLE JJIE;Lo;0;L;;;;;N;;;;;
+A41F;YI SYLLABLE JJIEP;Lo;0;L;;;;;N;;;;;
+A420;YI SYLLABLE JJUOX;Lo;0;L;;;;;N;;;;;
+A421;YI SYLLABLE JJUO;Lo;0;L;;;;;N;;;;;
+A422;YI SYLLABLE JJUOP;Lo;0;L;;;;;N;;;;;
+A423;YI SYLLABLE JJOT;Lo;0;L;;;;;N;;;;;
+A424;YI SYLLABLE JJOX;Lo;0;L;;;;;N;;;;;
+A425;YI SYLLABLE JJO;Lo;0;L;;;;;N;;;;;
+A426;YI SYLLABLE JJOP;Lo;0;L;;;;;N;;;;;
+A427;YI SYLLABLE JJUT;Lo;0;L;;;;;N;;;;;
+A428;YI SYLLABLE JJUX;Lo;0;L;;;;;N;;;;;
+A429;YI SYLLABLE JJU;Lo;0;L;;;;;N;;;;;
+A42A;YI SYLLABLE JJUP;Lo;0;L;;;;;N;;;;;
+A42B;YI SYLLABLE JJURX;Lo;0;L;;;;;N;;;;;
+A42C;YI SYLLABLE JJUR;Lo;0;L;;;;;N;;;;;
+A42D;YI SYLLABLE JJYT;Lo;0;L;;;;;N;;;;;
+A42E;YI SYLLABLE JJYX;Lo;0;L;;;;;N;;;;;
+A42F;YI SYLLABLE JJY;Lo;0;L;;;;;N;;;;;
+A430;YI SYLLABLE JJYP;Lo;0;L;;;;;N;;;;;
+A431;YI SYLLABLE NJIT;Lo;0;L;;;;;N;;;;;
+A432;YI SYLLABLE NJIX;Lo;0;L;;;;;N;;;;;
+A433;YI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
+A434;YI SYLLABLE NJIP;Lo;0;L;;;;;N;;;;;
+A435;YI SYLLABLE NJIET;Lo;0;L;;;;;N;;;;;
+A436;YI SYLLABLE NJIEX;Lo;0;L;;;;;N;;;;;
+A437;YI SYLLABLE NJIE;Lo;0;L;;;;;N;;;;;
+A438;YI SYLLABLE NJIEP;Lo;0;L;;;;;N;;;;;
+A439;YI SYLLABLE NJUOX;Lo;0;L;;;;;N;;;;;
+A43A;YI SYLLABLE NJUO;Lo;0;L;;;;;N;;;;;
+A43B;YI SYLLABLE NJOT;Lo;0;L;;;;;N;;;;;
+A43C;YI SYLLABLE NJOX;Lo;0;L;;;;;N;;;;;
+A43D;YI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
+A43E;YI SYLLABLE NJOP;Lo;0;L;;;;;N;;;;;
+A43F;YI SYLLABLE NJUX;Lo;0;L;;;;;N;;;;;
+A440;YI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
+A441;YI SYLLABLE NJUP;Lo;0;L;;;;;N;;;;;
+A442;YI SYLLABLE NJURX;Lo;0;L;;;;;N;;;;;
+A443;YI SYLLABLE NJUR;Lo;0;L;;;;;N;;;;;
+A444;YI SYLLABLE NJYT;Lo;0;L;;;;;N;;;;;
+A445;YI SYLLABLE NJYX;Lo;0;L;;;;;N;;;;;
+A446;YI SYLLABLE NJY;Lo;0;L;;;;;N;;;;;
+A447;YI SYLLABLE NJYP;Lo;0;L;;;;;N;;;;;
+A448;YI SYLLABLE NJYRX;Lo;0;L;;;;;N;;;;;
+A449;YI SYLLABLE NJYR;Lo;0;L;;;;;N;;;;;
+A44A;YI SYLLABLE NYIT;Lo;0;L;;;;;N;;;;;
+A44B;YI SYLLABLE NYIX;Lo;0;L;;;;;N;;;;;
+A44C;YI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+A44D;YI SYLLABLE NYIP;Lo;0;L;;;;;N;;;;;
+A44E;YI SYLLABLE NYIET;Lo;0;L;;;;;N;;;;;
+A44F;YI SYLLABLE NYIEX;Lo;0;L;;;;;N;;;;;
+A450;YI SYLLABLE NYIE;Lo;0;L;;;;;N;;;;;
+A451;YI SYLLABLE NYIEP;Lo;0;L;;;;;N;;;;;
+A452;YI SYLLABLE NYUOX;Lo;0;L;;;;;N;;;;;
+A453;YI SYLLABLE NYUO;Lo;0;L;;;;;N;;;;;
+A454;YI SYLLABLE NYUOP;Lo;0;L;;;;;N;;;;;
+A455;YI SYLLABLE NYOT;Lo;0;L;;;;;N;;;;;
+A456;YI SYLLABLE NYOX;Lo;0;L;;;;;N;;;;;
+A457;YI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+A458;YI SYLLABLE NYOP;Lo;0;L;;;;;N;;;;;
+A459;YI SYLLABLE NYUT;Lo;0;L;;;;;N;;;;;
+A45A;YI SYLLABLE NYUX;Lo;0;L;;;;;N;;;;;
+A45B;YI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+A45C;YI SYLLABLE NYUP;Lo;0;L;;;;;N;;;;;
+A45D;YI SYLLABLE XIT;Lo;0;L;;;;;N;;;;;
+A45E;YI SYLLABLE XIX;Lo;0;L;;;;;N;;;;;
+A45F;YI SYLLABLE XI;Lo;0;L;;;;;N;;;;;
+A460;YI SYLLABLE XIP;Lo;0;L;;;;;N;;;;;
+A461;YI SYLLABLE XIET;Lo;0;L;;;;;N;;;;;
+A462;YI SYLLABLE XIEX;Lo;0;L;;;;;N;;;;;
+A463;YI SYLLABLE XIE;Lo;0;L;;;;;N;;;;;
+A464;YI SYLLABLE XIEP;Lo;0;L;;;;;N;;;;;
+A465;YI SYLLABLE XUOX;Lo;0;L;;;;;N;;;;;
+A466;YI SYLLABLE XUO;Lo;0;L;;;;;N;;;;;
+A467;YI SYLLABLE XOT;Lo;0;L;;;;;N;;;;;
+A468;YI SYLLABLE XOX;Lo;0;L;;;;;N;;;;;
+A469;YI SYLLABLE XO;Lo;0;L;;;;;N;;;;;
+A46A;YI SYLLABLE XOP;Lo;0;L;;;;;N;;;;;
+A46B;YI SYLLABLE XYT;Lo;0;L;;;;;N;;;;;
+A46C;YI SYLLABLE XYX;Lo;0;L;;;;;N;;;;;
+A46D;YI SYLLABLE XY;Lo;0;L;;;;;N;;;;;
+A46E;YI SYLLABLE XYP;Lo;0;L;;;;;N;;;;;
+A46F;YI SYLLABLE XYRX;Lo;0;L;;;;;N;;;;;
+A470;YI SYLLABLE XYR;Lo;0;L;;;;;N;;;;;
+A471;YI SYLLABLE YIT;Lo;0;L;;;;;N;;;;;
+A472;YI SYLLABLE YIX;Lo;0;L;;;;;N;;;;;
+A473;YI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+A474;YI SYLLABLE YIP;Lo;0;L;;;;;N;;;;;
+A475;YI SYLLABLE YIET;Lo;0;L;;;;;N;;;;;
+A476;YI SYLLABLE YIEX;Lo;0;L;;;;;N;;;;;
+A477;YI SYLLABLE YIE;Lo;0;L;;;;;N;;;;;
+A478;YI SYLLABLE YIEP;Lo;0;L;;;;;N;;;;;
+A479;YI SYLLABLE YUOT;Lo;0;L;;;;;N;;;;;
+A47A;YI SYLLABLE YUOX;Lo;0;L;;;;;N;;;;;
+A47B;YI SYLLABLE YUO;Lo;0;L;;;;;N;;;;;
+A47C;YI SYLLABLE YUOP;Lo;0;L;;;;;N;;;;;
+A47D;YI SYLLABLE YOT;Lo;0;L;;;;;N;;;;;
+A47E;YI SYLLABLE YOX;Lo;0;L;;;;;N;;;;;
+A47F;YI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+A480;YI SYLLABLE YOP;Lo;0;L;;;;;N;;;;;
+A481;YI SYLLABLE YUT;Lo;0;L;;;;;N;;;;;
+A482;YI SYLLABLE YUX;Lo;0;L;;;;;N;;;;;
+A483;YI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+A484;YI SYLLABLE YUP;Lo;0;L;;;;;N;;;;;
+A485;YI SYLLABLE YURX;Lo;0;L;;;;;N;;;;;
+A486;YI SYLLABLE YUR;Lo;0;L;;;;;N;;;;;
+A487;YI SYLLABLE YYT;Lo;0;L;;;;;N;;;;;
+A488;YI SYLLABLE YYX;Lo;0;L;;;;;N;;;;;
+A489;YI SYLLABLE YY;Lo;0;L;;;;;N;;;;;
+A48A;YI SYLLABLE YYP;Lo;0;L;;;;;N;;;;;
+A48B;YI SYLLABLE YYRX;Lo;0;L;;;;;N;;;;;
+A48C;YI SYLLABLE YYR;Lo;0;L;;;;;N;;;;;
+A490;YI RADICAL QOT;So;0;ON;;;;;N;;;;;
+A491;YI RADICAL LI;So;0;ON;;;;;N;;;;;
+A492;YI RADICAL KIT;So;0;ON;;;;;N;;;;;
+A493;YI RADICAL NYIP;So;0;ON;;;;;N;;;;;
+A494;YI RADICAL CYP;So;0;ON;;;;;N;;;;;
+A495;YI RADICAL SSI;So;0;ON;;;;;N;;;;;
+A496;YI RADICAL GGOP;So;0;ON;;;;;N;;;;;
+A497;YI RADICAL GEP;So;0;ON;;;;;N;;;;;
+A498;YI RADICAL MI;So;0;ON;;;;;N;;;;;
+A499;YI RADICAL HXIT;So;0;ON;;;;;N;;;;;
+A49A;YI RADICAL LYR;So;0;ON;;;;;N;;;;;
+A49B;YI RADICAL BBUT;So;0;ON;;;;;N;;;;;
+A49C;YI RADICAL MOP;So;0;ON;;;;;N;;;;;
+A49D;YI RADICAL YO;So;0;ON;;;;;N;;;;;
+A49E;YI RADICAL PUT;So;0;ON;;;;;N;;;;;
+A49F;YI RADICAL HXUO;So;0;ON;;;;;N;;;;;
+A4A0;YI RADICAL TAT;So;0;ON;;;;;N;;;;;
+A4A1;YI RADICAL GA;So;0;ON;;;;;N;;;;;
+A4A2;YI RADICAL ZUP;So;0;ON;;;;;N;;;;;
+A4A3;YI RADICAL CYT;So;0;ON;;;;;N;;;;;
+A4A4;YI RADICAL DDUR;So;0;ON;;;;;N;;;;;
+A4A5;YI RADICAL BUR;So;0;ON;;;;;N;;;;;
+A4A6;YI RADICAL GGUO;So;0;ON;;;;;N;;;;;
+A4A7;YI RADICAL NYOP;So;0;ON;;;;;N;;;;;
+A4A8;YI RADICAL TU;So;0;ON;;;;;N;;;;;
+A4A9;YI RADICAL OP;So;0;ON;;;;;N;;;;;
+A4AA;YI RADICAL JJUT;So;0;ON;;;;;N;;;;;
+A4AB;YI RADICAL ZOT;So;0;ON;;;;;N;;;;;
+A4AC;YI RADICAL PYT;So;0;ON;;;;;N;;;;;
+A4AD;YI RADICAL HMO;So;0;ON;;;;;N;;;;;
+A4AE;YI RADICAL YIT;So;0;ON;;;;;N;;;;;
+A4AF;YI RADICAL VUR;So;0;ON;;;;;N;;;;;
+A4B0;YI RADICAL SHY;So;0;ON;;;;;N;;;;;
+A4B1;YI RADICAL VEP;So;0;ON;;;;;N;;;;;
+A4B2;YI RADICAL ZA;So;0;ON;;;;;N;;;;;
+A4B3;YI RADICAL JO;So;0;ON;;;;;N;;;;;
+A4B4;YI RADICAL NZUP;So;0;ON;;;;;N;;;;;
+A4B5;YI RADICAL JJY;So;0;ON;;;;;N;;;;;
+A4B6;YI RADICAL GOT;So;0;ON;;;;;N;;;;;
+A4B7;YI RADICAL JJIE;So;0;ON;;;;;N;;;;;
+A4B8;YI RADICAL WO;So;0;ON;;;;;N;;;;;
+A4B9;YI RADICAL DU;So;0;ON;;;;;N;;;;;
+A4BA;YI RADICAL SHUR;So;0;ON;;;;;N;;;;;
+A4BB;YI RADICAL LIE;So;0;ON;;;;;N;;;;;
+A4BC;YI RADICAL CY;So;0;ON;;;;;N;;;;;
+A4BD;YI RADICAL CUOP;So;0;ON;;;;;N;;;;;
+A4BE;YI RADICAL CIP;So;0;ON;;;;;N;;;;;
+A4BF;YI RADICAL HXOP;So;0;ON;;;;;N;;;;;
+A4C0;YI RADICAL SHAT;So;0;ON;;;;;N;;;;;
+A4C1;YI RADICAL ZUR;So;0;ON;;;;;N;;;;;
+A4C2;YI RADICAL SHOP;So;0;ON;;;;;N;;;;;
+A4C3;YI RADICAL CHE;So;0;ON;;;;;N;;;;;
+A4C4;YI RADICAL ZZIET;So;0;ON;;;;;N;;;;;
+A4C5;YI RADICAL NBIE;So;0;ON;;;;;N;;;;;
+A4C6;YI RADICAL KE;So;0;ON;;;;;N;;;;;
+A4D0;LISU LETTER BA;Lo;0;L;;;;;N;;;;;
+A4D1;LISU LETTER PA;Lo;0;L;;;;;N;;;;;
+A4D2;LISU LETTER PHA;Lo;0;L;;;;;N;;;;;
+A4D3;LISU LETTER DA;Lo;0;L;;;;;N;;;;;
+A4D4;LISU LETTER TA;Lo;0;L;;;;;N;;;;;
+A4D5;LISU LETTER THA;Lo;0;L;;;;;N;;;;;
+A4D6;LISU LETTER GA;Lo;0;L;;;;;N;;;;;
+A4D7;LISU LETTER KA;Lo;0;L;;;;;N;;;;;
+A4D8;LISU LETTER KHA;Lo;0;L;;;;;N;;;;;
+A4D9;LISU LETTER JA;Lo;0;L;;;;;N;;;;;
+A4DA;LISU LETTER CA;Lo;0;L;;;;;N;;;;;
+A4DB;LISU LETTER CHA;Lo;0;L;;;;;N;;;;;
+A4DC;LISU LETTER DZA;Lo;0;L;;;;;N;;;;;
+A4DD;LISU LETTER TSA;Lo;0;L;;;;;N;;;;;
+A4DE;LISU LETTER TSHA;Lo;0;L;;;;;N;;;;;
+A4DF;LISU LETTER MA;Lo;0;L;;;;;N;;;;;
+A4E0;LISU LETTER NA;Lo;0;L;;;;;N;;;;;
+A4E1;LISU LETTER LA;Lo;0;L;;;;;N;;;;;
+A4E2;LISU LETTER SA;Lo;0;L;;;;;N;;;;;
+A4E3;LISU LETTER ZHA;Lo;0;L;;;;;N;;;;;
+A4E4;LISU LETTER ZA;Lo;0;L;;;;;N;;;;;
+A4E5;LISU LETTER NGA;Lo;0;L;;;;;N;;;;;
+A4E6;LISU LETTER HA;Lo;0;L;;;;;N;;;;;
+A4E7;LISU LETTER XA;Lo;0;L;;;;;N;;;;;
+A4E8;LISU LETTER HHA;Lo;0;L;;;;;N;;;;;
+A4E9;LISU LETTER FA;Lo;0;L;;;;;N;;;;;
+A4EA;LISU LETTER WA;Lo;0;L;;;;;N;;;;;
+A4EB;LISU LETTER SHA;Lo;0;L;;;;;N;;;;;
+A4EC;LISU LETTER YA;Lo;0;L;;;;;N;;;;;
+A4ED;LISU LETTER GHA;Lo;0;L;;;;;N;;;;;
+A4EE;LISU LETTER A;Lo;0;L;;;;;N;;;;;
+A4EF;LISU LETTER AE;Lo;0;L;;;;;N;;;;;
+A4F0;LISU LETTER E;Lo;0;L;;;;;N;;;;;
+A4F1;LISU LETTER EU;Lo;0;L;;;;;N;;;;;
+A4F2;LISU LETTER I;Lo;0;L;;;;;N;;;;;
+A4F3;LISU LETTER O;Lo;0;L;;;;;N;;;;;
+A4F4;LISU LETTER U;Lo;0;L;;;;;N;;;;;
+A4F5;LISU LETTER UE;Lo;0;L;;;;;N;;;;;
+A4F6;LISU LETTER UH;Lo;0;L;;;;;N;;;;;
+A4F7;LISU LETTER OE;Lo;0;L;;;;;N;;;;;
+A4F8;LISU LETTER TONE MYA TI;Lm;0;L;;;;;N;;;;;
+A4F9;LISU LETTER TONE NA PO;Lm;0;L;;;;;N;;;;;
+A4FA;LISU LETTER TONE MYA CYA;Lm;0;L;;;;;N;;;;;
+A4FB;LISU LETTER TONE MYA BO;Lm;0;L;;;;;N;;;;;
+A4FC;LISU LETTER TONE MYA NA;Lm;0;L;;;;;N;;;;;
+A4FD;LISU LETTER TONE MYA JEU;Lm;0;L;;;;;N;;;;;
+A4FE;LISU PUNCTUATION COMMA;Po;0;L;;;;;N;;;;;
+A4FF;LISU PUNCTUATION FULL STOP;Po;0;L;;;;;N;;;;;
+A500;VAI SYLLABLE EE;Lo;0;L;;;;;N;;;;;
+A501;VAI SYLLABLE EEN;Lo;0;L;;;;;N;;;;;
+A502;VAI SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
+A503;VAI SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
+A504;VAI SYLLABLE WEEN;Lo;0;L;;;;;N;;;;;
+A505;VAI SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
+A506;VAI SYLLABLE BHEE;Lo;0;L;;;;;N;;;;;
+A507;VAI SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
+A508;VAI SYLLABLE MBEE;Lo;0;L;;;;;N;;;;;
+A509;VAI SYLLABLE KPEE;Lo;0;L;;;;;N;;;;;
+A50A;VAI SYLLABLE MGBEE;Lo;0;L;;;;;N;;;;;
+A50B;VAI SYLLABLE GBEE;Lo;0;L;;;;;N;;;;;
+A50C;VAI SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
+A50D;VAI SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
+A50E;VAI SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
+A50F;VAI SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
+A510;VAI SYLLABLE DHEE;Lo;0;L;;;;;N;;;;;
+A511;VAI SYLLABLE DHHEE;Lo;0;L;;;;;N;;;;;
+A512;VAI SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
+A513;VAI SYLLABLE REE;Lo;0;L;;;;;N;;;;;
+A514;VAI SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
+A515;VAI SYLLABLE NDEE;Lo;0;L;;;;;N;;;;;
+A516;VAI SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
+A517;VAI SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
+A518;VAI SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
+A519;VAI SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
+A51A;VAI SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
+A51B;VAI SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
+A51C;VAI SYLLABLE NJEE;Lo;0;L;;;;;N;;;;;
+A51D;VAI SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
+A51E;VAI SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
+A51F;VAI SYLLABLE NGGEE;Lo;0;L;;;;;N;;;;;
+A520;VAI SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
+A521;VAI SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
+A522;VAI SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
+A523;VAI SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
+A524;VAI SYLLABLE I;Lo;0;L;;;;;N;;;;;
+A525;VAI SYLLABLE IN;Lo;0;L;;;;;N;;;;;
+A526;VAI SYLLABLE HI;Lo;0;L;;;;;N;;;;;
+A527;VAI SYLLABLE HIN;Lo;0;L;;;;;N;;;;;
+A528;VAI SYLLABLE WI;Lo;0;L;;;;;N;;;;;
+A529;VAI SYLLABLE WIN;Lo;0;L;;;;;N;;;;;
+A52A;VAI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+A52B;VAI SYLLABLE BHI;Lo;0;L;;;;;N;;;;;
+A52C;VAI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+A52D;VAI SYLLABLE MBI;Lo;0;L;;;;;N;;;;;
+A52E;VAI SYLLABLE KPI;Lo;0;L;;;;;N;;;;;
+A52F;VAI SYLLABLE MGBI;Lo;0;L;;;;;N;;;;;
+A530;VAI SYLLABLE GBI;Lo;0;L;;;;;N;;;;;
+A531;VAI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+A532;VAI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+A533;VAI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+A534;VAI SYLLABLE THI;Lo;0;L;;;;;N;;;;;
+A535;VAI SYLLABLE DHI;Lo;0;L;;;;;N;;;;;
+A536;VAI SYLLABLE DHHI;Lo;0;L;;;;;N;;;;;
+A537;VAI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+A538;VAI SYLLABLE RI;Lo;0;L;;;;;N;;;;;
+A539;VAI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+A53A;VAI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
+A53B;VAI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+A53C;VAI SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
+A53D;VAI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+A53E;VAI SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
+A53F;VAI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+A540;VAI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+A541;VAI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
+A542;VAI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+A543;VAI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+A544;VAI SYLLABLE NGGI;Lo;0;L;;;;;N;;;;;
+A545;VAI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+A546;VAI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+A547;VAI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+A548;VAI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+A549;VAI SYLLABLE A;Lo;0;L;;;;;N;;;;;
+A54A;VAI SYLLABLE AN;Lo;0;L;;;;;N;;;;;
+A54B;VAI SYLLABLE NGAN;Lo;0;L;;;;;N;;;;;
+A54C;VAI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+A54D;VAI SYLLABLE HAN;Lo;0;L;;;;;N;;;;;
+A54E;VAI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+A54F;VAI SYLLABLE WAN;Lo;0;L;;;;;N;;;;;
+A550;VAI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+A551;VAI SYLLABLE BHA;Lo;0;L;;;;;N;;;;;
+A552;VAI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+A553;VAI SYLLABLE MBA;Lo;0;L;;;;;N;;;;;
+A554;VAI SYLLABLE KPA;Lo;0;L;;;;;N;;;;;
+A555;VAI SYLLABLE KPAN;Lo;0;L;;;;;N;;;;;
+A556;VAI SYLLABLE MGBA;Lo;0;L;;;;;N;;;;;
+A557;VAI SYLLABLE GBA;Lo;0;L;;;;;N;;;;;
+A558;VAI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+A559;VAI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+A55A;VAI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+A55B;VAI SYLLABLE THA;Lo;0;L;;;;;N;;;;;
+A55C;VAI SYLLABLE DHA;Lo;0;L;;;;;N;;;;;
+A55D;VAI SYLLABLE DHHA;Lo;0;L;;;;;N;;;;;
+A55E;VAI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+A55F;VAI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+A560;VAI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+A561;VAI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
+A562;VAI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+A563;VAI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+A564;VAI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+A565;VAI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+A566;VAI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+A567;VAI SYLLABLE JA;Lo;0;L;;;;;N;;;;;
+A568;VAI SYLLABLE NJA;Lo;0;L;;;;;N;;;;;
+A569;VAI SYLLABLE YA;Lo;0;L;;;;;N;;;;;
+A56A;VAI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+A56B;VAI SYLLABLE KAN;Lo;0;L;;;;;N;;;;;
+A56C;VAI SYLLABLE NGGA;Lo;0;L;;;;;N;;;;;
+A56D;VAI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+A56E;VAI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+A56F;VAI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+A570;VAI SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
+A571;VAI SYLLABLE OO;Lo;0;L;;;;;N;;;;;
+A572;VAI SYLLABLE OON;Lo;0;L;;;;;N;;;;;
+A573;VAI SYLLABLE HOO;Lo;0;L;;;;;N;;;;;
+A574;VAI SYLLABLE WOO;Lo;0;L;;;;;N;;;;;
+A575;VAI SYLLABLE WOON;Lo;0;L;;;;;N;;;;;
+A576;VAI SYLLABLE POO;Lo;0;L;;;;;N;;;;;
+A577;VAI SYLLABLE BHOO;Lo;0;L;;;;;N;;;;;
+A578;VAI SYLLABLE BOO;Lo;0;L;;;;;N;;;;;
+A579;VAI SYLLABLE MBOO;Lo;0;L;;;;;N;;;;;
+A57A;VAI SYLLABLE KPOO;Lo;0;L;;;;;N;;;;;
+A57B;VAI SYLLABLE MGBOO;Lo;0;L;;;;;N;;;;;
+A57C;VAI SYLLABLE GBOO;Lo;0;L;;;;;N;;;;;
+A57D;VAI SYLLABLE FOO;Lo;0;L;;;;;N;;;;;
+A57E;VAI SYLLABLE VOO;Lo;0;L;;;;;N;;;;;
+A57F;VAI SYLLABLE TOO;Lo;0;L;;;;;N;;;;;
+A580;VAI SYLLABLE THOO;Lo;0;L;;;;;N;;;;;
+A581;VAI SYLLABLE DHOO;Lo;0;L;;;;;N;;;;;
+A582;VAI SYLLABLE DHHOO;Lo;0;L;;;;;N;;;;;
+A583;VAI SYLLABLE LOO;Lo;0;L;;;;;N;;;;;
+A584;VAI SYLLABLE ROO;Lo;0;L;;;;;N;;;;;
+A585;VAI SYLLABLE DOO;Lo;0;L;;;;;N;;;;;
+A586;VAI SYLLABLE NDOO;Lo;0;L;;;;;N;;;;;
+A587;VAI SYLLABLE SOO;Lo;0;L;;;;;N;;;;;
+A588;VAI SYLLABLE SHOO;Lo;0;L;;;;;N;;;;;
+A589;VAI SYLLABLE ZOO;Lo;0;L;;;;;N;;;;;
+A58A;VAI SYLLABLE ZHOO;Lo;0;L;;;;;N;;;;;
+A58B;VAI SYLLABLE COO;Lo;0;L;;;;;N;;;;;
+A58C;VAI SYLLABLE JOO;Lo;0;L;;;;;N;;;;;
+A58D;VAI SYLLABLE NJOO;Lo;0;L;;;;;N;;;;;
+A58E;VAI SYLLABLE YOO;Lo;0;L;;;;;N;;;;;
+A58F;VAI SYLLABLE KOO;Lo;0;L;;;;;N;;;;;
+A590;VAI SYLLABLE NGGOO;Lo;0;L;;;;;N;;;;;
+A591;VAI SYLLABLE GOO;Lo;0;L;;;;;N;;;;;
+A592;VAI SYLLABLE MOO;Lo;0;L;;;;;N;;;;;
+A593;VAI SYLLABLE NOO;Lo;0;L;;;;;N;;;;;
+A594;VAI SYLLABLE NYOO;Lo;0;L;;;;;N;;;;;
+A595;VAI SYLLABLE U;Lo;0;L;;;;;N;;;;;
+A596;VAI SYLLABLE UN;Lo;0;L;;;;;N;;;;;
+A597;VAI SYLLABLE HU;Lo;0;L;;;;;N;;;;;
+A598;VAI SYLLABLE HUN;Lo;0;L;;;;;N;;;;;
+A599;VAI SYLLABLE WU;Lo;0;L;;;;;N;;;;;
+A59A;VAI SYLLABLE WUN;Lo;0;L;;;;;N;;;;;
+A59B;VAI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+A59C;VAI SYLLABLE BHU;Lo;0;L;;;;;N;;;;;
+A59D;VAI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+A59E;VAI SYLLABLE MBU;Lo;0;L;;;;;N;;;;;
+A59F;VAI SYLLABLE KPU;Lo;0;L;;;;;N;;;;;
+A5A0;VAI SYLLABLE MGBU;Lo;0;L;;;;;N;;;;;
+A5A1;VAI SYLLABLE GBU;Lo;0;L;;;;;N;;;;;
+A5A2;VAI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+A5A3;VAI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+A5A4;VAI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+A5A5;VAI SYLLABLE THU;Lo;0;L;;;;;N;;;;;
+A5A6;VAI SYLLABLE DHU;Lo;0;L;;;;;N;;;;;
+A5A7;VAI SYLLABLE DHHU;Lo;0;L;;;;;N;;;;;
+A5A8;VAI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+A5A9;VAI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+A5AA;VAI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+A5AB;VAI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
+A5AC;VAI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+A5AD;VAI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+A5AE;VAI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+A5AF;VAI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+A5B0;VAI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+A5B1;VAI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+A5B2;VAI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
+A5B3;VAI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+A5B4;VAI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+A5B5;VAI SYLLABLE NGGU;Lo;0;L;;;;;N;;;;;
+A5B6;VAI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+A5B7;VAI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+A5B8;VAI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+A5B9;VAI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+A5BA;VAI SYLLABLE O;Lo;0;L;;;;;N;;;;;
+A5BB;VAI SYLLABLE ON;Lo;0;L;;;;;N;;;;;
+A5BC;VAI SYLLABLE NGON;Lo;0;L;;;;;N;;;;;
+A5BD;VAI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+A5BE;VAI SYLLABLE HON;Lo;0;L;;;;;N;;;;;
+A5BF;VAI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+A5C0;VAI SYLLABLE WON;Lo;0;L;;;;;N;;;;;
+A5C1;VAI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+A5C2;VAI SYLLABLE BHO;Lo;0;L;;;;;N;;;;;
+A5C3;VAI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+A5C4;VAI SYLLABLE MBO;Lo;0;L;;;;;N;;;;;
+A5C5;VAI SYLLABLE KPO;Lo;0;L;;;;;N;;;;;
+A5C6;VAI SYLLABLE MGBO;Lo;0;L;;;;;N;;;;;
+A5C7;VAI SYLLABLE GBO;Lo;0;L;;;;;N;;;;;
+A5C8;VAI SYLLABLE GBON;Lo;0;L;;;;;N;;;;;
+A5C9;VAI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+A5CA;VAI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+A5CB;VAI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+A5CC;VAI SYLLABLE THO;Lo;0;L;;;;;N;;;;;
+A5CD;VAI SYLLABLE DHO;Lo;0;L;;;;;N;;;;;
+A5CE;VAI SYLLABLE DHHO;Lo;0;L;;;;;N;;;;;
+A5CF;VAI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+A5D0;VAI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+A5D1;VAI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+A5D2;VAI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
+A5D3;VAI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+A5D4;VAI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+A5D5;VAI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+A5D6;VAI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+A5D7;VAI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+A5D8;VAI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+A5D9;VAI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
+A5DA;VAI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+A5DB;VAI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+A5DC;VAI SYLLABLE NGGO;Lo;0;L;;;;;N;;;;;
+A5DD;VAI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+A5DE;VAI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+A5DF;VAI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+A5E0;VAI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+A5E1;VAI SYLLABLE E;Lo;0;L;;;;;N;;;;;
+A5E2;VAI SYLLABLE EN;Lo;0;L;;;;;N;;;;;
+A5E3;VAI SYLLABLE NGEN;Lo;0;L;;;;;N;;;;;
+A5E4;VAI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+A5E5;VAI SYLLABLE HEN;Lo;0;L;;;;;N;;;;;
+A5E6;VAI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+A5E7;VAI SYLLABLE WEN;Lo;0;L;;;;;N;;;;;
+A5E8;VAI SYLLABLE PE;Lo;0;L;;;;;N;;;;;
+A5E9;VAI SYLLABLE BHE;Lo;0;L;;;;;N;;;;;
+A5EA;VAI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+A5EB;VAI SYLLABLE MBE;Lo;0;L;;;;;N;;;;;
+A5EC;VAI SYLLABLE KPE;Lo;0;L;;;;;N;;;;;
+A5ED;VAI SYLLABLE KPEN;Lo;0;L;;;;;N;;;;;
+A5EE;VAI SYLLABLE MGBE;Lo;0;L;;;;;N;;;;;
+A5EF;VAI SYLLABLE GBE;Lo;0;L;;;;;N;;;;;
+A5F0;VAI SYLLABLE GBEN;Lo;0;L;;;;;N;;;;;
+A5F1;VAI SYLLABLE FE;Lo;0;L;;;;;N;;;;;
+A5F2;VAI SYLLABLE VE;Lo;0;L;;;;;N;;;;;
+A5F3;VAI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+A5F4;VAI SYLLABLE THE;Lo;0;L;;;;;N;;;;;
+A5F5;VAI SYLLABLE DHE;Lo;0;L;;;;;N;;;;;
+A5F6;VAI SYLLABLE DHHE;Lo;0;L;;;;;N;;;;;
+A5F7;VAI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+A5F8;VAI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+A5F9;VAI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+A5FA;VAI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
+A5FB;VAI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+A5FC;VAI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+A5FD;VAI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+A5FE;VAI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+A5FF;VAI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+A600;VAI SYLLABLE JE;Lo;0;L;;;;;N;;;;;
+A601;VAI SYLLABLE NJE;Lo;0;L;;;;;N;;;;;
+A602;VAI SYLLABLE YE;Lo;0;L;;;;;N;;;;;
+A603;VAI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+A604;VAI SYLLABLE NGGE;Lo;0;L;;;;;N;;;;;
+A605;VAI SYLLABLE NGGEN;Lo;0;L;;;;;N;;;;;
+A606;VAI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+A607;VAI SYLLABLE GEN;Lo;0;L;;;;;N;;;;;
+A608;VAI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+A609;VAI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+A60A;VAI SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
+A60B;VAI SYLLABLE NG;Lo;0;L;;;;;N;;;;;
+A60C;VAI SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;;
+A60D;VAI COMMA;Po;0;ON;;;;;N;;;;;
+A60E;VAI FULL STOP;Po;0;ON;;;;;N;;;;;
+A60F;VAI QUESTION MARK;Po;0;ON;;;;;N;;;;;
+A610;VAI SYLLABLE NDOLE FA;Lo;0;L;;;;;N;;;;;
+A611;VAI SYLLABLE NDOLE KA;Lo;0;L;;;;;N;;;;;
+A612;VAI SYLLABLE NDOLE SOO;Lo;0;L;;;;;N;;;;;
+A613;VAI SYMBOL FEENG;Lo;0;L;;;;;N;;;;;
+A614;VAI SYMBOL KEENG;Lo;0;L;;;;;N;;;;;
+A615;VAI SYMBOL TING;Lo;0;L;;;;;N;;;;;
+A616;VAI SYMBOL NII;Lo;0;L;;;;;N;;;;;
+A617;VAI SYMBOL BANG;Lo;0;L;;;;;N;;;;;
+A618;VAI SYMBOL FAA;Lo;0;L;;;;;N;;;;;
+A619;VAI SYMBOL TAA;Lo;0;L;;;;;N;;;;;
+A61A;VAI SYMBOL DANG;Lo;0;L;;;;;N;;;;;
+A61B;VAI SYMBOL DOONG;Lo;0;L;;;;;N;;;;;
+A61C;VAI SYMBOL KUNG;Lo;0;L;;;;;N;;;;;
+A61D;VAI SYMBOL TONG;Lo;0;L;;;;;N;;;;;
+A61E;VAI SYMBOL DO-O;Lo;0;L;;;;;N;;;;;
+A61F;VAI SYMBOL JONG;Lo;0;L;;;;;N;;;;;
+A620;VAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A621;VAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A622;VAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A623;VAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A624;VAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A625;VAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A626;VAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A627;VAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A628;VAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A629;VAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A62A;VAI SYLLABLE NDOLE MA;Lo;0;L;;;;;N;;;;;
+A62B;VAI SYLLABLE NDOLE DO;Lo;0;L;;;;;N;;;;;
+A640;CYRILLIC CAPITAL LETTER ZEMLYA;Lu;0;L;;;;;N;;;;A641;
+A641;CYRILLIC SMALL LETTER ZEMLYA;Ll;0;L;;;;;N;;;A640;;A640
+A642;CYRILLIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;A643;
+A643;CYRILLIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;A642;;A642
+A644;CYRILLIC CAPITAL LETTER REVERSED DZE;Lu;0;L;;;;;N;;;;A645;
+A645;CYRILLIC SMALL LETTER REVERSED DZE;Ll;0;L;;;;;N;;;A644;;A644
+A646;CYRILLIC CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;A647;
+A647;CYRILLIC SMALL LETTER IOTA;Ll;0;L;;;;;N;;;A646;;A646
+A648;CYRILLIC CAPITAL LETTER DJERV;Lu;0;L;;;;;N;;;;A649;
+A649;CYRILLIC SMALL LETTER DJERV;Ll;0;L;;;;;N;;;A648;;A648
+A64A;CYRILLIC CAPITAL LETTER MONOGRAPH UK;Lu;0;L;;;;;N;;;;A64B;
+A64B;CYRILLIC SMALL LETTER MONOGRAPH UK;Ll;0;L;;;;;N;;;A64A;;A64A
+A64C;CYRILLIC CAPITAL LETTER BROAD OMEGA;Lu;0;L;;;;;N;;;;A64D;
+A64D;CYRILLIC SMALL LETTER BROAD OMEGA;Ll;0;L;;;;;N;;;A64C;;A64C
+A64E;CYRILLIC CAPITAL LETTER NEUTRAL YER;Lu;0;L;;;;;N;;;;A64F;
+A64F;CYRILLIC SMALL LETTER NEUTRAL YER;Ll;0;L;;;;;N;;;A64E;;A64E
+A650;CYRILLIC CAPITAL LETTER YERU WITH BACK YER;Lu;0;L;;;;;N;;;;A651;
+A651;CYRILLIC SMALL LETTER YERU WITH BACK YER;Ll;0;L;;;;;N;;;A650;;A650
+A652;CYRILLIC CAPITAL LETTER IOTIFIED YAT;Lu;0;L;;;;;N;;;;A653;
+A653;CYRILLIC SMALL LETTER IOTIFIED YAT;Ll;0;L;;;;;N;;;A652;;A652
+A654;CYRILLIC CAPITAL LETTER REVERSED YU;Lu;0;L;;;;;N;;;;A655;
+A655;CYRILLIC SMALL LETTER REVERSED YU;Ll;0;L;;;;;N;;;A654;;A654
+A656;CYRILLIC CAPITAL LETTER IOTIFIED A;Lu;0;L;;;;;N;;;;A657;
+A657;CYRILLIC SMALL LETTER IOTIFIED A;Ll;0;L;;;;;N;;;A656;;A656
+A658;CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A659;
+A659;CYRILLIC SMALL LETTER CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A658;;A658
+A65A;CYRILLIC CAPITAL LETTER BLENDED YUS;Lu;0;L;;;;;N;;;;A65B;
+A65B;CYRILLIC SMALL LETTER BLENDED YUS;Ll;0;L;;;;;N;;;A65A;;A65A
+A65C;CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A65D;
+A65D;CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A65C;;A65C
+A65E;CYRILLIC CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;A65F;
+A65F;CYRILLIC SMALL LETTER YN;Ll;0;L;;;;;N;;;A65E;;A65E
+A660;CYRILLIC CAPITAL LETTER REVERSED TSE;Lu;0;L;;;;;N;;;;A661;
+A661;CYRILLIC SMALL LETTER REVERSED TSE;Ll;0;L;;;;;N;;;A660;;A660
+A662;CYRILLIC CAPITAL LETTER SOFT DE;Lu;0;L;;;;;N;;;;A663;
+A663;CYRILLIC SMALL LETTER SOFT DE;Ll;0;L;;;;;N;;;A662;;A662
+A664;CYRILLIC CAPITAL LETTER SOFT EL;Lu;0;L;;;;;N;;;;A665;
+A665;CYRILLIC SMALL LETTER SOFT EL;Ll;0;L;;;;;N;;;A664;;A664
+A666;CYRILLIC CAPITAL LETTER SOFT EM;Lu;0;L;;;;;N;;;;A667;
+A667;CYRILLIC SMALL LETTER SOFT EM;Ll;0;L;;;;;N;;;A666;;A666
+A668;CYRILLIC CAPITAL LETTER MONOCULAR O;Lu;0;L;;;;;N;;;;A669;
+A669;CYRILLIC SMALL LETTER MONOCULAR O;Ll;0;L;;;;;N;;;A668;;A668
+A66A;CYRILLIC CAPITAL LETTER BINOCULAR O;Lu;0;L;;;;;N;;;;A66B;
+A66B;CYRILLIC SMALL LETTER BINOCULAR O;Ll;0;L;;;;;N;;;A66A;;A66A
+A66C;CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O;Lu;0;L;;;;;N;;;;A66D;
+A66D;CYRILLIC SMALL LETTER DOUBLE MONOCULAR O;Ll;0;L;;;;;N;;;A66C;;A66C
+A66E;CYRILLIC LETTER MULTIOCULAR O;Lo;0;L;;;;;N;;;;;
+A66F;COMBINING CYRILLIC VZMET;Mn;230;NSM;;;;;N;;;;;
+A670;COMBINING CYRILLIC TEN MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A671;COMBINING CYRILLIC HUNDRED MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A672;COMBINING CYRILLIC THOUSAND MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A673;SLAVONIC ASTERISK;Po;0;ON;;;;;N;;;;;
+A674;COMBINING CYRILLIC LETTER UKRAINIAN IE;Mn;230;NSM;;;;;N;;;;;
+A675;COMBINING CYRILLIC LETTER I;Mn;230;NSM;;;;;N;;;;;
+A676;COMBINING CYRILLIC LETTER YI;Mn;230;NSM;;;;;N;;;;;
+A677;COMBINING CYRILLIC LETTER U;Mn;230;NSM;;;;;N;;;;;
+A678;COMBINING CYRILLIC LETTER HARD SIGN;Mn;230;NSM;;;;;N;;;;;
+A679;COMBINING CYRILLIC LETTER YERU;Mn;230;NSM;;;;;N;;;;;
+A67A;COMBINING CYRILLIC LETTER SOFT SIGN;Mn;230;NSM;;;;;N;;;;;
+A67B;COMBINING CYRILLIC LETTER OMEGA;Mn;230;NSM;;;;;N;;;;;
+A67C;COMBINING CYRILLIC KAVYKA;Mn;230;NSM;;;;;N;;;;;
+A67D;COMBINING CYRILLIC PAYEROK;Mn;230;NSM;;;;;N;;;;;
+A67E;CYRILLIC KAVYKA;Po;0;ON;;;;;N;;;;;
+A67F;CYRILLIC PAYEROK;Lm;0;ON;;;;;N;;;;;
+A680;CYRILLIC CAPITAL LETTER DWE;Lu;0;L;;;;;N;;;;A681;
+A681;CYRILLIC SMALL LETTER DWE;Ll;0;L;;;;;N;;;A680;;A680
+A682;CYRILLIC CAPITAL LETTER DZWE;Lu;0;L;;;;;N;;;;A683;
+A683;CYRILLIC SMALL LETTER DZWE;Ll;0;L;;;;;N;;;A682;;A682
+A684;CYRILLIC CAPITAL LETTER ZHWE;Lu;0;L;;;;;N;;;;A685;
+A685;CYRILLIC SMALL LETTER ZHWE;Ll;0;L;;;;;N;;;A684;;A684
+A686;CYRILLIC CAPITAL LETTER CCHE;Lu;0;L;;;;;N;;;;A687;
+A687;CYRILLIC SMALL LETTER CCHE;Ll;0;L;;;;;N;;;A686;;A686
+A688;CYRILLIC CAPITAL LETTER DZZE;Lu;0;L;;;;;N;;;;A689;
+A689;CYRILLIC SMALL LETTER DZZE;Ll;0;L;;;;;N;;;A688;;A688
+A68A;CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;A68B;
+A68B;CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;A68A;;A68A
+A68C;CYRILLIC CAPITAL LETTER TWE;Lu;0;L;;;;;N;;;;A68D;
+A68D;CYRILLIC SMALL LETTER TWE;Ll;0;L;;;;;N;;;A68C;;A68C
+A68E;CYRILLIC CAPITAL LETTER TSWE;Lu;0;L;;;;;N;;;;A68F;
+A68F;CYRILLIC SMALL LETTER TSWE;Ll;0;L;;;;;N;;;A68E;;A68E
+A690;CYRILLIC CAPITAL LETTER TSSE;Lu;0;L;;;;;N;;;;A691;
+A691;CYRILLIC SMALL LETTER TSSE;Ll;0;L;;;;;N;;;A690;;A690
+A692;CYRILLIC CAPITAL LETTER TCHE;Lu;0;L;;;;;N;;;;A693;
+A693;CYRILLIC SMALL LETTER TCHE;Ll;0;L;;;;;N;;;A692;;A692
+A694;CYRILLIC CAPITAL LETTER HWE;Lu;0;L;;;;;N;;;;A695;
+A695;CYRILLIC SMALL LETTER HWE;Ll;0;L;;;;;N;;;A694;;A694
+A696;CYRILLIC CAPITAL LETTER SHWE;Lu;0;L;;;;;N;;;;A697;
+A697;CYRILLIC SMALL LETTER SHWE;Ll;0;L;;;;;N;;;A696;;A696
+A698;CYRILLIC CAPITAL LETTER DOUBLE O;Lu;0;L;;;;;N;;;;A699;
+A699;CYRILLIC SMALL LETTER DOUBLE O;Ll;0;L;;;;;N;;;A698;;A698
+A69A;CYRILLIC CAPITAL LETTER CROSSED O;Lu;0;L;;;;;N;;;;A69B;
+A69B;CYRILLIC SMALL LETTER CROSSED O;Ll;0;L;;;;;N;;;A69A;;A69A
+A69C;MODIFIER LETTER CYRILLIC HARD SIGN;Lm;0;L;<super> 044A;;;;N;;;;;
+A69D;MODIFIER LETTER CYRILLIC SOFT SIGN;Lm;0;L;<super> 044C;;;;N;;;;;
+A69E;COMBINING CYRILLIC LETTER EF;Mn;230;NSM;;;;;N;;;;;
+A69F;COMBINING CYRILLIC LETTER IOTIFIED E;Mn;230;NSM;;;;;N;;;;;
+A6A0;BAMUM LETTER A;Lo;0;L;;;;;N;;;;;
+A6A1;BAMUM LETTER KA;Lo;0;L;;;;;N;;;;;
+A6A2;BAMUM LETTER U;Lo;0;L;;;;;N;;;;;
+A6A3;BAMUM LETTER KU;Lo;0;L;;;;;N;;;;;
+A6A4;BAMUM LETTER EE;Lo;0;L;;;;;N;;;;;
+A6A5;BAMUM LETTER REE;Lo;0;L;;;;;N;;;;;
+A6A6;BAMUM LETTER TAE;Lo;0;L;;;;;N;;;;;
+A6A7;BAMUM LETTER O;Lo;0;L;;;;;N;;;;;
+A6A8;BAMUM LETTER NYI;Lo;0;L;;;;;N;;;;;
+A6A9;BAMUM LETTER I;Lo;0;L;;;;;N;;;;;
+A6AA;BAMUM LETTER LA;Lo;0;L;;;;;N;;;;;
+A6AB;BAMUM LETTER PA;Lo;0;L;;;;;N;;;;;
+A6AC;BAMUM LETTER RII;Lo;0;L;;;;;N;;;;;
+A6AD;BAMUM LETTER RIEE;Lo;0;L;;;;;N;;;;;
+A6AE;BAMUM LETTER LEEEE;Lo;0;L;;;;;N;;;;;
+A6AF;BAMUM LETTER MEEEE;Lo;0;L;;;;;N;;;;;
+A6B0;BAMUM LETTER TAA;Lo;0;L;;;;;N;;;;;
+A6B1;BAMUM LETTER NDAA;Lo;0;L;;;;;N;;;;;
+A6B2;BAMUM LETTER NJAEM;Lo;0;L;;;;;N;;;;;
+A6B3;BAMUM LETTER M;Lo;0;L;;;;;N;;;;;
+A6B4;BAMUM LETTER SUU;Lo;0;L;;;;;N;;;;;
+A6B5;BAMUM LETTER MU;Lo;0;L;;;;;N;;;;;
+A6B6;BAMUM LETTER SHII;Lo;0;L;;;;;N;;;;;
+A6B7;BAMUM LETTER SI;Lo;0;L;;;;;N;;;;;
+A6B8;BAMUM LETTER SHEUX;Lo;0;L;;;;;N;;;;;
+A6B9;BAMUM LETTER SEUX;Lo;0;L;;;;;N;;;;;
+A6BA;BAMUM LETTER KYEE;Lo;0;L;;;;;N;;;;;
+A6BB;BAMUM LETTER KET;Lo;0;L;;;;;N;;;;;
+A6BC;BAMUM LETTER NUAE;Lo;0;L;;;;;N;;;;;
+A6BD;BAMUM LETTER NU;Lo;0;L;;;;;N;;;;;
+A6BE;BAMUM LETTER NJUAE;Lo;0;L;;;;;N;;;;;
+A6BF;BAMUM LETTER YOQ;Lo;0;L;;;;;N;;;;;
+A6C0;BAMUM LETTER SHU;Lo;0;L;;;;;N;;;;;
+A6C1;BAMUM LETTER YUQ;Lo;0;L;;;;;N;;;;;
+A6C2;BAMUM LETTER YA;Lo;0;L;;;;;N;;;;;
+A6C3;BAMUM LETTER NSHA;Lo;0;L;;;;;N;;;;;
+A6C4;BAMUM LETTER KEUX;Lo;0;L;;;;;N;;;;;
+A6C5;BAMUM LETTER PEUX;Lo;0;L;;;;;N;;;;;
+A6C6;BAMUM LETTER NJEE;Lo;0;L;;;;;N;;;;;
+A6C7;BAMUM LETTER NTEE;Lo;0;L;;;;;N;;;;;
+A6C8;BAMUM LETTER PUE;Lo;0;L;;;;;N;;;;;
+A6C9;BAMUM LETTER WUE;Lo;0;L;;;;;N;;;;;
+A6CA;BAMUM LETTER PEE;Lo;0;L;;;;;N;;;;;
+A6CB;BAMUM LETTER FEE;Lo;0;L;;;;;N;;;;;
+A6CC;BAMUM LETTER RU;Lo;0;L;;;;;N;;;;;
+A6CD;BAMUM LETTER LU;Lo;0;L;;;;;N;;;;;
+A6CE;BAMUM LETTER MI;Lo;0;L;;;;;N;;;;;
+A6CF;BAMUM LETTER NI;Lo;0;L;;;;;N;;;;;
+A6D0;BAMUM LETTER REUX;Lo;0;L;;;;;N;;;;;
+A6D1;BAMUM LETTER RAE;Lo;0;L;;;;;N;;;;;
+A6D2;BAMUM LETTER KEN;Lo;0;L;;;;;N;;;;;
+A6D3;BAMUM LETTER NGKWAEN;Lo;0;L;;;;;N;;;;;
+A6D4;BAMUM LETTER NGGA;Lo;0;L;;;;;N;;;;;
+A6D5;BAMUM LETTER NGA;Lo;0;L;;;;;N;;;;;
+A6D6;BAMUM LETTER SHO;Lo;0;L;;;;;N;;;;;
+A6D7;BAMUM LETTER PUAE;Lo;0;L;;;;;N;;;;;
+A6D8;BAMUM LETTER FU;Lo;0;L;;;;;N;;;;;
+A6D9;BAMUM LETTER FOM;Lo;0;L;;;;;N;;;;;
+A6DA;BAMUM LETTER WA;Lo;0;L;;;;;N;;;;;
+A6DB;BAMUM LETTER NA;Lo;0;L;;;;;N;;;;;
+A6DC;BAMUM LETTER LI;Lo;0;L;;;;;N;;;;;
+A6DD;BAMUM LETTER PI;Lo;0;L;;;;;N;;;;;
+A6DE;BAMUM LETTER LOQ;Lo;0;L;;;;;N;;;;;
+A6DF;BAMUM LETTER KO;Lo;0;L;;;;;N;;;;;
+A6E0;BAMUM LETTER MBEN;Lo;0;L;;;;;N;;;;;
+A6E1;BAMUM LETTER REN;Lo;0;L;;;;;N;;;;;
+A6E2;BAMUM LETTER MEN;Lo;0;L;;;;;N;;;;;
+A6E3;BAMUM LETTER MA;Lo;0;L;;;;;N;;;;;
+A6E4;BAMUM LETTER TI;Lo;0;L;;;;;N;;;;;
+A6E5;BAMUM LETTER KI;Lo;0;L;;;;;N;;;;;
+A6E6;BAMUM LETTER MO;Nl;0;L;;;;1;N;;;;;
+A6E7;BAMUM LETTER MBAA;Nl;0;L;;;;2;N;;;;;
+A6E8;BAMUM LETTER TET;Nl;0;L;;;;3;N;;;;;
+A6E9;BAMUM LETTER KPA;Nl;0;L;;;;4;N;;;;;
+A6EA;BAMUM LETTER TEN;Nl;0;L;;;;5;N;;;;;
+A6EB;BAMUM LETTER NTUU;Nl;0;L;;;;6;N;;;;;
+A6EC;BAMUM LETTER SAMBA;Nl;0;L;;;;7;N;;;;;
+A6ED;BAMUM LETTER FAAMAE;Nl;0;L;;;;8;N;;;;;
+A6EE;BAMUM LETTER KOVUU;Nl;0;L;;;;9;N;;;;;
+A6EF;BAMUM LETTER KOGHOM;Nl;0;L;;;;0;N;;;;;
+A6F0;BAMUM COMBINING MARK KOQNDON;Mn;230;NSM;;;;;N;;;;;
+A6F1;BAMUM COMBINING MARK TUKWENTIS;Mn;230;NSM;;;;;N;;;;;
+A6F2;BAMUM NJAEMLI;Po;0;L;;;;;N;;;;;
+A6F3;BAMUM FULL STOP;Po;0;L;;;;;N;;;;;
+A6F4;BAMUM COLON;Po;0;L;;;;;N;;;;;
+A6F5;BAMUM COMMA;Po;0;L;;;;;N;;;;;
+A6F6;BAMUM SEMICOLON;Po;0;L;;;;;N;;;;;
+A6F7;BAMUM QUESTION MARK;Po;0;L;;;;;N;;;;;
+A700;MODIFIER LETTER CHINESE TONE YIN PING;Sk;0;ON;;;;;N;;;;;
+A701;MODIFIER LETTER CHINESE TONE YANG PING;Sk;0;ON;;;;;N;;;;;
+A702;MODIFIER LETTER CHINESE TONE YIN SHANG;Sk;0;ON;;;;;N;;;;;
+A703;MODIFIER LETTER CHINESE TONE YANG SHANG;Sk;0;ON;;;;;N;;;;;
+A704;MODIFIER LETTER CHINESE TONE YIN QU;Sk;0;ON;;;;;N;;;;;
+A705;MODIFIER LETTER CHINESE TONE YANG QU;Sk;0;ON;;;;;N;;;;;
+A706;MODIFIER LETTER CHINESE TONE YIN RU;Sk;0;ON;;;;;N;;;;;
+A707;MODIFIER LETTER CHINESE TONE YANG RU;Sk;0;ON;;;;;N;;;;;
+A708;MODIFIER LETTER EXTRA-HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A709;MODIFIER LETTER HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70A;MODIFIER LETTER MID DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70B;MODIFIER LETTER LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70C;MODIFIER LETTER EXTRA-LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70D;MODIFIER LETTER EXTRA-HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70E;MODIFIER LETTER HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70F;MODIFIER LETTER MID DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A710;MODIFIER LETTER LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A711;MODIFIER LETTER EXTRA-LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A712;MODIFIER LETTER EXTRA-HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A713;MODIFIER LETTER HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A714;MODIFIER LETTER MID LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A715;MODIFIER LETTER LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A716;MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A717;MODIFIER LETTER DOT VERTICAL BAR;Lm;0;ON;;;;;N;;;;;
+A718;MODIFIER LETTER DOT SLASH;Lm;0;ON;;;;;N;;;;;
+A719;MODIFIER LETTER DOT HORIZONTAL BAR;Lm;0;ON;;;;;N;;;;;
+A71A;MODIFIER LETTER LOWER RIGHT CORNER ANGLE;Lm;0;ON;;;;;N;;;;;
+A71B;MODIFIER LETTER RAISED UP ARROW;Lm;0;ON;;;;;N;;;;;
+A71C;MODIFIER LETTER RAISED DOWN ARROW;Lm;0;ON;;;;;N;;;;;
+A71D;MODIFIER LETTER RAISED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A71E;MODIFIER LETTER RAISED INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A71F;MODIFIER LETTER LOW INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A720;MODIFIER LETTER STRESS AND HIGH TONE;Sk;0;ON;;;;;N;;;;;
+A721;MODIFIER LETTER STRESS AND LOW TONE;Sk;0;ON;;;;;N;;;;;
+A722;LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF;Lu;0;L;;;;;N;;;;A723;
+A723;LATIN SMALL LETTER EGYPTOLOGICAL ALEF;Ll;0;L;;;;;N;;;A722;;A722
+A724;LATIN CAPITAL LETTER EGYPTOLOGICAL AIN;Lu;0;L;;;;;N;;;;A725;
+A725;LATIN SMALL LETTER EGYPTOLOGICAL AIN;Ll;0;L;;;;;N;;;A724;;A724
+A726;LATIN CAPITAL LETTER HENG;Lu;0;L;;;;;N;;;;A727;
+A727;LATIN SMALL LETTER HENG;Ll;0;L;;;;;N;;;A726;;A726
+A728;LATIN CAPITAL LETTER TZ;Lu;0;L;;;;;N;;;;A729;
+A729;LATIN SMALL LETTER TZ;Ll;0;L;;;;;N;;;A728;;A728
+A72A;LATIN CAPITAL LETTER TRESILLO;Lu;0;L;;;;;N;;;;A72B;
+A72B;LATIN SMALL LETTER TRESILLO;Ll;0;L;;;;;N;;;A72A;;A72A
+A72C;LATIN CAPITAL LETTER CUATRILLO;Lu;0;L;;;;;N;;;;A72D;
+A72D;LATIN SMALL LETTER CUATRILLO;Ll;0;L;;;;;N;;;A72C;;A72C
+A72E;LATIN CAPITAL LETTER CUATRILLO WITH COMMA;Lu;0;L;;;;;N;;;;A72F;
+A72F;LATIN SMALL LETTER CUATRILLO WITH COMMA;Ll;0;L;;;;;N;;;A72E;;A72E
+A730;LATIN LETTER SMALL CAPITAL F;Ll;0;L;;;;;N;;;;;
+A731;LATIN LETTER SMALL CAPITAL S;Ll;0;L;;;;;N;;;;;
+A732;LATIN CAPITAL LETTER AA;Lu;0;L;;;;;N;;;;A733;
+A733;LATIN SMALL LETTER AA;Ll;0;L;;;;;N;;;A732;;A732
+A734;LATIN CAPITAL LETTER AO;Lu;0;L;;;;;N;;;;A735;
+A735;LATIN SMALL LETTER AO;Ll;0;L;;;;;N;;;A734;;A734
+A736;LATIN CAPITAL LETTER AU;Lu;0;L;;;;;N;;;;A737;
+A737;LATIN SMALL LETTER AU;Ll;0;L;;;;;N;;;A736;;A736
+A738;LATIN CAPITAL LETTER AV;Lu;0;L;;;;;N;;;;A739;
+A739;LATIN SMALL LETTER AV;Ll;0;L;;;;;N;;;A738;;A738
+A73A;LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR;Lu;0;L;;;;;N;;;;A73B;
+A73B;LATIN SMALL LETTER AV WITH HORIZONTAL BAR;Ll;0;L;;;;;N;;;A73A;;A73A
+A73C;LATIN CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;A73D;
+A73D;LATIN SMALL LETTER AY;Ll;0;L;;;;;N;;;A73C;;A73C
+A73E;LATIN CAPITAL LETTER REVERSED C WITH DOT;Lu;0;L;;;;;N;;;;A73F;
+A73F;LATIN SMALL LETTER REVERSED C WITH DOT;Ll;0;L;;;;;N;;;A73E;;A73E
+A740;LATIN CAPITAL LETTER K WITH STROKE;Lu;0;L;;;;;N;;;;A741;
+A741;LATIN SMALL LETTER K WITH STROKE;Ll;0;L;;;;;N;;;A740;;A740
+A742;LATIN CAPITAL LETTER K WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A743;
+A743;LATIN SMALL LETTER K WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A742;;A742
+A744;LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A745;
+A745;LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE;Ll;0;L;;;;;N;;;A744;;A744
+A746;LATIN CAPITAL LETTER BROKEN L;Lu;0;L;;;;;N;;;;A747;
+A747;LATIN SMALL LETTER BROKEN L;Ll;0;L;;;;;N;;;A746;;A746
+A748;LATIN CAPITAL LETTER L WITH HIGH STROKE;Lu;0;L;;;;;N;;;;A749;
+A749;LATIN SMALL LETTER L WITH HIGH STROKE;Ll;0;L;;;;;N;;;A748;;A748
+A74A;LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY;Lu;0;L;;;;;N;;;;A74B;
+A74B;LATIN SMALL LETTER O WITH LONG STROKE OVERLAY;Ll;0;L;;;;;N;;;A74A;;A74A
+A74C;LATIN CAPITAL LETTER O WITH LOOP;Lu;0;L;;;;;N;;;;A74D;
+A74D;LATIN SMALL LETTER O WITH LOOP;Ll;0;L;;;;;N;;;A74C;;A74C
+A74E;LATIN CAPITAL LETTER OO;Lu;0;L;;;;;N;;;;A74F;
+A74F;LATIN SMALL LETTER OO;Ll;0;L;;;;;N;;;A74E;;A74E
+A750;LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A751;
+A751;LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A750;;A750
+A752;LATIN CAPITAL LETTER P WITH FLOURISH;Lu;0;L;;;;;N;;;;A753;
+A753;LATIN SMALL LETTER P WITH FLOURISH;Ll;0;L;;;;;N;;;A752;;A752
+A754;LATIN CAPITAL LETTER P WITH SQUIRREL TAIL;Lu;0;L;;;;;N;;;;A755;
+A755;LATIN SMALL LETTER P WITH SQUIRREL TAIL;Ll;0;L;;;;;N;;;A754;;A754
+A756;LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A757;
+A757;LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A756;;A756
+A758;LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A759;
+A759;LATIN SMALL LETTER Q WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A758;;A758
+A75A;LATIN CAPITAL LETTER R ROTUNDA;Lu;0;L;;;;;N;;;;A75B;
+A75B;LATIN SMALL LETTER R ROTUNDA;Ll;0;L;;;;;N;;;A75A;;A75A
+A75C;LATIN CAPITAL LETTER RUM ROTUNDA;Lu;0;L;;;;;N;;;;A75D;
+A75D;LATIN SMALL LETTER RUM ROTUNDA;Ll;0;L;;;;;N;;;A75C;;A75C
+A75E;LATIN CAPITAL LETTER V WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A75F;
+A75F;LATIN SMALL LETTER V WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A75E;;A75E
+A760;LATIN CAPITAL LETTER VY;Lu;0;L;;;;;N;;;;A761;
+A761;LATIN SMALL LETTER VY;Ll;0;L;;;;;N;;;A760;;A760
+A762;LATIN CAPITAL LETTER VISIGOTHIC Z;Lu;0;L;;;;;N;;;;A763;
+A763;LATIN SMALL LETTER VISIGOTHIC Z;Ll;0;L;;;;;N;;;A762;;A762
+A764;LATIN CAPITAL LETTER THORN WITH STROKE;Lu;0;L;;;;;N;;;;A765;
+A765;LATIN SMALL LETTER THORN WITH STROKE;Ll;0;L;;;;;N;;;A764;;A764
+A766;LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A767;
+A767;LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A766;;A766
+A768;LATIN CAPITAL LETTER VEND;Lu;0;L;;;;;N;;;;A769;
+A769;LATIN SMALL LETTER VEND;Ll;0;L;;;;;N;;;A768;;A768
+A76A;LATIN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;A76B;
+A76B;LATIN SMALL LETTER ET;Ll;0;L;;;;;N;;;A76A;;A76A
+A76C;LATIN CAPITAL LETTER IS;Lu;0;L;;;;;N;;;;A76D;
+A76D;LATIN SMALL LETTER IS;Ll;0;L;;;;;N;;;A76C;;A76C
+A76E;LATIN CAPITAL LETTER CON;Lu;0;L;;;;;N;;;;A76F;
+A76F;LATIN SMALL LETTER CON;Ll;0;L;;;;;N;;;A76E;;A76E
+A770;MODIFIER LETTER US;Lm;0;L;<super> A76F;;;;N;;;;;
+A771;LATIN SMALL LETTER DUM;Ll;0;L;;;;;N;;;;;
+A772;LATIN SMALL LETTER LUM;Ll;0;L;;;;;N;;;;;
+A773;LATIN SMALL LETTER MUM;Ll;0;L;;;;;N;;;;;
+A774;LATIN SMALL LETTER NUM;Ll;0;L;;;;;N;;;;;
+A775;LATIN SMALL LETTER RUM;Ll;0;L;;;;;N;;;;;
+A776;LATIN LETTER SMALL CAPITAL RUM;Ll;0;L;;;;;N;;;;;
+A777;LATIN SMALL LETTER TUM;Ll;0;L;;;;;N;;;;;
+A778;LATIN SMALL LETTER UM;Ll;0;L;;;;;N;;;;;
+A779;LATIN CAPITAL LETTER INSULAR D;Lu;0;L;;;;;N;;;;A77A;
+A77A;LATIN SMALL LETTER INSULAR D;Ll;0;L;;;;;N;;;A779;;A779
+A77B;LATIN CAPITAL LETTER INSULAR F;Lu;0;L;;;;;N;;;;A77C;
+A77C;LATIN SMALL LETTER INSULAR F;Ll;0;L;;;;;N;;;A77B;;A77B
+A77D;LATIN CAPITAL LETTER INSULAR G;Lu;0;L;;;;;N;;;;1D79;
+A77E;LATIN CAPITAL LETTER TURNED INSULAR G;Lu;0;L;;;;;N;;;;A77F;
+A77F;LATIN SMALL LETTER TURNED INSULAR G;Ll;0;L;;;;;N;;;A77E;;A77E
+A780;LATIN CAPITAL LETTER TURNED L;Lu;0;L;;;;;N;;;;A781;
+A781;LATIN SMALL LETTER TURNED L;Ll;0;L;;;;;N;;;A780;;A780
+A782;LATIN CAPITAL LETTER INSULAR R;Lu;0;L;;;;;N;;;;A783;
+A783;LATIN SMALL LETTER INSULAR R;Ll;0;L;;;;;N;;;A782;;A782
+A784;LATIN CAPITAL LETTER INSULAR S;Lu;0;L;;;;;N;;;;A785;
+A785;LATIN SMALL LETTER INSULAR S;Ll;0;L;;;;;N;;;A784;;A784
+A786;LATIN CAPITAL LETTER INSULAR T;Lu;0;L;;;;;N;;;;A787;
+A787;LATIN SMALL LETTER INSULAR T;Ll;0;L;;;;;N;;;A786;;A786
+A788;MODIFIER LETTER LOW CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;;;;;
+A789;MODIFIER LETTER COLON;Sk;0;L;;;;;N;;;;;
+A78A;MODIFIER LETTER SHORT EQUALS SIGN;Sk;0;L;;;;;N;;;;;
+A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C;
+A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
+A78D;LATIN CAPITAL LETTER TURNED H;Lu;0;L;;;;;N;;;;0265;
+A78E;LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT;Ll;0;L;;;;;N;;;;;
+A78F;LATIN LETTER SINOLOGICAL DOT;Lo;0;L;;;;;N;;;;;
+A790;LATIN CAPITAL LETTER N WITH DESCENDER;Lu;0;L;;;;;N;;;;A791;
+A791;LATIN SMALL LETTER N WITH DESCENDER;Ll;0;L;;;;;N;;;A790;;A790
+A792;LATIN CAPITAL LETTER C WITH BAR;Lu;0;L;;;;;N;;;;A793;
+A793;LATIN SMALL LETTER C WITH BAR;Ll;0;L;;;;;N;;;A792;;A792
+A794;LATIN SMALL LETTER C WITH PALATAL HOOK;Ll;0;L;;;;;N;;;A7C4;;A7C4
+A795;LATIN SMALL LETTER H WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+A796;LATIN CAPITAL LETTER B WITH FLOURISH;Lu;0;L;;;;;N;;;;A797;
+A797;LATIN SMALL LETTER B WITH FLOURISH;Ll;0;L;;;;;N;;;A796;;A796
+A798;LATIN CAPITAL LETTER F WITH STROKE;Lu;0;L;;;;;N;;;;A799;
+A799;LATIN SMALL LETTER F WITH STROKE;Ll;0;L;;;;;N;;;A798;;A798
+A79A;LATIN CAPITAL LETTER VOLAPUK AE;Lu;0;L;;;;;N;;;;A79B;
+A79B;LATIN SMALL LETTER VOLAPUK AE;Ll;0;L;;;;;N;;;A79A;;A79A
+A79C;LATIN CAPITAL LETTER VOLAPUK OE;Lu;0;L;;;;;N;;;;A79D;
+A79D;LATIN SMALL LETTER VOLAPUK OE;Ll;0;L;;;;;N;;;A79C;;A79C
+A79E;LATIN CAPITAL LETTER VOLAPUK UE;Lu;0;L;;;;;N;;;;A79F;
+A79F;LATIN SMALL LETTER VOLAPUK UE;Ll;0;L;;;;;N;;;A79E;;A79E
+A7A0;LATIN CAPITAL LETTER G WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A1;
+A7A1;LATIN SMALL LETTER G WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A0;;A7A0
+A7A2;LATIN CAPITAL LETTER K WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A3;
+A7A3;LATIN SMALL LETTER K WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A2;;A7A2
+A7A4;LATIN CAPITAL LETTER N WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A5;
+A7A5;LATIN SMALL LETTER N WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A4;;A7A4
+A7A6;LATIN CAPITAL LETTER R WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A7;
+A7A7;LATIN SMALL LETTER R WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A6;;A7A6
+A7A8;LATIN CAPITAL LETTER S WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A9;
+A7A9;LATIN SMALL LETTER S WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A8;;A7A8
+A7AA;LATIN CAPITAL LETTER H WITH HOOK;Lu;0;L;;;;;N;;;;0266;
+A7AB;LATIN CAPITAL LETTER REVERSED OPEN E;Lu;0;L;;;;;N;;;;025C;
+A7AC;LATIN CAPITAL LETTER SCRIPT G;Lu;0;L;;;;;N;;;;0261;
+A7AD;LATIN CAPITAL LETTER L WITH BELT;Lu;0;L;;;;;N;;;;026C;
+A7AE;LATIN CAPITAL LETTER SMALL CAPITAL I;Lu;0;L;;;;;N;;;;026A;
+A7AF;LATIN LETTER SMALL CAPITAL Q;Ll;0;L;;;;;N;;;;;
+A7B0;LATIN CAPITAL LETTER TURNED K;Lu;0;L;;;;;N;;;;029E;
+A7B1;LATIN CAPITAL LETTER TURNED T;Lu;0;L;;;;;N;;;;0287;
+A7B2;LATIN CAPITAL LETTER J WITH CROSSED-TAIL;Lu;0;L;;;;;N;;;;029D;
+A7B3;LATIN CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;AB53;
+A7B4;LATIN CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;A7B5;
+A7B5;LATIN SMALL LETTER BETA;Ll;0;L;;;;;N;;;A7B4;;A7B4
+A7B6;LATIN CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;A7B7;
+A7B7;LATIN SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;A7B6;;A7B6
+A7B8;LATIN CAPITAL LETTER U WITH STROKE;Lu;0;L;;;;;N;;;;A7B9;
+A7B9;LATIN SMALL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;A7B8;;A7B8
+A7BA;LATIN CAPITAL LETTER GLOTTAL A;Lu;0;L;;;;;N;;;;A7BB;
+A7BB;LATIN SMALL LETTER GLOTTAL A;Ll;0;L;;;;;N;;;A7BA;;A7BA
+A7BC;LATIN CAPITAL LETTER GLOTTAL I;Lu;0;L;;;;;N;;;;A7BD;
+A7BD;LATIN SMALL LETTER GLOTTAL I;Ll;0;L;;;;;N;;;A7BC;;A7BC
+A7BE;LATIN CAPITAL LETTER GLOTTAL U;Lu;0;L;;;;;N;;;;A7BF;
+A7BF;LATIN SMALL LETTER GLOTTAL U;Ll;0;L;;;;;N;;;A7BE;;A7BE
+A7C2;LATIN CAPITAL LETTER ANGLICANA W;Lu;0;L;;;;;N;;;;A7C3;
+A7C3;LATIN SMALL LETTER ANGLICANA W;Ll;0;L;;;;;N;;;A7C2;;A7C2
+A7C4;LATIN CAPITAL LETTER C WITH PALATAL HOOK;Lu;0;L;;;;;N;;;;A794;
+A7C5;LATIN CAPITAL LETTER S WITH HOOK;Lu;0;L;;;;;N;;;;0282;
+A7C6;LATIN CAPITAL LETTER Z WITH PALATAL HOOK;Lu;0;L;;;;;N;;;;1D8E;
+A7C7;LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7C8;
+A7C8;LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C7;;A7C7
+A7C9;LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7CA;
+A7CA;LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C9;;A7C9
+A7F5;LATIN CAPITAL LETTER REVERSED HALF H;Lu;0;L;;;;;N;;;;A7F6;
+A7F6;LATIN SMALL LETTER REVERSED HALF H;Ll;0;L;;;;;N;;;A7F5;;A7F5
+A7F7;LATIN EPIGRAPHIC LETTER SIDEWAYS I;Lo;0;L;;;;;N;;;;;
+A7F8;MODIFIER LETTER CAPITAL H WITH STROKE;Lm;0;L;<super> 0126;;;;N;;;;;
+A7F9;MODIFIER LETTER SMALL LIGATURE OE;Lm;0;L;<super> 0153;;;;N;;;;;
+A7FA;LATIN LETTER SMALL CAPITAL TURNED M;Ll;0;L;;;;;N;;;;;
+A7FB;LATIN EPIGRAPHIC LETTER REVERSED F;Lo;0;L;;;;;N;;;;;
+A7FC;LATIN EPIGRAPHIC LETTER REVERSED P;Lo;0;L;;;;;N;;;;;
+A7FD;LATIN EPIGRAPHIC LETTER INVERTED M;Lo;0;L;;;;;N;;;;;
+A7FE;LATIN EPIGRAPHIC LETTER I LONGA;Lo;0;L;;;;;N;;;;;
+A7FF;LATIN EPIGRAPHIC LETTER ARCHAIC M;Lo;0;L;;;;;N;;;;;
+A800;SYLOTI NAGRI LETTER A;Lo;0;L;;;;;N;;;;;
+A801;SYLOTI NAGRI LETTER I;Lo;0;L;;;;;N;;;;;
+A802;SYLOTI NAGRI SIGN DVISVARA;Mn;0;NSM;;;;;N;;;;;
+A803;SYLOTI NAGRI LETTER U;Lo;0;L;;;;;N;;;;;
+A804;SYLOTI NAGRI LETTER E;Lo;0;L;;;;;N;;;;;
+A805;SYLOTI NAGRI LETTER O;Lo;0;L;;;;;N;;;;;
+A806;SYLOTI NAGRI SIGN HASANTA;Mn;9;NSM;;;;;N;;;;;
+A807;SYLOTI NAGRI LETTER KO;Lo;0;L;;;;;N;;;;;
+A808;SYLOTI NAGRI LETTER KHO;Lo;0;L;;;;;N;;;;;
+A809;SYLOTI NAGRI LETTER GO;Lo;0;L;;;;;N;;;;;
+A80A;SYLOTI NAGRI LETTER GHO;Lo;0;L;;;;;N;;;;;
+A80B;SYLOTI NAGRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+A80C;SYLOTI NAGRI LETTER CO;Lo;0;L;;;;;N;;;;;
+A80D;SYLOTI NAGRI LETTER CHO;Lo;0;L;;;;;N;;;;;
+A80E;SYLOTI NAGRI LETTER JO;Lo;0;L;;;;;N;;;;;
+A80F;SYLOTI NAGRI LETTER JHO;Lo;0;L;;;;;N;;;;;
+A810;SYLOTI NAGRI LETTER TTO;Lo;0;L;;;;;N;;;;;
+A811;SYLOTI NAGRI LETTER TTHO;Lo;0;L;;;;;N;;;;;
+A812;SYLOTI NAGRI LETTER DDO;Lo;0;L;;;;;N;;;;;
+A813;SYLOTI NAGRI LETTER DDHO;Lo;0;L;;;;;N;;;;;
+A814;SYLOTI NAGRI LETTER TO;Lo;0;L;;;;;N;;;;;
+A815;SYLOTI NAGRI LETTER THO;Lo;0;L;;;;;N;;;;;
+A816;SYLOTI NAGRI LETTER DO;Lo;0;L;;;;;N;;;;;
+A817;SYLOTI NAGRI LETTER DHO;Lo;0;L;;;;;N;;;;;
+A818;SYLOTI NAGRI LETTER NO;Lo;0;L;;;;;N;;;;;
+A819;SYLOTI NAGRI LETTER PO;Lo;0;L;;;;;N;;;;;
+A81A;SYLOTI NAGRI LETTER PHO;Lo;0;L;;;;;N;;;;;
+A81B;SYLOTI NAGRI LETTER BO;Lo;0;L;;;;;N;;;;;
+A81C;SYLOTI NAGRI LETTER BHO;Lo;0;L;;;;;N;;;;;
+A81D;SYLOTI NAGRI LETTER MO;Lo;0;L;;;;;N;;;;;
+A81E;SYLOTI NAGRI LETTER RO;Lo;0;L;;;;;N;;;;;
+A81F;SYLOTI NAGRI LETTER LO;Lo;0;L;;;;;N;;;;;
+A820;SYLOTI NAGRI LETTER RRO;Lo;0;L;;;;;N;;;;;
+A821;SYLOTI NAGRI LETTER SO;Lo;0;L;;;;;N;;;;;
+A822;SYLOTI NAGRI LETTER HO;Lo;0;L;;;;;N;;;;;
+A823;SYLOTI NAGRI VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+A824;SYLOTI NAGRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+A825;SYLOTI NAGRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+A826;SYLOTI NAGRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+A827;SYLOTI NAGRI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+A828;SYLOTI NAGRI POETRY MARK-1;So;0;ON;;;;;N;;;;;
+A829;SYLOTI NAGRI POETRY MARK-2;So;0;ON;;;;;N;;;;;
+A82A;SYLOTI NAGRI POETRY MARK-3;So;0;ON;;;;;N;;;;;
+A82B;SYLOTI NAGRI POETRY MARK-4;So;0;ON;;;;;N;;;;;
+A82C;SYLOTI NAGRI SIGN ALTERNATE HASANTA;Mn;9;NSM;;;;;N;;;;;
+A830;NORTH INDIC FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+A831;NORTH INDIC FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+A832;NORTH INDIC FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+A833;NORTH INDIC FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+A834;NORTH INDIC FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+A835;NORTH INDIC FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+A836;NORTH INDIC QUARTER MARK;So;0;L;;;;;N;;;;;
+A837;NORTH INDIC PLACEHOLDER MARK;So;0;L;;;;;N;;;;;
+A838;NORTH INDIC RUPEE MARK;Sc;0;ET;;;;;N;;;;;
+A839;NORTH INDIC QUANTITY MARK;So;0;ET;;;;;N;;;;;
+A840;PHAGS-PA LETTER KA;Lo;0;L;;;;;N;;;;;
+A841;PHAGS-PA LETTER KHA;Lo;0;L;;;;;N;;;;;
+A842;PHAGS-PA LETTER GA;Lo;0;L;;;;;N;;;;;
+A843;PHAGS-PA LETTER NGA;Lo;0;L;;;;;N;;;;;
+A844;PHAGS-PA LETTER CA;Lo;0;L;;;;;N;;;;;
+A845;PHAGS-PA LETTER CHA;Lo;0;L;;;;;N;;;;;
+A846;PHAGS-PA LETTER JA;Lo;0;L;;;;;N;;;;;
+A847;PHAGS-PA LETTER NYA;Lo;0;L;;;;;N;;;;;
+A848;PHAGS-PA LETTER TA;Lo;0;L;;;;;N;;;;;
+A849;PHAGS-PA LETTER THA;Lo;0;L;;;;;N;;;;;
+A84A;PHAGS-PA LETTER DA;Lo;0;L;;;;;N;;;;;
+A84B;PHAGS-PA LETTER NA;Lo;0;L;;;;;N;;;;;
+A84C;PHAGS-PA LETTER PA;Lo;0;L;;;;;N;;;;;
+A84D;PHAGS-PA LETTER PHA;Lo;0;L;;;;;N;;;;;
+A84E;PHAGS-PA LETTER BA;Lo;0;L;;;;;N;;;;;
+A84F;PHAGS-PA LETTER MA;Lo;0;L;;;;;N;;;;;
+A850;PHAGS-PA LETTER TSA;Lo;0;L;;;;;N;;;;;
+A851;PHAGS-PA LETTER TSHA;Lo;0;L;;;;;N;;;;;
+A852;PHAGS-PA LETTER DZA;Lo;0;L;;;;;N;;;;;
+A853;PHAGS-PA LETTER WA;Lo;0;L;;;;;N;;;;;
+A854;PHAGS-PA LETTER ZHA;Lo;0;L;;;;;N;;;;;
+A855;PHAGS-PA LETTER ZA;Lo;0;L;;;;;N;;;;;
+A856;PHAGS-PA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+A857;PHAGS-PA LETTER YA;Lo;0;L;;;;;N;;;;;
+A858;PHAGS-PA LETTER RA;Lo;0;L;;;;;N;;;;;
+A859;PHAGS-PA LETTER LA;Lo;0;L;;;;;N;;;;;
+A85A;PHAGS-PA LETTER SHA;Lo;0;L;;;;;N;;;;;
+A85B;PHAGS-PA LETTER SA;Lo;0;L;;;;;N;;;;;
+A85C;PHAGS-PA LETTER HA;Lo;0;L;;;;;N;;;;;
+A85D;PHAGS-PA LETTER A;Lo;0;L;;;;;N;;;;;
+A85E;PHAGS-PA LETTER I;Lo;0;L;;;;;N;;;;;
+A85F;PHAGS-PA LETTER U;Lo;0;L;;;;;N;;;;;
+A860;PHAGS-PA LETTER E;Lo;0;L;;;;;N;;;;;
+A861;PHAGS-PA LETTER O;Lo;0;L;;;;;N;;;;;
+A862;PHAGS-PA LETTER QA;Lo;0;L;;;;;N;;;;;
+A863;PHAGS-PA LETTER XA;Lo;0;L;;;;;N;;;;;
+A864;PHAGS-PA LETTER FA;Lo;0;L;;;;;N;;;;;
+A865;PHAGS-PA LETTER GGA;Lo;0;L;;;;;N;;;;;
+A866;PHAGS-PA LETTER EE;Lo;0;L;;;;;N;;;;;
+A867;PHAGS-PA SUBJOINED LETTER WA;Lo;0;L;;;;;N;;;;;
+A868;PHAGS-PA SUBJOINED LETTER YA;Lo;0;L;;;;;N;;;;;
+A869;PHAGS-PA LETTER TTA;Lo;0;L;;;;;N;;;;;
+A86A;PHAGS-PA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+A86B;PHAGS-PA LETTER DDA;Lo;0;L;;;;;N;;;;;
+A86C;PHAGS-PA LETTER NNA;Lo;0;L;;;;;N;;;;;
+A86D;PHAGS-PA LETTER ALTERNATE YA;Lo;0;L;;;;;N;;;;;
+A86E;PHAGS-PA LETTER VOICELESS SHA;Lo;0;L;;;;;N;;;;;
+A86F;PHAGS-PA LETTER VOICED HA;Lo;0;L;;;;;N;;;;;
+A870;PHAGS-PA LETTER ASPIRATED FA;Lo;0;L;;;;;N;;;;;
+A871;PHAGS-PA SUBJOINED LETTER RA;Lo;0;L;;;;;N;;;;;
+A872;PHAGS-PA SUPERFIXED LETTER RA;Lo;0;L;;;;;N;;;;;
+A873;PHAGS-PA LETTER CANDRABINDU;Lo;0;L;;;;;N;;;;;
+A874;PHAGS-PA SINGLE HEAD MARK;Po;0;ON;;;;;N;;;;;
+A875;PHAGS-PA DOUBLE HEAD MARK;Po;0;ON;;;;;N;;;;;
+A876;PHAGS-PA MARK SHAD;Po;0;ON;;;;;N;;;;;
+A877;PHAGS-PA MARK DOUBLE SHAD;Po;0;ON;;;;;N;;;;;
+A880;SAURASHTRA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+A881;SAURASHTRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+A882;SAURASHTRA LETTER A;Lo;0;L;;;;;N;;;;;
+A883;SAURASHTRA LETTER AA;Lo;0;L;;;;;N;;;;;
+A884;SAURASHTRA LETTER I;Lo;0;L;;;;;N;;;;;
+A885;SAURASHTRA LETTER II;Lo;0;L;;;;;N;;;;;
+A886;SAURASHTRA LETTER U;Lo;0;L;;;;;N;;;;;
+A887;SAURASHTRA LETTER UU;Lo;0;L;;;;;N;;;;;
+A888;SAURASHTRA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+A889;SAURASHTRA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+A88A;SAURASHTRA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+A88B;SAURASHTRA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+A88C;SAURASHTRA LETTER E;Lo;0;L;;;;;N;;;;;
+A88D;SAURASHTRA LETTER EE;Lo;0;L;;;;;N;;;;;
+A88E;SAURASHTRA LETTER AI;Lo;0;L;;;;;N;;;;;
+A88F;SAURASHTRA LETTER O;Lo;0;L;;;;;N;;;;;
+A890;SAURASHTRA LETTER OO;Lo;0;L;;;;;N;;;;;
+A891;SAURASHTRA LETTER AU;Lo;0;L;;;;;N;;;;;
+A892;SAURASHTRA LETTER KA;Lo;0;L;;;;;N;;;;;
+A893;SAURASHTRA LETTER KHA;Lo;0;L;;;;;N;;;;;
+A894;SAURASHTRA LETTER GA;Lo;0;L;;;;;N;;;;;
+A895;SAURASHTRA LETTER GHA;Lo;0;L;;;;;N;;;;;
+A896;SAURASHTRA LETTER NGA;Lo;0;L;;;;;N;;;;;
+A897;SAURASHTRA LETTER CA;Lo;0;L;;;;;N;;;;;
+A898;SAURASHTRA LETTER CHA;Lo;0;L;;;;;N;;;;;
+A899;SAURASHTRA LETTER JA;Lo;0;L;;;;;N;;;;;
+A89A;SAURASHTRA LETTER JHA;Lo;0;L;;;;;N;;;;;
+A89B;SAURASHTRA LETTER NYA;Lo;0;L;;;;;N;;;;;
+A89C;SAURASHTRA LETTER TTA;Lo;0;L;;;;;N;;;;;
+A89D;SAURASHTRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+A89E;SAURASHTRA LETTER DDA;Lo;0;L;;;;;N;;;;;
+A89F;SAURASHTRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+A8A0;SAURASHTRA LETTER NNA;Lo;0;L;;;;;N;;;;;
+A8A1;SAURASHTRA LETTER TA;Lo;0;L;;;;;N;;;;;
+A8A2;SAURASHTRA LETTER THA;Lo;0;L;;;;;N;;;;;
+A8A3;SAURASHTRA LETTER DA;Lo;0;L;;;;;N;;;;;
+A8A4;SAURASHTRA LETTER DHA;Lo;0;L;;;;;N;;;;;
+A8A5;SAURASHTRA LETTER NA;Lo;0;L;;;;;N;;;;;
+A8A6;SAURASHTRA LETTER PA;Lo;0;L;;;;;N;;;;;
+A8A7;SAURASHTRA LETTER PHA;Lo;0;L;;;;;N;;;;;
+A8A8;SAURASHTRA LETTER BA;Lo;0;L;;;;;N;;;;;
+A8A9;SAURASHTRA LETTER BHA;Lo;0;L;;;;;N;;;;;
+A8AA;SAURASHTRA LETTER MA;Lo;0;L;;;;;N;;;;;
+A8AB;SAURASHTRA LETTER YA;Lo;0;L;;;;;N;;;;;
+A8AC;SAURASHTRA LETTER RA;Lo;0;L;;;;;N;;;;;
+A8AD;SAURASHTRA LETTER LA;Lo;0;L;;;;;N;;;;;
+A8AE;SAURASHTRA LETTER VA;Lo;0;L;;;;;N;;;;;
+A8AF;SAURASHTRA LETTER SHA;Lo;0;L;;;;;N;;;;;
+A8B0;SAURASHTRA LETTER SSA;Lo;0;L;;;;;N;;;;;
+A8B1;SAURASHTRA LETTER SA;Lo;0;L;;;;;N;;;;;
+A8B2;SAURASHTRA LETTER HA;Lo;0;L;;;;;N;;;;;
+A8B3;SAURASHTRA LETTER LLA;Lo;0;L;;;;;N;;;;;
+A8B4;SAURASHTRA CONSONANT SIGN HAARU;Mc;0;L;;;;;N;;;;;
+A8B5;SAURASHTRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+A8B6;SAURASHTRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+A8B7;SAURASHTRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+A8B8;SAURASHTRA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+A8B9;SAURASHTRA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+A8BA;SAURASHTRA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+A8BB;SAURASHTRA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+A8BC;SAURASHTRA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;;
+A8BD;SAURASHTRA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;;
+A8BE;SAURASHTRA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+A8BF;SAURASHTRA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+A8C0;SAURASHTRA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+A8C1;SAURASHTRA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+A8C2;SAURASHTRA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+A8C3;SAURASHTRA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+A8C4;SAURASHTRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+A8C5;SAURASHTRA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+A8CE;SAURASHTRA DANDA;Po;0;L;;;;;N;;;;;
+A8CF;SAURASHTRA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+A8D0;SAURASHTRA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A8D1;SAURASHTRA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A8D2;SAURASHTRA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A8D3;SAURASHTRA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A8D4;SAURASHTRA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A8D5;SAURASHTRA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A8D6;SAURASHTRA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A8D7;SAURASHTRA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A8D8;SAURASHTRA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A8D9;SAURASHTRA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A8E0;COMBINING DEVANAGARI DIGIT ZERO;Mn;230;NSM;;;;;N;;;;;
+A8E1;COMBINING DEVANAGARI DIGIT ONE;Mn;230;NSM;;;;;N;;;;;
+A8E2;COMBINING DEVANAGARI DIGIT TWO;Mn;230;NSM;;;;;N;;;;;
+A8E3;COMBINING DEVANAGARI DIGIT THREE;Mn;230;NSM;;;;;N;;;;;
+A8E4;COMBINING DEVANAGARI DIGIT FOUR;Mn;230;NSM;;;;;N;;;;;
+A8E5;COMBINING DEVANAGARI DIGIT FIVE;Mn;230;NSM;;;;;N;;;;;
+A8E6;COMBINING DEVANAGARI DIGIT SIX;Mn;230;NSM;;;;;N;;;;;
+A8E7;COMBINING DEVANAGARI DIGIT SEVEN;Mn;230;NSM;;;;;N;;;;;
+A8E8;COMBINING DEVANAGARI DIGIT EIGHT;Mn;230;NSM;;;;;N;;;;;
+A8E9;COMBINING DEVANAGARI DIGIT NINE;Mn;230;NSM;;;;;N;;;;;
+A8EA;COMBINING DEVANAGARI LETTER A;Mn;230;NSM;;;;;N;;;;;
+A8EB;COMBINING DEVANAGARI LETTER U;Mn;230;NSM;;;;;N;;;;;
+A8EC;COMBINING DEVANAGARI LETTER KA;Mn;230;NSM;;;;;N;;;;;
+A8ED;COMBINING DEVANAGARI LETTER NA;Mn;230;NSM;;;;;N;;;;;
+A8EE;COMBINING DEVANAGARI LETTER PA;Mn;230;NSM;;;;;N;;;;;
+A8EF;COMBINING DEVANAGARI LETTER RA;Mn;230;NSM;;;;;N;;;;;
+A8F0;COMBINING DEVANAGARI LETTER VI;Mn;230;NSM;;;;;N;;;;;
+A8F1;COMBINING DEVANAGARI SIGN AVAGRAHA;Mn;230;NSM;;;;;N;;;;;
+A8F2;DEVANAGARI SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;;
+A8F3;DEVANAGARI SIGN CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;;
+A8F4;DEVANAGARI SIGN DOUBLE CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;;
+A8F5;DEVANAGARI SIGN CANDRABINDU TWO;Lo;0;L;;;;;N;;;;;
+A8F6;DEVANAGARI SIGN CANDRABINDU THREE;Lo;0;L;;;;;N;;;;;
+A8F7;DEVANAGARI SIGN CANDRABINDU AVAGRAHA;Lo;0;L;;;;;N;;;;;
+A8F8;DEVANAGARI SIGN PUSHPIKA;Po;0;L;;;;;N;;;;;
+A8F9;DEVANAGARI GAP FILLER;Po;0;L;;;;;N;;;;;
+A8FA;DEVANAGARI CARET;Po;0;L;;;;;N;;;;;
+A8FB;DEVANAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;;
+A8FC;DEVANAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+A8FD;DEVANAGARI JAIN OM;Lo;0;L;;;;;N;;;;;
+A8FE;DEVANAGARI LETTER AY;Lo;0;L;;;;;N;;;;;
+A8FF;DEVANAGARI VOWEL SIGN AY;Mn;0;NSM;;;;;N;;;;;
+A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A903;KAYAH LI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A904;KAYAH LI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A905;KAYAH LI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A906;KAYAH LI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A907;KAYAH LI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A908;KAYAH LI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A909;KAYAH LI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A90A;KAYAH LI LETTER KA;Lo;0;L;;;;;N;;;;;
+A90B;KAYAH LI LETTER KHA;Lo;0;L;;;;;N;;;;;
+A90C;KAYAH LI LETTER GA;Lo;0;L;;;;;N;;;;;
+A90D;KAYAH LI LETTER NGA;Lo;0;L;;;;;N;;;;;
+A90E;KAYAH LI LETTER SA;Lo;0;L;;;;;N;;;;;
+A90F;KAYAH LI LETTER SHA;Lo;0;L;;;;;N;;;;;
+A910;KAYAH LI LETTER ZA;Lo;0;L;;;;;N;;;;;
+A911;KAYAH LI LETTER NYA;Lo;0;L;;;;;N;;;;;
+A912;KAYAH LI LETTER TA;Lo;0;L;;;;;N;;;;;
+A913;KAYAH LI LETTER HTA;Lo;0;L;;;;;N;;;;;
+A914;KAYAH LI LETTER NA;Lo;0;L;;;;;N;;;;;
+A915;KAYAH LI LETTER PA;Lo;0;L;;;;;N;;;;;
+A916;KAYAH LI LETTER PHA;Lo;0;L;;;;;N;;;;;
+A917;KAYAH LI LETTER MA;Lo;0;L;;;;;N;;;;;
+A918;KAYAH LI LETTER DA;Lo;0;L;;;;;N;;;;;
+A919;KAYAH LI LETTER BA;Lo;0;L;;;;;N;;;;;
+A91A;KAYAH LI LETTER RA;Lo;0;L;;;;;N;;;;;
+A91B;KAYAH LI LETTER YA;Lo;0;L;;;;;N;;;;;
+A91C;KAYAH LI LETTER LA;Lo;0;L;;;;;N;;;;;
+A91D;KAYAH LI LETTER WA;Lo;0;L;;;;;N;;;;;
+A91E;KAYAH LI LETTER THA;Lo;0;L;;;;;N;;;;;
+A91F;KAYAH LI LETTER HA;Lo;0;L;;;;;N;;;;;
+A920;KAYAH LI LETTER VA;Lo;0;L;;;;;N;;;;;
+A921;KAYAH LI LETTER CA;Lo;0;L;;;;;N;;;;;
+A922;KAYAH LI LETTER A;Lo;0;L;;;;;N;;;;;
+A923;KAYAH LI LETTER OE;Lo;0;L;;;;;N;;;;;
+A924;KAYAH LI LETTER I;Lo;0;L;;;;;N;;;;;
+A925;KAYAH LI LETTER OO;Lo;0;L;;;;;N;;;;;
+A926;KAYAH LI VOWEL UE;Mn;0;NSM;;;;;N;;;;;
+A927;KAYAH LI VOWEL E;Mn;0;NSM;;;;;N;;;;;
+A928;KAYAH LI VOWEL U;Mn;0;NSM;;;;;N;;;;;
+A929;KAYAH LI VOWEL EE;Mn;0;NSM;;;;;N;;;;;
+A92A;KAYAH LI VOWEL O;Mn;0;NSM;;;;;N;;;;;
+A92B;KAYAH LI TONE PLOPHU;Mn;220;NSM;;;;;N;;;;;
+A92C;KAYAH LI TONE CALYA;Mn;220;NSM;;;;;N;;;;;
+A92D;KAYAH LI TONE CALYA PLOPHU;Mn;220;NSM;;;;;N;;;;;
+A92E;KAYAH LI SIGN CWI;Po;0;L;;;;;N;;;;;
+A92F;KAYAH LI SIGN SHYA;Po;0;L;;;;;N;;;;;
+A930;REJANG LETTER KA;Lo;0;L;;;;;N;;;;;
+A931;REJANG LETTER GA;Lo;0;L;;;;;N;;;;;
+A932;REJANG LETTER NGA;Lo;0;L;;;;;N;;;;;
+A933;REJANG LETTER TA;Lo;0;L;;;;;N;;;;;
+A934;REJANG LETTER DA;Lo;0;L;;;;;N;;;;;
+A935;REJANG LETTER NA;Lo;0;L;;;;;N;;;;;
+A936;REJANG LETTER PA;Lo;0;L;;;;;N;;;;;
+A937;REJANG LETTER BA;Lo;0;L;;;;;N;;;;;
+A938;REJANG LETTER MA;Lo;0;L;;;;;N;;;;;
+A939;REJANG LETTER CA;Lo;0;L;;;;;N;;;;;
+A93A;REJANG LETTER JA;Lo;0;L;;;;;N;;;;;
+A93B;REJANG LETTER NYA;Lo;0;L;;;;;N;;;;;
+A93C;REJANG LETTER SA;Lo;0;L;;;;;N;;;;;
+A93D;REJANG LETTER RA;Lo;0;L;;;;;N;;;;;
+A93E;REJANG LETTER LA;Lo;0;L;;;;;N;;;;;
+A93F;REJANG LETTER YA;Lo;0;L;;;;;N;;;;;
+A940;REJANG LETTER WA;Lo;0;L;;;;;N;;;;;
+A941;REJANG LETTER HA;Lo;0;L;;;;;N;;;;;
+A942;REJANG LETTER MBA;Lo;0;L;;;;;N;;;;;
+A943;REJANG LETTER NGGA;Lo;0;L;;;;;N;;;;;
+A944;REJANG LETTER NDA;Lo;0;L;;;;;N;;;;;
+A945;REJANG LETTER NYJA;Lo;0;L;;;;;N;;;;;
+A946;REJANG LETTER A;Lo;0;L;;;;;N;;;;;
+A947;REJANG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+A948;REJANG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+A949;REJANG VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+A94A;REJANG VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+A94B;REJANG VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+A94C;REJANG VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+A94D;REJANG VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;;
+A94E;REJANG VOWEL SIGN EA;Mn;0;NSM;;;;;N;;;;;
+A94F;REJANG CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+A950;REJANG CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+A951;REJANG CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+A952;REJANG CONSONANT SIGN H;Mc;0;L;;;;;N;;;;;
+A953;REJANG VIRAMA;Mc;9;L;;;;;N;;;;;
+A95F;REJANG SECTION MARK;Po;0;L;;;;;N;;;;;
+A960;HANGUL CHOSEONG TIKEUT-MIEUM;Lo;0;L;;;;;N;;;;;
+A961;HANGUL CHOSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+A962;HANGUL CHOSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;;
+A963;HANGUL CHOSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;;
+A964;HANGUL CHOSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;;
+A965;HANGUL CHOSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+A966;HANGUL CHOSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
+A967;HANGUL CHOSEONG RIEUL-SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+A968;HANGUL CHOSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;;
+A969;HANGUL CHOSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;;
+A96A;HANGUL CHOSEONG RIEUL-SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+A96B;HANGUL CHOSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+A96C;HANGUL CHOSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;;
+A96D;HANGUL CHOSEONG RIEUL-CIEUC;Lo;0;L;;;;;N;;;;;
+A96E;HANGUL CHOSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+A96F;HANGUL CHOSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+A970;HANGUL CHOSEONG MIEUM-TIKEUT;Lo;0;L;;;;;N;;;;;
+A971;HANGUL CHOSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+A972;HANGUL CHOSEONG PIEUP-SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+A973;HANGUL CHOSEONG PIEUP-KHIEUKH;Lo;0;L;;;;;N;;;;;
+A974;HANGUL CHOSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+A975;HANGUL CHOSEONG SSANGSIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+A976;HANGUL CHOSEONG IEUNG-RIEUL;Lo;0;L;;;;;N;;;;;
+A977;HANGUL CHOSEONG IEUNG-HIEUH;Lo;0;L;;;;;N;;;;;
+A978;HANGUL CHOSEONG SSANGCIEUC-HIEUH;Lo;0;L;;;;;N;;;;;
+A979;HANGUL CHOSEONG SSANGTHIEUTH;Lo;0;L;;;;;N;;;;;
+A97A;HANGUL CHOSEONG PHIEUPH-HIEUH;Lo;0;L;;;;;N;;;;;
+A97B;HANGUL CHOSEONG HIEUH-SIOS;Lo;0;L;;;;;N;;;;;
+A97C;HANGUL CHOSEONG SSANGYEORINHIEUH;Lo;0;L;;;;;N;;;;;
+A980;JAVANESE SIGN PANYANGGA;Mn;0;NSM;;;;;N;;;;;
+A981;JAVANESE SIGN CECAK;Mn;0;NSM;;;;;N;;;;;
+A982;JAVANESE SIGN LAYAR;Mn;0;NSM;;;;;N;;;;;
+A983;JAVANESE SIGN WIGNYAN;Mc;0;L;;;;;N;;;;;
+A984;JAVANESE LETTER A;Lo;0;L;;;;;N;;;;;
+A985;JAVANESE LETTER I KAWI;Lo;0;L;;;;;N;;;;;
+A986;JAVANESE LETTER I;Lo;0;L;;;;;N;;;;;
+A987;JAVANESE LETTER II;Lo;0;L;;;;;N;;;;;
+A988;JAVANESE LETTER U;Lo;0;L;;;;;N;;;;;
+A989;JAVANESE LETTER PA CEREK;Lo;0;L;;;;;N;;;;;
+A98A;JAVANESE LETTER NGA LELET;Lo;0;L;;;;;N;;;;;
+A98B;JAVANESE LETTER NGA LELET RASWADI;Lo;0;L;;;;;N;;;;;
+A98C;JAVANESE LETTER E;Lo;0;L;;;;;N;;;;;
+A98D;JAVANESE LETTER AI;Lo;0;L;;;;;N;;;;;
+A98E;JAVANESE LETTER O;Lo;0;L;;;;;N;;;;;
+A98F;JAVANESE LETTER KA;Lo;0;L;;;;;N;;;;;
+A990;JAVANESE LETTER KA SASAK;Lo;0;L;;;;;N;;;;;
+A991;JAVANESE LETTER KA MURDA;Lo;0;L;;;;;N;;;;;
+A992;JAVANESE LETTER GA;Lo;0;L;;;;;N;;;;;
+A993;JAVANESE LETTER GA MURDA;Lo;0;L;;;;;N;;;;;
+A994;JAVANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+A995;JAVANESE LETTER CA;Lo;0;L;;;;;N;;;;;
+A996;JAVANESE LETTER CA MURDA;Lo;0;L;;;;;N;;;;;
+A997;JAVANESE LETTER JA;Lo;0;L;;;;;N;;;;;
+A998;JAVANESE LETTER NYA MURDA;Lo;0;L;;;;;N;;;;;
+A999;JAVANESE LETTER JA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99A;JAVANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+A99B;JAVANESE LETTER TTA;Lo;0;L;;;;;N;;;;;
+A99C;JAVANESE LETTER TTA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99D;JAVANESE LETTER DDA;Lo;0;L;;;;;N;;;;;
+A99E;JAVANESE LETTER DDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99F;JAVANESE LETTER NA MURDA;Lo;0;L;;;;;N;;;;;
+A9A0;JAVANESE LETTER TA;Lo;0;L;;;;;N;;;;;
+A9A1;JAVANESE LETTER TA MURDA;Lo;0;L;;;;;N;;;;;
+A9A2;JAVANESE LETTER DA;Lo;0;L;;;;;N;;;;;
+A9A3;JAVANESE LETTER DA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A9A4;JAVANESE LETTER NA;Lo;0;L;;;;;N;;;;;
+A9A5;JAVANESE LETTER PA;Lo;0;L;;;;;N;;;;;
+A9A6;JAVANESE LETTER PA MURDA;Lo;0;L;;;;;N;;;;;
+A9A7;JAVANESE LETTER BA;Lo;0;L;;;;;N;;;;;
+A9A8;JAVANESE LETTER BA MURDA;Lo;0;L;;;;;N;;;;;
+A9A9;JAVANESE LETTER MA;Lo;0;L;;;;;N;;;;;
+A9AA;JAVANESE LETTER YA;Lo;0;L;;;;;N;;;;;
+A9AB;JAVANESE LETTER RA;Lo;0;L;;;;;N;;;;;
+A9AC;JAVANESE LETTER RA AGUNG;Lo;0;L;;;;;N;;;;;
+A9AD;JAVANESE LETTER LA;Lo;0;L;;;;;N;;;;;
+A9AE;JAVANESE LETTER WA;Lo;0;L;;;;;N;;;;;
+A9AF;JAVANESE LETTER SA MURDA;Lo;0;L;;;;;N;;;;;
+A9B0;JAVANESE LETTER SA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A9B1;JAVANESE LETTER SA;Lo;0;L;;;;;N;;;;;
+A9B2;JAVANESE LETTER HA;Lo;0;L;;;;;N;;;;;
+A9B3;JAVANESE SIGN CECAK TELU;Mn;7;NSM;;;;;N;;;;;
+A9B4;JAVANESE VOWEL SIGN TARUNG;Mc;0;L;;;;;N;;;;;
+A9B5;JAVANESE VOWEL SIGN TOLONG;Mc;0;L;;;;;N;;;;;
+A9B6;JAVANESE VOWEL SIGN WULU;Mn;0;NSM;;;;;N;;;;;
+A9B7;JAVANESE VOWEL SIGN WULU MELIK;Mn;0;NSM;;;;;N;;;;;
+A9B8;JAVANESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;;
+A9B9;JAVANESE VOWEL SIGN SUKU MENDUT;Mn;0;NSM;;;;;N;;;;;
+A9BA;JAVANESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;;
+A9BB;JAVANESE VOWEL SIGN DIRGA MURE;Mc;0;L;;;;;N;;;;;
+A9BC;JAVANESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;;
+A9BD;JAVANESE CONSONANT SIGN KERET;Mn;0;NSM;;;;;N;;;;;
+A9BE;JAVANESE CONSONANT SIGN PENGKAL;Mc;0;L;;;;;N;;;;;
+A9BF;JAVANESE CONSONANT SIGN CAKRA;Mc;0;L;;;;;N;;;;;
+A9C0;JAVANESE PANGKON;Mc;9;L;;;;;N;;;;;
+A9C1;JAVANESE LEFT RERENGGAN;Po;0;L;;;;;N;;;;;
+A9C2;JAVANESE RIGHT RERENGGAN;Po;0;L;;;;;N;;;;;
+A9C3;JAVANESE PADA ANDAP;Po;0;L;;;;;N;;;;;
+A9C4;JAVANESE PADA MADYA;Po;0;L;;;;;N;;;;;
+A9C5;JAVANESE PADA LUHUR;Po;0;L;;;;;N;;;;;
+A9C6;JAVANESE PADA WINDU;Po;0;L;;;;;N;;;;;
+A9C7;JAVANESE PADA PANGKAT;Po;0;L;;;;;N;;;;;
+A9C8;JAVANESE PADA LINGSA;Po;0;L;;;;;N;;;;;
+A9C9;JAVANESE PADA LUNGSI;Po;0;L;;;;;N;;;;;
+A9CA;JAVANESE PADA ADEG;Po;0;L;;;;;N;;;;;
+A9CB;JAVANESE PADA ADEG ADEG;Po;0;L;;;;;N;;;;;
+A9CC;JAVANESE PADA PISELEH;Po;0;L;;;;;N;;;;;
+A9CD;JAVANESE TURNED PADA PISELEH;Po;0;L;;;;;N;;;;;
+A9CF;JAVANESE PANGRANGKEP;Lm;0;L;;;;;N;;;;;
+A9D0;JAVANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A9D1;JAVANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A9D2;JAVANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A9D3;JAVANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A9D4;JAVANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A9D5;JAVANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A9D6;JAVANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A9D7;JAVANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A9D8;JAVANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A9D9;JAVANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A9DE;JAVANESE PADA TIRTA TUMETES;Po;0;L;;;;;N;;;;;
+A9DF;JAVANESE PADA ISEN-ISEN;Po;0;L;;;;;N;;;;;
+A9E0;MYANMAR LETTER SHAN GHA;Lo;0;L;;;;;N;;;;;
+A9E1;MYANMAR LETTER SHAN CHA;Lo;0;L;;;;;N;;;;;
+A9E2;MYANMAR LETTER SHAN JHA;Lo;0;L;;;;;N;;;;;
+A9E3;MYANMAR LETTER SHAN NNA;Lo;0;L;;;;;N;;;;;
+A9E4;MYANMAR LETTER SHAN BHA;Lo;0;L;;;;;N;;;;;
+A9E5;MYANMAR SIGN SHAN SAW;Mn;0;NSM;;;;;N;;;;;
+A9E6;MYANMAR MODIFIER LETTER SHAN REDUPLICATION;Lm;0;L;;;;;N;;;;;
+A9E7;MYANMAR LETTER TAI LAING NYA;Lo;0;L;;;;;N;;;;;
+A9E8;MYANMAR LETTER TAI LAING FA;Lo;0;L;;;;;N;;;;;
+A9E9;MYANMAR LETTER TAI LAING GA;Lo;0;L;;;;;N;;;;;
+A9EA;MYANMAR LETTER TAI LAING GHA;Lo;0;L;;;;;N;;;;;
+A9EB;MYANMAR LETTER TAI LAING JA;Lo;0;L;;;;;N;;;;;
+A9EC;MYANMAR LETTER TAI LAING JHA;Lo;0;L;;;;;N;;;;;
+A9ED;MYANMAR LETTER TAI LAING DDA;Lo;0;L;;;;;N;;;;;
+A9EE;MYANMAR LETTER TAI LAING DDHA;Lo;0;L;;;;;N;;;;;
+A9EF;MYANMAR LETTER TAI LAING NNA;Lo;0;L;;;;;N;;;;;
+A9F0;MYANMAR TAI LAING DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A9F1;MYANMAR TAI LAING DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A9F2;MYANMAR TAI LAING DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A9F3;MYANMAR TAI LAING DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A9F4;MYANMAR TAI LAING DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A9F5;MYANMAR TAI LAING DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A9F6;MYANMAR TAI LAING DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A9F7;MYANMAR TAI LAING DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A9F8;MYANMAR TAI LAING DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A9F9;MYANMAR TAI LAING DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A9FA;MYANMAR LETTER TAI LAING LLA;Lo;0;L;;;;;N;;;;;
+A9FB;MYANMAR LETTER TAI LAING DA;Lo;0;L;;;;;N;;;;;
+A9FC;MYANMAR LETTER TAI LAING DHA;Lo;0;L;;;;;N;;;;;
+A9FD;MYANMAR LETTER TAI LAING BA;Lo;0;L;;;;;N;;;;;
+A9FE;MYANMAR LETTER TAI LAING BHA;Lo;0;L;;;;;N;;;;;
+AA00;CHAM LETTER A;Lo;0;L;;;;;N;;;;;
+AA01;CHAM LETTER I;Lo;0;L;;;;;N;;;;;
+AA02;CHAM LETTER U;Lo;0;L;;;;;N;;;;;
+AA03;CHAM LETTER E;Lo;0;L;;;;;N;;;;;
+AA04;CHAM LETTER AI;Lo;0;L;;;;;N;;;;;
+AA05;CHAM LETTER O;Lo;0;L;;;;;N;;;;;
+AA06;CHAM LETTER KA;Lo;0;L;;;;;N;;;;;
+AA07;CHAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+AA08;CHAM LETTER GA;Lo;0;L;;;;;N;;;;;
+AA09;CHAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+AA0A;CHAM LETTER NGUE;Lo;0;L;;;;;N;;;;;
+AA0B;CHAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+AA0C;CHAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+AA0D;CHAM LETTER CHHA;Lo;0;L;;;;;N;;;;;
+AA0E;CHAM LETTER JA;Lo;0;L;;;;;N;;;;;
+AA0F;CHAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+AA10;CHAM LETTER NHUE;Lo;0;L;;;;;N;;;;;
+AA11;CHAM LETTER NHA;Lo;0;L;;;;;N;;;;;
+AA12;CHAM LETTER NHJA;Lo;0;L;;;;;N;;;;;
+AA13;CHAM LETTER TA;Lo;0;L;;;;;N;;;;;
+AA14;CHAM LETTER THA;Lo;0;L;;;;;N;;;;;
+AA15;CHAM LETTER DA;Lo;0;L;;;;;N;;;;;
+AA16;CHAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+AA17;CHAM LETTER NUE;Lo;0;L;;;;;N;;;;;
+AA18;CHAM LETTER NA;Lo;0;L;;;;;N;;;;;
+AA19;CHAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+AA1A;CHAM LETTER PA;Lo;0;L;;;;;N;;;;;
+AA1B;CHAM LETTER PPA;Lo;0;L;;;;;N;;;;;
+AA1C;CHAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+AA1D;CHAM LETTER BA;Lo;0;L;;;;;N;;;;;
+AA1E;CHAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+AA1F;CHAM LETTER MUE;Lo;0;L;;;;;N;;;;;
+AA20;CHAM LETTER MA;Lo;0;L;;;;;N;;;;;
+AA21;CHAM LETTER BBA;Lo;0;L;;;;;N;;;;;
+AA22;CHAM LETTER YA;Lo;0;L;;;;;N;;;;;
+AA23;CHAM LETTER RA;Lo;0;L;;;;;N;;;;;
+AA24;CHAM LETTER LA;Lo;0;L;;;;;N;;;;;
+AA25;CHAM LETTER VA;Lo;0;L;;;;;N;;;;;
+AA26;CHAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+AA27;CHAM LETTER SA;Lo;0;L;;;;;N;;;;;
+AA28;CHAM LETTER HA;Lo;0;L;;;;;N;;;;;
+AA29;CHAM VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+AA2A;CHAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+AA2B;CHAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+AA2C;CHAM VOWEL SIGN EI;Mn;0;NSM;;;;;N;;;;;
+AA2D;CHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+AA2E;CHAM VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+AA2F;CHAM VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+AA30;CHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+AA31;CHAM VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+AA32;CHAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+AA33;CHAM CONSONANT SIGN YA;Mc;0;L;;;;;N;;;;;
+AA34;CHAM CONSONANT SIGN RA;Mc;0;L;;;;;N;;;;;
+AA35;CHAM CONSONANT SIGN LA;Mn;0;NSM;;;;;N;;;;;
+AA36;CHAM CONSONANT SIGN WA;Mn;0;NSM;;;;;N;;;;;
+AA40;CHAM LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+AA41;CHAM LETTER FINAL G;Lo;0;L;;;;;N;;;;;
+AA42;CHAM LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+AA43;CHAM CONSONANT SIGN FINAL NG;Mn;0;NSM;;;;;N;;;;;
+AA44;CHAM LETTER FINAL CH;Lo;0;L;;;;;N;;;;;
+AA45;CHAM LETTER FINAL T;Lo;0;L;;;;;N;;;;;
+AA46;CHAM LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+AA47;CHAM LETTER FINAL P;Lo;0;L;;;;;N;;;;;
+AA48;CHAM LETTER FINAL Y;Lo;0;L;;;;;N;;;;;
+AA49;CHAM LETTER FINAL R;Lo;0;L;;;;;N;;;;;
+AA4A;CHAM LETTER FINAL L;Lo;0;L;;;;;N;;;;;
+AA4B;CHAM LETTER FINAL SS;Lo;0;L;;;;;N;;;;;
+AA4C;CHAM CONSONANT SIGN FINAL M;Mn;0;NSM;;;;;N;;;;;
+AA4D;CHAM CONSONANT SIGN FINAL H;Mc;0;L;;;;;N;;;;;
+AA50;CHAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+AA51;CHAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+AA52;CHAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+AA53;CHAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+AA54;CHAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+AA55;CHAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+AA56;CHAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+AA57;CHAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+AA58;CHAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+AA59;CHAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+AA5C;CHAM PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
+AA5D;CHAM PUNCTUATION DANDA;Po;0;L;;;;;N;;;;;
+AA5E;CHAM PUNCTUATION DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+AA5F;CHAM PUNCTUATION TRIPLE DANDA;Po;0;L;;;;;N;;;;;
+AA60;MYANMAR LETTER KHAMTI GA;Lo;0;L;;;;;N;;;;;
+AA61;MYANMAR LETTER KHAMTI CA;Lo;0;L;;;;;N;;;;;
+AA62;MYANMAR LETTER KHAMTI CHA;Lo;0;L;;;;;N;;;;;
+AA63;MYANMAR LETTER KHAMTI JA;Lo;0;L;;;;;N;;;;;
+AA64;MYANMAR LETTER KHAMTI JHA;Lo;0;L;;;;;N;;;;;
+AA65;MYANMAR LETTER KHAMTI NYA;Lo;0;L;;;;;N;;;;;
+AA66;MYANMAR LETTER KHAMTI TTA;Lo;0;L;;;;;N;;;;;
+AA67;MYANMAR LETTER KHAMTI TTHA;Lo;0;L;;;;;N;;;;;
+AA68;MYANMAR LETTER KHAMTI DDA;Lo;0;L;;;;;N;;;;;
+AA69;MYANMAR LETTER KHAMTI DDHA;Lo;0;L;;;;;N;;;;;
+AA6A;MYANMAR LETTER KHAMTI DHA;Lo;0;L;;;;;N;;;;;
+AA6B;MYANMAR LETTER KHAMTI NA;Lo;0;L;;;;;N;;;;;
+AA6C;MYANMAR LETTER KHAMTI SA;Lo;0;L;;;;;N;;;;;
+AA6D;MYANMAR LETTER KHAMTI HA;Lo;0;L;;;;;N;;;;;
+AA6E;MYANMAR LETTER KHAMTI HHA;Lo;0;L;;;;;N;;;;;
+AA6F;MYANMAR LETTER KHAMTI FA;Lo;0;L;;;;;N;;;;;
+AA70;MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION;Lm;0;L;;;;;N;;;;;
+AA71;MYANMAR LETTER KHAMTI XA;Lo;0;L;;;;;N;;;;;
+AA72;MYANMAR LETTER KHAMTI ZA;Lo;0;L;;;;;N;;;;;
+AA73;MYANMAR LETTER KHAMTI RA;Lo;0;L;;;;;N;;;;;
+AA74;MYANMAR LOGOGRAM KHAMTI OAY;Lo;0;L;;;;;N;;;;;
+AA75;MYANMAR LOGOGRAM KHAMTI QN;Lo;0;L;;;;;N;;;;;
+AA76;MYANMAR LOGOGRAM KHAMTI HM;Lo;0;L;;;;;N;;;;;
+AA77;MYANMAR SYMBOL AITON EXCLAMATION;So;0;L;;;;;N;;;;;
+AA78;MYANMAR SYMBOL AITON ONE;So;0;L;;;;;N;;;;;
+AA79;MYANMAR SYMBOL AITON TWO;So;0;L;;;;;N;;;;;
+AA7A;MYANMAR LETTER AITON RA;Lo;0;L;;;;;N;;;;;
+AA7B;MYANMAR SIGN PAO KAREN TONE;Mc;0;L;;;;;N;;;;;
+AA7C;MYANMAR SIGN TAI LAING TONE-2;Mn;0;NSM;;;;;N;;;;;
+AA7D;MYANMAR SIGN TAI LAING TONE-5;Mc;0;L;;;;;N;;;;;
+AA7E;MYANMAR LETTER SHWE PALAUNG CHA;Lo;0;L;;;;;N;;;;;
+AA7F;MYANMAR LETTER SHWE PALAUNG SHA;Lo;0;L;;;;;N;;;;;
+AA80;TAI VIET LETTER LOW KO;Lo;0;L;;;;;N;;;;;
+AA81;TAI VIET LETTER HIGH KO;Lo;0;L;;;;;N;;;;;
+AA82;TAI VIET LETTER LOW KHO;Lo;0;L;;;;;N;;;;;
+AA83;TAI VIET LETTER HIGH KHO;Lo;0;L;;;;;N;;;;;
+AA84;TAI VIET LETTER LOW KHHO;Lo;0;L;;;;;N;;;;;
+AA85;TAI VIET LETTER HIGH KHHO;Lo;0;L;;;;;N;;;;;
+AA86;TAI VIET LETTER LOW GO;Lo;0;L;;;;;N;;;;;
+AA87;TAI VIET LETTER HIGH GO;Lo;0;L;;;;;N;;;;;
+AA88;TAI VIET LETTER LOW NGO;Lo;0;L;;;;;N;;;;;
+AA89;TAI VIET LETTER HIGH NGO;Lo;0;L;;;;;N;;;;;
+AA8A;TAI VIET LETTER LOW CO;Lo;0;L;;;;;N;;;;;
+AA8B;TAI VIET LETTER HIGH CO;Lo;0;L;;;;;N;;;;;
+AA8C;TAI VIET LETTER LOW CHO;Lo;0;L;;;;;N;;;;;
+AA8D;TAI VIET LETTER HIGH CHO;Lo;0;L;;;;;N;;;;;
+AA8E;TAI VIET LETTER LOW SO;Lo;0;L;;;;;N;;;;;
+AA8F;TAI VIET LETTER HIGH SO;Lo;0;L;;;;;N;;;;;
+AA90;TAI VIET LETTER LOW NYO;Lo;0;L;;;;;N;;;;;
+AA91;TAI VIET LETTER HIGH NYO;Lo;0;L;;;;;N;;;;;
+AA92;TAI VIET LETTER LOW DO;Lo;0;L;;;;;N;;;;;
+AA93;TAI VIET LETTER HIGH DO;Lo;0;L;;;;;N;;;;;
+AA94;TAI VIET LETTER LOW TO;Lo;0;L;;;;;N;;;;;
+AA95;TAI VIET LETTER HIGH TO;Lo;0;L;;;;;N;;;;;
+AA96;TAI VIET LETTER LOW THO;Lo;0;L;;;;;N;;;;;
+AA97;TAI VIET LETTER HIGH THO;Lo;0;L;;;;;N;;;;;
+AA98;TAI VIET LETTER LOW NO;Lo;0;L;;;;;N;;;;;
+AA99;TAI VIET LETTER HIGH NO;Lo;0;L;;;;;N;;;;;
+AA9A;TAI VIET LETTER LOW BO;Lo;0;L;;;;;N;;;;;
+AA9B;TAI VIET LETTER HIGH BO;Lo;0;L;;;;;N;;;;;
+AA9C;TAI VIET LETTER LOW PO;Lo;0;L;;;;;N;;;;;
+AA9D;TAI VIET LETTER HIGH PO;Lo;0;L;;;;;N;;;;;
+AA9E;TAI VIET LETTER LOW PHO;Lo;0;L;;;;;N;;;;;
+AA9F;TAI VIET LETTER HIGH PHO;Lo;0;L;;;;;N;;;;;
+AAA0;TAI VIET LETTER LOW FO;Lo;0;L;;;;;N;;;;;
+AAA1;TAI VIET LETTER HIGH FO;Lo;0;L;;;;;N;;;;;
+AAA2;TAI VIET LETTER LOW MO;Lo;0;L;;;;;N;;;;;
+AAA3;TAI VIET LETTER HIGH MO;Lo;0;L;;;;;N;;;;;
+AAA4;TAI VIET LETTER LOW YO;Lo;0;L;;;;;N;;;;;
+AAA5;TAI VIET LETTER HIGH YO;Lo;0;L;;;;;N;;;;;
+AAA6;TAI VIET LETTER LOW RO;Lo;0;L;;;;;N;;;;;
+AAA7;TAI VIET LETTER HIGH RO;Lo;0;L;;;;;N;;;;;
+AAA8;TAI VIET LETTER LOW LO;Lo;0;L;;;;;N;;;;;
+AAA9;TAI VIET LETTER HIGH LO;Lo;0;L;;;;;N;;;;;
+AAAA;TAI VIET LETTER LOW VO;Lo;0;L;;;;;N;;;;;
+AAAB;TAI VIET LETTER HIGH VO;Lo;0;L;;;;;N;;;;;
+AAAC;TAI VIET LETTER LOW HO;Lo;0;L;;;;;N;;;;;
+AAAD;TAI VIET LETTER HIGH HO;Lo;0;L;;;;;N;;;;;
+AAAE;TAI VIET LETTER LOW O;Lo;0;L;;;;;N;;;;;
+AAAF;TAI VIET LETTER HIGH O;Lo;0;L;;;;;N;;;;;
+AAB0;TAI VIET MAI KANG;Mn;230;NSM;;;;;N;;;;;
+AAB1;TAI VIET VOWEL AA;Lo;0;L;;;;;N;;;;;
+AAB2;TAI VIET VOWEL I;Mn;230;NSM;;;;;N;;;;;
+AAB3;TAI VIET VOWEL UE;Mn;230;NSM;;;;;N;;;;;
+AAB4;TAI VIET VOWEL U;Mn;220;NSM;;;;;N;;;;;
+AAB5;TAI VIET VOWEL E;Lo;0;L;;;;;N;;;;;
+AAB6;TAI VIET VOWEL O;Lo;0;L;;;;;N;;;;;
+AAB7;TAI VIET MAI KHIT;Mn;230;NSM;;;;;N;;;;;
+AAB8;TAI VIET VOWEL IA;Mn;230;NSM;;;;;N;;;;;
+AAB9;TAI VIET VOWEL UEA;Lo;0;L;;;;;N;;;;;
+AABA;TAI VIET VOWEL UA;Lo;0;L;;;;;N;;;;;
+AABB;TAI VIET VOWEL AUE;Lo;0;L;;;;;N;;;;;
+AABC;TAI VIET VOWEL AY;Lo;0;L;;;;;N;;;;;
+AABD;TAI VIET VOWEL AN;Lo;0;L;;;;;N;;;;;
+AABE;TAI VIET VOWEL AM;Mn;230;NSM;;;;;N;;;;;
+AABF;TAI VIET TONE MAI EK;Mn;230;NSM;;;;;N;;;;;
+AAC0;TAI VIET TONE MAI NUENG;Lo;0;L;;;;;N;;;;;
+AAC1;TAI VIET TONE MAI THO;Mn;230;NSM;;;;;N;;;;;
+AAC2;TAI VIET TONE MAI SONG;Lo;0;L;;;;;N;;;;;
+AADB;TAI VIET SYMBOL KON;Lo;0;L;;;;;N;;;;;
+AADC;TAI VIET SYMBOL NUENG;Lo;0;L;;;;;N;;;;;
+AADD;TAI VIET SYMBOL SAM;Lm;0;L;;;;;N;;;;;
+AADE;TAI VIET SYMBOL HO HOI;Po;0;L;;;;;N;;;;;
+AADF;TAI VIET SYMBOL KOI KOI;Po;0;L;;;;;N;;;;;
+AAE0;MEETEI MAYEK LETTER E;Lo;0;L;;;;;N;;;;;
+AAE1;MEETEI MAYEK LETTER O;Lo;0;L;;;;;N;;;;;
+AAE2;MEETEI MAYEK LETTER CHA;Lo;0;L;;;;;N;;;;;
+AAE3;MEETEI MAYEK LETTER NYA;Lo;0;L;;;;;N;;;;;
+AAE4;MEETEI MAYEK LETTER TTA;Lo;0;L;;;;;N;;;;;
+AAE5;MEETEI MAYEK LETTER TTHA;Lo;0;L;;;;;N;;;;;
+AAE6;MEETEI MAYEK LETTER DDA;Lo;0;L;;;;;N;;;;;
+AAE7;MEETEI MAYEK LETTER DDHA;Lo;0;L;;;;;N;;;;;
+AAE8;MEETEI MAYEK LETTER NNA;Lo;0;L;;;;;N;;;;;
+AAE9;MEETEI MAYEK LETTER SHA;Lo;0;L;;;;;N;;;;;
+AAEA;MEETEI MAYEK LETTER SSA;Lo;0;L;;;;;N;;;;;
+AAEB;MEETEI MAYEK VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+AAEC;MEETEI MAYEK VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+AAED;MEETEI MAYEK VOWEL SIGN AAI;Mn;0;NSM;;;;;N;;;;;
+AAEE;MEETEI MAYEK VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+AAEF;MEETEI MAYEK VOWEL SIGN AAU;Mc;0;L;;;;;N;;;;;
+AAF0;MEETEI MAYEK CHEIKHAN;Po;0;L;;;;;N;;;;;
+AAF1;MEETEI MAYEK AHANG KHUDAM;Po;0;L;;;;;N;;;;;
+AAF2;MEETEI MAYEK ANJI;Lo;0;L;;;;;N;;;;;
+AAF3;MEETEI MAYEK SYLLABLE REPETITION MARK;Lm;0;L;;;;;N;;;;;
+AAF4;MEETEI MAYEK WORD REPETITION MARK;Lm;0;L;;;;;N;;;;;
+AAF5;MEETEI MAYEK VOWEL SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+AAF6;MEETEI MAYEK VIRAMA;Mn;9;NSM;;;;;N;;;;;
+AB01;ETHIOPIC SYLLABLE TTHU;Lo;0;L;;;;;N;;;;;
+AB02;ETHIOPIC SYLLABLE TTHI;Lo;0;L;;;;;N;;;;;
+AB03;ETHIOPIC SYLLABLE TTHAA;Lo;0;L;;;;;N;;;;;
+AB04;ETHIOPIC SYLLABLE TTHEE;Lo;0;L;;;;;N;;;;;
+AB05;ETHIOPIC SYLLABLE TTHE;Lo;0;L;;;;;N;;;;;
+AB06;ETHIOPIC SYLLABLE TTHO;Lo;0;L;;;;;N;;;;;
+AB09;ETHIOPIC SYLLABLE DDHU;Lo;0;L;;;;;N;;;;;
+AB0A;ETHIOPIC SYLLABLE DDHI;Lo;0;L;;;;;N;;;;;
+AB0B;ETHIOPIC SYLLABLE DDHAA;Lo;0;L;;;;;N;;;;;
+AB0C;ETHIOPIC SYLLABLE DDHEE;Lo;0;L;;;;;N;;;;;
+AB0D;ETHIOPIC SYLLABLE DDHE;Lo;0;L;;;;;N;;;;;
+AB0E;ETHIOPIC SYLLABLE DDHO;Lo;0;L;;;;;N;;;;;
+AB11;ETHIOPIC SYLLABLE DZU;Lo;0;L;;;;;N;;;;;
+AB12;ETHIOPIC SYLLABLE DZI;Lo;0;L;;;;;N;;;;;
+AB13;ETHIOPIC SYLLABLE DZAA;Lo;0;L;;;;;N;;;;;
+AB14;ETHIOPIC SYLLABLE DZEE;Lo;0;L;;;;;N;;;;;
+AB15;ETHIOPIC SYLLABLE DZE;Lo;0;L;;;;;N;;;;;
+AB16;ETHIOPIC SYLLABLE DZO;Lo;0;L;;;;;N;;;;;
+AB20;ETHIOPIC SYLLABLE CCHHA;Lo;0;L;;;;;N;;;;;
+AB21;ETHIOPIC SYLLABLE CCHHU;Lo;0;L;;;;;N;;;;;
+AB22;ETHIOPIC SYLLABLE CCHHI;Lo;0;L;;;;;N;;;;;
+AB23;ETHIOPIC SYLLABLE CCHHAA;Lo;0;L;;;;;N;;;;;
+AB24;ETHIOPIC SYLLABLE CCHHEE;Lo;0;L;;;;;N;;;;;
+AB25;ETHIOPIC SYLLABLE CCHHE;Lo;0;L;;;;;N;;;;;
+AB26;ETHIOPIC SYLLABLE CCHHO;Lo;0;L;;;;;N;;;;;
+AB28;ETHIOPIC SYLLABLE BBA;Lo;0;L;;;;;N;;;;;
+AB29;ETHIOPIC SYLLABLE BBU;Lo;0;L;;;;;N;;;;;
+AB2A;ETHIOPIC SYLLABLE BBI;Lo;0;L;;;;;N;;;;;
+AB2B;ETHIOPIC SYLLABLE BBAA;Lo;0;L;;;;;N;;;;;
+AB2C;ETHIOPIC SYLLABLE BBEE;Lo;0;L;;;;;N;;;;;
+AB2D;ETHIOPIC SYLLABLE BBE;Lo;0;L;;;;;N;;;;;
+AB2E;ETHIOPIC SYLLABLE BBO;Lo;0;L;;;;;N;;;;;
+AB30;LATIN SMALL LETTER BARRED ALPHA;Ll;0;L;;;;;N;;;;;
+AB31;LATIN SMALL LETTER A REVERSED-SCHWA;Ll;0;L;;;;;N;;;;;
+AB32;LATIN SMALL LETTER BLACKLETTER E;Ll;0;L;;;;;N;;;;;
+AB33;LATIN SMALL LETTER BARRED E;Ll;0;L;;;;;N;;;;;
+AB34;LATIN SMALL LETTER E WITH FLOURISH;Ll;0;L;;;;;N;;;;;
+AB35;LATIN SMALL LETTER LENIS F;Ll;0;L;;;;;N;;;;;
+AB36;LATIN SMALL LETTER SCRIPT G WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB37;LATIN SMALL LETTER L WITH INVERTED LAZY S;Ll;0;L;;;;;N;;;;;
+AB38;LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+AB39;LATIN SMALL LETTER L WITH MIDDLE RING;Ll;0;L;;;;;N;;;;;
+AB3A;LATIN SMALL LETTER M WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB3B;LATIN SMALL LETTER N WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB3C;LATIN SMALL LETTER ENG WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB3D;LATIN SMALL LETTER BLACKLETTER O;Ll;0;L;;;;;N;;;;;
+AB3E;LATIN SMALL LETTER BLACKLETTER O WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB3F;LATIN SMALL LETTER OPEN O WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB40;LATIN SMALL LETTER INVERTED OE;Ll;0;L;;;;;N;;;;;
+AB41;LATIN SMALL LETTER TURNED OE WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB42;LATIN SMALL LETTER TURNED OE WITH HORIZONTAL STROKE;Ll;0;L;;;;;N;;;;;
+AB43;LATIN SMALL LETTER TURNED O OPEN-O;Ll;0;L;;;;;N;;;;;
+AB44;LATIN SMALL LETTER TURNED O OPEN-O WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB45;LATIN SMALL LETTER STIRRUP R;Ll;0;L;;;;;N;;;;;
+AB46;LATIN LETTER SMALL CAPITAL R WITH RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB47;LATIN SMALL LETTER R WITHOUT HANDLE;Ll;0;L;;;;;N;;;;;
+AB48;LATIN SMALL LETTER DOUBLE R;Ll;0;L;;;;;N;;;;;
+AB49;LATIN SMALL LETTER R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB4A;LATIN SMALL LETTER DOUBLE R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB4B;LATIN SMALL LETTER SCRIPT R;Ll;0;L;;;;;N;;;;;
+AB4C;LATIN SMALL LETTER SCRIPT R WITH RING;Ll;0;L;;;;;N;;;;;
+AB4D;LATIN SMALL LETTER BASELINE ESH;Ll;0;L;;;;;N;;;;;
+AB4E;LATIN SMALL LETTER U WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB4F;LATIN SMALL LETTER U BAR WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB50;LATIN SMALL LETTER UI;Ll;0;L;;;;;N;;;;;
+AB51;LATIN SMALL LETTER TURNED UI;Ll;0;L;;;;;N;;;;;
+AB52;LATIN SMALL LETTER U WITH LEFT HOOK;Ll;0;L;;;;;N;;;;;
+AB53;LATIN SMALL LETTER CHI;Ll;0;L;;;;;N;;;A7B3;;A7B3
+AB54;LATIN SMALL LETTER CHI WITH LOW RIGHT RING;Ll;0;L;;;;;N;;;;;
+AB55;LATIN SMALL LETTER CHI WITH LOW LEFT SERIF;Ll;0;L;;;;;N;;;;;
+AB56;LATIN SMALL LETTER X WITH LOW RIGHT RING;Ll;0;L;;;;;N;;;;;
+AB57;LATIN SMALL LETTER X WITH LONG LEFT LEG;Ll;0;L;;;;;N;;;;;
+AB58;LATIN SMALL LETTER X WITH LONG LEFT LEG AND LOW RIGHT RING;Ll;0;L;;;;;N;;;;;
+AB59;LATIN SMALL LETTER X WITH LONG LEFT LEG WITH SERIF;Ll;0;L;;;;;N;;;;;
+AB5A;LATIN SMALL LETTER Y WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB5B;MODIFIER BREVE WITH INVERTED BREVE;Sk;0;L;;;;;N;;;;;
+AB5C;MODIFIER LETTER SMALL HENG;Lm;0;L;<super> A727;;;;N;;;;;
+AB5D;MODIFIER LETTER SMALL L WITH INVERTED LAZY S;Lm;0;L;<super> AB37;;;;N;;;;;
+AB5E;MODIFIER LETTER SMALL L WITH MIDDLE TILDE;Lm;0;L;<super> 026B;;;;N;;;;;
+AB5F;MODIFIER LETTER SMALL U WITH LEFT HOOK;Lm;0;L;<super> AB52;;;;N;;;;;
+AB60;LATIN SMALL LETTER SAKHA YAT;Ll;0;L;;;;;N;;;;;
+AB61;LATIN SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;;;
+AB62;LATIN SMALL LETTER OPEN OE;Ll;0;L;;;;;N;;;;;
+AB63;LATIN SMALL LETTER UO;Ll;0;L;;;;;N;;;;;
+AB64;LATIN SMALL LETTER INVERTED ALPHA;Ll;0;L;;;;;N;;;;;
+AB65;GREEK LETTER SMALL CAPITAL OMEGA;Ll;0;L;;;;;N;;;;;
+AB66;LATIN SMALL LETTER DZ DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+AB67;LATIN SMALL LETTER TS DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+AB68;LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+AB69;MODIFIER LETTER SMALL TURNED W;Lm;0;L;<super> 028D;;;;N;;;;;
+AB6A;MODIFIER LETTER LEFT TACK;Sk;0;ON;;;;;N;;;;;
+AB6B;MODIFIER LETTER RIGHT TACK;Sk;0;ON;;;;;N;;;;;
+AB70;CHEROKEE SMALL LETTER A;Ll;0;L;;;;;N;;;13A0;;13A0
+AB71;CHEROKEE SMALL LETTER E;Ll;0;L;;;;;N;;;13A1;;13A1
+AB72;CHEROKEE SMALL LETTER I;Ll;0;L;;;;;N;;;13A2;;13A2
+AB73;CHEROKEE SMALL LETTER O;Ll;0;L;;;;;N;;;13A3;;13A3
+AB74;CHEROKEE SMALL LETTER U;Ll;0;L;;;;;N;;;13A4;;13A4
+AB75;CHEROKEE SMALL LETTER V;Ll;0;L;;;;;N;;;13A5;;13A5
+AB76;CHEROKEE SMALL LETTER GA;Ll;0;L;;;;;N;;;13A6;;13A6
+AB77;CHEROKEE SMALL LETTER KA;Ll;0;L;;;;;N;;;13A7;;13A7
+AB78;CHEROKEE SMALL LETTER GE;Ll;0;L;;;;;N;;;13A8;;13A8
+AB79;CHEROKEE SMALL LETTER GI;Ll;0;L;;;;;N;;;13A9;;13A9
+AB7A;CHEROKEE SMALL LETTER GO;Ll;0;L;;;;;N;;;13AA;;13AA
+AB7B;CHEROKEE SMALL LETTER GU;Ll;0;L;;;;;N;;;13AB;;13AB
+AB7C;CHEROKEE SMALL LETTER GV;Ll;0;L;;;;;N;;;13AC;;13AC
+AB7D;CHEROKEE SMALL LETTER HA;Ll;0;L;;;;;N;;;13AD;;13AD
+AB7E;CHEROKEE SMALL LETTER HE;Ll;0;L;;;;;N;;;13AE;;13AE
+AB7F;CHEROKEE SMALL LETTER HI;Ll;0;L;;;;;N;;;13AF;;13AF
+AB80;CHEROKEE SMALL LETTER HO;Ll;0;L;;;;;N;;;13B0;;13B0
+AB81;CHEROKEE SMALL LETTER HU;Ll;0;L;;;;;N;;;13B1;;13B1
+AB82;CHEROKEE SMALL LETTER HV;Ll;0;L;;;;;N;;;13B2;;13B2
+AB83;CHEROKEE SMALL LETTER LA;Ll;0;L;;;;;N;;;13B3;;13B3
+AB84;CHEROKEE SMALL LETTER LE;Ll;0;L;;;;;N;;;13B4;;13B4
+AB85;CHEROKEE SMALL LETTER LI;Ll;0;L;;;;;N;;;13B5;;13B5
+AB86;CHEROKEE SMALL LETTER LO;Ll;0;L;;;;;N;;;13B6;;13B6
+AB87;CHEROKEE SMALL LETTER LU;Ll;0;L;;;;;N;;;13B7;;13B7
+AB88;CHEROKEE SMALL LETTER LV;Ll;0;L;;;;;N;;;13B8;;13B8
+AB89;CHEROKEE SMALL LETTER MA;Ll;0;L;;;;;N;;;13B9;;13B9
+AB8A;CHEROKEE SMALL LETTER ME;Ll;0;L;;;;;N;;;13BA;;13BA
+AB8B;CHEROKEE SMALL LETTER MI;Ll;0;L;;;;;N;;;13BB;;13BB
+AB8C;CHEROKEE SMALL LETTER MO;Ll;0;L;;;;;N;;;13BC;;13BC
+AB8D;CHEROKEE SMALL LETTER MU;Ll;0;L;;;;;N;;;13BD;;13BD
+AB8E;CHEROKEE SMALL LETTER NA;Ll;0;L;;;;;N;;;13BE;;13BE
+AB8F;CHEROKEE SMALL LETTER HNA;Ll;0;L;;;;;N;;;13BF;;13BF
+AB90;CHEROKEE SMALL LETTER NAH;Ll;0;L;;;;;N;;;13C0;;13C0
+AB91;CHEROKEE SMALL LETTER NE;Ll;0;L;;;;;N;;;13C1;;13C1
+AB92;CHEROKEE SMALL LETTER NI;Ll;0;L;;;;;N;;;13C2;;13C2
+AB93;CHEROKEE SMALL LETTER NO;Ll;0;L;;;;;N;;;13C3;;13C3
+AB94;CHEROKEE SMALL LETTER NU;Ll;0;L;;;;;N;;;13C4;;13C4
+AB95;CHEROKEE SMALL LETTER NV;Ll;0;L;;;;;N;;;13C5;;13C5
+AB96;CHEROKEE SMALL LETTER QUA;Ll;0;L;;;;;N;;;13C6;;13C6
+AB97;CHEROKEE SMALL LETTER QUE;Ll;0;L;;;;;N;;;13C7;;13C7
+AB98;CHEROKEE SMALL LETTER QUI;Ll;0;L;;;;;N;;;13C8;;13C8
+AB99;CHEROKEE SMALL LETTER QUO;Ll;0;L;;;;;N;;;13C9;;13C9
+AB9A;CHEROKEE SMALL LETTER QUU;Ll;0;L;;;;;N;;;13CA;;13CA
+AB9B;CHEROKEE SMALL LETTER QUV;Ll;0;L;;;;;N;;;13CB;;13CB
+AB9C;CHEROKEE SMALL LETTER SA;Ll;0;L;;;;;N;;;13CC;;13CC
+AB9D;CHEROKEE SMALL LETTER S;Ll;0;L;;;;;N;;;13CD;;13CD
+AB9E;CHEROKEE SMALL LETTER SE;Ll;0;L;;;;;N;;;13CE;;13CE
+AB9F;CHEROKEE SMALL LETTER SI;Ll;0;L;;;;;N;;;13CF;;13CF
+ABA0;CHEROKEE SMALL LETTER SO;Ll;0;L;;;;;N;;;13D0;;13D0
+ABA1;CHEROKEE SMALL LETTER SU;Ll;0;L;;;;;N;;;13D1;;13D1
+ABA2;CHEROKEE SMALL LETTER SV;Ll;0;L;;;;;N;;;13D2;;13D2
+ABA3;CHEROKEE SMALL LETTER DA;Ll;0;L;;;;;N;;;13D3;;13D3
+ABA4;CHEROKEE SMALL LETTER TA;Ll;0;L;;;;;N;;;13D4;;13D4
+ABA5;CHEROKEE SMALL LETTER DE;Ll;0;L;;;;;N;;;13D5;;13D5
+ABA6;CHEROKEE SMALL LETTER TE;Ll;0;L;;;;;N;;;13D6;;13D6
+ABA7;CHEROKEE SMALL LETTER DI;Ll;0;L;;;;;N;;;13D7;;13D7
+ABA8;CHEROKEE SMALL LETTER TI;Ll;0;L;;;;;N;;;13D8;;13D8
+ABA9;CHEROKEE SMALL LETTER DO;Ll;0;L;;;;;N;;;13D9;;13D9
+ABAA;CHEROKEE SMALL LETTER DU;Ll;0;L;;;;;N;;;13DA;;13DA
+ABAB;CHEROKEE SMALL LETTER DV;Ll;0;L;;;;;N;;;13DB;;13DB
+ABAC;CHEROKEE SMALL LETTER DLA;Ll;0;L;;;;;N;;;13DC;;13DC
+ABAD;CHEROKEE SMALL LETTER TLA;Ll;0;L;;;;;N;;;13DD;;13DD
+ABAE;CHEROKEE SMALL LETTER TLE;Ll;0;L;;;;;N;;;13DE;;13DE
+ABAF;CHEROKEE SMALL LETTER TLI;Ll;0;L;;;;;N;;;13DF;;13DF
+ABB0;CHEROKEE SMALL LETTER TLO;Ll;0;L;;;;;N;;;13E0;;13E0
+ABB1;CHEROKEE SMALL LETTER TLU;Ll;0;L;;;;;N;;;13E1;;13E1
+ABB2;CHEROKEE SMALL LETTER TLV;Ll;0;L;;;;;N;;;13E2;;13E2
+ABB3;CHEROKEE SMALL LETTER TSA;Ll;0;L;;;;;N;;;13E3;;13E3
+ABB4;CHEROKEE SMALL LETTER TSE;Ll;0;L;;;;;N;;;13E4;;13E4
+ABB5;CHEROKEE SMALL LETTER TSI;Ll;0;L;;;;;N;;;13E5;;13E5
+ABB6;CHEROKEE SMALL LETTER TSO;Ll;0;L;;;;;N;;;13E6;;13E6
+ABB7;CHEROKEE SMALL LETTER TSU;Ll;0;L;;;;;N;;;13E7;;13E7
+ABB8;CHEROKEE SMALL LETTER TSV;Ll;0;L;;;;;N;;;13E8;;13E8
+ABB9;CHEROKEE SMALL LETTER WA;Ll;0;L;;;;;N;;;13E9;;13E9
+ABBA;CHEROKEE SMALL LETTER WE;Ll;0;L;;;;;N;;;13EA;;13EA
+ABBB;CHEROKEE SMALL LETTER WI;Ll;0;L;;;;;N;;;13EB;;13EB
+ABBC;CHEROKEE SMALL LETTER WO;Ll;0;L;;;;;N;;;13EC;;13EC
+ABBD;CHEROKEE SMALL LETTER WU;Ll;0;L;;;;;N;;;13ED;;13ED
+ABBE;CHEROKEE SMALL LETTER WV;Ll;0;L;;;;;N;;;13EE;;13EE
+ABBF;CHEROKEE SMALL LETTER YA;Ll;0;L;;;;;N;;;13EF;;13EF
+ABC0;MEETEI MAYEK LETTER KOK;Lo;0;L;;;;;N;;;;;
+ABC1;MEETEI MAYEK LETTER SAM;Lo;0;L;;;;;N;;;;;
+ABC2;MEETEI MAYEK LETTER LAI;Lo;0;L;;;;;N;;;;;
+ABC3;MEETEI MAYEK LETTER MIT;Lo;0;L;;;;;N;;;;;
+ABC4;MEETEI MAYEK LETTER PA;Lo;0;L;;;;;N;;;;;
+ABC5;MEETEI MAYEK LETTER NA;Lo;0;L;;;;;N;;;;;
+ABC6;MEETEI MAYEK LETTER CHIL;Lo;0;L;;;;;N;;;;;
+ABC7;MEETEI MAYEK LETTER TIL;Lo;0;L;;;;;N;;;;;
+ABC8;MEETEI MAYEK LETTER KHOU;Lo;0;L;;;;;N;;;;;
+ABC9;MEETEI MAYEK LETTER NGOU;Lo;0;L;;;;;N;;;;;
+ABCA;MEETEI MAYEK LETTER THOU;Lo;0;L;;;;;N;;;;;
+ABCB;MEETEI MAYEK LETTER WAI;Lo;0;L;;;;;N;;;;;
+ABCC;MEETEI MAYEK LETTER YANG;Lo;0;L;;;;;N;;;;;
+ABCD;MEETEI MAYEK LETTER HUK;Lo;0;L;;;;;N;;;;;
+ABCE;MEETEI MAYEK LETTER UN;Lo;0;L;;;;;N;;;;;
+ABCF;MEETEI MAYEK LETTER I;Lo;0;L;;;;;N;;;;;
+ABD0;MEETEI MAYEK LETTER PHAM;Lo;0;L;;;;;N;;;;;
+ABD1;MEETEI MAYEK LETTER ATIYA;Lo;0;L;;;;;N;;;;;
+ABD2;MEETEI MAYEK LETTER GOK;Lo;0;L;;;;;N;;;;;
+ABD3;MEETEI MAYEK LETTER JHAM;Lo;0;L;;;;;N;;;;;
+ABD4;MEETEI MAYEK LETTER RAI;Lo;0;L;;;;;N;;;;;
+ABD5;MEETEI MAYEK LETTER BA;Lo;0;L;;;;;N;;;;;
+ABD6;MEETEI MAYEK LETTER JIL;Lo;0;L;;;;;N;;;;;
+ABD7;MEETEI MAYEK LETTER DIL;Lo;0;L;;;;;N;;;;;
+ABD8;MEETEI MAYEK LETTER GHOU;Lo;0;L;;;;;N;;;;;
+ABD9;MEETEI MAYEK LETTER DHOU;Lo;0;L;;;;;N;;;;;
+ABDA;MEETEI MAYEK LETTER BHAM;Lo;0;L;;;;;N;;;;;
+ABDB;MEETEI MAYEK LETTER KOK LONSUM;Lo;0;L;;;;;N;;;;;
+ABDC;MEETEI MAYEK LETTER LAI LONSUM;Lo;0;L;;;;;N;;;;;
+ABDD;MEETEI MAYEK LETTER MIT LONSUM;Lo;0;L;;;;;N;;;;;
+ABDE;MEETEI MAYEK LETTER PA LONSUM;Lo;0;L;;;;;N;;;;;
+ABDF;MEETEI MAYEK LETTER NA LONSUM;Lo;0;L;;;;;N;;;;;
+ABE0;MEETEI MAYEK LETTER TIL LONSUM;Lo;0;L;;;;;N;;;;;
+ABE1;MEETEI MAYEK LETTER NGOU LONSUM;Lo;0;L;;;;;N;;;;;
+ABE2;MEETEI MAYEK LETTER I LONSUM;Lo;0;L;;;;;N;;;;;
+ABE3;MEETEI MAYEK VOWEL SIGN ONAP;Mc;0;L;;;;;N;;;;;
+ABE4;MEETEI MAYEK VOWEL SIGN INAP;Mc;0;L;;;;;N;;;;;
+ABE5;MEETEI MAYEK VOWEL SIGN ANAP;Mn;0;NSM;;;;;N;;;;;
+ABE6;MEETEI MAYEK VOWEL SIGN YENAP;Mc;0;L;;;;;N;;;;;
+ABE7;MEETEI MAYEK VOWEL SIGN SOUNAP;Mc;0;L;;;;;N;;;;;
+ABE8;MEETEI MAYEK VOWEL SIGN UNAP;Mn;0;NSM;;;;;N;;;;;
+ABE9;MEETEI MAYEK VOWEL SIGN CHEINAP;Mc;0;L;;;;;N;;;;;
+ABEA;MEETEI MAYEK VOWEL SIGN NUNG;Mc;0;L;;;;;N;;;;;
+ABEB;MEETEI MAYEK CHEIKHEI;Po;0;L;;;;;N;;;;;
+ABEC;MEETEI MAYEK LUM IYEK;Mc;0;L;;;;;N;;;;;
+ABED;MEETEI MAYEK APUN IYEK;Mn;9;NSM;;;;;N;;;;;
+ABF0;MEETEI MAYEK DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+ABF1;MEETEI MAYEK DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+ABF2;MEETEI MAYEK DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+ABF3;MEETEI MAYEK DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+ABF4;MEETEI MAYEK DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+ABF5;MEETEI MAYEK DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+ABF6;MEETEI MAYEK DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+ABF7;MEETEI MAYEK DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+ABF8;MEETEI MAYEK DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+ABF9;MEETEI MAYEK DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+AC00;<Hangul Syllable, First>;Lo;0;L;;;;;N;;;;;
+D7A3;<Hangul Syllable, Last>;Lo;0;L;;;;;N;;;;;
+D7B0;HANGUL JUNGSEONG O-YEO;Lo;0;L;;;;;N;;;;;
+D7B1;HANGUL JUNGSEONG O-O-I;Lo;0;L;;;;;N;;;;;
+D7B2;HANGUL JUNGSEONG YO-A;Lo;0;L;;;;;N;;;;;
+D7B3;HANGUL JUNGSEONG YO-AE;Lo;0;L;;;;;N;;;;;
+D7B4;HANGUL JUNGSEONG YO-EO;Lo;0;L;;;;;N;;;;;
+D7B5;HANGUL JUNGSEONG U-YEO;Lo;0;L;;;;;N;;;;;
+D7B6;HANGUL JUNGSEONG U-I-I;Lo;0;L;;;;;N;;;;;
+D7B7;HANGUL JUNGSEONG YU-AE;Lo;0;L;;;;;N;;;;;
+D7B8;HANGUL JUNGSEONG YU-O;Lo;0;L;;;;;N;;;;;
+D7B9;HANGUL JUNGSEONG EU-A;Lo;0;L;;;;;N;;;;;
+D7BA;HANGUL JUNGSEONG EU-EO;Lo;0;L;;;;;N;;;;;
+D7BB;HANGUL JUNGSEONG EU-E;Lo;0;L;;;;;N;;;;;
+D7BC;HANGUL JUNGSEONG EU-O;Lo;0;L;;;;;N;;;;;
+D7BD;HANGUL JUNGSEONG I-YA-O;Lo;0;L;;;;;N;;;;;
+D7BE;HANGUL JUNGSEONG I-YAE;Lo;0;L;;;;;N;;;;;
+D7BF;HANGUL JUNGSEONG I-YEO;Lo;0;L;;;;;N;;;;;
+D7C0;HANGUL JUNGSEONG I-YE;Lo;0;L;;;;;N;;;;;
+D7C1;HANGUL JUNGSEONG I-O-I;Lo;0;L;;;;;N;;;;;
+D7C2;HANGUL JUNGSEONG I-YO;Lo;0;L;;;;;N;;;;;
+D7C3;HANGUL JUNGSEONG I-YU;Lo;0;L;;;;;N;;;;;
+D7C4;HANGUL JUNGSEONG I-I;Lo;0;L;;;;;N;;;;;
+D7C5;HANGUL JUNGSEONG ARAEA-A;Lo;0;L;;;;;N;;;;;
+D7C6;HANGUL JUNGSEONG ARAEA-E;Lo;0;L;;;;;N;;;;;
+D7CB;HANGUL JONGSEONG NIEUN-RIEUL;Lo;0;L;;;;;N;;;;;
+D7CC;HANGUL JONGSEONG NIEUN-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7CD;HANGUL JONGSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+D7CE;HANGUL JONGSEONG SSANGTIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+D7CF;HANGUL JONGSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+D7D0;HANGUL JONGSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;;
+D7D1;HANGUL JONGSEONG TIKEUT-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+D7D2;HANGUL JONGSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;;
+D7D3;HANGUL JONGSEONG TIKEUT-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7D4;HANGUL JONGSEONG TIKEUT-THIEUTH;Lo;0;L;;;;;N;;;;;
+D7D5;HANGUL JONGSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+D7D6;HANGUL JONGSEONG RIEUL-KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;;
+D7D7;HANGUL JONGSEONG SSANGRIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+D7D8;HANGUL JONGSEONG RIEUL-MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
+D7D9;HANGUL JONGSEONG RIEUL-PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7DA;HANGUL JONGSEONG RIEUL-PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+D7DB;HANGUL JONGSEONG RIEUL-YESIEUNG;Lo;0;L;;;;;N;;;;;
+D7DC;HANGUL JONGSEONG RIEUL-YEORINHIEUH-HIEUH;Lo;0;L;;;;;N;;;;;
+D7DD;HANGUL JONGSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
+D7DE;HANGUL JONGSEONG MIEUM-NIEUN;Lo;0;L;;;;;N;;;;;
+D7DF;HANGUL JONGSEONG MIEUM-SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+D7E0;HANGUL JONGSEONG SSANGMIEUM;Lo;0;L;;;;;N;;;;;
+D7E1;HANGUL JONGSEONG MIEUM-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+D7E2;HANGUL JONGSEONG MIEUM-CIEUC;Lo;0;L;;;;;N;;;;;
+D7E3;HANGUL JONGSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7E4;HANGUL JONGSEONG PIEUP-RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;;
+D7E5;HANGUL JONGSEONG PIEUP-MIEUM;Lo;0;L;;;;;N;;;;;
+D7E6;HANGUL JONGSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+D7E7;HANGUL JONGSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7E8;HANGUL JONGSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
+D7E9;HANGUL JONGSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7EA;HANGUL JONGSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
+D7EB;HANGUL JONGSEONG SIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+D7EC;HANGUL JONGSEONG SSANGSIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+D7ED;HANGUL JONGSEONG SSANGSIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7EE;HANGUL JONGSEONG SIOS-PANSIOS;Lo;0;L;;;;;N;;;;;
+D7EF;HANGUL JONGSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+D7F0;HANGUL JONGSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7F1;HANGUL JONGSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+D7F2;HANGUL JONGSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
+D7F3;HANGUL JONGSEONG PANSIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+D7F4;HANGUL JONGSEONG PANSIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+D7F5;HANGUL JONGSEONG YESIEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
+D7F6;HANGUL JONGSEONG YESIEUNG-HIEUH;Lo;0;L;;;;;N;;;;;
+D7F7;HANGUL JONGSEONG CIEUC-PIEUP;Lo;0;L;;;;;N;;;;;
+D7F8;HANGUL JONGSEONG CIEUC-SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+D7F9;HANGUL JONGSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;;
+D7FA;HANGUL JONGSEONG PHIEUPH-SIOS;Lo;0;L;;;;;N;;;;;
+D7FB;HANGUL JONGSEONG PHIEUPH-THIEUTH;Lo;0;L;;;;;N;;;;;
+D800;<Non Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DB7F;<Non Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+DB80;<Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DBFF;<Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+DC00;<Low Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DFFF;<Low Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+E000;<Private Use, First>;Co;0;L;;;;;N;;;;;
+F8FF;<Private Use, Last>;Co;0;L;;;;;N;;;;;
+F900;CJK COMPATIBILITY IDEOGRAPH-F900;Lo;0;L;8C48;;;;N;;;;;
+F901;CJK COMPATIBILITY IDEOGRAPH-F901;Lo;0;L;66F4;;;;N;;;;;
+F902;CJK COMPATIBILITY IDEOGRAPH-F902;Lo;0;L;8ECA;;;;N;;;;;
+F903;CJK COMPATIBILITY IDEOGRAPH-F903;Lo;0;L;8CC8;;;;N;;;;;
+F904;CJK COMPATIBILITY IDEOGRAPH-F904;Lo;0;L;6ED1;;;;N;;;;;
+F905;CJK COMPATIBILITY IDEOGRAPH-F905;Lo;0;L;4E32;;;;N;;;;;
+F906;CJK COMPATIBILITY IDEOGRAPH-F906;Lo;0;L;53E5;;;;N;;;;;
+F907;CJK COMPATIBILITY IDEOGRAPH-F907;Lo;0;L;9F9C;;;;N;;;;;
+F908;CJK COMPATIBILITY IDEOGRAPH-F908;Lo;0;L;9F9C;;;;N;;;;;
+F909;CJK COMPATIBILITY IDEOGRAPH-F909;Lo;0;L;5951;;;;N;;;;;
+F90A;CJK COMPATIBILITY IDEOGRAPH-F90A;Lo;0;L;91D1;;;;N;;;;;
+F90B;CJK COMPATIBILITY IDEOGRAPH-F90B;Lo;0;L;5587;;;;N;;;;;
+F90C;CJK COMPATIBILITY IDEOGRAPH-F90C;Lo;0;L;5948;;;;N;;;;;
+F90D;CJK COMPATIBILITY IDEOGRAPH-F90D;Lo;0;L;61F6;;;;N;;;;;
+F90E;CJK COMPATIBILITY IDEOGRAPH-F90E;Lo;0;L;7669;;;;N;;;;;
+F90F;CJK COMPATIBILITY IDEOGRAPH-F90F;Lo;0;L;7F85;;;;N;;;;;
+F910;CJK COMPATIBILITY IDEOGRAPH-F910;Lo;0;L;863F;;;;N;;;;;
+F911;CJK COMPATIBILITY IDEOGRAPH-F911;Lo;0;L;87BA;;;;N;;;;;
+F912;CJK COMPATIBILITY IDEOGRAPH-F912;Lo;0;L;88F8;;;;N;;;;;
+F913;CJK COMPATIBILITY IDEOGRAPH-F913;Lo;0;L;908F;;;;N;;;;;
+F914;CJK COMPATIBILITY IDEOGRAPH-F914;Lo;0;L;6A02;;;;N;;;;;
+F915;CJK COMPATIBILITY IDEOGRAPH-F915;Lo;0;L;6D1B;;;;N;;;;;
+F916;CJK COMPATIBILITY IDEOGRAPH-F916;Lo;0;L;70D9;;;;N;;;;;
+F917;CJK COMPATIBILITY IDEOGRAPH-F917;Lo;0;L;73DE;;;;N;;;;;
+F918;CJK COMPATIBILITY IDEOGRAPH-F918;Lo;0;L;843D;;;;N;;;;;
+F919;CJK COMPATIBILITY IDEOGRAPH-F919;Lo;0;L;916A;;;;N;;;;;
+F91A;CJK COMPATIBILITY IDEOGRAPH-F91A;Lo;0;L;99F1;;;;N;;;;;
+F91B;CJK COMPATIBILITY IDEOGRAPH-F91B;Lo;0;L;4E82;;;;N;;;;;
+F91C;CJK COMPATIBILITY IDEOGRAPH-F91C;Lo;0;L;5375;;;;N;;;;;
+F91D;CJK COMPATIBILITY IDEOGRAPH-F91D;Lo;0;L;6B04;;;;N;;;;;
+F91E;CJK COMPATIBILITY IDEOGRAPH-F91E;Lo;0;L;721B;;;;N;;;;;
+F91F;CJK COMPATIBILITY IDEOGRAPH-F91F;Lo;0;L;862D;;;;N;;;;;
+F920;CJK COMPATIBILITY IDEOGRAPH-F920;Lo;0;L;9E1E;;;;N;;;;;
+F921;CJK COMPATIBILITY IDEOGRAPH-F921;Lo;0;L;5D50;;;;N;;;;;
+F922;CJK COMPATIBILITY IDEOGRAPH-F922;Lo;0;L;6FEB;;;;N;;;;;
+F923;CJK COMPATIBILITY IDEOGRAPH-F923;Lo;0;L;85CD;;;;N;;;;;
+F924;CJK COMPATIBILITY IDEOGRAPH-F924;Lo;0;L;8964;;;;N;;;;;
+F925;CJK COMPATIBILITY IDEOGRAPH-F925;Lo;0;L;62C9;;;;N;;;;;
+F926;CJK COMPATIBILITY IDEOGRAPH-F926;Lo;0;L;81D8;;;;N;;;;;
+F927;CJK COMPATIBILITY IDEOGRAPH-F927;Lo;0;L;881F;;;;N;;;;;
+F928;CJK COMPATIBILITY IDEOGRAPH-F928;Lo;0;L;5ECA;;;;N;;;;;
+F929;CJK COMPATIBILITY IDEOGRAPH-F929;Lo;0;L;6717;;;;N;;;;;
+F92A;CJK COMPATIBILITY IDEOGRAPH-F92A;Lo;0;L;6D6A;;;;N;;;;;
+F92B;CJK COMPATIBILITY IDEOGRAPH-F92B;Lo;0;L;72FC;;;;N;;;;;
+F92C;CJK COMPATIBILITY IDEOGRAPH-F92C;Lo;0;L;90CE;;;;N;;;;;
+F92D;CJK COMPATIBILITY IDEOGRAPH-F92D;Lo;0;L;4F86;;;;N;;;;;
+F92E;CJK COMPATIBILITY IDEOGRAPH-F92E;Lo;0;L;51B7;;;;N;;;;;
+F92F;CJK COMPATIBILITY IDEOGRAPH-F92F;Lo;0;L;52DE;;;;N;;;;;
+F930;CJK COMPATIBILITY IDEOGRAPH-F930;Lo;0;L;64C4;;;;N;;;;;
+F931;CJK COMPATIBILITY IDEOGRAPH-F931;Lo;0;L;6AD3;;;;N;;;;;
+F932;CJK COMPATIBILITY IDEOGRAPH-F932;Lo;0;L;7210;;;;N;;;;;
+F933;CJK COMPATIBILITY IDEOGRAPH-F933;Lo;0;L;76E7;;;;N;;;;;
+F934;CJK COMPATIBILITY IDEOGRAPH-F934;Lo;0;L;8001;;;;N;;;;;
+F935;CJK COMPATIBILITY IDEOGRAPH-F935;Lo;0;L;8606;;;;N;;;;;
+F936;CJK COMPATIBILITY IDEOGRAPH-F936;Lo;0;L;865C;;;;N;;;;;
+F937;CJK COMPATIBILITY IDEOGRAPH-F937;Lo;0;L;8DEF;;;;N;;;;;
+F938;CJK COMPATIBILITY IDEOGRAPH-F938;Lo;0;L;9732;;;;N;;;;;
+F939;CJK COMPATIBILITY IDEOGRAPH-F939;Lo;0;L;9B6F;;;;N;;;;;
+F93A;CJK COMPATIBILITY IDEOGRAPH-F93A;Lo;0;L;9DFA;;;;N;;;;;
+F93B;CJK COMPATIBILITY IDEOGRAPH-F93B;Lo;0;L;788C;;;;N;;;;;
+F93C;CJK COMPATIBILITY IDEOGRAPH-F93C;Lo;0;L;797F;;;;N;;;;;
+F93D;CJK COMPATIBILITY IDEOGRAPH-F93D;Lo;0;L;7DA0;;;;N;;;;;
+F93E;CJK COMPATIBILITY IDEOGRAPH-F93E;Lo;0;L;83C9;;;;N;;;;;
+F93F;CJK COMPATIBILITY IDEOGRAPH-F93F;Lo;0;L;9304;;;;N;;;;;
+F940;CJK COMPATIBILITY IDEOGRAPH-F940;Lo;0;L;9E7F;;;;N;;;;;
+F941;CJK COMPATIBILITY IDEOGRAPH-F941;Lo;0;L;8AD6;;;;N;;;;;
+F942;CJK COMPATIBILITY IDEOGRAPH-F942;Lo;0;L;58DF;;;;N;;;;;
+F943;CJK COMPATIBILITY IDEOGRAPH-F943;Lo;0;L;5F04;;;;N;;;;;
+F944;CJK COMPATIBILITY IDEOGRAPH-F944;Lo;0;L;7C60;;;;N;;;;;
+F945;CJK COMPATIBILITY IDEOGRAPH-F945;Lo;0;L;807E;;;;N;;;;;
+F946;CJK COMPATIBILITY IDEOGRAPH-F946;Lo;0;L;7262;;;;N;;;;;
+F947;CJK COMPATIBILITY IDEOGRAPH-F947;Lo;0;L;78CA;;;;N;;;;;
+F948;CJK COMPATIBILITY IDEOGRAPH-F948;Lo;0;L;8CC2;;;;N;;;;;
+F949;CJK COMPATIBILITY IDEOGRAPH-F949;Lo;0;L;96F7;;;;N;;;;;
+F94A;CJK COMPATIBILITY IDEOGRAPH-F94A;Lo;0;L;58D8;;;;N;;;;;
+F94B;CJK COMPATIBILITY IDEOGRAPH-F94B;Lo;0;L;5C62;;;;N;;;;;
+F94C;CJK COMPATIBILITY IDEOGRAPH-F94C;Lo;0;L;6A13;;;;N;;;;;
+F94D;CJK COMPATIBILITY IDEOGRAPH-F94D;Lo;0;L;6DDA;;;;N;;;;;
+F94E;CJK COMPATIBILITY IDEOGRAPH-F94E;Lo;0;L;6F0F;;;;N;;;;;
+F94F;CJK COMPATIBILITY IDEOGRAPH-F94F;Lo;0;L;7D2F;;;;N;;;;;
+F950;CJK COMPATIBILITY IDEOGRAPH-F950;Lo;0;L;7E37;;;;N;;;;;
+F951;CJK COMPATIBILITY IDEOGRAPH-F951;Lo;0;L;964B;;;;N;;;;;
+F952;CJK COMPATIBILITY IDEOGRAPH-F952;Lo;0;L;52D2;;;;N;;;;;
+F953;CJK COMPATIBILITY IDEOGRAPH-F953;Lo;0;L;808B;;;;N;;;;;
+F954;CJK COMPATIBILITY IDEOGRAPH-F954;Lo;0;L;51DC;;;;N;;;;;
+F955;CJK COMPATIBILITY IDEOGRAPH-F955;Lo;0;L;51CC;;;;N;;;;;
+F956;CJK COMPATIBILITY IDEOGRAPH-F956;Lo;0;L;7A1C;;;;N;;;;;
+F957;CJK COMPATIBILITY IDEOGRAPH-F957;Lo;0;L;7DBE;;;;N;;;;;
+F958;CJK COMPATIBILITY IDEOGRAPH-F958;Lo;0;L;83F1;;;;N;;;;;
+F959;CJK COMPATIBILITY IDEOGRAPH-F959;Lo;0;L;9675;;;;N;;;;;
+F95A;CJK COMPATIBILITY IDEOGRAPH-F95A;Lo;0;L;8B80;;;;N;;;;;
+F95B;CJK COMPATIBILITY IDEOGRAPH-F95B;Lo;0;L;62CF;;;;N;;;;;
+F95C;CJK COMPATIBILITY IDEOGRAPH-F95C;Lo;0;L;6A02;;;;N;;;;;
+F95D;CJK COMPATIBILITY IDEOGRAPH-F95D;Lo;0;L;8AFE;;;;N;;;;;
+F95E;CJK COMPATIBILITY IDEOGRAPH-F95E;Lo;0;L;4E39;;;;N;;;;;
+F95F;CJK COMPATIBILITY IDEOGRAPH-F95F;Lo;0;L;5BE7;;;;N;;;;;
+F960;CJK COMPATIBILITY IDEOGRAPH-F960;Lo;0;L;6012;;;;N;;;;;
+F961;CJK COMPATIBILITY IDEOGRAPH-F961;Lo;0;L;7387;;;;N;;;;;
+F962;CJK COMPATIBILITY IDEOGRAPH-F962;Lo;0;L;7570;;;;N;;;;;
+F963;CJK COMPATIBILITY IDEOGRAPH-F963;Lo;0;L;5317;;;;N;;;;;
+F964;CJK COMPATIBILITY IDEOGRAPH-F964;Lo;0;L;78FB;;;;N;;;;;
+F965;CJK COMPATIBILITY IDEOGRAPH-F965;Lo;0;L;4FBF;;;;N;;;;;
+F966;CJK COMPATIBILITY IDEOGRAPH-F966;Lo;0;L;5FA9;;;;N;;;;;
+F967;CJK COMPATIBILITY IDEOGRAPH-F967;Lo;0;L;4E0D;;;;N;;;;;
+F968;CJK COMPATIBILITY IDEOGRAPH-F968;Lo;0;L;6CCC;;;;N;;;;;
+F969;CJK COMPATIBILITY IDEOGRAPH-F969;Lo;0;L;6578;;;;N;;;;;
+F96A;CJK COMPATIBILITY IDEOGRAPH-F96A;Lo;0;L;7D22;;;;N;;;;;
+F96B;CJK COMPATIBILITY IDEOGRAPH-F96B;Lo;0;L;53C3;;;3;N;;;;;
+F96C;CJK COMPATIBILITY IDEOGRAPH-F96C;Lo;0;L;585E;;;;N;;;;;
+F96D;CJK COMPATIBILITY IDEOGRAPH-F96D;Lo;0;L;7701;;;;N;;;;;
+F96E;CJK COMPATIBILITY IDEOGRAPH-F96E;Lo;0;L;8449;;;;N;;;;;
+F96F;CJK COMPATIBILITY IDEOGRAPH-F96F;Lo;0;L;8AAA;;;;N;;;;;
+F970;CJK COMPATIBILITY IDEOGRAPH-F970;Lo;0;L;6BBA;;;;N;;;;;
+F971;CJK COMPATIBILITY IDEOGRAPH-F971;Lo;0;L;8FB0;;;;N;;;;;
+F972;CJK COMPATIBILITY IDEOGRAPH-F972;Lo;0;L;6C88;;;;N;;;;;
+F973;CJK COMPATIBILITY IDEOGRAPH-F973;Lo;0;L;62FE;;;10;N;;;;;
+F974;CJK COMPATIBILITY IDEOGRAPH-F974;Lo;0;L;82E5;;;;N;;;;;
+F975;CJK COMPATIBILITY IDEOGRAPH-F975;Lo;0;L;63A0;;;;N;;;;;
+F976;CJK COMPATIBILITY IDEOGRAPH-F976;Lo;0;L;7565;;;;N;;;;;
+F977;CJK COMPATIBILITY IDEOGRAPH-F977;Lo;0;L;4EAE;;;;N;;;;;
+F978;CJK COMPATIBILITY IDEOGRAPH-F978;Lo;0;L;5169;;;2;N;;;;;
+F979;CJK COMPATIBILITY IDEOGRAPH-F979;Lo;0;L;51C9;;;;N;;;;;
+F97A;CJK COMPATIBILITY IDEOGRAPH-F97A;Lo;0;L;6881;;;;N;;;;;
+F97B;CJK COMPATIBILITY IDEOGRAPH-F97B;Lo;0;L;7CE7;;;;N;;;;;
+F97C;CJK COMPATIBILITY IDEOGRAPH-F97C;Lo;0;L;826F;;;;N;;;;;
+F97D;CJK COMPATIBILITY IDEOGRAPH-F97D;Lo;0;L;8AD2;;;;N;;;;;
+F97E;CJK COMPATIBILITY IDEOGRAPH-F97E;Lo;0;L;91CF;;;;N;;;;;
+F97F;CJK COMPATIBILITY IDEOGRAPH-F97F;Lo;0;L;52F5;;;;N;;;;;
+F980;CJK COMPATIBILITY IDEOGRAPH-F980;Lo;0;L;5442;;;;N;;;;;
+F981;CJK COMPATIBILITY IDEOGRAPH-F981;Lo;0;L;5973;;;;N;;;;;
+F982;CJK COMPATIBILITY IDEOGRAPH-F982;Lo;0;L;5EEC;;;;N;;;;;
+F983;CJK COMPATIBILITY IDEOGRAPH-F983;Lo;0;L;65C5;;;;N;;;;;
+F984;CJK COMPATIBILITY IDEOGRAPH-F984;Lo;0;L;6FFE;;;;N;;;;;
+F985;CJK COMPATIBILITY IDEOGRAPH-F985;Lo;0;L;792A;;;;N;;;;;
+F986;CJK COMPATIBILITY IDEOGRAPH-F986;Lo;0;L;95AD;;;;N;;;;;
+F987;CJK COMPATIBILITY IDEOGRAPH-F987;Lo;0;L;9A6A;;;;N;;;;;
+F988;CJK COMPATIBILITY IDEOGRAPH-F988;Lo;0;L;9E97;;;;N;;;;;
+F989;CJK COMPATIBILITY IDEOGRAPH-F989;Lo;0;L;9ECE;;;;N;;;;;
+F98A;CJK COMPATIBILITY IDEOGRAPH-F98A;Lo;0;L;529B;;;;N;;;;;
+F98B;CJK COMPATIBILITY IDEOGRAPH-F98B;Lo;0;L;66C6;;;;N;;;;;
+F98C;CJK COMPATIBILITY IDEOGRAPH-F98C;Lo;0;L;6B77;;;;N;;;;;
+F98D;CJK COMPATIBILITY IDEOGRAPH-F98D;Lo;0;L;8F62;;;;N;;;;;
+F98E;CJK COMPATIBILITY IDEOGRAPH-F98E;Lo;0;L;5E74;;;;N;;;;;
+F98F;CJK COMPATIBILITY IDEOGRAPH-F98F;Lo;0;L;6190;;;;N;;;;;
+F990;CJK COMPATIBILITY IDEOGRAPH-F990;Lo;0;L;6200;;;;N;;;;;
+F991;CJK COMPATIBILITY IDEOGRAPH-F991;Lo;0;L;649A;;;;N;;;;;
+F992;CJK COMPATIBILITY IDEOGRAPH-F992;Lo;0;L;6F23;;;;N;;;;;
+F993;CJK COMPATIBILITY IDEOGRAPH-F993;Lo;0;L;7149;;;;N;;;;;
+F994;CJK COMPATIBILITY IDEOGRAPH-F994;Lo;0;L;7489;;;;N;;;;;
+F995;CJK COMPATIBILITY IDEOGRAPH-F995;Lo;0;L;79CA;;;;N;;;;;
+F996;CJK COMPATIBILITY IDEOGRAPH-F996;Lo;0;L;7DF4;;;;N;;;;;
+F997;CJK COMPATIBILITY IDEOGRAPH-F997;Lo;0;L;806F;;;;N;;;;;
+F998;CJK COMPATIBILITY IDEOGRAPH-F998;Lo;0;L;8F26;;;;N;;;;;
+F999;CJK COMPATIBILITY IDEOGRAPH-F999;Lo;0;L;84EE;;;;N;;;;;
+F99A;CJK COMPATIBILITY IDEOGRAPH-F99A;Lo;0;L;9023;;;;N;;;;;
+F99B;CJK COMPATIBILITY IDEOGRAPH-F99B;Lo;0;L;934A;;;;N;;;;;
+F99C;CJK COMPATIBILITY IDEOGRAPH-F99C;Lo;0;L;5217;;;;N;;;;;
+F99D;CJK COMPATIBILITY IDEOGRAPH-F99D;Lo;0;L;52A3;;;;N;;;;;
+F99E;CJK COMPATIBILITY IDEOGRAPH-F99E;Lo;0;L;54BD;;;;N;;;;;
+F99F;CJK COMPATIBILITY IDEOGRAPH-F99F;Lo;0;L;70C8;;;;N;;;;;
+F9A0;CJK COMPATIBILITY IDEOGRAPH-F9A0;Lo;0;L;88C2;;;;N;;;;;
+F9A1;CJK COMPATIBILITY IDEOGRAPH-F9A1;Lo;0;L;8AAA;;;;N;;;;;
+F9A2;CJK COMPATIBILITY IDEOGRAPH-F9A2;Lo;0;L;5EC9;;;;N;;;;;
+F9A3;CJK COMPATIBILITY IDEOGRAPH-F9A3;Lo;0;L;5FF5;;;;N;;;;;
+F9A4;CJK COMPATIBILITY IDEOGRAPH-F9A4;Lo;0;L;637B;;;;N;;;;;
+F9A5;CJK COMPATIBILITY IDEOGRAPH-F9A5;Lo;0;L;6BAE;;;;N;;;;;
+F9A6;CJK COMPATIBILITY IDEOGRAPH-F9A6;Lo;0;L;7C3E;;;;N;;;;;
+F9A7;CJK COMPATIBILITY IDEOGRAPH-F9A7;Lo;0;L;7375;;;;N;;;;;
+F9A8;CJK COMPATIBILITY IDEOGRAPH-F9A8;Lo;0;L;4EE4;;;;N;;;;;
+F9A9;CJK COMPATIBILITY IDEOGRAPH-F9A9;Lo;0;L;56F9;;;;N;;;;;
+F9AA;CJK COMPATIBILITY IDEOGRAPH-F9AA;Lo;0;L;5BE7;;;;N;;;;;
+F9AB;CJK COMPATIBILITY IDEOGRAPH-F9AB;Lo;0;L;5DBA;;;;N;;;;;
+F9AC;CJK COMPATIBILITY IDEOGRAPH-F9AC;Lo;0;L;601C;;;;N;;;;;
+F9AD;CJK COMPATIBILITY IDEOGRAPH-F9AD;Lo;0;L;73B2;;;;N;;;;;
+F9AE;CJK COMPATIBILITY IDEOGRAPH-F9AE;Lo;0;L;7469;;;;N;;;;;
+F9AF;CJK COMPATIBILITY IDEOGRAPH-F9AF;Lo;0;L;7F9A;;;;N;;;;;
+F9B0;CJK COMPATIBILITY IDEOGRAPH-F9B0;Lo;0;L;8046;;;;N;;;;;
+F9B1;CJK COMPATIBILITY IDEOGRAPH-F9B1;Lo;0;L;9234;;;;N;;;;;
+F9B2;CJK COMPATIBILITY IDEOGRAPH-F9B2;Lo;0;L;96F6;;;0;N;;;;;
+F9B3;CJK COMPATIBILITY IDEOGRAPH-F9B3;Lo;0;L;9748;;;;N;;;;;
+F9B4;CJK COMPATIBILITY IDEOGRAPH-F9B4;Lo;0;L;9818;;;;N;;;;;
+F9B5;CJK COMPATIBILITY IDEOGRAPH-F9B5;Lo;0;L;4F8B;;;;N;;;;;
+F9B6;CJK COMPATIBILITY IDEOGRAPH-F9B6;Lo;0;L;79AE;;;;N;;;;;
+F9B7;CJK COMPATIBILITY IDEOGRAPH-F9B7;Lo;0;L;91B4;;;;N;;;;;
+F9B8;CJK COMPATIBILITY IDEOGRAPH-F9B8;Lo;0;L;96B8;;;;N;;;;;
+F9B9;CJK COMPATIBILITY IDEOGRAPH-F9B9;Lo;0;L;60E1;;;;N;;;;;
+F9BA;CJK COMPATIBILITY IDEOGRAPH-F9BA;Lo;0;L;4E86;;;;N;;;;;
+F9BB;CJK COMPATIBILITY IDEOGRAPH-F9BB;Lo;0;L;50DA;;;;N;;;;;
+F9BC;CJK COMPATIBILITY IDEOGRAPH-F9BC;Lo;0;L;5BEE;;;;N;;;;;
+F9BD;CJK COMPATIBILITY IDEOGRAPH-F9BD;Lo;0;L;5C3F;;;;N;;;;;
+F9BE;CJK COMPATIBILITY IDEOGRAPH-F9BE;Lo;0;L;6599;;;;N;;;;;
+F9BF;CJK COMPATIBILITY IDEOGRAPH-F9BF;Lo;0;L;6A02;;;;N;;;;;
+F9C0;CJK COMPATIBILITY IDEOGRAPH-F9C0;Lo;0;L;71CE;;;;N;;;;;
+F9C1;CJK COMPATIBILITY IDEOGRAPH-F9C1;Lo;0;L;7642;;;;N;;;;;
+F9C2;CJK COMPATIBILITY IDEOGRAPH-F9C2;Lo;0;L;84FC;;;;N;;;;;
+F9C3;CJK COMPATIBILITY IDEOGRAPH-F9C3;Lo;0;L;907C;;;;N;;;;;
+F9C4;CJK COMPATIBILITY IDEOGRAPH-F9C4;Lo;0;L;9F8D;;;;N;;;;;
+F9C5;CJK COMPATIBILITY IDEOGRAPH-F9C5;Lo;0;L;6688;;;;N;;;;;
+F9C6;CJK COMPATIBILITY IDEOGRAPH-F9C6;Lo;0;L;962E;;;;N;;;;;
+F9C7;CJK COMPATIBILITY IDEOGRAPH-F9C7;Lo;0;L;5289;;;;N;;;;;
+F9C8;CJK COMPATIBILITY IDEOGRAPH-F9C8;Lo;0;L;677B;;;;N;;;;;
+F9C9;CJK COMPATIBILITY IDEOGRAPH-F9C9;Lo;0;L;67F3;;;;N;;;;;
+F9CA;CJK COMPATIBILITY IDEOGRAPH-F9CA;Lo;0;L;6D41;;;;N;;;;;
+F9CB;CJK COMPATIBILITY IDEOGRAPH-F9CB;Lo;0;L;6E9C;;;;N;;;;;
+F9CC;CJK COMPATIBILITY IDEOGRAPH-F9CC;Lo;0;L;7409;;;;N;;;;;
+F9CD;CJK COMPATIBILITY IDEOGRAPH-F9CD;Lo;0;L;7559;;;;N;;;;;
+F9CE;CJK COMPATIBILITY IDEOGRAPH-F9CE;Lo;0;L;786B;;;;N;;;;;
+F9CF;CJK COMPATIBILITY IDEOGRAPH-F9CF;Lo;0;L;7D10;;;;N;;;;;
+F9D0;CJK COMPATIBILITY IDEOGRAPH-F9D0;Lo;0;L;985E;;;;N;;;;;
+F9D1;CJK COMPATIBILITY IDEOGRAPH-F9D1;Lo;0;L;516D;;;6;N;;;;;
+F9D2;CJK COMPATIBILITY IDEOGRAPH-F9D2;Lo;0;L;622E;;;;N;;;;;
+F9D3;CJK COMPATIBILITY IDEOGRAPH-F9D3;Lo;0;L;9678;;;6;N;;;;;
+F9D4;CJK COMPATIBILITY IDEOGRAPH-F9D4;Lo;0;L;502B;;;;N;;;;;
+F9D5;CJK COMPATIBILITY IDEOGRAPH-F9D5;Lo;0;L;5D19;;;;N;;;;;
+F9D6;CJK COMPATIBILITY IDEOGRAPH-F9D6;Lo;0;L;6DEA;;;;N;;;;;
+F9D7;CJK COMPATIBILITY IDEOGRAPH-F9D7;Lo;0;L;8F2A;;;;N;;;;;
+F9D8;CJK COMPATIBILITY IDEOGRAPH-F9D8;Lo;0;L;5F8B;;;;N;;;;;
+F9D9;CJK COMPATIBILITY IDEOGRAPH-F9D9;Lo;0;L;6144;;;;N;;;;;
+F9DA;CJK COMPATIBILITY IDEOGRAPH-F9DA;Lo;0;L;6817;;;;N;;;;;
+F9DB;CJK COMPATIBILITY IDEOGRAPH-F9DB;Lo;0;L;7387;;;;N;;;;;
+F9DC;CJK COMPATIBILITY IDEOGRAPH-F9DC;Lo;0;L;9686;;;;N;;;;;
+F9DD;CJK COMPATIBILITY IDEOGRAPH-F9DD;Lo;0;L;5229;;;;N;;;;;
+F9DE;CJK COMPATIBILITY IDEOGRAPH-F9DE;Lo;0;L;540F;;;;N;;;;;
+F9DF;CJK COMPATIBILITY IDEOGRAPH-F9DF;Lo;0;L;5C65;;;;N;;;;;
+F9E0;CJK COMPATIBILITY IDEOGRAPH-F9E0;Lo;0;L;6613;;;;N;;;;;
+F9E1;CJK COMPATIBILITY IDEOGRAPH-F9E1;Lo;0;L;674E;;;;N;;;;;
+F9E2;CJK COMPATIBILITY IDEOGRAPH-F9E2;Lo;0;L;68A8;;;;N;;;;;
+F9E3;CJK COMPATIBILITY IDEOGRAPH-F9E3;Lo;0;L;6CE5;;;;N;;;;;
+F9E4;CJK COMPATIBILITY IDEOGRAPH-F9E4;Lo;0;L;7406;;;;N;;;;;
+F9E5;CJK COMPATIBILITY IDEOGRAPH-F9E5;Lo;0;L;75E2;;;;N;;;;;
+F9E6;CJK COMPATIBILITY IDEOGRAPH-F9E6;Lo;0;L;7F79;;;;N;;;;;
+F9E7;CJK COMPATIBILITY IDEOGRAPH-F9E7;Lo;0;L;88CF;;;;N;;;;;
+F9E8;CJK COMPATIBILITY IDEOGRAPH-F9E8;Lo;0;L;88E1;;;;N;;;;;
+F9E9;CJK COMPATIBILITY IDEOGRAPH-F9E9;Lo;0;L;91CC;;;;N;;;;;
+F9EA;CJK COMPATIBILITY IDEOGRAPH-F9EA;Lo;0;L;96E2;;;;N;;;;;
+F9EB;CJK COMPATIBILITY IDEOGRAPH-F9EB;Lo;0;L;533F;;;;N;;;;;
+F9EC;CJK COMPATIBILITY IDEOGRAPH-F9EC;Lo;0;L;6EBA;;;;N;;;;;
+F9ED;CJK COMPATIBILITY IDEOGRAPH-F9ED;Lo;0;L;541D;;;;N;;;;;
+F9EE;CJK COMPATIBILITY IDEOGRAPH-F9EE;Lo;0;L;71D0;;;;N;;;;;
+F9EF;CJK COMPATIBILITY IDEOGRAPH-F9EF;Lo;0;L;7498;;;;N;;;;;
+F9F0;CJK COMPATIBILITY IDEOGRAPH-F9F0;Lo;0;L;85FA;;;;N;;;;;
+F9F1;CJK COMPATIBILITY IDEOGRAPH-F9F1;Lo;0;L;96A3;;;;N;;;;;
+F9F2;CJK COMPATIBILITY IDEOGRAPH-F9F2;Lo;0;L;9C57;;;;N;;;;;
+F9F3;CJK COMPATIBILITY IDEOGRAPH-F9F3;Lo;0;L;9E9F;;;;N;;;;;
+F9F4;CJK COMPATIBILITY IDEOGRAPH-F9F4;Lo;0;L;6797;;;;N;;;;;
+F9F5;CJK COMPATIBILITY IDEOGRAPH-F9F5;Lo;0;L;6DCB;;;;N;;;;;
+F9F6;CJK COMPATIBILITY IDEOGRAPH-F9F6;Lo;0;L;81E8;;;;N;;;;;
+F9F7;CJK COMPATIBILITY IDEOGRAPH-F9F7;Lo;0;L;7ACB;;;;N;;;;;
+F9F8;CJK COMPATIBILITY IDEOGRAPH-F9F8;Lo;0;L;7B20;;;;N;;;;;
+F9F9;CJK COMPATIBILITY IDEOGRAPH-F9F9;Lo;0;L;7C92;;;;N;;;;;
+F9FA;CJK COMPATIBILITY IDEOGRAPH-F9FA;Lo;0;L;72C0;;;;N;;;;;
+F9FB;CJK COMPATIBILITY IDEOGRAPH-F9FB;Lo;0;L;7099;;;;N;;;;;
+F9FC;CJK COMPATIBILITY IDEOGRAPH-F9FC;Lo;0;L;8B58;;;;N;;;;;
+F9FD;CJK COMPATIBILITY IDEOGRAPH-F9FD;Lo;0;L;4EC0;;;10;N;;;;;
+F9FE;CJK COMPATIBILITY IDEOGRAPH-F9FE;Lo;0;L;8336;;;;N;;;;;
+F9FF;CJK COMPATIBILITY IDEOGRAPH-F9FF;Lo;0;L;523A;;;;N;;;;;
+FA00;CJK COMPATIBILITY IDEOGRAPH-FA00;Lo;0;L;5207;;;;N;;;;;
+FA01;CJK COMPATIBILITY IDEOGRAPH-FA01;Lo;0;L;5EA6;;;;N;;;;;
+FA02;CJK COMPATIBILITY IDEOGRAPH-FA02;Lo;0;L;62D3;;;;N;;;;;
+FA03;CJK COMPATIBILITY IDEOGRAPH-FA03;Lo;0;L;7CD6;;;;N;;;;;
+FA04;CJK COMPATIBILITY IDEOGRAPH-FA04;Lo;0;L;5B85;;;;N;;;;;
+FA05;CJK COMPATIBILITY IDEOGRAPH-FA05;Lo;0;L;6D1E;;;;N;;;;;
+FA06;CJK COMPATIBILITY IDEOGRAPH-FA06;Lo;0;L;66B4;;;;N;;;;;
+FA07;CJK COMPATIBILITY IDEOGRAPH-FA07;Lo;0;L;8F3B;;;;N;;;;;
+FA08;CJK COMPATIBILITY IDEOGRAPH-FA08;Lo;0;L;884C;;;;N;;;;;
+FA09;CJK COMPATIBILITY IDEOGRAPH-FA09;Lo;0;L;964D;;;;N;;;;;
+FA0A;CJK COMPATIBILITY IDEOGRAPH-FA0A;Lo;0;L;898B;;;;N;;;;;
+FA0B;CJK COMPATIBILITY IDEOGRAPH-FA0B;Lo;0;L;5ED3;;;;N;;;;;
+FA0C;CJK COMPATIBILITY IDEOGRAPH-FA0C;Lo;0;L;5140;;;;N;;;;;
+FA0D;CJK COMPATIBILITY IDEOGRAPH-FA0D;Lo;0;L;55C0;;;;N;;;;;
+FA0E;CJK COMPATIBILITY IDEOGRAPH-FA0E;Lo;0;L;;;;;N;;;;;
+FA0F;CJK COMPATIBILITY IDEOGRAPH-FA0F;Lo;0;L;;;;;N;;;;;
+FA10;CJK COMPATIBILITY IDEOGRAPH-FA10;Lo;0;L;585A;;;;N;;;;;
+FA11;CJK COMPATIBILITY IDEOGRAPH-FA11;Lo;0;L;;;;;N;;;;;
+FA12;CJK COMPATIBILITY IDEOGRAPH-FA12;Lo;0;L;6674;;;;N;;;;;
+FA13;CJK COMPATIBILITY IDEOGRAPH-FA13;Lo;0;L;;;;;N;;;;;
+FA14;CJK COMPATIBILITY IDEOGRAPH-FA14;Lo;0;L;;;;;N;;;;;
+FA15;CJK COMPATIBILITY IDEOGRAPH-FA15;Lo;0;L;51DE;;;;N;;;;;
+FA16;CJK COMPATIBILITY IDEOGRAPH-FA16;Lo;0;L;732A;;;;N;;;;;
+FA17;CJK COMPATIBILITY IDEOGRAPH-FA17;Lo;0;L;76CA;;;;N;;;;;
+FA18;CJK COMPATIBILITY IDEOGRAPH-FA18;Lo;0;L;793C;;;;N;;;;;
+FA19;CJK COMPATIBILITY IDEOGRAPH-FA19;Lo;0;L;795E;;;;N;;;;;
+FA1A;CJK COMPATIBILITY IDEOGRAPH-FA1A;Lo;0;L;7965;;;;N;;;;;
+FA1B;CJK COMPATIBILITY IDEOGRAPH-FA1B;Lo;0;L;798F;;;;N;;;;;
+FA1C;CJK COMPATIBILITY IDEOGRAPH-FA1C;Lo;0;L;9756;;;;N;;;;;
+FA1D;CJK COMPATIBILITY IDEOGRAPH-FA1D;Lo;0;L;7CBE;;;;N;;;;;
+FA1E;CJK COMPATIBILITY IDEOGRAPH-FA1E;Lo;0;L;7FBD;;;;N;;;;;
+FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;;;;
+FA20;CJK COMPATIBILITY IDEOGRAPH-FA20;Lo;0;L;8612;;;;N;;;;;
+FA21;CJK COMPATIBILITY IDEOGRAPH-FA21;Lo;0;L;;;;;N;;;;;
+FA22;CJK COMPATIBILITY IDEOGRAPH-FA22;Lo;0;L;8AF8;;;;N;;;;;
+FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;;;;
+FA24;CJK COMPATIBILITY IDEOGRAPH-FA24;Lo;0;L;;;;;N;;;;;
+FA25;CJK COMPATIBILITY IDEOGRAPH-FA25;Lo;0;L;9038;;;;N;;;;;
+FA26;CJK COMPATIBILITY IDEOGRAPH-FA26;Lo;0;L;90FD;;;;N;;;;;
+FA27;CJK COMPATIBILITY IDEOGRAPH-FA27;Lo;0;L;;;;;N;;;;;
+FA28;CJK COMPATIBILITY IDEOGRAPH-FA28;Lo;0;L;;;;;N;;;;;
+FA29;CJK COMPATIBILITY IDEOGRAPH-FA29;Lo;0;L;;;;;N;;;;;
+FA2A;CJK COMPATIBILITY IDEOGRAPH-FA2A;Lo;0;L;98EF;;;;N;;;;;
+FA2B;CJK COMPATIBILITY IDEOGRAPH-FA2B;Lo;0;L;98FC;;;;N;;;;;
+FA2C;CJK COMPATIBILITY IDEOGRAPH-FA2C;Lo;0;L;9928;;;;N;;;;;
+FA2D;CJK COMPATIBILITY IDEOGRAPH-FA2D;Lo;0;L;9DB4;;;;N;;;;;
+FA2E;CJK COMPATIBILITY IDEOGRAPH-FA2E;Lo;0;L;90DE;;;;N;;;;;
+FA2F;CJK COMPATIBILITY IDEOGRAPH-FA2F;Lo;0;L;96B7;;;;N;;;;;
+FA30;CJK COMPATIBILITY IDEOGRAPH-FA30;Lo;0;L;4FAE;;;;N;;;;;
+FA31;CJK COMPATIBILITY IDEOGRAPH-FA31;Lo;0;L;50E7;;;;N;;;;;
+FA32;CJK COMPATIBILITY IDEOGRAPH-FA32;Lo;0;L;514D;;;;N;;;;;
+FA33;CJK COMPATIBILITY IDEOGRAPH-FA33;Lo;0;L;52C9;;;;N;;;;;
+FA34;CJK COMPATIBILITY IDEOGRAPH-FA34;Lo;0;L;52E4;;;;N;;;;;
+FA35;CJK COMPATIBILITY IDEOGRAPH-FA35;Lo;0;L;5351;;;;N;;;;;
+FA36;CJK COMPATIBILITY IDEOGRAPH-FA36;Lo;0;L;559D;;;;N;;;;;
+FA37;CJK COMPATIBILITY IDEOGRAPH-FA37;Lo;0;L;5606;;;;N;;;;;
+FA38;CJK COMPATIBILITY IDEOGRAPH-FA38;Lo;0;L;5668;;;;N;;;;;
+FA39;CJK COMPATIBILITY IDEOGRAPH-FA39;Lo;0;L;5840;;;;N;;;;;
+FA3A;CJK COMPATIBILITY IDEOGRAPH-FA3A;Lo;0;L;58A8;;;;N;;;;;
+FA3B;CJK COMPATIBILITY IDEOGRAPH-FA3B;Lo;0;L;5C64;;;;N;;;;;
+FA3C;CJK COMPATIBILITY IDEOGRAPH-FA3C;Lo;0;L;5C6E;;;;N;;;;;
+FA3D;CJK COMPATIBILITY IDEOGRAPH-FA3D;Lo;0;L;6094;;;;N;;;;;
+FA3E;CJK COMPATIBILITY IDEOGRAPH-FA3E;Lo;0;L;6168;;;;N;;;;;
+FA3F;CJK COMPATIBILITY IDEOGRAPH-FA3F;Lo;0;L;618E;;;;N;;;;;
+FA40;CJK COMPATIBILITY IDEOGRAPH-FA40;Lo;0;L;61F2;;;;N;;;;;
+FA41;CJK COMPATIBILITY IDEOGRAPH-FA41;Lo;0;L;654F;;;;N;;;;;
+FA42;CJK COMPATIBILITY IDEOGRAPH-FA42;Lo;0;L;65E2;;;;N;;;;;
+FA43;CJK COMPATIBILITY IDEOGRAPH-FA43;Lo;0;L;6691;;;;N;;;;;
+FA44;CJK COMPATIBILITY IDEOGRAPH-FA44;Lo;0;L;6885;;;;N;;;;;
+FA45;CJK COMPATIBILITY IDEOGRAPH-FA45;Lo;0;L;6D77;;;;N;;;;;
+FA46;CJK COMPATIBILITY IDEOGRAPH-FA46;Lo;0;L;6E1A;;;;N;;;;;
+FA47;CJK COMPATIBILITY IDEOGRAPH-FA47;Lo;0;L;6F22;;;;N;;;;;
+FA48;CJK COMPATIBILITY IDEOGRAPH-FA48;Lo;0;L;716E;;;;N;;;;;
+FA49;CJK COMPATIBILITY IDEOGRAPH-FA49;Lo;0;L;722B;;;;N;;;;;
+FA4A;CJK COMPATIBILITY IDEOGRAPH-FA4A;Lo;0;L;7422;;;;N;;;;;
+FA4B;CJK COMPATIBILITY IDEOGRAPH-FA4B;Lo;0;L;7891;;;;N;;;;;
+FA4C;CJK COMPATIBILITY IDEOGRAPH-FA4C;Lo;0;L;793E;;;;N;;;;;
+FA4D;CJK COMPATIBILITY IDEOGRAPH-FA4D;Lo;0;L;7949;;;;N;;;;;
+FA4E;CJK COMPATIBILITY IDEOGRAPH-FA4E;Lo;0;L;7948;;;;N;;;;;
+FA4F;CJK COMPATIBILITY IDEOGRAPH-FA4F;Lo;0;L;7950;;;;N;;;;;
+FA50;CJK COMPATIBILITY IDEOGRAPH-FA50;Lo;0;L;7956;;;;N;;;;;
+FA51;CJK COMPATIBILITY IDEOGRAPH-FA51;Lo;0;L;795D;;;;N;;;;;
+FA52;CJK COMPATIBILITY IDEOGRAPH-FA52;Lo;0;L;798D;;;;N;;;;;
+FA53;CJK COMPATIBILITY IDEOGRAPH-FA53;Lo;0;L;798E;;;;N;;;;;
+FA54;CJK COMPATIBILITY IDEOGRAPH-FA54;Lo;0;L;7A40;;;;N;;;;;
+FA55;CJK COMPATIBILITY IDEOGRAPH-FA55;Lo;0;L;7A81;;;;N;;;;;
+FA56;CJK COMPATIBILITY IDEOGRAPH-FA56;Lo;0;L;7BC0;;;;N;;;;;
+FA57;CJK COMPATIBILITY IDEOGRAPH-FA57;Lo;0;L;7DF4;;;;N;;;;;
+FA58;CJK COMPATIBILITY IDEOGRAPH-FA58;Lo;0;L;7E09;;;;N;;;;;
+FA59;CJK COMPATIBILITY IDEOGRAPH-FA59;Lo;0;L;7E41;;;;N;;;;;
+FA5A;CJK COMPATIBILITY IDEOGRAPH-FA5A;Lo;0;L;7F72;;;;N;;;;;
+FA5B;CJK COMPATIBILITY IDEOGRAPH-FA5B;Lo;0;L;8005;;;;N;;;;;
+FA5C;CJK COMPATIBILITY IDEOGRAPH-FA5C;Lo;0;L;81ED;;;;N;;;;;
+FA5D;CJK COMPATIBILITY IDEOGRAPH-FA5D;Lo;0;L;8279;;;;N;;;;;
+FA5E;CJK COMPATIBILITY IDEOGRAPH-FA5E;Lo;0;L;8279;;;;N;;;;;
+FA5F;CJK COMPATIBILITY IDEOGRAPH-FA5F;Lo;0;L;8457;;;;N;;;;;
+FA60;CJK COMPATIBILITY IDEOGRAPH-FA60;Lo;0;L;8910;;;;N;;;;;
+FA61;CJK COMPATIBILITY IDEOGRAPH-FA61;Lo;0;L;8996;;;;N;;;;;
+FA62;CJK COMPATIBILITY IDEOGRAPH-FA62;Lo;0;L;8B01;;;;N;;;;;
+FA63;CJK COMPATIBILITY IDEOGRAPH-FA63;Lo;0;L;8B39;;;;N;;;;;
+FA64;CJK COMPATIBILITY IDEOGRAPH-FA64;Lo;0;L;8CD3;;;;N;;;;;
+FA65;CJK COMPATIBILITY IDEOGRAPH-FA65;Lo;0;L;8D08;;;;N;;;;;
+FA66;CJK COMPATIBILITY IDEOGRAPH-FA66;Lo;0;L;8FB6;;;;N;;;;;
+FA67;CJK COMPATIBILITY IDEOGRAPH-FA67;Lo;0;L;9038;;;;N;;;;;
+FA68;CJK COMPATIBILITY IDEOGRAPH-FA68;Lo;0;L;96E3;;;;N;;;;;
+FA69;CJK COMPATIBILITY IDEOGRAPH-FA69;Lo;0;L;97FF;;;;N;;;;;
+FA6A;CJK COMPATIBILITY IDEOGRAPH-FA6A;Lo;0;L;983B;;;;N;;;;;
+FA6B;CJK COMPATIBILITY IDEOGRAPH-FA6B;Lo;0;L;6075;;;;N;;;;;
+FA6C;CJK COMPATIBILITY IDEOGRAPH-FA6C;Lo;0;L;242EE;;;;N;;;;;
+FA6D;CJK COMPATIBILITY IDEOGRAPH-FA6D;Lo;0;L;8218;;;;N;;;;;
+FA70;CJK COMPATIBILITY IDEOGRAPH-FA70;Lo;0;L;4E26;;;;N;;;;;
+FA71;CJK COMPATIBILITY IDEOGRAPH-FA71;Lo;0;L;51B5;;;;N;;;;;
+FA72;CJK COMPATIBILITY IDEOGRAPH-FA72;Lo;0;L;5168;;;;N;;;;;
+FA73;CJK COMPATIBILITY IDEOGRAPH-FA73;Lo;0;L;4F80;;;;N;;;;;
+FA74;CJK COMPATIBILITY IDEOGRAPH-FA74;Lo;0;L;5145;;;;N;;;;;
+FA75;CJK COMPATIBILITY IDEOGRAPH-FA75;Lo;0;L;5180;;;;N;;;;;
+FA76;CJK COMPATIBILITY IDEOGRAPH-FA76;Lo;0;L;52C7;;;;N;;;;;
+FA77;CJK COMPATIBILITY IDEOGRAPH-FA77;Lo;0;L;52FA;;;;N;;;;;
+FA78;CJK COMPATIBILITY IDEOGRAPH-FA78;Lo;0;L;559D;;;;N;;;;;
+FA79;CJK COMPATIBILITY IDEOGRAPH-FA79;Lo;0;L;5555;;;;N;;;;;
+FA7A;CJK COMPATIBILITY IDEOGRAPH-FA7A;Lo;0;L;5599;;;;N;;;;;
+FA7B;CJK COMPATIBILITY IDEOGRAPH-FA7B;Lo;0;L;55E2;;;;N;;;;;
+FA7C;CJK COMPATIBILITY IDEOGRAPH-FA7C;Lo;0;L;585A;;;;N;;;;;
+FA7D;CJK COMPATIBILITY IDEOGRAPH-FA7D;Lo;0;L;58B3;;;;N;;;;;
+FA7E;CJK COMPATIBILITY IDEOGRAPH-FA7E;Lo;0;L;5944;;;;N;;;;;
+FA7F;CJK COMPATIBILITY IDEOGRAPH-FA7F;Lo;0;L;5954;;;;N;;;;;
+FA80;CJK COMPATIBILITY IDEOGRAPH-FA80;Lo;0;L;5A62;;;;N;;;;;
+FA81;CJK COMPATIBILITY IDEOGRAPH-FA81;Lo;0;L;5B28;;;;N;;;;;
+FA82;CJK COMPATIBILITY IDEOGRAPH-FA82;Lo;0;L;5ED2;;;;N;;;;;
+FA83;CJK COMPATIBILITY IDEOGRAPH-FA83;Lo;0;L;5ED9;;;;N;;;;;
+FA84;CJK COMPATIBILITY IDEOGRAPH-FA84;Lo;0;L;5F69;;;;N;;;;;
+FA85;CJK COMPATIBILITY IDEOGRAPH-FA85;Lo;0;L;5FAD;;;;N;;;;;
+FA86;CJK COMPATIBILITY IDEOGRAPH-FA86;Lo;0;L;60D8;;;;N;;;;;
+FA87;CJK COMPATIBILITY IDEOGRAPH-FA87;Lo;0;L;614E;;;;N;;;;;
+FA88;CJK COMPATIBILITY IDEOGRAPH-FA88;Lo;0;L;6108;;;;N;;;;;
+FA89;CJK COMPATIBILITY IDEOGRAPH-FA89;Lo;0;L;618E;;;;N;;;;;
+FA8A;CJK COMPATIBILITY IDEOGRAPH-FA8A;Lo;0;L;6160;;;;N;;;;;
+FA8B;CJK COMPATIBILITY IDEOGRAPH-FA8B;Lo;0;L;61F2;;;;N;;;;;
+FA8C;CJK COMPATIBILITY IDEOGRAPH-FA8C;Lo;0;L;6234;;;;N;;;;;
+FA8D;CJK COMPATIBILITY IDEOGRAPH-FA8D;Lo;0;L;63C4;;;;N;;;;;
+FA8E;CJK COMPATIBILITY IDEOGRAPH-FA8E;Lo;0;L;641C;;;;N;;;;;
+FA8F;CJK COMPATIBILITY IDEOGRAPH-FA8F;Lo;0;L;6452;;;;N;;;;;
+FA90;CJK COMPATIBILITY IDEOGRAPH-FA90;Lo;0;L;6556;;;;N;;;;;
+FA91;CJK COMPATIBILITY IDEOGRAPH-FA91;Lo;0;L;6674;;;;N;;;;;
+FA92;CJK COMPATIBILITY IDEOGRAPH-FA92;Lo;0;L;6717;;;;N;;;;;
+FA93;CJK COMPATIBILITY IDEOGRAPH-FA93;Lo;0;L;671B;;;;N;;;;;
+FA94;CJK COMPATIBILITY IDEOGRAPH-FA94;Lo;0;L;6756;;;;N;;;;;
+FA95;CJK COMPATIBILITY IDEOGRAPH-FA95;Lo;0;L;6B79;;;;N;;;;;
+FA96;CJK COMPATIBILITY IDEOGRAPH-FA96;Lo;0;L;6BBA;;;;N;;;;;
+FA97;CJK COMPATIBILITY IDEOGRAPH-FA97;Lo;0;L;6D41;;;;N;;;;;
+FA98;CJK COMPATIBILITY IDEOGRAPH-FA98;Lo;0;L;6EDB;;;;N;;;;;
+FA99;CJK COMPATIBILITY IDEOGRAPH-FA99;Lo;0;L;6ECB;;;;N;;;;;
+FA9A;CJK COMPATIBILITY IDEOGRAPH-FA9A;Lo;0;L;6F22;;;;N;;;;;
+FA9B;CJK COMPATIBILITY IDEOGRAPH-FA9B;Lo;0;L;701E;;;;N;;;;;
+FA9C;CJK COMPATIBILITY IDEOGRAPH-FA9C;Lo;0;L;716E;;;;N;;;;;
+FA9D;CJK COMPATIBILITY IDEOGRAPH-FA9D;Lo;0;L;77A7;;;;N;;;;;
+FA9E;CJK COMPATIBILITY IDEOGRAPH-FA9E;Lo;0;L;7235;;;;N;;;;;
+FA9F;CJK COMPATIBILITY IDEOGRAPH-FA9F;Lo;0;L;72AF;;;;N;;;;;
+FAA0;CJK COMPATIBILITY IDEOGRAPH-FAA0;Lo;0;L;732A;;;;N;;;;;
+FAA1;CJK COMPATIBILITY IDEOGRAPH-FAA1;Lo;0;L;7471;;;;N;;;;;
+FAA2;CJK COMPATIBILITY IDEOGRAPH-FAA2;Lo;0;L;7506;;;;N;;;;;
+FAA3;CJK COMPATIBILITY IDEOGRAPH-FAA3;Lo;0;L;753B;;;;N;;;;;
+FAA4;CJK COMPATIBILITY IDEOGRAPH-FAA4;Lo;0;L;761D;;;;N;;;;;
+FAA5;CJK COMPATIBILITY IDEOGRAPH-FAA5;Lo;0;L;761F;;;;N;;;;;
+FAA6;CJK COMPATIBILITY IDEOGRAPH-FAA6;Lo;0;L;76CA;;;;N;;;;;
+FAA7;CJK COMPATIBILITY IDEOGRAPH-FAA7;Lo;0;L;76DB;;;;N;;;;;
+FAA8;CJK COMPATIBILITY IDEOGRAPH-FAA8;Lo;0;L;76F4;;;;N;;;;;
+FAA9;CJK COMPATIBILITY IDEOGRAPH-FAA9;Lo;0;L;774A;;;;N;;;;;
+FAAA;CJK COMPATIBILITY IDEOGRAPH-FAAA;Lo;0;L;7740;;;;N;;;;;
+FAAB;CJK COMPATIBILITY IDEOGRAPH-FAAB;Lo;0;L;78CC;;;;N;;;;;
+FAAC;CJK COMPATIBILITY IDEOGRAPH-FAAC;Lo;0;L;7AB1;;;;N;;;;;
+FAAD;CJK COMPATIBILITY IDEOGRAPH-FAAD;Lo;0;L;7BC0;;;;N;;;;;
+FAAE;CJK COMPATIBILITY IDEOGRAPH-FAAE;Lo;0;L;7C7B;;;;N;;;;;
+FAAF;CJK COMPATIBILITY IDEOGRAPH-FAAF;Lo;0;L;7D5B;;;;N;;;;;
+FAB0;CJK COMPATIBILITY IDEOGRAPH-FAB0;Lo;0;L;7DF4;;;;N;;;;;
+FAB1;CJK COMPATIBILITY IDEOGRAPH-FAB1;Lo;0;L;7F3E;;;;N;;;;;
+FAB2;CJK COMPATIBILITY IDEOGRAPH-FAB2;Lo;0;L;8005;;;;N;;;;;
+FAB3;CJK COMPATIBILITY IDEOGRAPH-FAB3;Lo;0;L;8352;;;;N;;;;;
+FAB4;CJK COMPATIBILITY IDEOGRAPH-FAB4;Lo;0;L;83EF;;;;N;;;;;
+FAB5;CJK COMPATIBILITY IDEOGRAPH-FAB5;Lo;0;L;8779;;;;N;;;;;
+FAB6;CJK COMPATIBILITY IDEOGRAPH-FAB6;Lo;0;L;8941;;;;N;;;;;
+FAB7;CJK COMPATIBILITY IDEOGRAPH-FAB7;Lo;0;L;8986;;;;N;;;;;
+FAB8;CJK COMPATIBILITY IDEOGRAPH-FAB8;Lo;0;L;8996;;;;N;;;;;
+FAB9;CJK COMPATIBILITY IDEOGRAPH-FAB9;Lo;0;L;8ABF;;;;N;;;;;
+FABA;CJK COMPATIBILITY IDEOGRAPH-FABA;Lo;0;L;8AF8;;;;N;;;;;
+FABB;CJK COMPATIBILITY IDEOGRAPH-FABB;Lo;0;L;8ACB;;;;N;;;;;
+FABC;CJK COMPATIBILITY IDEOGRAPH-FABC;Lo;0;L;8B01;;;;N;;;;;
+FABD;CJK COMPATIBILITY IDEOGRAPH-FABD;Lo;0;L;8AFE;;;;N;;;;;
+FABE;CJK COMPATIBILITY IDEOGRAPH-FABE;Lo;0;L;8AED;;;;N;;;;;
+FABF;CJK COMPATIBILITY IDEOGRAPH-FABF;Lo;0;L;8B39;;;;N;;;;;
+FAC0;CJK COMPATIBILITY IDEOGRAPH-FAC0;Lo;0;L;8B8A;;;;N;;;;;
+FAC1;CJK COMPATIBILITY IDEOGRAPH-FAC1;Lo;0;L;8D08;;;;N;;;;;
+FAC2;CJK COMPATIBILITY IDEOGRAPH-FAC2;Lo;0;L;8F38;;;;N;;;;;
+FAC3;CJK COMPATIBILITY IDEOGRAPH-FAC3;Lo;0;L;9072;;;;N;;;;;
+FAC4;CJK COMPATIBILITY IDEOGRAPH-FAC4;Lo;0;L;9199;;;;N;;;;;
+FAC5;CJK COMPATIBILITY IDEOGRAPH-FAC5;Lo;0;L;9276;;;;N;;;;;
+FAC6;CJK COMPATIBILITY IDEOGRAPH-FAC6;Lo;0;L;967C;;;;N;;;;;
+FAC7;CJK COMPATIBILITY IDEOGRAPH-FAC7;Lo;0;L;96E3;;;;N;;;;;
+FAC8;CJK COMPATIBILITY IDEOGRAPH-FAC8;Lo;0;L;9756;;;;N;;;;;
+FAC9;CJK COMPATIBILITY IDEOGRAPH-FAC9;Lo;0;L;97DB;;;;N;;;;;
+FACA;CJK COMPATIBILITY IDEOGRAPH-FACA;Lo;0;L;97FF;;;;N;;;;;
+FACB;CJK COMPATIBILITY IDEOGRAPH-FACB;Lo;0;L;980B;;;;N;;;;;
+FACC;CJK COMPATIBILITY IDEOGRAPH-FACC;Lo;0;L;983B;;;;N;;;;;
+FACD;CJK COMPATIBILITY IDEOGRAPH-FACD;Lo;0;L;9B12;;;;N;;;;;
+FACE;CJK COMPATIBILITY IDEOGRAPH-FACE;Lo;0;L;9F9C;;;;N;;;;;
+FACF;CJK COMPATIBILITY IDEOGRAPH-FACF;Lo;0;L;2284A;;;;N;;;;;
+FAD0;CJK COMPATIBILITY IDEOGRAPH-FAD0;Lo;0;L;22844;;;;N;;;;;
+FAD1;CJK COMPATIBILITY IDEOGRAPH-FAD1;Lo;0;L;233D5;;;;N;;;;;
+FAD2;CJK COMPATIBILITY IDEOGRAPH-FAD2;Lo;0;L;3B9D;;;;N;;;;;
+FAD3;CJK COMPATIBILITY IDEOGRAPH-FAD3;Lo;0;L;4018;;;;N;;;;;
+FAD4;CJK COMPATIBILITY IDEOGRAPH-FAD4;Lo;0;L;4039;;;;N;;;;;
+FAD5;CJK COMPATIBILITY IDEOGRAPH-FAD5;Lo;0;L;25249;;;;N;;;;;
+FAD6;CJK COMPATIBILITY IDEOGRAPH-FAD6;Lo;0;L;25CD0;;;;N;;;;;
+FAD7;CJK COMPATIBILITY IDEOGRAPH-FAD7;Lo;0;L;27ED3;;;;N;;;;;
+FAD8;CJK COMPATIBILITY IDEOGRAPH-FAD8;Lo;0;L;9F43;;;;N;;;;;
+FAD9;CJK COMPATIBILITY IDEOGRAPH-FAD9;Lo;0;L;9F8E;;;;N;;;;;
+FB00;LATIN SMALL LIGATURE FF;Ll;0;L;<compat> 0066 0066;;;;N;;;;;
+FB01;LATIN SMALL LIGATURE FI;Ll;0;L;<compat> 0066 0069;;;;N;;;;;
+FB02;LATIN SMALL LIGATURE FL;Ll;0;L;<compat> 0066 006C;;;;N;;;;;
+FB03;LATIN SMALL LIGATURE FFI;Ll;0;L;<compat> 0066 0066 0069;;;;N;;;;;
+FB04;LATIN SMALL LIGATURE FFL;Ll;0;L;<compat> 0066 0066 006C;;;;N;;;;;
+FB05;LATIN SMALL LIGATURE LONG S T;Ll;0;L;<compat> 017F 0074;;;;N;;;;;
+FB06;LATIN SMALL LIGATURE ST;Ll;0;L;<compat> 0073 0074;;;;N;;;;;
+FB13;ARMENIAN SMALL LIGATURE MEN NOW;Ll;0;L;<compat> 0574 0576;;;;N;;;;;
+FB14;ARMENIAN SMALL LIGATURE MEN ECH;Ll;0;L;<compat> 0574 0565;;;;N;;;;;
+FB15;ARMENIAN SMALL LIGATURE MEN INI;Ll;0;L;<compat> 0574 056B;;;;N;;;;;
+FB16;ARMENIAN SMALL LIGATURE VEW NOW;Ll;0;L;<compat> 057E 0576;;;;N;;;;;
+FB17;ARMENIAN SMALL LIGATURE MEN XEH;Ll;0;L;<compat> 0574 056D;;;;N;;;;;
+FB1D;HEBREW LETTER YOD WITH HIRIQ;Lo;0;R;05D9 05B4;;;;N;;;;;
+FB1E;HEBREW POINT JUDEO-SPANISH VARIKA;Mn;26;NSM;;;;;N;HEBREW POINT VARIKA;;;;
+FB1F;HEBREW LIGATURE YIDDISH YOD YOD PATAH;Lo;0;R;05F2 05B7;;;;N;;;;;
+FB20;HEBREW LETTER ALTERNATIVE AYIN;Lo;0;R;<font> 05E2;;;;N;;;;;
+FB21;HEBREW LETTER WIDE ALEF;Lo;0;R;<font> 05D0;;;;N;;;;;
+FB22;HEBREW LETTER WIDE DALET;Lo;0;R;<font> 05D3;;;;N;;;;;
+FB23;HEBREW LETTER WIDE HE;Lo;0;R;<font> 05D4;;;;N;;;;;
+FB24;HEBREW LETTER WIDE KAF;Lo;0;R;<font> 05DB;;;;N;;;;;
+FB25;HEBREW LETTER WIDE LAMED;Lo;0;R;<font> 05DC;;;;N;;;;;
+FB26;HEBREW LETTER WIDE FINAL MEM;Lo;0;R;<font> 05DD;;;;N;;;;;
+FB27;HEBREW LETTER WIDE RESH;Lo;0;R;<font> 05E8;;;;N;;;;;
+FB28;HEBREW LETTER WIDE TAV;Lo;0;R;<font> 05EA;;;;N;;;;;
+FB29;HEBREW LETTER ALTERNATIVE PLUS SIGN;Sm;0;ES;<font> 002B;;;;N;;;;;
+FB2A;HEBREW LETTER SHIN WITH SHIN DOT;Lo;0;R;05E9 05C1;;;;N;;;;;
+FB2B;HEBREW LETTER SHIN WITH SIN DOT;Lo;0;R;05E9 05C2;;;;N;;;;;
+FB2C;HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT;Lo;0;R;FB49 05C1;;;;N;;;;;
+FB2D;HEBREW LETTER SHIN WITH DAGESH AND SIN DOT;Lo;0;R;FB49 05C2;;;;N;;;;;
+FB2E;HEBREW LETTER ALEF WITH PATAH;Lo;0;R;05D0 05B7;;;;N;;;;;
+FB2F;HEBREW LETTER ALEF WITH QAMATS;Lo;0;R;05D0 05B8;;;;N;;;;;
+FB30;HEBREW LETTER ALEF WITH MAPIQ;Lo;0;R;05D0 05BC;;;;N;;;;;
+FB31;HEBREW LETTER BET WITH DAGESH;Lo;0;R;05D1 05BC;;;;N;;;;;
+FB32;HEBREW LETTER GIMEL WITH DAGESH;Lo;0;R;05D2 05BC;;;;N;;;;;
+FB33;HEBREW LETTER DALET WITH DAGESH;Lo;0;R;05D3 05BC;;;;N;;;;;
+FB34;HEBREW LETTER HE WITH MAPIQ;Lo;0;R;05D4 05BC;;;;N;;;;;
+FB35;HEBREW LETTER VAV WITH DAGESH;Lo;0;R;05D5 05BC;;;;N;;;;;
+FB36;HEBREW LETTER ZAYIN WITH DAGESH;Lo;0;R;05D6 05BC;;;;N;;;;;
+FB38;HEBREW LETTER TET WITH DAGESH;Lo;0;R;05D8 05BC;;;;N;;;;;
+FB39;HEBREW LETTER YOD WITH DAGESH;Lo;0;R;05D9 05BC;;;;N;;;;;
+FB3A;HEBREW LETTER FINAL KAF WITH DAGESH;Lo;0;R;05DA 05BC;;;;N;;;;;
+FB3B;HEBREW LETTER KAF WITH DAGESH;Lo;0;R;05DB 05BC;;;;N;;;;;
+FB3C;HEBREW LETTER LAMED WITH DAGESH;Lo;0;R;05DC 05BC;;;;N;;;;;
+FB3E;HEBREW LETTER MEM WITH DAGESH;Lo;0;R;05DE 05BC;;;;N;;;;;
+FB40;HEBREW LETTER NUN WITH DAGESH;Lo;0;R;05E0 05BC;;;;N;;;;;
+FB41;HEBREW LETTER SAMEKH WITH DAGESH;Lo;0;R;05E1 05BC;;;;N;;;;;
+FB43;HEBREW LETTER FINAL PE WITH DAGESH;Lo;0;R;05E3 05BC;;;;N;;;;;
+FB44;HEBREW LETTER PE WITH DAGESH;Lo;0;R;05E4 05BC;;;;N;;;;;
+FB46;HEBREW LETTER TSADI WITH DAGESH;Lo;0;R;05E6 05BC;;;;N;;;;;
+FB47;HEBREW LETTER QOF WITH DAGESH;Lo;0;R;05E7 05BC;;;;N;;;;;
+FB48;HEBREW LETTER RESH WITH DAGESH;Lo;0;R;05E8 05BC;;;;N;;;;;
+FB49;HEBREW LETTER SHIN WITH DAGESH;Lo;0;R;05E9 05BC;;;;N;;;;;
+FB4A;HEBREW LETTER TAV WITH DAGESH;Lo;0;R;05EA 05BC;;;;N;;;;;
+FB4B;HEBREW LETTER VAV WITH HOLAM;Lo;0;R;05D5 05B9;;;;N;;;;;
+FB4C;HEBREW LETTER BET WITH RAFE;Lo;0;R;05D1 05BF;;;;N;;;;;
+FB4D;HEBREW LETTER KAF WITH RAFE;Lo;0;R;05DB 05BF;;;;N;;;;;
+FB4E;HEBREW LETTER PE WITH RAFE;Lo;0;R;05E4 05BF;;;;N;;;;;
+FB4F;HEBREW LIGATURE ALEF LAMED;Lo;0;R;<compat> 05D0 05DC;;;;N;;;;;
+FB50;ARABIC LETTER ALEF WASLA ISOLATED FORM;Lo;0;AL;<isolated> 0671;;;;N;;;;;
+FB51;ARABIC LETTER ALEF WASLA FINAL FORM;Lo;0;AL;<final> 0671;;;;N;;;;;
+FB52;ARABIC LETTER BEEH ISOLATED FORM;Lo;0;AL;<isolated> 067B;;;;N;;;;;
+FB53;ARABIC LETTER BEEH FINAL FORM;Lo;0;AL;<final> 067B;;;;N;;;;;
+FB54;ARABIC LETTER BEEH INITIAL FORM;Lo;0;AL;<initial> 067B;;;;N;;;;;
+FB55;ARABIC LETTER BEEH MEDIAL FORM;Lo;0;AL;<medial> 067B;;;;N;;;;;
+FB56;ARABIC LETTER PEH ISOLATED FORM;Lo;0;AL;<isolated> 067E;;;;N;;;;;
+FB57;ARABIC LETTER PEH FINAL FORM;Lo;0;AL;<final> 067E;;;;N;;;;;
+FB58;ARABIC LETTER PEH INITIAL FORM;Lo;0;AL;<initial> 067E;;;;N;;;;;
+FB59;ARABIC LETTER PEH MEDIAL FORM;Lo;0;AL;<medial> 067E;;;;N;;;;;
+FB5A;ARABIC LETTER BEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0680;;;;N;;;;;
+FB5B;ARABIC LETTER BEHEH FINAL FORM;Lo;0;AL;<final> 0680;;;;N;;;;;
+FB5C;ARABIC LETTER BEHEH INITIAL FORM;Lo;0;AL;<initial> 0680;;;;N;;;;;
+FB5D;ARABIC LETTER BEHEH MEDIAL FORM;Lo;0;AL;<medial> 0680;;;;N;;;;;
+FB5E;ARABIC LETTER TTEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067A;;;;N;;;;;
+FB5F;ARABIC LETTER TTEHEH FINAL FORM;Lo;0;AL;<final> 067A;;;;N;;;;;
+FB60;ARABIC LETTER TTEHEH INITIAL FORM;Lo;0;AL;<initial> 067A;;;;N;;;;;
+FB61;ARABIC LETTER TTEHEH MEDIAL FORM;Lo;0;AL;<medial> 067A;;;;N;;;;;
+FB62;ARABIC LETTER TEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067F;;;;N;;;;;
+FB63;ARABIC LETTER TEHEH FINAL FORM;Lo;0;AL;<final> 067F;;;;N;;;;;
+FB64;ARABIC LETTER TEHEH INITIAL FORM;Lo;0;AL;<initial> 067F;;;;N;;;;;
+FB65;ARABIC LETTER TEHEH MEDIAL FORM;Lo;0;AL;<medial> 067F;;;;N;;;;;
+FB66;ARABIC LETTER TTEH ISOLATED FORM;Lo;0;AL;<isolated> 0679;;;;N;;;;;
+FB67;ARABIC LETTER TTEH FINAL FORM;Lo;0;AL;<final> 0679;;;;N;;;;;
+FB68;ARABIC LETTER TTEH INITIAL FORM;Lo;0;AL;<initial> 0679;;;;N;;;;;
+FB69;ARABIC LETTER TTEH MEDIAL FORM;Lo;0;AL;<medial> 0679;;;;N;;;;;
+FB6A;ARABIC LETTER VEH ISOLATED FORM;Lo;0;AL;<isolated> 06A4;;;;N;;;;;
+FB6B;ARABIC LETTER VEH FINAL FORM;Lo;0;AL;<final> 06A4;;;;N;;;;;
+FB6C;ARABIC LETTER VEH INITIAL FORM;Lo;0;AL;<initial> 06A4;;;;N;;;;;
+FB6D;ARABIC LETTER VEH MEDIAL FORM;Lo;0;AL;<medial> 06A4;;;;N;;;;;
+FB6E;ARABIC LETTER PEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A6;;;;N;;;;;
+FB6F;ARABIC LETTER PEHEH FINAL FORM;Lo;0;AL;<final> 06A6;;;;N;;;;;
+FB70;ARABIC LETTER PEHEH INITIAL FORM;Lo;0;AL;<initial> 06A6;;;;N;;;;;
+FB71;ARABIC LETTER PEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A6;;;;N;;;;;
+FB72;ARABIC LETTER DYEH ISOLATED FORM;Lo;0;AL;<isolated> 0684;;;;N;;;;;
+FB73;ARABIC LETTER DYEH FINAL FORM;Lo;0;AL;<final> 0684;;;;N;;;;;
+FB74;ARABIC LETTER DYEH INITIAL FORM;Lo;0;AL;<initial> 0684;;;;N;;;;;
+FB75;ARABIC LETTER DYEH MEDIAL FORM;Lo;0;AL;<medial> 0684;;;;N;;;;;
+FB76;ARABIC LETTER NYEH ISOLATED FORM;Lo;0;AL;<isolated> 0683;;;;N;;;;;
+FB77;ARABIC LETTER NYEH FINAL FORM;Lo;0;AL;<final> 0683;;;;N;;;;;
+FB78;ARABIC LETTER NYEH INITIAL FORM;Lo;0;AL;<initial> 0683;;;;N;;;;;
+FB79;ARABIC LETTER NYEH MEDIAL FORM;Lo;0;AL;<medial> 0683;;;;N;;;;;
+FB7A;ARABIC LETTER TCHEH ISOLATED FORM;Lo;0;AL;<isolated> 0686;;;;N;;;;;
+FB7B;ARABIC LETTER TCHEH FINAL FORM;Lo;0;AL;<final> 0686;;;;N;;;;;
+FB7C;ARABIC LETTER TCHEH INITIAL FORM;Lo;0;AL;<initial> 0686;;;;N;;;;;
+FB7D;ARABIC LETTER TCHEH MEDIAL FORM;Lo;0;AL;<medial> 0686;;;;N;;;;;
+FB7E;ARABIC LETTER TCHEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0687;;;;N;;;;;
+FB7F;ARABIC LETTER TCHEHEH FINAL FORM;Lo;0;AL;<final> 0687;;;;N;;;;;
+FB80;ARABIC LETTER TCHEHEH INITIAL FORM;Lo;0;AL;<initial> 0687;;;;N;;;;;
+FB81;ARABIC LETTER TCHEHEH MEDIAL FORM;Lo;0;AL;<medial> 0687;;;;N;;;;;
+FB82;ARABIC LETTER DDAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068D;;;;N;;;;;
+FB83;ARABIC LETTER DDAHAL FINAL FORM;Lo;0;AL;<final> 068D;;;;N;;;;;
+FB84;ARABIC LETTER DAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068C;;;;N;;;;;
+FB85;ARABIC LETTER DAHAL FINAL FORM;Lo;0;AL;<final> 068C;;;;N;;;;;
+FB86;ARABIC LETTER DUL ISOLATED FORM;Lo;0;AL;<isolated> 068E;;;;N;;;;;
+FB87;ARABIC LETTER DUL FINAL FORM;Lo;0;AL;<final> 068E;;;;N;;;;;
+FB88;ARABIC LETTER DDAL ISOLATED FORM;Lo;0;AL;<isolated> 0688;;;;N;;;;;
+FB89;ARABIC LETTER DDAL FINAL FORM;Lo;0;AL;<final> 0688;;;;N;;;;;
+FB8A;ARABIC LETTER JEH ISOLATED FORM;Lo;0;AL;<isolated> 0698;;;;N;;;;;
+FB8B;ARABIC LETTER JEH FINAL FORM;Lo;0;AL;<final> 0698;;;;N;;;;;
+FB8C;ARABIC LETTER RREH ISOLATED FORM;Lo;0;AL;<isolated> 0691;;;;N;;;;;
+FB8D;ARABIC LETTER RREH FINAL FORM;Lo;0;AL;<final> 0691;;;;N;;;;;
+FB8E;ARABIC LETTER KEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A9;;;;N;;;;;
+FB8F;ARABIC LETTER KEHEH FINAL FORM;Lo;0;AL;<final> 06A9;;;;N;;;;;
+FB90;ARABIC LETTER KEHEH INITIAL FORM;Lo;0;AL;<initial> 06A9;;;;N;;;;;
+FB91;ARABIC LETTER KEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A9;;;;N;;;;;
+FB92;ARABIC LETTER GAF ISOLATED FORM;Lo;0;AL;<isolated> 06AF;;;;N;;;;;
+FB93;ARABIC LETTER GAF FINAL FORM;Lo;0;AL;<final> 06AF;;;;N;;;;;
+FB94;ARABIC LETTER GAF INITIAL FORM;Lo;0;AL;<initial> 06AF;;;;N;;;;;
+FB95;ARABIC LETTER GAF MEDIAL FORM;Lo;0;AL;<medial> 06AF;;;;N;;;;;
+FB96;ARABIC LETTER GUEH ISOLATED FORM;Lo;0;AL;<isolated> 06B3;;;;N;;;;;
+FB97;ARABIC LETTER GUEH FINAL FORM;Lo;0;AL;<final> 06B3;;;;N;;;;;
+FB98;ARABIC LETTER GUEH INITIAL FORM;Lo;0;AL;<initial> 06B3;;;;N;;;;;
+FB99;ARABIC LETTER GUEH MEDIAL FORM;Lo;0;AL;<medial> 06B3;;;;N;;;;;
+FB9A;ARABIC LETTER NGOEH ISOLATED FORM;Lo;0;AL;<isolated> 06B1;;;;N;;;;;
+FB9B;ARABIC LETTER NGOEH FINAL FORM;Lo;0;AL;<final> 06B1;;;;N;;;;;
+FB9C;ARABIC LETTER NGOEH INITIAL FORM;Lo;0;AL;<initial> 06B1;;;;N;;;;;
+FB9D;ARABIC LETTER NGOEH MEDIAL FORM;Lo;0;AL;<medial> 06B1;;;;N;;;;;
+FB9E;ARABIC LETTER NOON GHUNNA ISOLATED FORM;Lo;0;AL;<isolated> 06BA;;;;N;;;;;
+FB9F;ARABIC LETTER NOON GHUNNA FINAL FORM;Lo;0;AL;<final> 06BA;;;;N;;;;;
+FBA0;ARABIC LETTER RNOON ISOLATED FORM;Lo;0;AL;<isolated> 06BB;;;;N;;;;;
+FBA1;ARABIC LETTER RNOON FINAL FORM;Lo;0;AL;<final> 06BB;;;;N;;;;;
+FBA2;ARABIC LETTER RNOON INITIAL FORM;Lo;0;AL;<initial> 06BB;;;;N;;;;;
+FBA3;ARABIC LETTER RNOON MEDIAL FORM;Lo;0;AL;<medial> 06BB;;;;N;;;;;
+FBA4;ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06C0;;;;N;;;;;
+FBA5;ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM;Lo;0;AL;<final> 06C0;;;;N;;;;;
+FBA6;ARABIC LETTER HEH GOAL ISOLATED FORM;Lo;0;AL;<isolated> 06C1;;;;N;;;;;
+FBA7;ARABIC LETTER HEH GOAL FINAL FORM;Lo;0;AL;<final> 06C1;;;;N;;;;;
+FBA8;ARABIC LETTER HEH GOAL INITIAL FORM;Lo;0;AL;<initial> 06C1;;;;N;;;;;
+FBA9;ARABIC LETTER HEH GOAL MEDIAL FORM;Lo;0;AL;<medial> 06C1;;;;N;;;;;
+FBAA;ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM;Lo;0;AL;<isolated> 06BE;;;;N;;;;;
+FBAB;ARABIC LETTER HEH DOACHASHMEE FINAL FORM;Lo;0;AL;<final> 06BE;;;;N;;;;;
+FBAC;ARABIC LETTER HEH DOACHASHMEE INITIAL FORM;Lo;0;AL;<initial> 06BE;;;;N;;;;;
+FBAD;ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM;Lo;0;AL;<medial> 06BE;;;;N;;;;;
+FBAE;ARABIC LETTER YEH BARREE ISOLATED FORM;Lo;0;AL;<isolated> 06D2;;;;N;;;;;
+FBAF;ARABIC LETTER YEH BARREE FINAL FORM;Lo;0;AL;<final> 06D2;;;;N;;;;;
+FBB0;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06D3;;;;N;;;;;
+FBB1;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 06D3;;;;N;;;;;
+FBB2;ARABIC SYMBOL DOT ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB3;ARABIC SYMBOL DOT BELOW;Sk;0;AL;;;;;N;;;;;
+FBB4;ARABIC SYMBOL TWO DOTS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB5;ARABIC SYMBOL TWO DOTS BELOW;Sk;0;AL;;;;;N;;;;;
+FBB6;ARABIC SYMBOL THREE DOTS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB7;ARABIC SYMBOL THREE DOTS BELOW;Sk;0;AL;;;;;N;;;;;
+FBB8;ARABIC SYMBOL THREE DOTS POINTING DOWNWARDS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB9;ARABIC SYMBOL THREE DOTS POINTING DOWNWARDS BELOW;Sk;0;AL;;;;;N;;;;;
+FBBA;ARABIC SYMBOL FOUR DOTS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBBB;ARABIC SYMBOL FOUR DOTS BELOW;Sk;0;AL;;;;;N;;;;;
+FBBC;ARABIC SYMBOL DOUBLE VERTICAL BAR BELOW;Sk;0;AL;;;;;N;;;;;
+FBBD;ARABIC SYMBOL TWO DOTS VERTICALLY ABOVE;Sk;0;AL;;;;;N;;;;;
+FBBE;ARABIC SYMBOL TWO DOTS VERTICALLY BELOW;Sk;0;AL;;;;;N;;;;;
+FBBF;ARABIC SYMBOL RING;Sk;0;AL;;;;;N;;;;;
+FBC0;ARABIC SYMBOL SMALL TAH ABOVE;Sk;0;AL;;;;;N;;;;;
+FBC1;ARABIC SYMBOL SMALL TAH BELOW;Sk;0;AL;;;;;N;;;;;
+FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL;<isolated> 06AD;;;;N;;;;;
+FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL;<final> 06AD;;;;N;;;;;
+FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL;<initial> 06AD;;;;N;;;;;
+FBD6;ARABIC LETTER NG MEDIAL FORM;Lo;0;AL;<medial> 06AD;;;;N;;;;;
+FBD7;ARABIC LETTER U ISOLATED FORM;Lo;0;AL;<isolated> 06C7;;;;N;;;;;
+FBD8;ARABIC LETTER U FINAL FORM;Lo;0;AL;<final> 06C7;;;;N;;;;;
+FBD9;ARABIC LETTER OE ISOLATED FORM;Lo;0;AL;<isolated> 06C6;;;;N;;;;;
+FBDA;ARABIC LETTER OE FINAL FORM;Lo;0;AL;<final> 06C6;;;;N;;;;;
+FBDB;ARABIC LETTER YU ISOLATED FORM;Lo;0;AL;<isolated> 06C8;;;;N;;;;;
+FBDC;ARABIC LETTER YU FINAL FORM;Lo;0;AL;<final> 06C8;;;;N;;;;;
+FBDD;ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0677;;;;N;;;;;
+FBDE;ARABIC LETTER VE ISOLATED FORM;Lo;0;AL;<isolated> 06CB;;;;N;;;;;
+FBDF;ARABIC LETTER VE FINAL FORM;Lo;0;AL;<final> 06CB;;;;N;;;;;
+FBE0;ARABIC LETTER KIRGHIZ OE ISOLATED FORM;Lo;0;AL;<isolated> 06C5;;;;N;;;;;
+FBE1;ARABIC LETTER KIRGHIZ OE FINAL FORM;Lo;0;AL;<final> 06C5;;;;N;;;;;
+FBE2;ARABIC LETTER KIRGHIZ YU ISOLATED FORM;Lo;0;AL;<isolated> 06C9;;;;N;;;;;
+FBE3;ARABIC LETTER KIRGHIZ YU FINAL FORM;Lo;0;AL;<final> 06C9;;;;N;;;;;
+FBE4;ARABIC LETTER E ISOLATED FORM;Lo;0;AL;<isolated> 06D0;;;;N;;;;;
+FBE5;ARABIC LETTER E FINAL FORM;Lo;0;AL;<final> 06D0;;;;N;;;;;
+FBE6;ARABIC LETTER E INITIAL FORM;Lo;0;AL;<initial> 06D0;;;;N;;;;;
+FBE7;ARABIC LETTER E MEDIAL FORM;Lo;0;AL;<medial> 06D0;;;;N;;;;;
+FBE8;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0649;;;;N;;;;;
+FBE9;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM;Lo;0;AL;<medial> 0649;;;;N;;;;;
+FBEA;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0626 0627;;;;N;;;;;
+FBEB;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM;Lo;0;AL;<final> 0626 0627;;;;N;;;;;
+FBEC;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D5;;;;N;;;;;
+FBED;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM;Lo;0;AL;<final> 0626 06D5;;;;N;;;;;
+FBEE;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM;Lo;0;AL;<isolated> 0626 0648;;;;N;;;;;
+FBEF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM;Lo;0;AL;<final> 0626 0648;;;;N;;;;;
+FBF0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C7;;;;N;;;;;
+FBF1;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM;Lo;0;AL;<final> 0626 06C7;;;;N;;;;;
+FBF2;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C6;;;;N;;;;;
+FBF3;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM;Lo;0;AL;<final> 0626 06C6;;;;N;;;;;
+FBF4;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C8;;;;N;;;;;
+FBF5;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM;Lo;0;AL;<final> 0626 06C8;;;;N;;;;;
+FBF6;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D0;;;;N;;;;;
+FBF7;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM;Lo;0;AL;<final> 0626 06D0;;;;N;;;;;
+FBF8;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM;Lo;0;AL;<initial> 0626 06D0;;;;N;;;;;
+FBF9;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
+FBFA;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
+FBFB;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0626 0649;;;;N;;;;;
+FBFC;ARABIC LETTER FARSI YEH ISOLATED FORM;Lo;0;AL;<isolated> 06CC;;;;N;;;;;
+FBFD;ARABIC LETTER FARSI YEH FINAL FORM;Lo;0;AL;<final> 06CC;;;;N;;;;;
+FBFE;ARABIC LETTER FARSI YEH INITIAL FORM;Lo;0;AL;<initial> 06CC;;;;N;;;;;
+FBFF;ARABIC LETTER FARSI YEH MEDIAL FORM;Lo;0;AL;<medial> 06CC;;;;N;;;;;
+FC00;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 062C;;;;N;;;;;
+FC01;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0626 062D;;;;N;;;;;
+FC02;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 0645;;;;N;;;;;
+FC03;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
+FC04;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0626 064A;;;;N;;;;;
+FC05;ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 062C;;;;N;;;;;
+FC06;ARABIC LIGATURE BEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062D;;;;N;;;;;
+FC07;ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062E;;;;N;;;;;
+FC08;ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 0645;;;;N;;;;;
+FC09;ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0628 0649;;;;N;;;;;
+FC0A;ARABIC LIGATURE BEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0628 064A;;;;N;;;;;
+FC0B;ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 062C;;;;N;;;;;
+FC0C;ARABIC LIGATURE TEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062D;;;;N;;;;;
+FC0D;ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062E;;;;N;;;;;
+FC0E;ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 0645;;;;N;;;;;
+FC0F;ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062A 0649;;;;N;;;;;
+FC10;ARABIC LIGATURE TEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062A 064A;;;;N;;;;;
+FC11;ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 062C;;;;N;;;;;
+FC12;ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 0645;;;;N;;;;;
+FC13;ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062B 0649;;;;N;;;;;
+FC14;ARABIC LIGATURE THEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062B 064A;;;;N;;;;;
+FC15;ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062C 062D;;;;N;;;;;
+FC16;ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C 0645;;;;N;;;;;
+FC17;ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 062C;;;;N;;;;;
+FC18;ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 0645;;;;N;;;;;
+FC19;ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 062C;;;;N;;;;;
+FC1A;ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062E 062D;;;;N;;;;;
+FC1B;ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 0645;;;;N;;;;;
+FC1C;ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 062C;;;;N;;;;;
+FC1D;ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062D;;;;N;;;;;
+FC1E;ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062E;;;;N;;;;;
+FC1F;ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 0645;;;;N;;;;;
+FC20;ARABIC LIGATURE SAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0635 062D;;;;N;;;;;
+FC21;ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0645;;;;N;;;;;
+FC22;ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 062C;;;;N;;;;;
+FC23;ARABIC LIGATURE DAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062D;;;;N;;;;;
+FC24;ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062E;;;;N;;;;;
+FC25;ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 0645;;;;N;;;;;
+FC26;ARABIC LIGATURE TAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0637 062D;;;;N;;;;;
+FC27;ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0637 0645;;;;N;;;;;
+FC28;ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0638 0645;;;;N;;;;;
+FC29;ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 062C;;;;N;;;;;
+FC2A;ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 0645;;;;N;;;;;
+FC2B;ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 062C;;;;N;;;;;
+FC2C;ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 0645;;;;N;;;;;
+FC2D;ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 062C;;;;N;;;;;
+FC2E;ARABIC LIGATURE FEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062D;;;;N;;;;;
+FC2F;ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062E;;;;N;;;;;
+FC30;ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 0645;;;;N;;;;;
+FC31;ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0641 0649;;;;N;;;;;
+FC32;ARABIC LIGATURE FEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0641 064A;;;;N;;;;;
+FC33;ARABIC LIGATURE QAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0642 062D;;;;N;;;;;
+FC34;ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0642 0645;;;;N;;;;;
+FC35;ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0642 0649;;;;N;;;;;
+FC36;ARABIC LIGATURE QAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0642 064A;;;;N;;;;;
+FC37;ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0643 0627;;;;N;;;;;
+FC38;ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 062C;;;;N;;;;;
+FC39;ARABIC LIGATURE KAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062D;;;;N;;;;;
+FC3A;ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062E;;;;N;;;;;
+FC3B;ARABIC LIGATURE KAF WITH LAM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0644;;;;N;;;;;
+FC3C;ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0645;;;;N;;;;;
+FC3D;ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0643 0649;;;;N;;;;;
+FC3E;ARABIC LIGATURE KAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0643 064A;;;;N;;;;;
+FC3F;ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 062C;;;;N;;;;;
+FC40;ARABIC LIGATURE LAM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062D;;;;N;;;;;
+FC41;ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062E;;;;N;;;;;
+FC42;ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 0645;;;;N;;;;;
+FC43;ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0644 0649;;;;N;;;;;
+FC44;ARABIC LIGATURE LAM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0644 064A;;;;N;;;;;
+FC45;ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 062C;;;;N;;;;;
+FC46;ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D;;;;N;;;;;
+FC47;ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062E;;;;N;;;;;
+FC48;ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 0645;;;;N;;;;;
+FC49;ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0645 0649;;;;N;;;;;
+FC4A;ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0645 064A;;;;N;;;;;
+FC4B;ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 062C;;;;N;;;;;
+FC4C;ARABIC LIGATURE NOON WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062D;;;;N;;;;;
+FC4D;ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062E;;;;N;;;;;
+FC4E;ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 0645;;;;N;;;;;
+FC4F;ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0646 0649;;;;N;;;;;
+FC50;ARABIC LIGATURE NOON WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0646 064A;;;;N;;;;;
+FC51;ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 062C;;;;N;;;;;
+FC52;ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 0645;;;;N;;;;;
+FC53;ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0647 0649;;;;N;;;;;
+FC54;ARABIC LIGATURE HEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0647 064A;;;;N;;;;;
+FC55;ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 062C;;;;N;;;;;
+FC56;ARABIC LIGATURE YEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062D;;;;N;;;;;
+FC57;ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062E;;;;N;;;;;
+FC58;ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 0645;;;;N;;;;;
+FC59;ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 064A 0649;;;;N;;;;;
+FC5A;ARABIC LIGATURE YEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A 064A;;;;N;;;;;
+FC5B;ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0630 0670;;;;N;;;;;
+FC5C;ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0631 0670;;;;N;;;;;
+FC5D;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0649 0670;;;;N;;;;;
+FC5E;ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C 0651;;;;N;;;;;
+FC5F;ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D 0651;;;;N;;;;;
+FC60;ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E 0651;;;;N;;;;;
+FC61;ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F 0651;;;;N;;;;;
+FC62;ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650 0651;;;;N;;;;;
+FC63;ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651 0670;;;;N;;;;;
+FC64;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM;Lo;0;AL;<final> 0626 0631;;;;N;;;;;
+FC65;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0626 0632;;;;N;;;;;
+FC66;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM;Lo;0;AL;<final> 0626 0645;;;;N;;;;;
+FC67;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM;Lo;0;AL;<final> 0626 0646;;;;N;;;;;
+FC68;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
+FC69;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM;Lo;0;AL;<final> 0626 064A;;;;N;;;;;
+FC6A;ARABIC LIGATURE BEH WITH REH FINAL FORM;Lo;0;AL;<final> 0628 0631;;;;N;;;;;
+FC6B;ARABIC LIGATURE BEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0628 0632;;;;N;;;;;
+FC6C;ARABIC LIGATURE BEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0628 0645;;;;N;;;;;
+FC6D;ARABIC LIGATURE BEH WITH NOON FINAL FORM;Lo;0;AL;<final> 0628 0646;;;;N;;;;;
+FC6E;ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0628 0649;;;;N;;;;;
+FC6F;ARABIC LIGATURE BEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 064A;;;;N;;;;;
+FC70;ARABIC LIGATURE TEH WITH REH FINAL FORM;Lo;0;AL;<final> 062A 0631;;;;N;;;;;
+FC71;ARABIC LIGATURE TEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062A 0632;;;;N;;;;;
+FC72;ARABIC LIGATURE TEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062A 0645;;;;N;;;;;
+FC73;ARABIC LIGATURE TEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062A 0646;;;;N;;;;;
+FC74;ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0649;;;;N;;;;;
+FC75;ARABIC LIGATURE TEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 064A;;;;N;;;;;
+FC76;ARABIC LIGATURE THEH WITH REH FINAL FORM;Lo;0;AL;<final> 062B 0631;;;;N;;;;;
+FC77;ARABIC LIGATURE THEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062B 0632;;;;N;;;;;
+FC78;ARABIC LIGATURE THEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062B 0645;;;;N;;;;;
+FC79;ARABIC LIGATURE THEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062B 0646;;;;N;;;;;
+FC7A;ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062B 0649;;;;N;;;;;
+FC7B;ARABIC LIGATURE THEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062B 064A;;;;N;;;;;
+FC7C;ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0641 0649;;;;N;;;;;
+FC7D;ARABIC LIGATURE FEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 064A;;;;N;;;;;
+FC7E;ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0642 0649;;;;N;;;;;
+FC7F;ARABIC LIGATURE QAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 064A;;;;N;;;;;
+FC80;ARABIC LIGATURE KAF WITH ALEF FINAL FORM;Lo;0;AL;<final> 0643 0627;;;;N;;;;;
+FC81;ARABIC LIGATURE KAF WITH LAM FINAL FORM;Lo;0;AL;<final> 0643 0644;;;;N;;;;;
+FC82;ARABIC LIGATURE KAF WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645;;;;N;;;;;
+FC83;ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0643 0649;;;;N;;;;;
+FC84;ARABIC LIGATURE KAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 064A;;;;N;;;;;
+FC85;ARABIC LIGATURE LAM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 0645;;;;N;;;;;
+FC86;ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 0649;;;;N;;;;;
+FC87;ARABIC LIGATURE LAM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 064A;;;;N;;;;;
+FC88;ARABIC LIGATURE MEEM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0645 0627;;;;N;;;;;
+FC89;ARABIC LIGATURE MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0645 0645;;;;N;;;;;
+FC8A;ARABIC LIGATURE NOON WITH REH FINAL FORM;Lo;0;AL;<final> 0646 0631;;;;N;;;;;
+FC8B;ARABIC LIGATURE NOON WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0646 0632;;;;N;;;;;
+FC8C;ARABIC LIGATURE NOON WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 0645;;;;N;;;;;
+FC8D;ARABIC LIGATURE NOON WITH NOON FINAL FORM;Lo;0;AL;<final> 0646 0646;;;;N;;;;;
+FC8E;ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0649;;;;N;;;;;
+FC8F;ARABIC LIGATURE NOON WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 064A;;;;N;;;;;
+FC90;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM;Lo;0;AL;<final> 0649 0670;;;;N;;;;;
+FC91;ARABIC LIGATURE YEH WITH REH FINAL FORM;Lo;0;AL;<final> 064A 0631;;;;N;;;;;
+FC92;ARABIC LIGATURE YEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 064A 0632;;;;N;;;;;
+FC93;ARABIC LIGATURE YEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645;;;;N;;;;;
+FC94;ARABIC LIGATURE YEH WITH NOON FINAL FORM;Lo;0;AL;<final> 064A 0646;;;;N;;;;;
+FC95;ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 064A 0649;;;;N;;;;;
+FC96;ARABIC LIGATURE YEH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 064A;;;;N;;;;;
+FC97;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0626 062C;;;;N;;;;;
+FC98;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0626 062D;;;;N;;;;;
+FC99;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0626 062E;;;;N;;;;;
+FC9A;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0626 0645;;;;N;;;;;
+FC9B;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0626 0647;;;;N;;;;;
+FC9C;ARABIC LIGATURE BEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0628 062C;;;;N;;;;;
+FC9D;ARABIC LIGATURE BEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0628 062D;;;;N;;;;;
+FC9E;ARABIC LIGATURE BEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0628 062E;;;;N;;;;;
+FC9F;ARABIC LIGATURE BEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0628 0645;;;;N;;;;;
+FCA0;ARABIC LIGATURE BEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0628 0647;;;;N;;;;;
+FCA1;ARABIC LIGATURE TEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C;;;;N;;;;;
+FCA2;ARABIC LIGATURE TEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 062D;;;;N;;;;;
+FCA3;ARABIC LIGATURE TEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 062E;;;;N;;;;;
+FCA4;ARABIC LIGATURE TEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645;;;;N;;;;;
+FCA5;ARABIC LIGATURE TEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 062A 0647;;;;N;;;;;
+FCA6;ARABIC LIGATURE THEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062B 0645;;;;N;;;;;
+FCA7;ARABIC LIGATURE JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 062D;;;;N;;;;;
+FCA8;ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062C 0645;;;;N;;;;;
+FCA9;ARABIC LIGATURE HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062D 062C;;;;N;;;;;
+FCAA;ARABIC LIGATURE HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062D 0645;;;;N;;;;;
+FCAB;ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062E 062C;;;;N;;;;;
+FCAC;ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062E 0645;;;;N;;;;;
+FCAD;ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062C;;;;N;;;;;
+FCAE;ARABIC LIGATURE SEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062D;;;;N;;;;;
+FCAF;ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0633 062E;;;;N;;;;;
+FCB0;ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645;;;;N;;;;;
+FCB1;ARABIC LIGATURE SAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D;;;;N;;;;;
+FCB2;ARABIC LIGATURE SAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0635 062E;;;;N;;;;;
+FCB3;ARABIC LIGATURE SAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645;;;;N;;;;;
+FCB4;ARABIC LIGATURE DAD WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062C;;;;N;;;;;
+FCB5;ARABIC LIGATURE DAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0636 062D;;;;N;;;;;
+FCB6;ARABIC LIGATURE DAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0636 062E;;;;N;;;;;
+FCB7;ARABIC LIGATURE DAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 0645;;;;N;;;;;
+FCB8;ARABIC LIGATURE TAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 062D;;;;N;;;;;
+FCB9;ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0638 0645;;;;N;;;;;
+FCBA;ARABIC LIGATURE AIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C;;;;N;;;;;
+FCBB;ARABIC LIGATURE AIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645;;;;N;;;;;
+FCBC;ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 063A 062C;;;;N;;;;;
+FCBD;ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 063A 0645;;;;N;;;;;
+FCBE;ARABIC LIGATURE FEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062C;;;;N;;;;;
+FCBF;ARABIC LIGATURE FEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0641 062D;;;;N;;;;;
+FCC0;ARABIC LIGATURE FEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0641 062E;;;;N;;;;;
+FCC1;ARABIC LIGATURE FEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 0645;;;;N;;;;;
+FCC2;ARABIC LIGATURE QAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 062D;;;;N;;;;;
+FCC3;ARABIC LIGATURE QAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0642 0645;;;;N;;;;;
+FCC4;ARABIC LIGATURE KAF WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0643 062C;;;;N;;;;;
+FCC5;ARABIC LIGATURE KAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0643 062D;;;;N;;;;;
+FCC6;ARABIC LIGATURE KAF WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0643 062E;;;;N;;;;;
+FCC7;ARABIC LIGATURE KAF WITH LAM INITIAL FORM;Lo;0;AL;<initial> 0643 0644;;;;N;;;;;
+FCC8;ARABIC LIGATURE KAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645;;;;N;;;;;
+FCC9;ARABIC LIGATURE LAM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C;;;;N;;;;;
+FCCA;ARABIC LIGATURE LAM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 062D;;;;N;;;;;
+FCCB;ARABIC LIGATURE LAM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0644 062E;;;;N;;;;;
+FCCC;ARABIC LIGATURE LAM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 0645;;;;N;;;;;
+FCCD;ARABIC LIGATURE LAM WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0644 0647;;;;N;;;;;
+FCCE;ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C;;;;N;;;;;
+FCCF;ARABIC LIGATURE MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062D;;;;N;;;;;
+FCD0;ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062E;;;;N;;;;;
+FCD1;ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 0645;;;;N;;;;;
+FCD2;ARABIC LIGATURE NOON WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C;;;;N;;;;;
+FCD3;ARABIC LIGATURE NOON WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062D;;;;N;;;;;
+FCD4;ARABIC LIGATURE NOON WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0646 062E;;;;N;;;;;
+FCD5;ARABIC LIGATURE NOON WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 0645;;;;N;;;;;
+FCD6;ARABIC LIGATURE NOON WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0646 0647;;;;N;;;;;
+FCD7;ARABIC LIGATURE HEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 062C;;;;N;;;;;
+FCD8;ARABIC LIGATURE HEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645;;;;N;;;;;
+FCD9;ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM;Lo;0;AL;<initial> 0647 0670;;;;N;;;;;
+FCDA;ARABIC LIGATURE YEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 064A 062C;;;;N;;;;;
+FCDB;ARABIC LIGATURE YEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 064A 062D;;;;N;;;;;
+FCDC;ARABIC LIGATURE YEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 064A 062E;;;;N;;;;;
+FCDD;ARABIC LIGATURE YEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645;;;;N;;;;;
+FCDE;ARABIC LIGATURE YEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 064A 0647;;;;N;;;;;
+FCDF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0626 0645;;;;N;;;;;
+FCE0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0626 0647;;;;N;;;;;
+FCE1;ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0628 0645;;;;N;;;;;
+FCE2;ARABIC LIGATURE BEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0628 0647;;;;N;;;;;
+FCE3;ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062A 0645;;;;N;;;;;
+FCE4;ARABIC LIGATURE TEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062A 0647;;;;N;;;;;
+FCE5;ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062B 0645;;;;N;;;;;
+FCE6;ARABIC LIGATURE THEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062B 0647;;;;N;;;;;
+FCE7;ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 0645;;;;N;;;;;
+FCE8;ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0633 0647;;;;N;;;;;
+FCE9;ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 0645;;;;N;;;;;
+FCEA;ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0634 0647;;;;N;;;;;
+FCEB;ARABIC LIGATURE KAF WITH LAM MEDIAL FORM;Lo;0;AL;<medial> 0643 0644;;;;N;;;;;
+FCEC;ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0643 0645;;;;N;;;;;
+FCED;ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0644 0645;;;;N;;;;;
+FCEE;ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0646 0645;;;;N;;;;;
+FCEF;ARABIC LIGATURE NOON WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0646 0647;;;;N;;;;;
+FCF0;ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 064A 0645;;;;N;;;;;
+FCF1;ARABIC LIGATURE YEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 064A 0647;;;;N;;;;;
+FCF2;ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E 0651;;;;N;;;;;
+FCF3;ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F 0651;;;;N;;;;;
+FCF4;ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650 0651;;;;N;;;;;
+FCF5;ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0637 0649;;;;N;;;;;
+FCF6;ARABIC LIGATURE TAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0637 064A;;;;N;;;;;
+FCF7;ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0639 0649;;;;N;;;;;
+FCF8;ARABIC LIGATURE AIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0639 064A;;;;N;;;;;
+FCF9;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 063A 0649;;;;N;;;;;
+FCFA;ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 063A 064A;;;;N;;;;;
+FCFB;ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0633 0649;;;;N;;;;;
+FCFC;ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0633 064A;;;;N;;;;;
+FCFD;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0634 0649;;;;N;;;;;
+FCFE;ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0634 064A;;;;N;;;;;
+FCFF;ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062D 0649;;;;N;;;;;
+FD00;ARABIC LIGATURE HAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062D 064A;;;;N;;;;;
+FD01;ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062C 0649;;;;N;;;;;
+FD02;ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062C 064A;;;;N;;;;;
+FD03;ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062E 0649;;;;N;;;;;
+FD04;ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062E 064A;;;;N;;;;;
+FD05;ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0649;;;;N;;;;;
+FD06;ARABIC LIGATURE SAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0635 064A;;;;N;;;;;
+FD07;ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0636 0649;;;;N;;;;;
+FD08;ARABIC LIGATURE DAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0636 064A;;;;N;;;;;
+FD09;ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 062C;;;;N;;;;;
+FD0A;ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062D;;;;N;;;;;
+FD0B;ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062E;;;;N;;;;;
+FD0C;ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 0645;;;;N;;;;;
+FD0D;ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0634 0631;;;;N;;;;;
+FD0E;ARABIC LIGATURE SEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0633 0631;;;;N;;;;;
+FD0F;ARABIC LIGATURE SAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0635 0631;;;;N;;;;;
+FD10;ARABIC LIGATURE DAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0636 0631;;;;N;;;;;
+FD11;ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0637 0649;;;;N;;;;;
+FD12;ARABIC LIGATURE TAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 064A;;;;N;;;;;
+FD13;ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0649;;;;N;;;;;
+FD14;ARABIC LIGATURE AIN WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 064A;;;;N;;;;;
+FD15;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0649;;;;N;;;;;
+FD16;ARABIC LIGATURE GHAIN WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 064A;;;;N;;;;;
+FD17;ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 0649;;;;N;;;;;
+FD18;ARABIC LIGATURE SEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 064A;;;;N;;;;;
+FD19;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0634 0649;;;;N;;;;;
+FD1A;ARABIC LIGATURE SHEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 064A;;;;N;;;;;
+FD1B;ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0649;;;;N;;;;;
+FD1C;ARABIC LIGATURE HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 064A;;;;N;;;;;
+FD1D;ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0649;;;;N;;;;;
+FD1E;ARABIC LIGATURE JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 064A;;;;N;;;;;
+FD1F;ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062E 0649;;;;N;;;;;
+FD20;ARABIC LIGATURE KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062E 064A;;;;N;;;;;
+FD21;ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0635 0649;;;;N;;;;;
+FD22;ARABIC LIGATURE SAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 064A;;;;N;;;;;
+FD23;ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 0649;;;;N;;;;;
+FD24;ARABIC LIGATURE DAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 064A;;;;N;;;;;
+FD25;ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM;Lo;0;AL;<final> 0634 062C;;;;N;;;;;
+FD26;ARABIC LIGATURE SHEEN WITH HAH FINAL FORM;Lo;0;AL;<final> 0634 062D;;;;N;;;;;
+FD27;ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 062E;;;;N;;;;;
+FD28;ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645;;;;N;;;;;
+FD29;ARABIC LIGATURE SHEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0634 0631;;;;N;;;;;
+FD2A;ARABIC LIGATURE SEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0633 0631;;;;N;;;;;
+FD2B;ARABIC LIGATURE SAD WITH REH FINAL FORM;Lo;0;AL;<final> 0635 0631;;;;N;;;;;
+FD2C;ARABIC LIGATURE DAD WITH REH FINAL FORM;Lo;0;AL;<final> 0636 0631;;;;N;;;;;
+FD2D;ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062C;;;;N;;;;;
+FD2E;ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0634 062D;;;;N;;;;;
+FD2F;ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 062E;;;;N;;;;;
+FD30;ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645;;;;N;;;;;
+FD31;ARABIC LIGATURE SEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0633 0647;;;;N;;;;;
+FD32;ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0634 0647;;;;N;;;;;
+FD33;ARABIC LIGATURE TAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645;;;;N;;;;;
+FD34;ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 062C;;;;N;;;;;
+FD35;ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062D;;;;N;;;;;
+FD36;ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062E;;;;N;;;;;
+FD37;ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 062C;;;;N;;;;;
+FD38;ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062D;;;;N;;;;;
+FD39;ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062E;;;;N;;;;;
+FD3A;ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0637 0645;;;;N;;;;;
+FD3B;ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0638 0645;;;;N;;;;;
+FD3C;ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM;Lo;0;AL;<final> 0627 064B;;;;N;;;;;
+FD3D;ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0627 064B;;;;N;;;;;
+FD3E;ORNATE LEFT PARENTHESIS;Pe;0;ON;;;;;N;;;;;
+FD3F;ORNATE RIGHT PARENTHESIS;Ps;0;ON;;;;;N;;;;;
+FD50;ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C 0645;;;;N;;;;;
+FD51;ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM;Lo;0;AL;<final> 062A 062D 062C;;;;N;;;;;
+FD52;ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 062C;;;;N;;;;;
+FD53;ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 0645;;;;N;;;;;
+FD54;ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062E 0645;;;;N;;;;;
+FD55;ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062C;;;;N;;;;;
+FD56;ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062D;;;;N;;;;;
+FD57;ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062E;;;;N;;;;;
+FD58;ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 062C 0645 062D;;;;N;;;;;
+FD59;ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 0645 062D;;;;N;;;;;
+FD5A;ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 0645 064A;;;;N;;;;;
+FD5B;ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0645 0649;;;;N;;;;;
+FD5C;ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062D 062C;;;;N;;;;;
+FD5D;ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062C 062D;;;;N;;;;;
+FD5E;ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062C 0649;;;;N;;;;;
+FD5F;ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0633 0645 062D;;;;N;;;;;
+FD60;ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062D;;;;N;;;;;
+FD61;ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062C;;;;N;;;;;
+FD62;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0633 0645 0645;;;;N;;;;;
+FD63;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 0645;;;;N;;;;;
+FD64;ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM;Lo;0;AL;<final> 0635 062D 062D;;;;N;;;;;
+FD65;ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D 062D;;;;N;;;;;
+FD66;ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0635 0645 0645;;;;N;;;;;
+FD67;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 062D 0645;;;;N;;;;;
+FD68;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062D 0645;;;;N;;;;;
+FD69;ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062C 064A;;;;N;;;;;
+FD6A;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 0645 062E;;;;N;;;;;
+FD6B;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 0645 062E;;;;N;;;;;
+FD6C;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645 0645;;;;N;;;;;
+FD6D;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645 0645;;;;N;;;;;
+FD6E;ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 062D 0649;;;;N;;;;;
+FD6F;ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0636 062E 0645;;;;N;;;;;
+FD70;ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062E 0645;;;;N;;;;;
+FD71;ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0637 0645 062D;;;;N;;;;;
+FD72;ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 0645 062D;;;;N;;;;;
+FD73;ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645 0645;;;;N;;;;;
+FD74;ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 0645 064A;;;;N;;;;;
+FD75;ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 062C 0645;;;;N;;;;;
+FD76;ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 0645 0645;;;;N;;;;;
+FD77;ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645 0645;;;;N;;;;;
+FD78;ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0645 0649;;;;N;;;;;
+FD79;ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 063A 0645 0645;;;;N;;;;;
+FD7A;ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 0645 064A;;;;N;;;;;
+FD7B;ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0645 0649;;;;N;;;;;
+FD7C;ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0641 062E 0645;;;;N;;;;;
+FD7D;ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062E 0645;;;;N;;;;;
+FD7E;ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0642 0645 062D;;;;N;;;;;
+FD7F;ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0642 0645 0645;;;;N;;;;;
+FD80;ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062D 0645;;;;N;;;;;
+FD81;ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062D 064A;;;;N;;;;;
+FD82;ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 062D 0649;;;;N;;;;;
+FD83;ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 062C;;;;N;;;;;
+FD84;ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 062C;;;;N;;;;;
+FD85;ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062E 0645;;;;N;;;;;
+FD86;ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062E 0645;;;;N;;;;;
+FD87;ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0644 0645 062D;;;;N;;;;;
+FD88;ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 0645 062D;;;;N;;;;;
+FD89;ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 062C;;;;N;;;;;
+FD8A;ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 0645;;;;N;;;;;
+FD8B;ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062D 064A;;;;N;;;;;
+FD8C;ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062D;;;;N;;;;;
+FD8D;ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C 0645;;;;N;;;;;
+FD8E;ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 062C;;;;N;;;;;
+FD8F;ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 0645;;;;N;;;;;
+FD92;ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062E;;;;N;;;;;
+FD93;ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 062C;;;;N;;;;;
+FD94;ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 0645;;;;N;;;;;
+FD95;ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062D 0645;;;;N;;;;;
+FD96;ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062D 0649;;;;N;;;;;
+FD97;ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 062C 0645;;;;N;;;;;
+FD98;ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C 0645;;;;N;;;;;
+FD99;ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062C 0649;;;;N;;;;;
+FD9A;ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 0645 064A;;;;N;;;;;
+FD9B;ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0645 0649;;;;N;;;;;
+FD9C;ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645 0645;;;;N;;;;;
+FD9D;ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645 0645;;;;N;;;;;
+FD9E;ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062E 064A;;;;N;;;;;
+FD9F;ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062C 064A;;;;N;;;;;
+FDA0;ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062C 0649;;;;N;;;;;
+FDA1;ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062E 064A;;;;N;;;;;
+FDA2;ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062E 0649;;;;N;;;;;
+FDA3;ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 0645 064A;;;;N;;;;;
+FDA4;ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0645 0649;;;;N;;;;;
+FDA5;ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 0645 064A;;;;N;;;;;
+FDA6;ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 062D 0649;;;;N;;;;;
+FDA7;ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0645 0649;;;;N;;;;;
+FDA8;ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062E 0649;;;;N;;;;;
+FDA9;ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 062D 064A;;;;N;;;;;
+FDAA;ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062D 064A;;;;N;;;;;
+FDAB;ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 062D 064A;;;;N;;;;;
+FDAC;ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062C 064A;;;;N;;;;;
+FDAD;ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 0645 064A;;;;N;;;;;
+FDAE;ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062D 064A;;;;N;;;;;
+FDAF;ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062C 064A;;;;N;;;;;
+FDB0;ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 0645 064A;;;;N;;;;;
+FDB1;ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 0645 064A;;;;N;;;;;
+FDB2;ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 0645 064A;;;;N;;;;;
+FDB3;ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062D 064A;;;;N;;;;;
+FDB4;ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 0645 062D;;;;N;;;;;
+FDB5;ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062D 0645;;;;N;;;;;
+FDB6;ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 0645 064A;;;;N;;;;;
+FDB7;ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 0645 064A;;;;N;;;;;
+FDB8;ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062C 062D;;;;N;;;;;
+FDB9;ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062E 064A;;;;N;;;;;
+FDBA;ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 0645;;;;N;;;;;
+FDBB;ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645 0645;;;;N;;;;;
+FDBC;ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 0645;;;;N;;;;;
+FDBD;ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0646 062C 062D;;;;N;;;;;
+FDBE;ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 062D 064A;;;;N;;;;;
+FDBF;ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 062C 064A;;;;N;;;;;
+FDC0;ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062C 064A;;;;N;;;;;
+FDC1;ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 0645 064A;;;;N;;;;;
+FDC2;ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062D 064A;;;;N;;;;;
+FDC3;ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645 0645;;;;N;;;;;
+FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C 0645;;;;N;;;;;
+FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645 0645;;;;N;;;;;
+FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 062E 064A;;;;N;;;;;
+FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062C 064A;;;;N;;;;;
+FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 06D2;;;;N;;;;;
+FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0642 0644 06D2;;;;N;;;;;
+FDF2;ARABIC LIGATURE ALLAH ISOLATED FORM;Lo;0;AL;<isolated> 0627 0644 0644 0647;;;;N;;;;;
+FDF3;ARABIC LIGATURE AKBAR ISOLATED FORM;Lo;0;AL;<isolated> 0627 0643 0628 0631;;;;N;;;;;
+FDF4;ARABIC LIGATURE MOHAMMAD ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D 0645 062F;;;;N;;;;;
+FDF5;ARABIC LIGATURE SALAM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0639 0645;;;;N;;;;;
+FDF6;ARABIC LIGATURE RASOUL ISOLATED FORM;Lo;0;AL;<isolated> 0631 0633 0648 0644;;;;N;;;;;
+FDF7;ARABIC LIGATURE ALAYHE ISOLATED FORM;Lo;0;AL;<isolated> 0639 0644 064A 0647;;;;N;;;;;
+FDF8;ARABIC LIGATURE WASALLAM ISOLATED FORM;Lo;0;AL;<isolated> 0648 0633 0644 0645;;;;N;;;;;
+FDF9;ARABIC LIGATURE SALLA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0649;;;;N;;;;;
+FDFA;ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM;Lo;0;AL;<isolated> 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645;;;;N;ARABIC LETTER SALLALLAHOU ALAYHE WASALLAM;;;;
+FDFB;ARABIC LIGATURE JALLAJALALOUHOU;Lo;0;AL;<isolated> 062C 0644 0020 062C 0644 0627 0644 0647;;;;N;ARABIC LETTER JALLAJALALOUHOU;;;;
+FDFC;RIAL SIGN;Sc;0;AL;<isolated> 0631 06CC 0627 0644;;;;N;;;;;
+FDFD;ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM;So;0;ON;;;;;N;;;;;
+FE00;VARIATION SELECTOR-1;Mn;0;NSM;;;;;N;;;;;
+FE01;VARIATION SELECTOR-2;Mn;0;NSM;;;;;N;;;;;
+FE02;VARIATION SELECTOR-3;Mn;0;NSM;;;;;N;;;;;
+FE03;VARIATION SELECTOR-4;Mn;0;NSM;;;;;N;;;;;
+FE04;VARIATION SELECTOR-5;Mn;0;NSM;;;;;N;;;;;
+FE05;VARIATION SELECTOR-6;Mn;0;NSM;;;;;N;;;;;
+FE06;VARIATION SELECTOR-7;Mn;0;NSM;;;;;N;;;;;
+FE07;VARIATION SELECTOR-8;Mn;0;NSM;;;;;N;;;;;
+FE08;VARIATION SELECTOR-9;Mn;0;NSM;;;;;N;;;;;
+FE09;VARIATION SELECTOR-10;Mn;0;NSM;;;;;N;;;;;
+FE0A;VARIATION SELECTOR-11;Mn;0;NSM;;;;;N;;;;;
+FE0B;VARIATION SELECTOR-12;Mn;0;NSM;;;;;N;;;;;
+FE0C;VARIATION SELECTOR-13;Mn;0;NSM;;;;;N;;;;;
+FE0D;VARIATION SELECTOR-14;Mn;0;NSM;;;;;N;;;;;
+FE0E;VARIATION SELECTOR-15;Mn;0;NSM;;;;;N;;;;;
+FE0F;VARIATION SELECTOR-16;Mn;0;NSM;;;;;N;;;;;
+FE10;PRESENTATION FORM FOR VERTICAL COMMA;Po;0;ON;<vertical> 002C;;;;N;;;;;
+FE11;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA;Po;0;ON;<vertical> 3001;;;;N;;;;;
+FE12;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP;Po;0;ON;<vertical> 3002;;;;N;;;;;
+FE13;PRESENTATION FORM FOR VERTICAL COLON;Po;0;ON;<vertical> 003A;;;;N;;;;;
+FE14;PRESENTATION FORM FOR VERTICAL SEMICOLON;Po;0;ON;<vertical> 003B;;;;N;;;;;
+FE15;PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK;Po;0;ON;<vertical> 0021;;;;N;;;;;
+FE16;PRESENTATION FORM FOR VERTICAL QUESTION MARK;Po;0;ON;<vertical> 003F;;;;N;;;;;
+FE17;PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;<vertical> 3016;;;;N;;;;;
+FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET;Pe;0;ON;<vertical> 3017;;;;N;;;;;
+FE19;PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS;Po;0;ON;<vertical> 2026;;;;N;;;;;
+FE20;COMBINING LIGATURE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE21;COMBINING LIGATURE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE22;COMBINING DOUBLE TILDE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE23;COMBINING DOUBLE TILDE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE24;COMBINING MACRON LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE25;COMBINING MACRON RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE26;COMBINING CONJOINING MACRON;Mn;230;NSM;;;;;N;;;;;
+FE27;COMBINING LIGATURE LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE28;COMBINING LIGATURE RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE29;COMBINING TILDE LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2A;COMBINING TILDE RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2B;COMBINING MACRON LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2C;COMBINING MACRON RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2D;COMBINING CONJOINING MACRON BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2E;COMBINING CYRILLIC TITLO LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE2F;COMBINING CYRILLIC TITLO RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE30;PRESENTATION FORM FOR VERTICAL TWO DOT LEADER;Po;0;ON;<vertical> 2025;;;;N;GLYPH FOR VERTICAL TWO DOT LEADER;;;;
+FE31;PRESENTATION FORM FOR VERTICAL EM DASH;Pd;0;ON;<vertical> 2014;;;;N;GLYPH FOR VERTICAL EM DASH;;;;
+FE32;PRESENTATION FORM FOR VERTICAL EN DASH;Pd;0;ON;<vertical> 2013;;;;N;GLYPH FOR VERTICAL EN DASH;;;;
+FE33;PRESENTATION FORM FOR VERTICAL LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING UNDERSCORE;;;;
+FE34;PRESENTATION FORM FOR VERTICAL WAVY LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING WAVY UNDERSCORE;;;;
+FE35;PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS;Ps;0;ON;<vertical> 0028;;;;N;GLYPH FOR VERTICAL OPENING PARENTHESIS;;;;
+FE36;PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS;Pe;0;ON;<vertical> 0029;;;;N;GLYPH FOR VERTICAL CLOSING PARENTHESIS;;;;
+FE37;PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET;Ps;0;ON;<vertical> 007B;;;;N;GLYPH FOR VERTICAL OPENING CURLY BRACKET;;;;
+FE38;PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET;Pe;0;ON;<vertical> 007D;;;;N;GLYPH FOR VERTICAL CLOSING CURLY BRACKET;;;;
+FE39;PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<vertical> 3014;;;;N;GLYPH FOR VERTICAL OPENING TORTOISE SHELL BRACKET;;;;
+FE3A;PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<vertical> 3015;;;;N;GLYPH FOR VERTICAL CLOSING TORTOISE SHELL BRACKET;;;;
+FE3B;PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;<vertical> 3010;;;;N;GLYPH FOR VERTICAL OPENING BLACK LENTICULAR BRACKET;;;;
+FE3C;PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;<vertical> 3011;;;;N;GLYPH FOR VERTICAL CLOSING BLACK LENTICULAR BRACKET;;;;
+FE3D;PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;<vertical> 300A;;;;N;GLYPH FOR VERTICAL OPENING DOUBLE ANGLE BRACKET;;;;
+FE3E;PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;<vertical> 300B;;;;N;GLYPH FOR VERTICAL CLOSING DOUBLE ANGLE BRACKET;;;;
+FE3F;PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET;Ps;0;ON;<vertical> 3008;;;;N;GLYPH FOR VERTICAL OPENING ANGLE BRACKET;;;;
+FE40;PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET;Pe;0;ON;<vertical> 3009;;;;N;GLYPH FOR VERTICAL CLOSING ANGLE BRACKET;;;;
+FE41;PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET;Ps;0;ON;<vertical> 300C;;;;N;GLYPH FOR VERTICAL OPENING CORNER BRACKET;;;;
+FE42;PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET;Pe;0;ON;<vertical> 300D;;;;N;GLYPH FOR VERTICAL CLOSING CORNER BRACKET;;;;
+FE43;PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET;Ps;0;ON;<vertical> 300E;;;;N;GLYPH FOR VERTICAL OPENING WHITE CORNER BRACKET;;;;
+FE44;PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET;Pe;0;ON;<vertical> 300F;;;;N;GLYPH FOR VERTICAL CLOSING WHITE CORNER BRACKET;;;;
+FE45;SESAME DOT;Po;0;ON;;;;;N;;;;;
+FE46;WHITE SESAME DOT;Po;0;ON;;;;;N;;;;;
+FE47;PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET;Ps;0;ON;<vertical> 005B;;;;N;;;;;
+FE48;PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET;Pe;0;ON;<vertical> 005D;;;;N;;;;;
+FE49;DASHED OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DASHED OVERSCORE;;;;
+FE4A;CENTRELINE OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING CENTERLINE OVERSCORE;;;;
+FE4B;WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING WAVY OVERSCORE;;;;
+FE4C;DOUBLE WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DOUBLE WAVY OVERSCORE;;;;
+FE4D;DASHED LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING DASHED UNDERSCORE;;;;
+FE4E;CENTRELINE LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING CENTERLINE UNDERSCORE;;;;
+FE4F;WAVY LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING WAVY UNDERSCORE;;;;
+FE50;SMALL COMMA;Po;0;CS;<small> 002C;;;;N;;;;;
+FE51;SMALL IDEOGRAPHIC COMMA;Po;0;ON;<small> 3001;;;;N;;;;;
+FE52;SMALL FULL STOP;Po;0;CS;<small> 002E;;;;N;SMALL PERIOD;;;;
+FE54;SMALL SEMICOLON;Po;0;ON;<small> 003B;;;;N;;;;;
+FE55;SMALL COLON;Po;0;CS;<small> 003A;;;;N;;;;;
+FE56;SMALL QUESTION MARK;Po;0;ON;<small> 003F;;;;N;;;;;
+FE57;SMALL EXCLAMATION MARK;Po;0;ON;<small> 0021;;;;N;;;;;
+FE58;SMALL EM DASH;Pd;0;ON;<small> 2014;;;;N;;;;;
+FE59;SMALL LEFT PARENTHESIS;Ps;0;ON;<small> 0028;;;;Y;SMALL OPENING PARENTHESIS;;;;
+FE5A;SMALL RIGHT PARENTHESIS;Pe;0;ON;<small> 0029;;;;Y;SMALL CLOSING PARENTHESIS;;;;
+FE5B;SMALL LEFT CURLY BRACKET;Ps;0;ON;<small> 007B;;;;Y;SMALL OPENING CURLY BRACKET;;;;
+FE5C;SMALL RIGHT CURLY BRACKET;Pe;0;ON;<small> 007D;;;;Y;SMALL CLOSING CURLY BRACKET;;;;
+FE5D;SMALL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<small> 3014;;;;Y;SMALL OPENING TORTOISE SHELL BRACKET;;;;
+FE5E;SMALL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<small> 3015;;;;Y;SMALL CLOSING TORTOISE SHELL BRACKET;;;;
+FE5F;SMALL NUMBER SIGN;Po;0;ET;<small> 0023;;;;N;;;;;
+FE60;SMALL AMPERSAND;Po;0;ON;<small> 0026;;;;N;;;;;
+FE61;SMALL ASTERISK;Po;0;ON;<small> 002A;;;;N;;;;;
+FE62;SMALL PLUS SIGN;Sm;0;ES;<small> 002B;;;;N;;;;;
+FE63;SMALL HYPHEN-MINUS;Pd;0;ES;<small> 002D;;;;N;;;;;
+FE64;SMALL LESS-THAN SIGN;Sm;0;ON;<small> 003C;;;;Y;;;;;
+FE65;SMALL GREATER-THAN SIGN;Sm;0;ON;<small> 003E;;;;Y;;;;;
+FE66;SMALL EQUALS SIGN;Sm;0;ON;<small> 003D;;;;N;;;;;
+FE68;SMALL REVERSE SOLIDUS;Po;0;ON;<small> 005C;;;;N;SMALL BACKSLASH;;;;
+FE69;SMALL DOLLAR SIGN;Sc;0;ET;<small> 0024;;;;N;;;;;
+FE6A;SMALL PERCENT SIGN;Po;0;ET;<small> 0025;;;;N;;;;;
+FE6B;SMALL COMMERCIAL AT;Po;0;ON;<small> 0040;;;;N;;;;;
+FE70;ARABIC FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064B;;;;N;ARABIC SPACING FATHATAN;;;;
+FE71;ARABIC TATWEEL WITH FATHATAN ABOVE;Lo;0;AL;<medial> 0640 064B;;;;N;ARABIC FATHATAN ON TATWEEL;;;;
+FE72;ARABIC DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C;;;;N;ARABIC SPACING DAMMATAN;;;;
+FE73;ARABIC TAIL FRAGMENT;Lo;0;AL;;;;;N;;;;;
+FE74;ARABIC KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D;;;;N;ARABIC SPACING KASRATAN;;;;
+FE76;ARABIC FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E;;;;N;ARABIC SPACING FATHAH;;;;
+FE77;ARABIC FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E;;;;N;ARABIC FATHAH ON TATWEEL;;;;
+FE78;ARABIC DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F;;;;N;ARABIC SPACING DAMMAH;;;;
+FE79;ARABIC DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F;;;;N;ARABIC DAMMAH ON TATWEEL;;;;
+FE7A;ARABIC KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650;;;;N;ARABIC SPACING KASRAH;;;;
+FE7B;ARABIC KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650;;;;N;ARABIC KASRAH ON TATWEEL;;;;
+FE7C;ARABIC SHADDA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651;;;;N;ARABIC SPACING SHADDAH;;;;
+FE7D;ARABIC SHADDA MEDIAL FORM;Lo;0;AL;<medial> 0640 0651;;;;N;ARABIC SHADDAH ON TATWEEL;;;;
+FE7E;ARABIC SUKUN ISOLATED FORM;Lo;0;AL;<isolated> 0020 0652;;;;N;ARABIC SPACING SUKUN;;;;
+FE7F;ARABIC SUKUN MEDIAL FORM;Lo;0;AL;<medial> 0640 0652;;;;N;ARABIC SUKUN ON TATWEEL;;;;
+FE80;ARABIC LETTER HAMZA ISOLATED FORM;Lo;0;AL;<isolated> 0621;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH;;;;
+FE81;ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON ALEF;;;;
+FE82;ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON ALEF;;;;
+FE83;ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON ALEF;;;;
+FE84;ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON ALEF;;;;
+FE85;ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0624;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON WAW;;;;
+FE86;ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0624;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON WAW;;;;
+FE87;ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER ALEF;;;;
+FE88;ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER ALEF;;;;
+FE89;ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0626;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON YA;;;;
+FE8A;ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0626;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON YA;;;;
+FE8B;ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM;Lo;0;AL;<initial> 0626;;;;N;GLYPH FOR INITIAL ARABIC HAMZAH ON YA;;;;
+FE8C;ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM;Lo;0;AL;<medial> 0626;;;;N;GLYPH FOR MEDIAL ARABIC HAMZAH ON YA;;;;
+FE8D;ARABIC LETTER ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0627;;;;N;GLYPH FOR ISOLATE ARABIC ALEF;;;;
+FE8E;ARABIC LETTER ALEF FINAL FORM;Lo;0;AL;<final> 0627;;;;N;GLYPH FOR FINAL ARABIC ALEF;;;;
+FE8F;ARABIC LETTER BEH ISOLATED FORM;Lo;0;AL;<isolated> 0628;;;;N;GLYPH FOR ISOLATE ARABIC BAA;;;;
+FE90;ARABIC LETTER BEH FINAL FORM;Lo;0;AL;<final> 0628;;;;N;GLYPH FOR FINAL ARABIC BAA;;;;
+FE91;ARABIC LETTER BEH INITIAL FORM;Lo;0;AL;<initial> 0628;;;;N;GLYPH FOR INITIAL ARABIC BAA;;;;
+FE92;ARABIC LETTER BEH MEDIAL FORM;Lo;0;AL;<medial> 0628;;;;N;GLYPH FOR MEDIAL ARABIC BAA;;;;
+FE93;ARABIC LETTER TEH MARBUTA ISOLATED FORM;Lo;0;AL;<isolated> 0629;;;;N;GLYPH FOR ISOLATE ARABIC TAA MARBUTAH;;;;
+FE94;ARABIC LETTER TEH MARBUTA FINAL FORM;Lo;0;AL;<final> 0629;;;;N;GLYPH FOR FINAL ARABIC TAA MARBUTAH;;;;
+FE95;ARABIC LETTER TEH ISOLATED FORM;Lo;0;AL;<isolated> 062A;;;;N;GLYPH FOR ISOLATE ARABIC TAA;;;;
+FE96;ARABIC LETTER TEH FINAL FORM;Lo;0;AL;<final> 062A;;;;N;GLYPH FOR FINAL ARABIC TAA;;;;
+FE97;ARABIC LETTER TEH INITIAL FORM;Lo;0;AL;<initial> 062A;;;;N;GLYPH FOR INITIAL ARABIC TAA;;;;
+FE98;ARABIC LETTER TEH MEDIAL FORM;Lo;0;AL;<medial> 062A;;;;N;GLYPH FOR MEDIAL ARABIC TAA;;;;
+FE99;ARABIC LETTER THEH ISOLATED FORM;Lo;0;AL;<isolated> 062B;;;;N;GLYPH FOR ISOLATE ARABIC THAA;;;;
+FE9A;ARABIC LETTER THEH FINAL FORM;Lo;0;AL;<final> 062B;;;;N;GLYPH FOR FINAL ARABIC THAA;;;;
+FE9B;ARABIC LETTER THEH INITIAL FORM;Lo;0;AL;<initial> 062B;;;;N;GLYPH FOR INITIAL ARABIC THAA;;;;
+FE9C;ARABIC LETTER THEH MEDIAL FORM;Lo;0;AL;<medial> 062B;;;;N;GLYPH FOR MEDIAL ARABIC THAA;;;;
+FE9D;ARABIC LETTER JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C;;;;N;GLYPH FOR ISOLATE ARABIC JEEM;;;;
+FE9E;ARABIC LETTER JEEM FINAL FORM;Lo;0;AL;<final> 062C;;;;N;GLYPH FOR FINAL ARABIC JEEM;;;;
+FE9F;ARABIC LETTER JEEM INITIAL FORM;Lo;0;AL;<initial> 062C;;;;N;GLYPH FOR INITIAL ARABIC JEEM;;;;
+FEA0;ARABIC LETTER JEEM MEDIAL FORM;Lo;0;AL;<medial> 062C;;;;N;GLYPH FOR MEDIAL ARABIC JEEM;;;;
+FEA1;ARABIC LETTER HAH ISOLATED FORM;Lo;0;AL;<isolated> 062D;;;;N;GLYPH FOR ISOLATE ARABIC HAA;;;;
+FEA2;ARABIC LETTER HAH FINAL FORM;Lo;0;AL;<final> 062D;;;;N;GLYPH FOR FINAL ARABIC HAA;;;;
+FEA3;ARABIC LETTER HAH INITIAL FORM;Lo;0;AL;<initial> 062D;;;;N;GLYPH FOR INITIAL ARABIC HAA;;;;
+FEA4;ARABIC LETTER HAH MEDIAL FORM;Lo;0;AL;<medial> 062D;;;;N;GLYPH FOR MEDIAL ARABIC HAA;;;;
+FEA5;ARABIC LETTER KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062E;;;;N;GLYPH FOR ISOLATE ARABIC KHAA;;;;
+FEA6;ARABIC LETTER KHAH FINAL FORM;Lo;0;AL;<final> 062E;;;;N;GLYPH FOR FINAL ARABIC KHAA;;;;
+FEA7;ARABIC LETTER KHAH INITIAL FORM;Lo;0;AL;<initial> 062E;;;;N;GLYPH FOR INITIAL ARABIC KHAA;;;;
+FEA8;ARABIC LETTER KHAH MEDIAL FORM;Lo;0;AL;<medial> 062E;;;;N;GLYPH FOR MEDIAL ARABIC KHAA;;;;
+FEA9;ARABIC LETTER DAL ISOLATED FORM;Lo;0;AL;<isolated> 062F;;;;N;GLYPH FOR ISOLATE ARABIC DAL;;;;
+FEAA;ARABIC LETTER DAL FINAL FORM;Lo;0;AL;<final> 062F;;;;N;GLYPH FOR FINAL ARABIC DAL;;;;
+FEAB;ARABIC LETTER THAL ISOLATED FORM;Lo;0;AL;<isolated> 0630;;;;N;GLYPH FOR ISOLATE ARABIC THAL;;;;
+FEAC;ARABIC LETTER THAL FINAL FORM;Lo;0;AL;<final> 0630;;;;N;GLYPH FOR FINAL ARABIC THAL;;;;
+FEAD;ARABIC LETTER REH ISOLATED FORM;Lo;0;AL;<isolated> 0631;;;;N;GLYPH FOR ISOLATE ARABIC RA;;;;
+FEAE;ARABIC LETTER REH FINAL FORM;Lo;0;AL;<final> 0631;;;;N;GLYPH FOR FINAL ARABIC RA;;;;
+FEAF;ARABIC LETTER ZAIN ISOLATED FORM;Lo;0;AL;<isolated> 0632;;;;N;GLYPH FOR ISOLATE ARABIC ZAIN;;;;
+FEB0;ARABIC LETTER ZAIN FINAL FORM;Lo;0;AL;<final> 0632;;;;N;GLYPH FOR FINAL ARABIC ZAIN;;;;
+FEB1;ARABIC LETTER SEEN ISOLATED FORM;Lo;0;AL;<isolated> 0633;;;;N;GLYPH FOR ISOLATE ARABIC SEEN;;;;
+FEB2;ARABIC LETTER SEEN FINAL FORM;Lo;0;AL;<final> 0633;;;;N;GLYPH FOR FINAL ARABIC SEEN;;;;
+FEB3;ARABIC LETTER SEEN INITIAL FORM;Lo;0;AL;<initial> 0633;;;;N;GLYPH FOR INITIAL ARABIC SEEN;;;;
+FEB4;ARABIC LETTER SEEN MEDIAL FORM;Lo;0;AL;<medial> 0633;;;;N;GLYPH FOR MEDIAL ARABIC SEEN;;;;
+FEB5;ARABIC LETTER SHEEN ISOLATED FORM;Lo;0;AL;<isolated> 0634;;;;N;GLYPH FOR ISOLATE ARABIC SHEEN;;;;
+FEB6;ARABIC LETTER SHEEN FINAL FORM;Lo;0;AL;<final> 0634;;;;N;GLYPH FOR FINAL ARABIC SHEEN;;;;
+FEB7;ARABIC LETTER SHEEN INITIAL FORM;Lo;0;AL;<initial> 0634;;;;N;GLYPH FOR INITIAL ARABIC SHEEN;;;;
+FEB8;ARABIC LETTER SHEEN MEDIAL FORM;Lo;0;AL;<medial> 0634;;;;N;GLYPH FOR MEDIAL ARABIC SHEEN;;;;
+FEB9;ARABIC LETTER SAD ISOLATED FORM;Lo;0;AL;<isolated> 0635;;;;N;GLYPH FOR ISOLATE ARABIC SAD;;;;
+FEBA;ARABIC LETTER SAD FINAL FORM;Lo;0;AL;<final> 0635;;;;N;GLYPH FOR FINAL ARABIC SAD;;;;
+FEBB;ARABIC LETTER SAD INITIAL FORM;Lo;0;AL;<initial> 0635;;;;N;GLYPH FOR INITIAL ARABIC SAD;;;;
+FEBC;ARABIC LETTER SAD MEDIAL FORM;Lo;0;AL;<medial> 0635;;;;N;GLYPH FOR MEDIAL ARABIC SAD;;;;
+FEBD;ARABIC LETTER DAD ISOLATED FORM;Lo;0;AL;<isolated> 0636;;;;N;GLYPH FOR ISOLATE ARABIC DAD;;;;
+FEBE;ARABIC LETTER DAD FINAL FORM;Lo;0;AL;<final> 0636;;;;N;GLYPH FOR FINAL ARABIC DAD;;;;
+FEBF;ARABIC LETTER DAD INITIAL FORM;Lo;0;AL;<initial> 0636;;;;N;GLYPH FOR INITIAL ARABIC DAD;;;;
+FEC0;ARABIC LETTER DAD MEDIAL FORM;Lo;0;AL;<medial> 0636;;;;N;GLYPH FOR MEDIAL ARABIC DAD;;;;
+FEC1;ARABIC LETTER TAH ISOLATED FORM;Lo;0;AL;<isolated> 0637;;;;N;GLYPH FOR ISOLATE ARABIC TAH;;;;
+FEC2;ARABIC LETTER TAH FINAL FORM;Lo;0;AL;<final> 0637;;;;N;GLYPH FOR FINAL ARABIC TAH;;;;
+FEC3;ARABIC LETTER TAH INITIAL FORM;Lo;0;AL;<initial> 0637;;;;N;GLYPH FOR INITIAL ARABIC TAH;;;;
+FEC4;ARABIC LETTER TAH MEDIAL FORM;Lo;0;AL;<medial> 0637;;;;N;GLYPH FOR MEDIAL ARABIC TAH;;;;
+FEC5;ARABIC LETTER ZAH ISOLATED FORM;Lo;0;AL;<isolated> 0638;;;;N;GLYPH FOR ISOLATE ARABIC DHAH;;;;
+FEC6;ARABIC LETTER ZAH FINAL FORM;Lo;0;AL;<final> 0638;;;;N;GLYPH FOR FINAL ARABIC DHAH;;;;
+FEC7;ARABIC LETTER ZAH INITIAL FORM;Lo;0;AL;<initial> 0638;;;;N;GLYPH FOR INITIAL ARABIC DHAH;;;;
+FEC8;ARABIC LETTER ZAH MEDIAL FORM;Lo;0;AL;<medial> 0638;;;;N;GLYPH FOR MEDIAL ARABIC DHAH;;;;
+FEC9;ARABIC LETTER AIN ISOLATED FORM;Lo;0;AL;<isolated> 0639;;;;N;GLYPH FOR ISOLATE ARABIC AIN;;;;
+FECA;ARABIC LETTER AIN FINAL FORM;Lo;0;AL;<final> 0639;;;;N;GLYPH FOR FINAL ARABIC AIN;;;;
+FECB;ARABIC LETTER AIN INITIAL FORM;Lo;0;AL;<initial> 0639;;;;N;GLYPH FOR INITIAL ARABIC AIN;;;;
+FECC;ARABIC LETTER AIN MEDIAL FORM;Lo;0;AL;<medial> 0639;;;;N;GLYPH FOR MEDIAL ARABIC AIN;;;;
+FECD;ARABIC LETTER GHAIN ISOLATED FORM;Lo;0;AL;<isolated> 063A;;;;N;GLYPH FOR ISOLATE ARABIC GHAIN;;;;
+FECE;ARABIC LETTER GHAIN FINAL FORM;Lo;0;AL;<final> 063A;;;;N;GLYPH FOR FINAL ARABIC GHAIN;;;;
+FECF;ARABIC LETTER GHAIN INITIAL FORM;Lo;0;AL;<initial> 063A;;;;N;GLYPH FOR INITIAL ARABIC GHAIN;;;;
+FED0;ARABIC LETTER GHAIN MEDIAL FORM;Lo;0;AL;<medial> 063A;;;;N;GLYPH FOR MEDIAL ARABIC GHAIN;;;;
+FED1;ARABIC LETTER FEH ISOLATED FORM;Lo;0;AL;<isolated> 0641;;;;N;GLYPH FOR ISOLATE ARABIC FA;;;;
+FED2;ARABIC LETTER FEH FINAL FORM;Lo;0;AL;<final> 0641;;;;N;GLYPH FOR FINAL ARABIC FA;;;;
+FED3;ARABIC LETTER FEH INITIAL FORM;Lo;0;AL;<initial> 0641;;;;N;GLYPH FOR INITIAL ARABIC FA;;;;
+FED4;ARABIC LETTER FEH MEDIAL FORM;Lo;0;AL;<medial> 0641;;;;N;GLYPH FOR MEDIAL ARABIC FA;;;;
+FED5;ARABIC LETTER QAF ISOLATED FORM;Lo;0;AL;<isolated> 0642;;;;N;GLYPH FOR ISOLATE ARABIC QAF;;;;
+FED6;ARABIC LETTER QAF FINAL FORM;Lo;0;AL;<final> 0642;;;;N;GLYPH FOR FINAL ARABIC QAF;;;;
+FED7;ARABIC LETTER QAF INITIAL FORM;Lo;0;AL;<initial> 0642;;;;N;GLYPH FOR INITIAL ARABIC QAF;;;;
+FED8;ARABIC LETTER QAF MEDIAL FORM;Lo;0;AL;<medial> 0642;;;;N;GLYPH FOR MEDIAL ARABIC QAF;;;;
+FED9;ARABIC LETTER KAF ISOLATED FORM;Lo;0;AL;<isolated> 0643;;;;N;GLYPH FOR ISOLATE ARABIC CAF;;;;
+FEDA;ARABIC LETTER KAF FINAL FORM;Lo;0;AL;<final> 0643;;;;N;GLYPH FOR FINAL ARABIC CAF;;;;
+FEDB;ARABIC LETTER KAF INITIAL FORM;Lo;0;AL;<initial> 0643;;;;N;GLYPH FOR INITIAL ARABIC CAF;;;;
+FEDC;ARABIC LETTER KAF MEDIAL FORM;Lo;0;AL;<medial> 0643;;;;N;GLYPH FOR MEDIAL ARABIC CAF;;;;
+FEDD;ARABIC LETTER LAM ISOLATED FORM;Lo;0;AL;<isolated> 0644;;;;N;GLYPH FOR ISOLATE ARABIC LAM;;;;
+FEDE;ARABIC LETTER LAM FINAL FORM;Lo;0;AL;<final> 0644;;;;N;GLYPH FOR FINAL ARABIC LAM;;;;
+FEDF;ARABIC LETTER LAM INITIAL FORM;Lo;0;AL;<initial> 0644;;;;N;GLYPH FOR INITIAL ARABIC LAM;;;;
+FEE0;ARABIC LETTER LAM MEDIAL FORM;Lo;0;AL;<medial> 0644;;;;N;GLYPH FOR MEDIAL ARABIC LAM;;;;
+FEE1;ARABIC LETTER MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645;;;;N;GLYPH FOR ISOLATE ARABIC MEEM;;;;
+FEE2;ARABIC LETTER MEEM FINAL FORM;Lo;0;AL;<final> 0645;;;;N;GLYPH FOR FINAL ARABIC MEEM;;;;
+FEE3;ARABIC LETTER MEEM INITIAL FORM;Lo;0;AL;<initial> 0645;;;;N;GLYPH FOR INITIAL ARABIC MEEM;;;;
+FEE4;ARABIC LETTER MEEM MEDIAL FORM;Lo;0;AL;<medial> 0645;;;;N;GLYPH FOR MEDIAL ARABIC MEEM;;;;
+FEE5;ARABIC LETTER NOON ISOLATED FORM;Lo;0;AL;<isolated> 0646;;;;N;GLYPH FOR ISOLATE ARABIC NOON;;;;
+FEE6;ARABIC LETTER NOON FINAL FORM;Lo;0;AL;<final> 0646;;;;N;GLYPH FOR FINAL ARABIC NOON;;;;
+FEE7;ARABIC LETTER NOON INITIAL FORM;Lo;0;AL;<initial> 0646;;;;N;GLYPH FOR INITIAL ARABIC NOON;;;;
+FEE8;ARABIC LETTER NOON MEDIAL FORM;Lo;0;AL;<medial> 0646;;;;N;GLYPH FOR MEDIAL ARABIC NOON;;;;
+FEE9;ARABIC LETTER HEH ISOLATED FORM;Lo;0;AL;<isolated> 0647;;;;N;GLYPH FOR ISOLATE ARABIC HA;;;;
+FEEA;ARABIC LETTER HEH FINAL FORM;Lo;0;AL;<final> 0647;;;;N;GLYPH FOR FINAL ARABIC HA;;;;
+FEEB;ARABIC LETTER HEH INITIAL FORM;Lo;0;AL;<initial> 0647;;;;N;GLYPH FOR INITIAL ARABIC HA;;;;
+FEEC;ARABIC LETTER HEH MEDIAL FORM;Lo;0;AL;<medial> 0647;;;;N;GLYPH FOR MEDIAL ARABIC HA;;;;
+FEED;ARABIC LETTER WAW ISOLATED FORM;Lo;0;AL;<isolated> 0648;;;;N;GLYPH FOR ISOLATE ARABIC WAW;;;;
+FEEE;ARABIC LETTER WAW FINAL FORM;Lo;0;AL;<final> 0648;;;;N;GLYPH FOR FINAL ARABIC WAW;;;;
+FEEF;ARABIC LETTER ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0649;;;;N;GLYPH FOR ISOLATE ARABIC ALEF MAQSURAH;;;;
+FEF0;ARABIC LETTER ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0649;;;;N;GLYPH FOR FINAL ARABIC ALEF MAQSURAH;;;;
+FEF1;ARABIC LETTER YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A;;;;N;GLYPH FOR ISOLATE ARABIC YA;;;;
+FEF2;ARABIC LETTER YEH FINAL FORM;Lo;0;AL;<final> 064A;;;;N;GLYPH FOR FINAL ARABIC YA;;;;
+FEF3;ARABIC LETTER YEH INITIAL FORM;Lo;0;AL;<initial> 064A;;;;N;GLYPH FOR INITIAL ARABIC YA;;;;
+FEF4;ARABIC LETTER YEH MEDIAL FORM;Lo;0;AL;<medial> 064A;;;;N;GLYPH FOR MEDIAL ARABIC YA;;;;
+FEF5;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
+FEF6;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
+FEF7;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
+FEF8;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
+FEF9;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0644 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
+FEFA;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0644 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
+FEFB;ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0644 0627;;;;N;GLYPH FOR ISOLATE ARABIC LIGATURE LAM ALEF;;;;
+FEFC;ARABIC LIGATURE LAM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0644 0627;;;;N;GLYPH FOR FINAL ARABIC LIGATURE LAM ALEF;;;;
+FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;;
+FF01;FULLWIDTH EXCLAMATION MARK;Po;0;ON;<wide> 0021;;;;N;;;;;
+FF02;FULLWIDTH QUOTATION MARK;Po;0;ON;<wide> 0022;;;;N;;;;;
+FF03;FULLWIDTH NUMBER SIGN;Po;0;ET;<wide> 0023;;;;N;;;;;
+FF04;FULLWIDTH DOLLAR SIGN;Sc;0;ET;<wide> 0024;;;;N;;;;;
+FF05;FULLWIDTH PERCENT SIGN;Po;0;ET;<wide> 0025;;;;N;;;;;
+FF06;FULLWIDTH AMPERSAND;Po;0;ON;<wide> 0026;;;;N;;;;;
+FF07;FULLWIDTH APOSTROPHE;Po;0;ON;<wide> 0027;;;;N;;;;;
+FF08;FULLWIDTH LEFT PARENTHESIS;Ps;0;ON;<wide> 0028;;;;Y;FULLWIDTH OPENING PARENTHESIS;;;;
+FF09;FULLWIDTH RIGHT PARENTHESIS;Pe;0;ON;<wide> 0029;;;;Y;FULLWIDTH CLOSING PARENTHESIS;;;;
+FF0A;FULLWIDTH ASTERISK;Po;0;ON;<wide> 002A;;;;N;;;;;
+FF0B;FULLWIDTH PLUS SIGN;Sm;0;ES;<wide> 002B;;;;N;;;;;
+FF0C;FULLWIDTH COMMA;Po;0;CS;<wide> 002C;;;;N;;;;;
+FF0D;FULLWIDTH HYPHEN-MINUS;Pd;0;ES;<wide> 002D;;;;N;;;;;
+FF0E;FULLWIDTH FULL STOP;Po;0;CS;<wide> 002E;;;;N;FULLWIDTH PERIOD;;;;
+FF0F;FULLWIDTH SOLIDUS;Po;0;CS;<wide> 002F;;;;N;FULLWIDTH SLASH;;;;
+FF10;FULLWIDTH DIGIT ZERO;Nd;0;EN;<wide> 0030;0;0;0;N;;;;;
+FF11;FULLWIDTH DIGIT ONE;Nd;0;EN;<wide> 0031;1;1;1;N;;;;;
+FF12;FULLWIDTH DIGIT TWO;Nd;0;EN;<wide> 0032;2;2;2;N;;;;;
+FF13;FULLWIDTH DIGIT THREE;Nd;0;EN;<wide> 0033;3;3;3;N;;;;;
+FF14;FULLWIDTH DIGIT FOUR;Nd;0;EN;<wide> 0034;4;4;4;N;;;;;
+FF15;FULLWIDTH DIGIT FIVE;Nd;0;EN;<wide> 0035;5;5;5;N;;;;;
+FF16;FULLWIDTH DIGIT SIX;Nd;0;EN;<wide> 0036;6;6;6;N;;;;;
+FF17;FULLWIDTH DIGIT SEVEN;Nd;0;EN;<wide> 0037;7;7;7;N;;;;;
+FF18;FULLWIDTH DIGIT EIGHT;Nd;0;EN;<wide> 0038;8;8;8;N;;;;;
+FF19;FULLWIDTH DIGIT NINE;Nd;0;EN;<wide> 0039;9;9;9;N;;;;;
+FF1A;FULLWIDTH COLON;Po;0;CS;<wide> 003A;;;;N;;;;;
+FF1B;FULLWIDTH SEMICOLON;Po;0;ON;<wide> 003B;;;;N;;;;;
+FF1C;FULLWIDTH LESS-THAN SIGN;Sm;0;ON;<wide> 003C;;;;Y;;;;;
+FF1D;FULLWIDTH EQUALS SIGN;Sm;0;ON;<wide> 003D;;;;N;;;;;
+FF1E;FULLWIDTH GREATER-THAN SIGN;Sm;0;ON;<wide> 003E;;;;Y;;;;;
+FF1F;FULLWIDTH QUESTION MARK;Po;0;ON;<wide> 003F;;;;N;;;;;
+FF20;FULLWIDTH COMMERCIAL AT;Po;0;ON;<wide> 0040;;;;N;;;;;
+FF21;FULLWIDTH LATIN CAPITAL LETTER A;Lu;0;L;<wide> 0041;;;;N;;;;FF41;
+FF22;FULLWIDTH LATIN CAPITAL LETTER B;Lu;0;L;<wide> 0042;;;;N;;;;FF42;
+FF23;FULLWIDTH LATIN CAPITAL LETTER C;Lu;0;L;<wide> 0043;;;;N;;;;FF43;
+FF24;FULLWIDTH LATIN CAPITAL LETTER D;Lu;0;L;<wide> 0044;;;;N;;;;FF44;
+FF25;FULLWIDTH LATIN CAPITAL LETTER E;Lu;0;L;<wide> 0045;;;;N;;;;FF45;
+FF26;FULLWIDTH LATIN CAPITAL LETTER F;Lu;0;L;<wide> 0046;;;;N;;;;FF46;
+FF27;FULLWIDTH LATIN CAPITAL LETTER G;Lu;0;L;<wide> 0047;;;;N;;;;FF47;
+FF28;FULLWIDTH LATIN CAPITAL LETTER H;Lu;0;L;<wide> 0048;;;;N;;;;FF48;
+FF29;FULLWIDTH LATIN CAPITAL LETTER I;Lu;0;L;<wide> 0049;;;;N;;;;FF49;
+FF2A;FULLWIDTH LATIN CAPITAL LETTER J;Lu;0;L;<wide> 004A;;;;N;;;;FF4A;
+FF2B;FULLWIDTH LATIN CAPITAL LETTER K;Lu;0;L;<wide> 004B;;;;N;;;;FF4B;
+FF2C;FULLWIDTH LATIN CAPITAL LETTER L;Lu;0;L;<wide> 004C;;;;N;;;;FF4C;
+FF2D;FULLWIDTH LATIN CAPITAL LETTER M;Lu;0;L;<wide> 004D;;;;N;;;;FF4D;
+FF2E;FULLWIDTH LATIN CAPITAL LETTER N;Lu;0;L;<wide> 004E;;;;N;;;;FF4E;
+FF2F;FULLWIDTH LATIN CAPITAL LETTER O;Lu;0;L;<wide> 004F;;;;N;;;;FF4F;
+FF30;FULLWIDTH LATIN CAPITAL LETTER P;Lu;0;L;<wide> 0050;;;;N;;;;FF50;
+FF31;FULLWIDTH LATIN CAPITAL LETTER Q;Lu;0;L;<wide> 0051;;;;N;;;;FF51;
+FF32;FULLWIDTH LATIN CAPITAL LETTER R;Lu;0;L;<wide> 0052;;;;N;;;;FF52;
+FF33;FULLWIDTH LATIN CAPITAL LETTER S;Lu;0;L;<wide> 0053;;;;N;;;;FF53;
+FF34;FULLWIDTH LATIN CAPITAL LETTER T;Lu;0;L;<wide> 0054;;;;N;;;;FF54;
+FF35;FULLWIDTH LATIN CAPITAL LETTER U;Lu;0;L;<wide> 0055;;;;N;;;;FF55;
+FF36;FULLWIDTH LATIN CAPITAL LETTER V;Lu;0;L;<wide> 0056;;;;N;;;;FF56;
+FF37;FULLWIDTH LATIN CAPITAL LETTER W;Lu;0;L;<wide> 0057;;;;N;;;;FF57;
+FF38;FULLWIDTH LATIN CAPITAL LETTER X;Lu;0;L;<wide> 0058;;;;N;;;;FF58;
+FF39;FULLWIDTH LATIN CAPITAL LETTER Y;Lu;0;L;<wide> 0059;;;;N;;;;FF59;
+FF3A;FULLWIDTH LATIN CAPITAL LETTER Z;Lu;0;L;<wide> 005A;;;;N;;;;FF5A;
+FF3B;FULLWIDTH LEFT SQUARE BRACKET;Ps;0;ON;<wide> 005B;;;;Y;FULLWIDTH OPENING SQUARE BRACKET;;;;
+FF3C;FULLWIDTH REVERSE SOLIDUS;Po;0;ON;<wide> 005C;;;;N;FULLWIDTH BACKSLASH;;;;
+FF3D;FULLWIDTH RIGHT SQUARE BRACKET;Pe;0;ON;<wide> 005D;;;;Y;FULLWIDTH CLOSING SQUARE BRACKET;;;;
+FF3E;FULLWIDTH CIRCUMFLEX ACCENT;Sk;0;ON;<wide> 005E;;;;N;FULLWIDTH SPACING CIRCUMFLEX;;;;
+FF3F;FULLWIDTH LOW LINE;Pc;0;ON;<wide> 005F;;;;N;FULLWIDTH SPACING UNDERSCORE;;;;
+FF40;FULLWIDTH GRAVE ACCENT;Sk;0;ON;<wide> 0060;;;;N;FULLWIDTH SPACING GRAVE;;;;
+FF41;FULLWIDTH LATIN SMALL LETTER A;Ll;0;L;<wide> 0061;;;;N;;;FF21;;FF21
+FF42;FULLWIDTH LATIN SMALL LETTER B;Ll;0;L;<wide> 0062;;;;N;;;FF22;;FF22
+FF43;FULLWIDTH LATIN SMALL LETTER C;Ll;0;L;<wide> 0063;;;;N;;;FF23;;FF23
+FF44;FULLWIDTH LATIN SMALL LETTER D;Ll;0;L;<wide> 0064;;;;N;;;FF24;;FF24
+FF45;FULLWIDTH LATIN SMALL LETTER E;Ll;0;L;<wide> 0065;;;;N;;;FF25;;FF25
+FF46;FULLWIDTH LATIN SMALL LETTER F;Ll;0;L;<wide> 0066;;;;N;;;FF26;;FF26
+FF47;FULLWIDTH LATIN SMALL LETTER G;Ll;0;L;<wide> 0067;;;;N;;;FF27;;FF27
+FF48;FULLWIDTH LATIN SMALL LETTER H;Ll;0;L;<wide> 0068;;;;N;;;FF28;;FF28
+FF49;FULLWIDTH LATIN SMALL LETTER I;Ll;0;L;<wide> 0069;;;;N;;;FF29;;FF29
+FF4A;FULLWIDTH LATIN SMALL LETTER J;Ll;0;L;<wide> 006A;;;;N;;;FF2A;;FF2A
+FF4B;FULLWIDTH LATIN SMALL LETTER K;Ll;0;L;<wide> 006B;;;;N;;;FF2B;;FF2B
+FF4C;FULLWIDTH LATIN SMALL LETTER L;Ll;0;L;<wide> 006C;;;;N;;;FF2C;;FF2C
+FF4D;FULLWIDTH LATIN SMALL LETTER M;Ll;0;L;<wide> 006D;;;;N;;;FF2D;;FF2D
+FF4E;FULLWIDTH LATIN SMALL LETTER N;Ll;0;L;<wide> 006E;;;;N;;;FF2E;;FF2E
+FF4F;FULLWIDTH LATIN SMALL LETTER O;Ll;0;L;<wide> 006F;;;;N;;;FF2F;;FF2F
+FF50;FULLWIDTH LATIN SMALL LETTER P;Ll;0;L;<wide> 0070;;;;N;;;FF30;;FF30
+FF51;FULLWIDTH LATIN SMALL LETTER Q;Ll;0;L;<wide> 0071;;;;N;;;FF31;;FF31
+FF52;FULLWIDTH LATIN SMALL LETTER R;Ll;0;L;<wide> 0072;;;;N;;;FF32;;FF32
+FF53;FULLWIDTH LATIN SMALL LETTER S;Ll;0;L;<wide> 0073;;;;N;;;FF33;;FF33
+FF54;FULLWIDTH LATIN SMALL LETTER T;Ll;0;L;<wide> 0074;;;;N;;;FF34;;FF34
+FF55;FULLWIDTH LATIN SMALL LETTER U;Ll;0;L;<wide> 0075;;;;N;;;FF35;;FF35
+FF56;FULLWIDTH LATIN SMALL LETTER V;Ll;0;L;<wide> 0076;;;;N;;;FF36;;FF36
+FF57;FULLWIDTH LATIN SMALL LETTER W;Ll;0;L;<wide> 0077;;;;N;;;FF37;;FF37
+FF58;FULLWIDTH LATIN SMALL LETTER X;Ll;0;L;<wide> 0078;;;;N;;;FF38;;FF38
+FF59;FULLWIDTH LATIN SMALL LETTER Y;Ll;0;L;<wide> 0079;;;;N;;;FF39;;FF39
+FF5A;FULLWIDTH LATIN SMALL LETTER Z;Ll;0;L;<wide> 007A;;;;N;;;FF3A;;FF3A
+FF5B;FULLWIDTH LEFT CURLY BRACKET;Ps;0;ON;<wide> 007B;;;;Y;FULLWIDTH OPENING CURLY BRACKET;;;;
+FF5C;FULLWIDTH VERTICAL LINE;Sm;0;ON;<wide> 007C;;;;N;FULLWIDTH VERTICAL BAR;;;;
+FF5D;FULLWIDTH RIGHT CURLY BRACKET;Pe;0;ON;<wide> 007D;;;;Y;FULLWIDTH CLOSING CURLY BRACKET;;;;
+FF5E;FULLWIDTH TILDE;Sm;0;ON;<wide> 007E;;;;N;FULLWIDTH SPACING TILDE;;;;
+FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON;<wide> 2985;;;;Y;;;;;
+FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON;<wide> 2986;;;;Y;;;;;
+FF61;HALFWIDTH IDEOGRAPHIC FULL STOP;Po;0;ON;<narrow> 3002;;;;N;HALFWIDTH IDEOGRAPHIC PERIOD;;;;
+FF62;HALFWIDTH LEFT CORNER BRACKET;Ps;0;ON;<narrow> 300C;;;;Y;HALFWIDTH OPENING CORNER BRACKET;;;;
+FF63;HALFWIDTH RIGHT CORNER BRACKET;Pe;0;ON;<narrow> 300D;;;;Y;HALFWIDTH CLOSING CORNER BRACKET;;;;
+FF64;HALFWIDTH IDEOGRAPHIC COMMA;Po;0;ON;<narrow> 3001;;;;N;;;;;
+FF65;HALFWIDTH KATAKANA MIDDLE DOT;Po;0;ON;<narrow> 30FB;;;;N;;;;;
+FF66;HALFWIDTH KATAKANA LETTER WO;Lo;0;L;<narrow> 30F2;;;;N;;;;;
+FF67;HALFWIDTH KATAKANA LETTER SMALL A;Lo;0;L;<narrow> 30A1;;;;N;;;;;
+FF68;HALFWIDTH KATAKANA LETTER SMALL I;Lo;0;L;<narrow> 30A3;;;;N;;;;;
+FF69;HALFWIDTH KATAKANA LETTER SMALL U;Lo;0;L;<narrow> 30A5;;;;N;;;;;
+FF6A;HALFWIDTH KATAKANA LETTER SMALL E;Lo;0;L;<narrow> 30A7;;;;N;;;;;
+FF6B;HALFWIDTH KATAKANA LETTER SMALL O;Lo;0;L;<narrow> 30A9;;;;N;;;;;
+FF6C;HALFWIDTH KATAKANA LETTER SMALL YA;Lo;0;L;<narrow> 30E3;;;;N;;;;;
+FF6D;HALFWIDTH KATAKANA LETTER SMALL YU;Lo;0;L;<narrow> 30E5;;;;N;;;;;
+FF6E;HALFWIDTH KATAKANA LETTER SMALL YO;Lo;0;L;<narrow> 30E7;;;;N;;;;;
+FF6F;HALFWIDTH KATAKANA LETTER SMALL TU;Lo;0;L;<narrow> 30C3;;;;N;;;;;
+FF70;HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;<narrow> 30FC;;;;N;;;;;
+FF71;HALFWIDTH KATAKANA LETTER A;Lo;0;L;<narrow> 30A2;;;;N;;;;;
+FF72;HALFWIDTH KATAKANA LETTER I;Lo;0;L;<narrow> 30A4;;;;N;;;;;
+FF73;HALFWIDTH KATAKANA LETTER U;Lo;0;L;<narrow> 30A6;;;;N;;;;;
+FF74;HALFWIDTH KATAKANA LETTER E;Lo;0;L;<narrow> 30A8;;;;N;;;;;
+FF75;HALFWIDTH KATAKANA LETTER O;Lo;0;L;<narrow> 30AA;;;;N;;;;;
+FF76;HALFWIDTH KATAKANA LETTER KA;Lo;0;L;<narrow> 30AB;;;;N;;;;;
+FF77;HALFWIDTH KATAKANA LETTER KI;Lo;0;L;<narrow> 30AD;;;;N;;;;;
+FF78;HALFWIDTH KATAKANA LETTER KU;Lo;0;L;<narrow> 30AF;;;;N;;;;;
+FF79;HALFWIDTH KATAKANA LETTER KE;Lo;0;L;<narrow> 30B1;;;;N;;;;;
+FF7A;HALFWIDTH KATAKANA LETTER KO;Lo;0;L;<narrow> 30B3;;;;N;;;;;
+FF7B;HALFWIDTH KATAKANA LETTER SA;Lo;0;L;<narrow> 30B5;;;;N;;;;;
+FF7C;HALFWIDTH KATAKANA LETTER SI;Lo;0;L;<narrow> 30B7;;;;N;;;;;
+FF7D;HALFWIDTH KATAKANA LETTER SU;Lo;0;L;<narrow> 30B9;;;;N;;;;;
+FF7E;HALFWIDTH KATAKANA LETTER SE;Lo;0;L;<narrow> 30BB;;;;N;;;;;
+FF7F;HALFWIDTH KATAKANA LETTER SO;Lo;0;L;<narrow> 30BD;;;;N;;;;;
+FF80;HALFWIDTH KATAKANA LETTER TA;Lo;0;L;<narrow> 30BF;;;;N;;;;;
+FF81;HALFWIDTH KATAKANA LETTER TI;Lo;0;L;<narrow> 30C1;;;;N;;;;;
+FF82;HALFWIDTH KATAKANA LETTER TU;Lo;0;L;<narrow> 30C4;;;;N;;;;;
+FF83;HALFWIDTH KATAKANA LETTER TE;Lo;0;L;<narrow> 30C6;;;;N;;;;;
+FF84;HALFWIDTH KATAKANA LETTER TO;Lo;0;L;<narrow> 30C8;;;;N;;;;;
+FF85;HALFWIDTH KATAKANA LETTER NA;Lo;0;L;<narrow> 30CA;;;;N;;;;;
+FF86;HALFWIDTH KATAKANA LETTER NI;Lo;0;L;<narrow> 30CB;;;;N;;;;;
+FF87;HALFWIDTH KATAKANA LETTER NU;Lo;0;L;<narrow> 30CC;;;;N;;;;;
+FF88;HALFWIDTH KATAKANA LETTER NE;Lo;0;L;<narrow> 30CD;;;;N;;;;;
+FF89;HALFWIDTH KATAKANA LETTER NO;Lo;0;L;<narrow> 30CE;;;;N;;;;;
+FF8A;HALFWIDTH KATAKANA LETTER HA;Lo;0;L;<narrow> 30CF;;;;N;;;;;
+FF8B;HALFWIDTH KATAKANA LETTER HI;Lo;0;L;<narrow> 30D2;;;;N;;;;;
+FF8C;HALFWIDTH KATAKANA LETTER HU;Lo;0;L;<narrow> 30D5;;;;N;;;;;
+FF8D;HALFWIDTH KATAKANA LETTER HE;Lo;0;L;<narrow> 30D8;;;;N;;;;;
+FF8E;HALFWIDTH KATAKANA LETTER HO;Lo;0;L;<narrow> 30DB;;;;N;;;;;
+FF8F;HALFWIDTH KATAKANA LETTER MA;Lo;0;L;<narrow> 30DE;;;;N;;;;;
+FF90;HALFWIDTH KATAKANA LETTER MI;Lo;0;L;<narrow> 30DF;;;;N;;;;;
+FF91;HALFWIDTH KATAKANA LETTER MU;Lo;0;L;<narrow> 30E0;;;;N;;;;;
+FF92;HALFWIDTH KATAKANA LETTER ME;Lo;0;L;<narrow> 30E1;;;;N;;;;;
+FF93;HALFWIDTH KATAKANA LETTER MO;Lo;0;L;<narrow> 30E2;;;;N;;;;;
+FF94;HALFWIDTH KATAKANA LETTER YA;Lo;0;L;<narrow> 30E4;;;;N;;;;;
+FF95;HALFWIDTH KATAKANA LETTER YU;Lo;0;L;<narrow> 30E6;;;;N;;;;;
+FF96;HALFWIDTH KATAKANA LETTER YO;Lo;0;L;<narrow> 30E8;;;;N;;;;;
+FF97;HALFWIDTH KATAKANA LETTER RA;Lo;0;L;<narrow> 30E9;;;;N;;;;;
+FF98;HALFWIDTH KATAKANA LETTER RI;Lo;0;L;<narrow> 30EA;;;;N;;;;;
+FF99;HALFWIDTH KATAKANA LETTER RU;Lo;0;L;<narrow> 30EB;;;;N;;;;;
+FF9A;HALFWIDTH KATAKANA LETTER RE;Lo;0;L;<narrow> 30EC;;;;N;;;;;
+FF9B;HALFWIDTH KATAKANA LETTER RO;Lo;0;L;<narrow> 30ED;;;;N;;;;;
+FF9C;HALFWIDTH KATAKANA LETTER WA;Lo;0;L;<narrow> 30EF;;;;N;;;;;
+FF9D;HALFWIDTH KATAKANA LETTER N;Lo;0;L;<narrow> 30F3;;;;N;;;;;
+FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;;;;
+FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;;;;
+FFA0;HALFWIDTH HANGUL FILLER;Lo;0;L;<narrow> 3164;;;;N;HALFWIDTH HANGUL CAE OM;;;;
+FFA1;HALFWIDTH HANGUL LETTER KIYEOK;Lo;0;L;<narrow> 3131;;;;N;HALFWIDTH HANGUL LETTER GIYEOG;;;;
+FFA2;HALFWIDTH HANGUL LETTER SSANGKIYEOK;Lo;0;L;<narrow> 3132;;;;N;HALFWIDTH HANGUL LETTER SSANG GIYEOG;;;;
+FFA3;HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<narrow> 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;;
+FFA4;HALFWIDTH HANGUL LETTER NIEUN;Lo;0;L;<narrow> 3134;;;;N;;;;;
+FFA5;HALFWIDTH HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<narrow> 3135;;;;N;HALFWIDTH HANGUL LETTER NIEUN JIEUJ;;;;
+FFA6;HALFWIDTH HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<narrow> 3136;;;;N;HALFWIDTH HANGUL LETTER NIEUN HIEUH;;;;
+FFA7;HALFWIDTH HANGUL LETTER TIKEUT;Lo;0;L;<narrow> 3137;;;;N;HALFWIDTH HANGUL LETTER DIGEUD;;;;
+FFA8;HALFWIDTH HANGUL LETTER SSANGTIKEUT;Lo;0;L;<narrow> 3138;;;;N;HALFWIDTH HANGUL LETTER SSANG DIGEUD;;;;
+FFA9;HALFWIDTH HANGUL LETTER RIEUL;Lo;0;L;<narrow> 3139;;;;N;HALFWIDTH HANGUL LETTER LIEUL;;;;
+FFAA;HALFWIDTH HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<narrow> 313A;;;;N;HALFWIDTH HANGUL LETTER LIEUL GIYEOG;;;;
+FFAB;HALFWIDTH HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<narrow> 313B;;;;N;HALFWIDTH HANGUL LETTER LIEUL MIEUM;;;;
+FFAC;HALFWIDTH HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<narrow> 313C;;;;N;HALFWIDTH HANGUL LETTER LIEUL BIEUB;;;;
+FFAD;HALFWIDTH HANGUL LETTER RIEUL-SIOS;Lo;0;L;<narrow> 313D;;;;N;HALFWIDTH HANGUL LETTER LIEUL SIOS;;;;
+FFAE;HALFWIDTH HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<narrow> 313E;;;;N;HALFWIDTH HANGUL LETTER LIEUL TIEUT;;;;
+FFAF;HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<narrow> 313F;;;;N;HALFWIDTH HANGUL LETTER LIEUL PIEUP;;;;
+FFB0;HALFWIDTH HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<narrow> 3140;;;;N;HALFWIDTH HANGUL LETTER LIEUL HIEUH;;;;
+FFB1;HALFWIDTH HANGUL LETTER MIEUM;Lo;0;L;<narrow> 3141;;;;N;;;;;
+FFB2;HALFWIDTH HANGUL LETTER PIEUP;Lo;0;L;<narrow> 3142;;;;N;HALFWIDTH HANGUL LETTER BIEUB;;;;
+FFB3;HALFWIDTH HANGUL LETTER SSANGPIEUP;Lo;0;L;<narrow> 3143;;;;N;HALFWIDTH HANGUL LETTER SSANG BIEUB;;;;
+FFB4;HALFWIDTH HANGUL LETTER PIEUP-SIOS;Lo;0;L;<narrow> 3144;;;;N;HALFWIDTH HANGUL LETTER BIEUB SIOS;;;;
+FFB5;HALFWIDTH HANGUL LETTER SIOS;Lo;0;L;<narrow> 3145;;;;N;;;;;
+FFB6;HALFWIDTH HANGUL LETTER SSANGSIOS;Lo;0;L;<narrow> 3146;;;;N;HALFWIDTH HANGUL LETTER SSANG SIOS;;;;
+FFB7;HALFWIDTH HANGUL LETTER IEUNG;Lo;0;L;<narrow> 3147;;;;N;;;;;
+FFB8;HALFWIDTH HANGUL LETTER CIEUC;Lo;0;L;<narrow> 3148;;;;N;HALFWIDTH HANGUL LETTER JIEUJ;;;;
+FFB9;HALFWIDTH HANGUL LETTER SSANGCIEUC;Lo;0;L;<narrow> 3149;;;;N;HALFWIDTH HANGUL LETTER SSANG JIEUJ;;;;
+FFBA;HALFWIDTH HANGUL LETTER CHIEUCH;Lo;0;L;<narrow> 314A;;;;N;HALFWIDTH HANGUL LETTER CIEUC;;;;
+FFBB;HALFWIDTH HANGUL LETTER KHIEUKH;Lo;0;L;<narrow> 314B;;;;N;HALFWIDTH HANGUL LETTER KIYEOK;;;;
+FFBC;HALFWIDTH HANGUL LETTER THIEUTH;Lo;0;L;<narrow> 314C;;;;N;HALFWIDTH HANGUL LETTER TIEUT;;;;
+FFBD;HALFWIDTH HANGUL LETTER PHIEUPH;Lo;0;L;<narrow> 314D;;;;N;HALFWIDTH HANGUL LETTER PIEUP;;;;
+FFBE;HALFWIDTH HANGUL LETTER HIEUH;Lo;0;L;<narrow> 314E;;;;N;;;;;
+FFC2;HALFWIDTH HANGUL LETTER A;Lo;0;L;<narrow> 314F;;;;N;;;;;
+FFC3;HALFWIDTH HANGUL LETTER AE;Lo;0;L;<narrow> 3150;;;;N;;;;;
+FFC4;HALFWIDTH HANGUL LETTER YA;Lo;0;L;<narrow> 3151;;;;N;;;;;
+FFC5;HALFWIDTH HANGUL LETTER YAE;Lo;0;L;<narrow> 3152;;;;N;;;;;
+FFC6;HALFWIDTH HANGUL LETTER EO;Lo;0;L;<narrow> 3153;;;;N;;;;;
+FFC7;HALFWIDTH HANGUL LETTER E;Lo;0;L;<narrow> 3154;;;;N;;;;;
+FFCA;HALFWIDTH HANGUL LETTER YEO;Lo;0;L;<narrow> 3155;;;;N;;;;;
+FFCB;HALFWIDTH HANGUL LETTER YE;Lo;0;L;<narrow> 3156;;;;N;;;;;
+FFCC;HALFWIDTH HANGUL LETTER O;Lo;0;L;<narrow> 3157;;;;N;;;;;
+FFCD;HALFWIDTH HANGUL LETTER WA;Lo;0;L;<narrow> 3158;;;;N;;;;;
+FFCE;HALFWIDTH HANGUL LETTER WAE;Lo;0;L;<narrow> 3159;;;;N;;;;;
+FFCF;HALFWIDTH HANGUL LETTER OE;Lo;0;L;<narrow> 315A;;;;N;;;;;
+FFD2;HALFWIDTH HANGUL LETTER YO;Lo;0;L;<narrow> 315B;;;;N;;;;;
+FFD3;HALFWIDTH HANGUL LETTER U;Lo;0;L;<narrow> 315C;;;;N;;;;;
+FFD4;HALFWIDTH HANGUL LETTER WEO;Lo;0;L;<narrow> 315D;;;;N;;;;;
+FFD5;HALFWIDTH HANGUL LETTER WE;Lo;0;L;<narrow> 315E;;;;N;;;;;
+FFD6;HALFWIDTH HANGUL LETTER WI;Lo;0;L;<narrow> 315F;;;;N;;;;;
+FFD7;HALFWIDTH HANGUL LETTER YU;Lo;0;L;<narrow> 3160;;;;N;;;;;
+FFDA;HALFWIDTH HANGUL LETTER EU;Lo;0;L;<narrow> 3161;;;;N;;;;;
+FFDB;HALFWIDTH HANGUL LETTER YI;Lo;0;L;<narrow> 3162;;;;N;;;;;
+FFDC;HALFWIDTH HANGUL LETTER I;Lo;0;L;<narrow> 3163;;;;N;;;;;
+FFE0;FULLWIDTH CENT SIGN;Sc;0;ET;<wide> 00A2;;;;N;;;;;
+FFE1;FULLWIDTH POUND SIGN;Sc;0;ET;<wide> 00A3;;;;N;;;;;
+FFE2;FULLWIDTH NOT SIGN;Sm;0;ON;<wide> 00AC;;;;N;;;;;
+FFE3;FULLWIDTH MACRON;Sk;0;ON;<wide> 00AF;;;;N;FULLWIDTH SPACING MACRON;;;;
+FFE4;FULLWIDTH BROKEN BAR;So;0;ON;<wide> 00A6;;;;N;FULLWIDTH BROKEN VERTICAL BAR;;;;
+FFE5;FULLWIDTH YEN SIGN;Sc;0;ET;<wide> 00A5;;;;N;;;;;
+FFE6;FULLWIDTH WON SIGN;Sc;0;ET;<wide> 20A9;;;;N;;;;;
+FFE8;HALFWIDTH FORMS LIGHT VERTICAL;So;0;ON;<narrow> 2502;;;;N;;;;;
+FFE9;HALFWIDTH LEFTWARDS ARROW;Sm;0;ON;<narrow> 2190;;;;N;;;;;
+FFEA;HALFWIDTH UPWARDS ARROW;Sm;0;ON;<narrow> 2191;;;;N;;;;;
+FFEB;HALFWIDTH RIGHTWARDS ARROW;Sm;0;ON;<narrow> 2192;;;;N;;;;;
+FFEC;HALFWIDTH DOWNWARDS ARROW;Sm;0;ON;<narrow> 2193;;;;N;;;;;
+FFED;HALFWIDTH BLACK SQUARE;So;0;ON;<narrow> 25A0;;;;N;;;;;
+FFEE;HALFWIDTH WHITE CIRCLE;So;0;ON;<narrow> 25CB;;;;N;;;;;
+FFF9;INTERLINEAR ANNOTATION ANCHOR;Cf;0;ON;;;;;N;;;;;
+FFFA;INTERLINEAR ANNOTATION SEPARATOR;Cf;0;ON;;;;;N;;;;;
+FFFB;INTERLINEAR ANNOTATION TERMINATOR;Cf;0;ON;;;;;N;;;;;
+FFFC;OBJECT REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
+FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
+10000;LINEAR B SYLLABLE B008 A;Lo;0;L;;;;;N;;;;;
+10001;LINEAR B SYLLABLE B038 E;Lo;0;L;;;;;N;;;;;
+10002;LINEAR B SYLLABLE B028 I;Lo;0;L;;;;;N;;;;;
+10003;LINEAR B SYLLABLE B061 O;Lo;0;L;;;;;N;;;;;
+10004;LINEAR B SYLLABLE B010 U;Lo;0;L;;;;;N;;;;;
+10005;LINEAR B SYLLABLE B001 DA;Lo;0;L;;;;;N;;;;;
+10006;LINEAR B SYLLABLE B045 DE;Lo;0;L;;;;;N;;;;;
+10007;LINEAR B SYLLABLE B007 DI;Lo;0;L;;;;;N;;;;;
+10008;LINEAR B SYLLABLE B014 DO;Lo;0;L;;;;;N;;;;;
+10009;LINEAR B SYLLABLE B051 DU;Lo;0;L;;;;;N;;;;;
+1000A;LINEAR B SYLLABLE B057 JA;Lo;0;L;;;;;N;;;;;
+1000B;LINEAR B SYLLABLE B046 JE;Lo;0;L;;;;;N;;;;;
+1000D;LINEAR B SYLLABLE B036 JO;Lo;0;L;;;;;N;;;;;
+1000E;LINEAR B SYLLABLE B065 JU;Lo;0;L;;;;;N;;;;;
+1000F;LINEAR B SYLLABLE B077 KA;Lo;0;L;;;;;N;;;;;
+10010;LINEAR B SYLLABLE B044 KE;Lo;0;L;;;;;N;;;;;
+10011;LINEAR B SYLLABLE B067 KI;Lo;0;L;;;;;N;;;;;
+10012;LINEAR B SYLLABLE B070 KO;Lo;0;L;;;;;N;;;;;
+10013;LINEAR B SYLLABLE B081 KU;Lo;0;L;;;;;N;;;;;
+10014;LINEAR B SYLLABLE B080 MA;Lo;0;L;;;;;N;;;;;
+10015;LINEAR B SYLLABLE B013 ME;Lo;0;L;;;;;N;;;;;
+10016;LINEAR B SYLLABLE B073 MI;Lo;0;L;;;;;N;;;;;
+10017;LINEAR B SYLLABLE B015 MO;Lo;0;L;;;;;N;;;;;
+10018;LINEAR B SYLLABLE B023 MU;Lo;0;L;;;;;N;;;;;
+10019;LINEAR B SYLLABLE B006 NA;Lo;0;L;;;;;N;;;;;
+1001A;LINEAR B SYLLABLE B024 NE;Lo;0;L;;;;;N;;;;;
+1001B;LINEAR B SYLLABLE B030 NI;Lo;0;L;;;;;N;;;;;
+1001C;LINEAR B SYLLABLE B052 NO;Lo;0;L;;;;;N;;;;;
+1001D;LINEAR B SYLLABLE B055 NU;Lo;0;L;;;;;N;;;;;
+1001E;LINEAR B SYLLABLE B003 PA;Lo;0;L;;;;;N;;;;;
+1001F;LINEAR B SYLLABLE B072 PE;Lo;0;L;;;;;N;;;;;
+10020;LINEAR B SYLLABLE B039 PI;Lo;0;L;;;;;N;;;;;
+10021;LINEAR B SYLLABLE B011 PO;Lo;0;L;;;;;N;;;;;
+10022;LINEAR B SYLLABLE B050 PU;Lo;0;L;;;;;N;;;;;
+10023;LINEAR B SYLLABLE B016 QA;Lo;0;L;;;;;N;;;;;
+10024;LINEAR B SYLLABLE B078 QE;Lo;0;L;;;;;N;;;;;
+10025;LINEAR B SYLLABLE B021 QI;Lo;0;L;;;;;N;;;;;
+10026;LINEAR B SYLLABLE B032 QO;Lo;0;L;;;;;N;;;;;
+10028;LINEAR B SYLLABLE B060 RA;Lo;0;L;;;;;N;;;;;
+10029;LINEAR B SYLLABLE B027 RE;Lo;0;L;;;;;N;;;;;
+1002A;LINEAR B SYLLABLE B053 RI;Lo;0;L;;;;;N;;;;;
+1002B;LINEAR B SYLLABLE B002 RO;Lo;0;L;;;;;N;;;;;
+1002C;LINEAR B SYLLABLE B026 RU;Lo;0;L;;;;;N;;;;;
+1002D;LINEAR B SYLLABLE B031 SA;Lo;0;L;;;;;N;;;;;
+1002E;LINEAR B SYLLABLE B009 SE;Lo;0;L;;;;;N;;;;;
+1002F;LINEAR B SYLLABLE B041 SI;Lo;0;L;;;;;N;;;;;
+10030;LINEAR B SYLLABLE B012 SO;Lo;0;L;;;;;N;;;;;
+10031;LINEAR B SYLLABLE B058 SU;Lo;0;L;;;;;N;;;;;
+10032;LINEAR B SYLLABLE B059 TA;Lo;0;L;;;;;N;;;;;
+10033;LINEAR B SYLLABLE B004 TE;Lo;0;L;;;;;N;;;;;
+10034;LINEAR B SYLLABLE B037 TI;Lo;0;L;;;;;N;;;;;
+10035;LINEAR B SYLLABLE B005 TO;Lo;0;L;;;;;N;;;;;
+10036;LINEAR B SYLLABLE B069 TU;Lo;0;L;;;;;N;;;;;
+10037;LINEAR B SYLLABLE B054 WA;Lo;0;L;;;;;N;;;;;
+10038;LINEAR B SYLLABLE B075 WE;Lo;0;L;;;;;N;;;;;
+10039;LINEAR B SYLLABLE B040 WI;Lo;0;L;;;;;N;;;;;
+1003A;LINEAR B SYLLABLE B042 WO;Lo;0;L;;;;;N;;;;;
+1003C;LINEAR B SYLLABLE B017 ZA;Lo;0;L;;;;;N;;;;;
+1003D;LINEAR B SYLLABLE B074 ZE;Lo;0;L;;;;;N;;;;;
+1003F;LINEAR B SYLLABLE B020 ZO;Lo;0;L;;;;;N;;;;;
+10040;LINEAR B SYLLABLE B025 A2;Lo;0;L;;;;;N;;;;;
+10041;LINEAR B SYLLABLE B043 A3;Lo;0;L;;;;;N;;;;;
+10042;LINEAR B SYLLABLE B085 AU;Lo;0;L;;;;;N;;;;;
+10043;LINEAR B SYLLABLE B071 DWE;Lo;0;L;;;;;N;;;;;
+10044;LINEAR B SYLLABLE B090 DWO;Lo;0;L;;;;;N;;;;;
+10045;LINEAR B SYLLABLE B048 NWA;Lo;0;L;;;;;N;;;;;
+10046;LINEAR B SYLLABLE B029 PU2;Lo;0;L;;;;;N;;;;;
+10047;LINEAR B SYLLABLE B062 PTE;Lo;0;L;;;;;N;;;;;
+10048;LINEAR B SYLLABLE B076 RA2;Lo;0;L;;;;;N;;;;;
+10049;LINEAR B SYLLABLE B033 RA3;Lo;0;L;;;;;N;;;;;
+1004A;LINEAR B SYLLABLE B068 RO2;Lo;0;L;;;;;N;;;;;
+1004B;LINEAR B SYLLABLE B066 TA2;Lo;0;L;;;;;N;;;;;
+1004C;LINEAR B SYLLABLE B087 TWE;Lo;0;L;;;;;N;;;;;
+1004D;LINEAR B SYLLABLE B091 TWO;Lo;0;L;;;;;N;;;;;
+10050;LINEAR B SYMBOL B018;Lo;0;L;;;;;N;;;;;
+10051;LINEAR B SYMBOL B019;Lo;0;L;;;;;N;;;;;
+10052;LINEAR B SYMBOL B022;Lo;0;L;;;;;N;;;;;
+10053;LINEAR B SYMBOL B034;Lo;0;L;;;;;N;;;;;
+10054;LINEAR B SYMBOL B047;Lo;0;L;;;;;N;;;;;
+10055;LINEAR B SYMBOL B049;Lo;0;L;;;;;N;;;;;
+10056;LINEAR B SYMBOL B056;Lo;0;L;;;;;N;;;;;
+10057;LINEAR B SYMBOL B063;Lo;0;L;;;;;N;;;;;
+10058;LINEAR B SYMBOL B064;Lo;0;L;;;;;N;;;;;
+10059;LINEAR B SYMBOL B079;Lo;0;L;;;;;N;;;;;
+1005A;LINEAR B SYMBOL B082;Lo;0;L;;;;;N;;;;;
+1005B;LINEAR B SYMBOL B083;Lo;0;L;;;;;N;;;;;
+1005C;LINEAR B SYMBOL B086;Lo;0;L;;;;;N;;;;;
+1005D;LINEAR B SYMBOL B089;Lo;0;L;;;;;N;;;;;
+10080;LINEAR B IDEOGRAM B100 MAN;Lo;0;L;;;;;N;;;;;
+10081;LINEAR B IDEOGRAM B102 WOMAN;Lo;0;L;;;;;N;;;;;
+10082;LINEAR B IDEOGRAM B104 DEER;Lo;0;L;;;;;N;;;;;
+10083;LINEAR B IDEOGRAM B105 EQUID;Lo;0;L;;;;;N;;;;;
+10084;LINEAR B IDEOGRAM B105F MARE;Lo;0;L;;;;;N;;;;;
+10085;LINEAR B IDEOGRAM B105M STALLION;Lo;0;L;;;;;N;;;;;
+10086;LINEAR B IDEOGRAM B106F EWE;Lo;0;L;;;;;N;;;;;
+10087;LINEAR B IDEOGRAM B106M RAM;Lo;0;L;;;;;N;;;;;
+10088;LINEAR B IDEOGRAM B107F SHE-GOAT;Lo;0;L;;;;;N;;;;;
+10089;LINEAR B IDEOGRAM B107M HE-GOAT;Lo;0;L;;;;;N;;;;;
+1008A;LINEAR B IDEOGRAM B108F SOW;Lo;0;L;;;;;N;;;;;
+1008B;LINEAR B IDEOGRAM B108M BOAR;Lo;0;L;;;;;N;;;;;
+1008C;LINEAR B IDEOGRAM B109F COW;Lo;0;L;;;;;N;;;;;
+1008D;LINEAR B IDEOGRAM B109M BULL;Lo;0;L;;;;;N;;;;;
+1008E;LINEAR B IDEOGRAM B120 WHEAT;Lo;0;L;;;;;N;;;;;
+1008F;LINEAR B IDEOGRAM B121 BARLEY;Lo;0;L;;;;;N;;;;;
+10090;LINEAR B IDEOGRAM B122 OLIVE;Lo;0;L;;;;;N;;;;;
+10091;LINEAR B IDEOGRAM B123 SPICE;Lo;0;L;;;;;N;;;;;
+10092;LINEAR B IDEOGRAM B125 CYPERUS;Lo;0;L;;;;;N;;;;;
+10093;LINEAR B MONOGRAM B127 KAPO;Lo;0;L;;;;;N;;;;;
+10094;LINEAR B MONOGRAM B128 KANAKO;Lo;0;L;;;;;N;;;;;
+10095;LINEAR B IDEOGRAM B130 OIL;Lo;0;L;;;;;N;;;;;
+10096;LINEAR B IDEOGRAM B131 WINE;Lo;0;L;;;;;N;;;;;
+10097;LINEAR B IDEOGRAM B132;Lo;0;L;;;;;N;;;;;
+10098;LINEAR B MONOGRAM B133 AREPA;Lo;0;L;;;;;N;;;;;
+10099;LINEAR B MONOGRAM B135 MERI;Lo;0;L;;;;;N;;;;;
+1009A;LINEAR B IDEOGRAM B140 BRONZE;Lo;0;L;;;;;N;;;;;
+1009B;LINEAR B IDEOGRAM B141 GOLD;Lo;0;L;;;;;N;;;;;
+1009C;LINEAR B IDEOGRAM B142;Lo;0;L;;;;;N;;;;;
+1009D;LINEAR B IDEOGRAM B145 WOOL;Lo;0;L;;;;;N;;;;;
+1009E;LINEAR B IDEOGRAM B146;Lo;0;L;;;;;N;;;;;
+1009F;LINEAR B IDEOGRAM B150;Lo;0;L;;;;;N;;;;;
+100A0;LINEAR B IDEOGRAM B151 HORN;Lo;0;L;;;;;N;;;;;
+100A1;LINEAR B IDEOGRAM B152;Lo;0;L;;;;;N;;;;;
+100A2;LINEAR B IDEOGRAM B153;Lo;0;L;;;;;N;;;;;
+100A3;LINEAR B IDEOGRAM B154;Lo;0;L;;;;;N;;;;;
+100A4;LINEAR B MONOGRAM B156 TURO2;Lo;0;L;;;;;N;;;;;
+100A5;LINEAR B IDEOGRAM B157;Lo;0;L;;;;;N;;;;;
+100A6;LINEAR B IDEOGRAM B158;Lo;0;L;;;;;N;;;;;
+100A7;LINEAR B IDEOGRAM B159 CLOTH;Lo;0;L;;;;;N;;;;;
+100A8;LINEAR B IDEOGRAM B160;Lo;0;L;;;;;N;;;;;
+100A9;LINEAR B IDEOGRAM B161;Lo;0;L;;;;;N;;;;;
+100AA;LINEAR B IDEOGRAM B162 GARMENT;Lo;0;L;;;;;N;;;;;
+100AB;LINEAR B IDEOGRAM B163 ARMOUR;Lo;0;L;;;;;N;;;;;
+100AC;LINEAR B IDEOGRAM B164;Lo;0;L;;;;;N;;;;;
+100AD;LINEAR B IDEOGRAM B165;Lo;0;L;;;;;N;;;;;
+100AE;LINEAR B IDEOGRAM B166;Lo;0;L;;;;;N;;;;;
+100AF;LINEAR B IDEOGRAM B167;Lo;0;L;;;;;N;;;;;
+100B0;LINEAR B IDEOGRAM B168;Lo;0;L;;;;;N;;;;;
+100B1;LINEAR B IDEOGRAM B169;Lo;0;L;;;;;N;;;;;
+100B2;LINEAR B IDEOGRAM B170;Lo;0;L;;;;;N;;;;;
+100B3;LINEAR B IDEOGRAM B171;Lo;0;L;;;;;N;;;;;
+100B4;LINEAR B IDEOGRAM B172;Lo;0;L;;;;;N;;;;;
+100B5;LINEAR B IDEOGRAM B173 MONTH;Lo;0;L;;;;;N;;;;;
+100B6;LINEAR B IDEOGRAM B174;Lo;0;L;;;;;N;;;;;
+100B7;LINEAR B IDEOGRAM B176 TREE;Lo;0;L;;;;;N;;;;;
+100B8;LINEAR B IDEOGRAM B177;Lo;0;L;;;;;N;;;;;
+100B9;LINEAR B IDEOGRAM B178;Lo;0;L;;;;;N;;;;;
+100BA;LINEAR B IDEOGRAM B179;Lo;0;L;;;;;N;;;;;
+100BB;LINEAR B IDEOGRAM B180;Lo;0;L;;;;;N;;;;;
+100BC;LINEAR B IDEOGRAM B181;Lo;0;L;;;;;N;;;;;
+100BD;LINEAR B IDEOGRAM B182;Lo;0;L;;;;;N;;;;;
+100BE;LINEAR B IDEOGRAM B183;Lo;0;L;;;;;N;;;;;
+100BF;LINEAR B IDEOGRAM B184;Lo;0;L;;;;;N;;;;;
+100C0;LINEAR B IDEOGRAM B185;Lo;0;L;;;;;N;;;;;
+100C1;LINEAR B IDEOGRAM B189;Lo;0;L;;;;;N;;;;;
+100C2;LINEAR B IDEOGRAM B190;Lo;0;L;;;;;N;;;;;
+100C3;LINEAR B IDEOGRAM B191 HELMET;Lo;0;L;;;;;N;;;;;
+100C4;LINEAR B IDEOGRAM B220 FOOTSTOOL;Lo;0;L;;;;;N;;;;;
+100C5;LINEAR B IDEOGRAM B225 BATHTUB;Lo;0;L;;;;;N;;;;;
+100C6;LINEAR B IDEOGRAM B230 SPEAR;Lo;0;L;;;;;N;;;;;
+100C7;LINEAR B IDEOGRAM B231 ARROW;Lo;0;L;;;;;N;;;;;
+100C8;LINEAR B IDEOGRAM B232;Lo;0;L;;;;;N;;;;;
+100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;;;;
+100CA;LINEAR B IDEOGRAM B234;Lo;0;L;;;;;N;;;;;
+100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;;;;
+100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT;Lo;0;L;;;;;N;;;;;
+100CD;LINEAR B IDEOGRAM B241 CHARIOT;Lo;0;L;;;;;N;;;;;
+100CE;LINEAR B IDEOGRAM B242 CHARIOT FRAME;Lo;0;L;;;;;N;;;;;
+100CF;LINEAR B IDEOGRAM B243 WHEEL;Lo;0;L;;;;;N;;;;;
+100D0;LINEAR B IDEOGRAM B245;Lo;0;L;;;;;N;;;;;
+100D1;LINEAR B IDEOGRAM B246;Lo;0;L;;;;;N;;;;;
+100D2;LINEAR B MONOGRAM B247 DIPTE;Lo;0;L;;;;;N;;;;;
+100D3;LINEAR B IDEOGRAM B248;Lo;0;L;;;;;N;;;;;
+100D4;LINEAR B IDEOGRAM B249;Lo;0;L;;;;;N;;;;;
+100D5;LINEAR B IDEOGRAM B251;Lo;0;L;;;;;N;;;;;
+100D6;LINEAR B IDEOGRAM B252;Lo;0;L;;;;;N;;;;;
+100D7;LINEAR B IDEOGRAM B253;Lo;0;L;;;;;N;;;;;
+100D8;LINEAR B IDEOGRAM B254 DART;Lo;0;L;;;;;N;;;;;
+100D9;LINEAR B IDEOGRAM B255;Lo;0;L;;;;;N;;;;;
+100DA;LINEAR B IDEOGRAM B256;Lo;0;L;;;;;N;;;;;
+100DB;LINEAR B IDEOGRAM B257;Lo;0;L;;;;;N;;;;;
+100DC;LINEAR B IDEOGRAM B258;Lo;0;L;;;;;N;;;;;
+100DD;LINEAR B IDEOGRAM B259;Lo;0;L;;;;;N;;;;;
+100DE;LINEAR B IDEOGRAM VESSEL B155;Lo;0;L;;;;;N;;;;;
+100DF;LINEAR B IDEOGRAM VESSEL B200;Lo;0;L;;;;;N;;;;;
+100E0;LINEAR B IDEOGRAM VESSEL B201;Lo;0;L;;;;;N;;;;;
+100E1;LINEAR B IDEOGRAM VESSEL B202;Lo;0;L;;;;;N;;;;;
+100E2;LINEAR B IDEOGRAM VESSEL B203;Lo;0;L;;;;;N;;;;;
+100E3;LINEAR B IDEOGRAM VESSEL B204;Lo;0;L;;;;;N;;;;;
+100E4;LINEAR B IDEOGRAM VESSEL B205;Lo;0;L;;;;;N;;;;;
+100E5;LINEAR B IDEOGRAM VESSEL B206;Lo;0;L;;;;;N;;;;;
+100E6;LINEAR B IDEOGRAM VESSEL B207;Lo;0;L;;;;;N;;;;;
+100E7;LINEAR B IDEOGRAM VESSEL B208;Lo;0;L;;;;;N;;;;;
+100E8;LINEAR B IDEOGRAM VESSEL B209;Lo;0;L;;;;;N;;;;;
+100E9;LINEAR B IDEOGRAM VESSEL B210;Lo;0;L;;;;;N;;;;;
+100EA;LINEAR B IDEOGRAM VESSEL B211;Lo;0;L;;;;;N;;;;;
+100EB;LINEAR B IDEOGRAM VESSEL B212;Lo;0;L;;;;;N;;;;;
+100EC;LINEAR B IDEOGRAM VESSEL B213;Lo;0;L;;;;;N;;;;;
+100ED;LINEAR B IDEOGRAM VESSEL B214;Lo;0;L;;;;;N;;;;;
+100EE;LINEAR B IDEOGRAM VESSEL B215;Lo;0;L;;;;;N;;;;;
+100EF;LINEAR B IDEOGRAM VESSEL B216;Lo;0;L;;;;;N;;;;;
+100F0;LINEAR B IDEOGRAM VESSEL B217;Lo;0;L;;;;;N;;;;;
+100F1;LINEAR B IDEOGRAM VESSEL B218;Lo;0;L;;;;;N;;;;;
+100F2;LINEAR B IDEOGRAM VESSEL B219;Lo;0;L;;;;;N;;;;;
+100F3;LINEAR B IDEOGRAM VESSEL B221;Lo;0;L;;;;;N;;;;;
+100F4;LINEAR B IDEOGRAM VESSEL B222;Lo;0;L;;;;;N;;;;;
+100F5;LINEAR B IDEOGRAM VESSEL B226;Lo;0;L;;;;;N;;;;;
+100F6;LINEAR B IDEOGRAM VESSEL B227;Lo;0;L;;;;;N;;;;;
+100F7;LINEAR B IDEOGRAM VESSEL B228;Lo;0;L;;;;;N;;;;;
+100F8;LINEAR B IDEOGRAM VESSEL B229;Lo;0;L;;;;;N;;;;;
+100F9;LINEAR B IDEOGRAM VESSEL B250;Lo;0;L;;;;;N;;;;;
+100FA;LINEAR B IDEOGRAM VESSEL B305;Lo;0;L;;;;;N;;;;;
+10100;AEGEAN WORD SEPARATOR LINE;Po;0;L;;;;;N;;;;;
+10101;AEGEAN WORD SEPARATOR DOT;Po;0;ON;;;;;N;;;;;
+10102;AEGEAN CHECK MARK;Po;0;L;;;;;N;;;;;
+10107;AEGEAN NUMBER ONE;No;0;L;;;;1;N;;;;;
+10108;AEGEAN NUMBER TWO;No;0;L;;;;2;N;;;;;
+10109;AEGEAN NUMBER THREE;No;0;L;;;;3;N;;;;;
+1010A;AEGEAN NUMBER FOUR;No;0;L;;;;4;N;;;;;
+1010B;AEGEAN NUMBER FIVE;No;0;L;;;;5;N;;;;;
+1010C;AEGEAN NUMBER SIX;No;0;L;;;;6;N;;;;;
+1010D;AEGEAN NUMBER SEVEN;No;0;L;;;;7;N;;;;;
+1010E;AEGEAN NUMBER EIGHT;No;0;L;;;;8;N;;;;;
+1010F;AEGEAN NUMBER NINE;No;0;L;;;;9;N;;;;;
+10110;AEGEAN NUMBER TEN;No;0;L;;;;10;N;;;;;
+10111;AEGEAN NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+10112;AEGEAN NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+10113;AEGEAN NUMBER FORTY;No;0;L;;;;40;N;;;;;
+10114;AEGEAN NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+10115;AEGEAN NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+10116;AEGEAN NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+10117;AEGEAN NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+10118;AEGEAN NUMBER NINETY;No;0;L;;;;90;N;;;;;
+10119;AEGEAN NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+1011A;AEGEAN NUMBER TWO HUNDRED;No;0;L;;;;200;N;;;;;
+1011B;AEGEAN NUMBER THREE HUNDRED;No;0;L;;;;300;N;;;;;
+1011C;AEGEAN NUMBER FOUR HUNDRED;No;0;L;;;;400;N;;;;;
+1011D;AEGEAN NUMBER FIVE HUNDRED;No;0;L;;;;500;N;;;;;
+1011E;AEGEAN NUMBER SIX HUNDRED;No;0;L;;;;600;N;;;;;
+1011F;AEGEAN NUMBER SEVEN HUNDRED;No;0;L;;;;700;N;;;;;
+10120;AEGEAN NUMBER EIGHT HUNDRED;No;0;L;;;;800;N;;;;;
+10121;AEGEAN NUMBER NINE HUNDRED;No;0;L;;;;900;N;;;;;
+10122;AEGEAN NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+10123;AEGEAN NUMBER TWO THOUSAND;No;0;L;;;;2000;N;;;;;
+10124;AEGEAN NUMBER THREE THOUSAND;No;0;L;;;;3000;N;;;;;
+10125;AEGEAN NUMBER FOUR THOUSAND;No;0;L;;;;4000;N;;;;;
+10126;AEGEAN NUMBER FIVE THOUSAND;No;0;L;;;;5000;N;;;;;
+10127;AEGEAN NUMBER SIX THOUSAND;No;0;L;;;;6000;N;;;;;
+10128;AEGEAN NUMBER SEVEN THOUSAND;No;0;L;;;;7000;N;;;;;
+10129;AEGEAN NUMBER EIGHT THOUSAND;No;0;L;;;;8000;N;;;;;
+1012A;AEGEAN NUMBER NINE THOUSAND;No;0;L;;;;9000;N;;;;;
+1012B;AEGEAN NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
+1012C;AEGEAN NUMBER TWENTY THOUSAND;No;0;L;;;;20000;N;;;;;
+1012D;AEGEAN NUMBER THIRTY THOUSAND;No;0;L;;;;30000;N;;;;;
+1012E;AEGEAN NUMBER FORTY THOUSAND;No;0;L;;;;40000;N;;;;;
+1012F;AEGEAN NUMBER FIFTY THOUSAND;No;0;L;;;;50000;N;;;;;
+10130;AEGEAN NUMBER SIXTY THOUSAND;No;0;L;;;;60000;N;;;;;
+10131;AEGEAN NUMBER SEVENTY THOUSAND;No;0;L;;;;70000;N;;;;;
+10132;AEGEAN NUMBER EIGHTY THOUSAND;No;0;L;;;;80000;N;;;;;
+10133;AEGEAN NUMBER NINETY THOUSAND;No;0;L;;;;90000;N;;;;;
+10137;AEGEAN WEIGHT BASE UNIT;So;0;L;;;;;N;;;;;
+10138;AEGEAN WEIGHT FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+10139;AEGEAN WEIGHT SECOND SUBUNIT;So;0;L;;;;;N;;;;;
+1013A;AEGEAN WEIGHT THIRD SUBUNIT;So;0;L;;;;;N;;;;;
+1013B;AEGEAN WEIGHT FOURTH SUBUNIT;So;0;L;;;;;N;;;;;
+1013C;AEGEAN DRY MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+1013D;AEGEAN LIQUID MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+1013E;AEGEAN MEASURE SECOND SUBUNIT;So;0;L;;;;;N;;;;;
+1013F;AEGEAN MEASURE THIRD SUBUNIT;So;0;L;;;;;N;;;;;
+10140;GREEK ACROPHONIC ATTIC ONE QUARTER;Nl;0;ON;;;;1/4;N;;;;;
+10141;GREEK ACROPHONIC ATTIC ONE HALF;Nl;0;ON;;;;1/2;N;;;;;
+10142;GREEK ACROPHONIC ATTIC ONE DRACHMA;Nl;0;ON;;;;1;N;;;;;
+10143;GREEK ACROPHONIC ATTIC FIVE;Nl;0;ON;;;;5;N;;;;;
+10144;GREEK ACROPHONIC ATTIC FIFTY;Nl;0;ON;;;;50;N;;;;;
+10145;GREEK ACROPHONIC ATTIC FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10146;GREEK ACROPHONIC ATTIC FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
+10147;GREEK ACROPHONIC ATTIC FIFTY THOUSAND;Nl;0;ON;;;;50000;N;;;;;
+10148;GREEK ACROPHONIC ATTIC FIVE TALENTS;Nl;0;ON;;;;5;N;;;;;
+10149;GREEK ACROPHONIC ATTIC TEN TALENTS;Nl;0;ON;;;;10;N;;;;;
+1014A;GREEK ACROPHONIC ATTIC FIFTY TALENTS;Nl;0;ON;;;;50;N;;;;;
+1014B;GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS;Nl;0;ON;;;;100;N;;;;;
+1014C;GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS;Nl;0;ON;;;;500;N;;;;;
+1014D;GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS;Nl;0;ON;;;;1000;N;;;;;
+1014E;GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS;Nl;0;ON;;;;5000;N;;;;;
+1014F;GREEK ACROPHONIC ATTIC FIVE STATERS;Nl;0;ON;;;;5;N;;;;;
+10150;GREEK ACROPHONIC ATTIC TEN STATERS;Nl;0;ON;;;;10;N;;;;;
+10151;GREEK ACROPHONIC ATTIC FIFTY STATERS;Nl;0;ON;;;;50;N;;;;;
+10152;GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS;Nl;0;ON;;;;100;N;;;;;
+10153;GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS;Nl;0;ON;;;;500;N;;;;;
+10154;GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS;Nl;0;ON;;;;1000;N;;;;;
+10155;GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS;Nl;0;ON;;;;10000;N;;;;;
+10156;GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS;Nl;0;ON;;;;50000;N;;;;;
+10157;GREEK ACROPHONIC ATTIC TEN MNAS;Nl;0;ON;;;;10;N;;;;;
+10158;GREEK ACROPHONIC HERAEUM ONE PLETHRON;Nl;0;ON;;;;1;N;;;;;
+10159;GREEK ACROPHONIC THESPIAN ONE;Nl;0;ON;;;;1;N;;;;;
+1015A;GREEK ACROPHONIC HERMIONIAN ONE;Nl;0;ON;;;;1;N;;;;;
+1015B;GREEK ACROPHONIC EPIDAUREAN TWO;Nl;0;ON;;;;2;N;;;;;
+1015C;GREEK ACROPHONIC THESPIAN TWO;Nl;0;ON;;;;2;N;;;;;
+1015D;GREEK ACROPHONIC CYRENAIC TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
+1015E;GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
+1015F;GREEK ACROPHONIC TROEZENIAN FIVE;Nl;0;ON;;;;5;N;;;;;
+10160;GREEK ACROPHONIC TROEZENIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10161;GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM;Nl;0;ON;;;;10;N;;;;;
+10162;GREEK ACROPHONIC HERMIONIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10163;GREEK ACROPHONIC MESSENIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10164;GREEK ACROPHONIC THESPIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10165;GREEK ACROPHONIC THESPIAN THIRTY;Nl;0;ON;;;;30;N;;;;;
+10166;GREEK ACROPHONIC TROEZENIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+10167;GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM;Nl;0;ON;;;;50;N;;;;;
+10168;GREEK ACROPHONIC HERMIONIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+10169;GREEK ACROPHONIC THESPIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+1016A;GREEK ACROPHONIC THESPIAN ONE HUNDRED;Nl;0;ON;;;;100;N;;;;;
+1016B;GREEK ACROPHONIC THESPIAN THREE HUNDRED;Nl;0;ON;;;;300;N;;;;;
+1016C;GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016D;GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016E;GREEK ACROPHONIC THESPIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016F;GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10170;GREEK ACROPHONIC NAXIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10171;GREEK ACROPHONIC THESPIAN ONE THOUSAND;Nl;0;ON;;;;1000;N;;;;;
+10172;GREEK ACROPHONIC THESPIAN FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
+10173;GREEK ACROPHONIC DELPHIC FIVE MNAS;Nl;0;ON;;;;5;N;;;;;
+10174;GREEK ACROPHONIC STRATIAN FIFTY MNAS;Nl;0;ON;;;;50;N;;;;;
+10175;GREEK ONE HALF SIGN;No;0;ON;;;;1/2;N;;;;;
+10176;GREEK ONE HALF SIGN ALTERNATE FORM;No;0;ON;;;;1/2;N;;;;;
+10177;GREEK TWO THIRDS SIGN;No;0;ON;;;;2/3;N;;;;;
+10178;GREEK THREE QUARTERS SIGN;No;0;ON;;;;3/4;N;;;;;
+10179;GREEK YEAR SIGN;So;0;ON;;;;;N;;;;;
+1017A;GREEK TALENT SIGN;So;0;ON;;;;;N;;;;;
+1017B;GREEK DRACHMA SIGN;So;0;ON;;;;;N;;;;;
+1017C;GREEK OBOL SIGN;So;0;ON;;;;;N;;;;;
+1017D;GREEK TWO OBOLS SIGN;So;0;ON;;;;;N;;;;;
+1017E;GREEK THREE OBOLS SIGN;So;0;ON;;;;;N;;;;;
+1017F;GREEK FOUR OBOLS SIGN;So;0;ON;;;;;N;;;;;
+10180;GREEK FIVE OBOLS SIGN;So;0;ON;;;;;N;;;;;
+10181;GREEK METRETES SIGN;So;0;ON;;;;;N;;;;;
+10182;GREEK KYATHOS BASE SIGN;So;0;ON;;;;;N;;;;;
+10183;GREEK LITRA SIGN;So;0;ON;;;;;N;;;;;
+10184;GREEK OUNKIA SIGN;So;0;ON;;;;;N;;;;;
+10185;GREEK XESTES SIGN;So;0;ON;;;;;N;;;;;
+10186;GREEK ARTABE SIGN;So;0;ON;;;;;N;;;;;
+10187;GREEK AROURA SIGN;So;0;ON;;;;;N;;;;;
+10188;GREEK GRAMMA SIGN;So;0;ON;;;;;N;;;;;
+10189;GREEK TRYBLION BASE SIGN;So;0;ON;;;;;N;;;;;
+1018A;GREEK ZERO SIGN;No;0;ON;;;;0;N;;;;;
+1018B;GREEK ONE QUARTER SIGN;No;0;ON;;;;1/4;N;;;;;
+1018C;GREEK SINUSOID SIGN;So;0;ON;;;;;N;;;;;
+1018D;GREEK INDICTION SIGN;So;0;L;;;;;N;;;;;
+1018E;NOMISMA SIGN;So;0;L;;;;;N;;;;;
+10190;ROMAN SEXTANS SIGN;So;0;ON;;;;;N;;;;;
+10191;ROMAN UNCIA SIGN;So;0;ON;;;;;N;;;;;
+10192;ROMAN SEMUNCIA SIGN;So;0;ON;;;;;N;;;;;
+10193;ROMAN SEXTULA SIGN;So;0;ON;;;;;N;;;;;
+10194;ROMAN DIMIDIA SEXTULA SIGN;So;0;ON;;;;;N;;;;;
+10195;ROMAN SILIQUA SIGN;So;0;ON;;;;;N;;;;;
+10196;ROMAN DENARIUS SIGN;So;0;ON;;;;;N;;;;;
+10197;ROMAN QUINARIUS SIGN;So;0;ON;;;;;N;;;;;
+10198;ROMAN SESTERTIUS SIGN;So;0;ON;;;;;N;;;;;
+10199;ROMAN DUPONDIUS SIGN;So;0;ON;;;;;N;;;;;
+1019A;ROMAN AS SIGN;So;0;ON;;;;;N;;;;;
+1019B;ROMAN CENTURIAL SIGN;So;0;ON;;;;;N;;;;;
+1019C;ASCIA SYMBOL;So;0;ON;;;;;N;;;;;
+101A0;GREEK SYMBOL TAU RHO;So;0;ON;;;;;N;;;;;
+101D0;PHAISTOS DISC SIGN PEDESTRIAN;So;0;L;;;;;N;;;;;
+101D1;PHAISTOS DISC SIGN PLUMED HEAD;So;0;L;;;;;N;;;;;
+101D2;PHAISTOS DISC SIGN TATTOOED HEAD;So;0;L;;;;;N;;;;;
+101D3;PHAISTOS DISC SIGN CAPTIVE;So;0;L;;;;;N;;;;;
+101D4;PHAISTOS DISC SIGN CHILD;So;0;L;;;;;N;;;;;
+101D5;PHAISTOS DISC SIGN WOMAN;So;0;L;;;;;N;;;;;
+101D6;PHAISTOS DISC SIGN HELMET;So;0;L;;;;;N;;;;;
+101D7;PHAISTOS DISC SIGN GAUNTLET;So;0;L;;;;;N;;;;;
+101D8;PHAISTOS DISC SIGN TIARA;So;0;L;;;;;N;;;;;
+101D9;PHAISTOS DISC SIGN ARROW;So;0;L;;;;;N;;;;;
+101DA;PHAISTOS DISC SIGN BOW;So;0;L;;;;;N;;;;;
+101DB;PHAISTOS DISC SIGN SHIELD;So;0;L;;;;;N;;;;;
+101DC;PHAISTOS DISC SIGN CLUB;So;0;L;;;;;N;;;;;
+101DD;PHAISTOS DISC SIGN MANACLES;So;0;L;;;;;N;;;;;
+101DE;PHAISTOS DISC SIGN MATTOCK;So;0;L;;;;;N;;;;;
+101DF;PHAISTOS DISC SIGN SAW;So;0;L;;;;;N;;;;;
+101E0;PHAISTOS DISC SIGN LID;So;0;L;;;;;N;;;;;
+101E1;PHAISTOS DISC SIGN BOOMERANG;So;0;L;;;;;N;;;;;
+101E2;PHAISTOS DISC SIGN CARPENTRY PLANE;So;0;L;;;;;N;;;;;
+101E3;PHAISTOS DISC SIGN DOLIUM;So;0;L;;;;;N;;;;;
+101E4;PHAISTOS DISC SIGN COMB;So;0;L;;;;;N;;;;;
+101E5;PHAISTOS DISC SIGN SLING;So;0;L;;;;;N;;;;;
+101E6;PHAISTOS DISC SIGN COLUMN;So;0;L;;;;;N;;;;;
+101E7;PHAISTOS DISC SIGN BEEHIVE;So;0;L;;;;;N;;;;;
+101E8;PHAISTOS DISC SIGN SHIP;So;0;L;;;;;N;;;;;
+101E9;PHAISTOS DISC SIGN HORN;So;0;L;;;;;N;;;;;
+101EA;PHAISTOS DISC SIGN HIDE;So;0;L;;;;;N;;;;;
+101EB;PHAISTOS DISC SIGN BULLS LEG;So;0;L;;;;;N;;;;;
+101EC;PHAISTOS DISC SIGN CAT;So;0;L;;;;;N;;;;;
+101ED;PHAISTOS DISC SIGN RAM;So;0;L;;;;;N;;;;;
+101EE;PHAISTOS DISC SIGN EAGLE;So;0;L;;;;;N;;;;;
+101EF;PHAISTOS DISC SIGN DOVE;So;0;L;;;;;N;;;;;
+101F0;PHAISTOS DISC SIGN TUNNY;So;0;L;;;;;N;;;;;
+101F1;PHAISTOS DISC SIGN BEE;So;0;L;;;;;N;;;;;
+101F2;PHAISTOS DISC SIGN PLANE TREE;So;0;L;;;;;N;;;;;
+101F3;PHAISTOS DISC SIGN VINE;So;0;L;;;;;N;;;;;
+101F4;PHAISTOS DISC SIGN PAPYRUS;So;0;L;;;;;N;;;;;
+101F5;PHAISTOS DISC SIGN ROSETTE;So;0;L;;;;;N;;;;;
+101F6;PHAISTOS DISC SIGN LILY;So;0;L;;;;;N;;;;;
+101F7;PHAISTOS DISC SIGN OX BACK;So;0;L;;;;;N;;;;;
+101F8;PHAISTOS DISC SIGN FLUTE;So;0;L;;;;;N;;;;;
+101F9;PHAISTOS DISC SIGN GRATER;So;0;L;;;;;N;;;;;
+101FA;PHAISTOS DISC SIGN STRAINER;So;0;L;;;;;N;;;;;
+101FB;PHAISTOS DISC SIGN SMALL AXE;So;0;L;;;;;N;;;;;
+101FC;PHAISTOS DISC SIGN WAVY BAND;So;0;L;;;;;N;;;;;
+101FD;PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE;Mn;220;NSM;;;;;N;;;;;
+10280;LYCIAN LETTER A;Lo;0;L;;;;;N;;;;;
+10281;LYCIAN LETTER E;Lo;0;L;;;;;N;;;;;
+10282;LYCIAN LETTER B;Lo;0;L;;;;;N;;;;;
+10283;LYCIAN LETTER BH;Lo;0;L;;;;;N;;;;;
+10284;LYCIAN LETTER G;Lo;0;L;;;;;N;;;;;
+10285;LYCIAN LETTER D;Lo;0;L;;;;;N;;;;;
+10286;LYCIAN LETTER I;Lo;0;L;;;;;N;;;;;
+10287;LYCIAN LETTER W;Lo;0;L;;;;;N;;;;;
+10288;LYCIAN LETTER Z;Lo;0;L;;;;;N;;;;;
+10289;LYCIAN LETTER TH;Lo;0;L;;;;;N;;;;;
+1028A;LYCIAN LETTER J;Lo;0;L;;;;;N;;;;;
+1028B;LYCIAN LETTER K;Lo;0;L;;;;;N;;;;;
+1028C;LYCIAN LETTER Q;Lo;0;L;;;;;N;;;;;
+1028D;LYCIAN LETTER L;Lo;0;L;;;;;N;;;;;
+1028E;LYCIAN LETTER M;Lo;0;L;;;;;N;;;;;
+1028F;LYCIAN LETTER N;Lo;0;L;;;;;N;;;;;
+10290;LYCIAN LETTER MM;Lo;0;L;;;;;N;;;;;
+10291;LYCIAN LETTER NN;Lo;0;L;;;;;N;;;;;
+10292;LYCIAN LETTER U;Lo;0;L;;;;;N;;;;;
+10293;LYCIAN LETTER P;Lo;0;L;;;;;N;;;;;
+10294;LYCIAN LETTER KK;Lo;0;L;;;;;N;;;;;
+10295;LYCIAN LETTER R;Lo;0;L;;;;;N;;;;;
+10296;LYCIAN LETTER S;Lo;0;L;;;;;N;;;;;
+10297;LYCIAN LETTER T;Lo;0;L;;;;;N;;;;;
+10298;LYCIAN LETTER TT;Lo;0;L;;;;;N;;;;;
+10299;LYCIAN LETTER AN;Lo;0;L;;;;;N;;;;;
+1029A;LYCIAN LETTER EN;Lo;0;L;;;;;N;;;;;
+1029B;LYCIAN LETTER H;Lo;0;L;;;;;N;;;;;
+1029C;LYCIAN LETTER X;Lo;0;L;;;;;N;;;;;
+102A0;CARIAN LETTER A;Lo;0;L;;;;;N;;;;;
+102A1;CARIAN LETTER P2;Lo;0;L;;;;;N;;;;;
+102A2;CARIAN LETTER D;Lo;0;L;;;;;N;;;;;
+102A3;CARIAN LETTER L;Lo;0;L;;;;;N;;;;;
+102A4;CARIAN LETTER UUU;Lo;0;L;;;;;N;;;;;
+102A5;CARIAN LETTER R;Lo;0;L;;;;;N;;;;;
+102A6;CARIAN LETTER LD;Lo;0;L;;;;;N;;;;;
+102A7;CARIAN LETTER A2;Lo;0;L;;;;;N;;;;;
+102A8;CARIAN LETTER Q;Lo;0;L;;;;;N;;;;;
+102A9;CARIAN LETTER B;Lo;0;L;;;;;N;;;;;
+102AA;CARIAN LETTER M;Lo;0;L;;;;;N;;;;;
+102AB;CARIAN LETTER O;Lo;0;L;;;;;N;;;;;
+102AC;CARIAN LETTER D2;Lo;0;L;;;;;N;;;;;
+102AD;CARIAN LETTER T;Lo;0;L;;;;;N;;;;;
+102AE;CARIAN LETTER SH;Lo;0;L;;;;;N;;;;;
+102AF;CARIAN LETTER SH2;Lo;0;L;;;;;N;;;;;
+102B0;CARIAN LETTER S;Lo;0;L;;;;;N;;;;;
+102B1;CARIAN LETTER C-18;Lo;0;L;;;;;N;;;;;
+102B2;CARIAN LETTER U;Lo;0;L;;;;;N;;;;;
+102B3;CARIAN LETTER NN;Lo;0;L;;;;;N;;;;;
+102B4;CARIAN LETTER X;Lo;0;L;;;;;N;;;;;
+102B5;CARIAN LETTER N;Lo;0;L;;;;;N;;;;;
+102B6;CARIAN LETTER TT2;Lo;0;L;;;;;N;;;;;
+102B7;CARIAN LETTER P;Lo;0;L;;;;;N;;;;;
+102B8;CARIAN LETTER SS;Lo;0;L;;;;;N;;;;;
+102B9;CARIAN LETTER I;Lo;0;L;;;;;N;;;;;
+102BA;CARIAN LETTER E;Lo;0;L;;;;;N;;;;;
+102BB;CARIAN LETTER UUUU;Lo;0;L;;;;;N;;;;;
+102BC;CARIAN LETTER K;Lo;0;L;;;;;N;;;;;
+102BD;CARIAN LETTER K2;Lo;0;L;;;;;N;;;;;
+102BE;CARIAN LETTER ND;Lo;0;L;;;;;N;;;;;
+102BF;CARIAN LETTER UU;Lo;0;L;;;;;N;;;;;
+102C0;CARIAN LETTER G;Lo;0;L;;;;;N;;;;;
+102C1;CARIAN LETTER G2;Lo;0;L;;;;;N;;;;;
+102C2;CARIAN LETTER ST;Lo;0;L;;;;;N;;;;;
+102C3;CARIAN LETTER ST2;Lo;0;L;;;;;N;;;;;
+102C4;CARIAN LETTER NG;Lo;0;L;;;;;N;;;;;
+102C5;CARIAN LETTER II;Lo;0;L;;;;;N;;;;;
+102C6;CARIAN LETTER C-39;Lo;0;L;;;;;N;;;;;
+102C7;CARIAN LETTER TT;Lo;0;L;;;;;N;;;;;
+102C8;CARIAN LETTER UUU2;Lo;0;L;;;;;N;;;;;
+102C9;CARIAN LETTER RR;Lo;0;L;;;;;N;;;;;
+102CA;CARIAN LETTER MB;Lo;0;L;;;;;N;;;;;
+102CB;CARIAN LETTER MB2;Lo;0;L;;;;;N;;;;;
+102CC;CARIAN LETTER MB3;Lo;0;L;;;;;N;;;;;
+102CD;CARIAN LETTER MB4;Lo;0;L;;;;;N;;;;;
+102CE;CARIAN LETTER LD2;Lo;0;L;;;;;N;;;;;
+102CF;CARIAN LETTER E2;Lo;0;L;;;;;N;;;;;
+102D0;CARIAN LETTER UUU3;Lo;0;L;;;;;N;;;;;
+102E0;COPTIC EPACT THOUSANDS MARK;Mn;220;NSM;;;;;N;;;;;
+102E1;COPTIC EPACT DIGIT ONE;No;0;EN;;;;1;N;;;;;
+102E2;COPTIC EPACT DIGIT TWO;No;0;EN;;;;2;N;;;;;
+102E3;COPTIC EPACT DIGIT THREE;No;0;EN;;;;3;N;;;;;
+102E4;COPTIC EPACT DIGIT FOUR;No;0;EN;;;;4;N;;;;;
+102E5;COPTIC EPACT DIGIT FIVE;No;0;EN;;;;5;N;;;;;
+102E6;COPTIC EPACT DIGIT SIX;No;0;EN;;;;6;N;;;;;
+102E7;COPTIC EPACT DIGIT SEVEN;No;0;EN;;;;7;N;;;;;
+102E8;COPTIC EPACT DIGIT EIGHT;No;0;EN;;;;8;N;;;;;
+102E9;COPTIC EPACT DIGIT NINE;No;0;EN;;;;9;N;;;;;
+102EA;COPTIC EPACT NUMBER TEN;No;0;EN;;;;10;N;;;;;
+102EB;COPTIC EPACT NUMBER TWENTY;No;0;EN;;;;20;N;;;;;
+102EC;COPTIC EPACT NUMBER THIRTY;No;0;EN;;;;30;N;;;;;
+102ED;COPTIC EPACT NUMBER FORTY;No;0;EN;;;;40;N;;;;;
+102EE;COPTIC EPACT NUMBER FIFTY;No;0;EN;;;;50;N;;;;;
+102EF;COPTIC EPACT NUMBER SIXTY;No;0;EN;;;;60;N;;;;;
+102F0;COPTIC EPACT NUMBER SEVENTY;No;0;EN;;;;70;N;;;;;
+102F1;COPTIC EPACT NUMBER EIGHTY;No;0;EN;;;;80;N;;;;;
+102F2;COPTIC EPACT NUMBER NINETY;No;0;EN;;;;90;N;;;;;
+102F3;COPTIC EPACT NUMBER ONE HUNDRED;No;0;EN;;;;100;N;;;;;
+102F4;COPTIC EPACT NUMBER TWO HUNDRED;No;0;EN;;;;200;N;;;;;
+102F5;COPTIC EPACT NUMBER THREE HUNDRED;No;0;EN;;;;300;N;;;;;
+102F6;COPTIC EPACT NUMBER FOUR HUNDRED;No;0;EN;;;;400;N;;;;;
+102F7;COPTIC EPACT NUMBER FIVE HUNDRED;No;0;EN;;;;500;N;;;;;
+102F8;COPTIC EPACT NUMBER SIX HUNDRED;No;0;EN;;;;600;N;;;;;
+102F9;COPTIC EPACT NUMBER SEVEN HUNDRED;No;0;EN;;;;700;N;;;;;
+102FA;COPTIC EPACT NUMBER EIGHT HUNDRED;No;0;EN;;;;800;N;;;;;
+102FB;COPTIC EPACT NUMBER NINE HUNDRED;No;0;EN;;;;900;N;;;;;
+10300;OLD ITALIC LETTER A;Lo;0;L;;;;;N;;;;;
+10301;OLD ITALIC LETTER BE;Lo;0;L;;;;;N;;;;;
+10302;OLD ITALIC LETTER KE;Lo;0;L;;;;;N;;;;;
+10303;OLD ITALIC LETTER DE;Lo;0;L;;;;;N;;;;;
+10304;OLD ITALIC LETTER E;Lo;0;L;;;;;N;;;;;
+10305;OLD ITALIC LETTER VE;Lo;0;L;;;;;N;;;;;
+10306;OLD ITALIC LETTER ZE;Lo;0;L;;;;;N;;;;;
+10307;OLD ITALIC LETTER HE;Lo;0;L;;;;;N;;;;;
+10308;OLD ITALIC LETTER THE;Lo;0;L;;;;;N;;;;;
+10309;OLD ITALIC LETTER I;Lo;0;L;;;;;N;;;;;
+1030A;OLD ITALIC LETTER KA;Lo;0;L;;;;;N;;;;;
+1030B;OLD ITALIC LETTER EL;Lo;0;L;;;;;N;;;;;
+1030C;OLD ITALIC LETTER EM;Lo;0;L;;;;;N;;;;;
+1030D;OLD ITALIC LETTER EN;Lo;0;L;;;;;N;;;;;
+1030E;OLD ITALIC LETTER ESH;Lo;0;L;;;;;N;;;;;
+1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;;;;
+10310;OLD ITALIC LETTER PE;Lo;0;L;;;;;N;;;;;
+10311;OLD ITALIC LETTER SHE;Lo;0;L;;;;;N;;;;;
+10312;OLD ITALIC LETTER KU;Lo;0;L;;;;;N;;;;;
+10313;OLD ITALIC LETTER ER;Lo;0;L;;;;;N;;;;;
+10314;OLD ITALIC LETTER ES;Lo;0;L;;;;;N;;;;;
+10315;OLD ITALIC LETTER TE;Lo;0;L;;;;;N;;;;;
+10316;OLD ITALIC LETTER U;Lo;0;L;;;;;N;;;;;
+10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;;;;
+10318;OLD ITALIC LETTER PHE;Lo;0;L;;;;;N;;;;;
+10319;OLD ITALIC LETTER KHE;Lo;0;L;;;;;N;;;;;
+1031A;OLD ITALIC LETTER EF;Lo;0;L;;;;;N;;;;;
+1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;;;;
+1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;;;;
+1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;;;;
+1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;;;;
+1031F;OLD ITALIC LETTER ESS;Lo;0;L;;;;;N;;;;;
+10320;OLD ITALIC NUMERAL ONE;No;0;L;;;;1;N;;;;;
+10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
+10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;;
+1032D;OLD ITALIC LETTER YE;Lo;0;L;;;;;N;;;;;
+1032E;OLD ITALIC LETTER NORTHERN TSE;Lo;0;L;;;;;N;;;;;
+1032F;OLD ITALIC LETTER SOUTHERN TSE;Lo;0;L;;;;;N;;;;;
+10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;;
+10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;;
+10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;;
+10333;GOTHIC LETTER DAGS;Lo;0;L;;;;;N;;;;;
+10334;GOTHIC LETTER AIHVUS;Lo;0;L;;;;;N;;;;;
+10335;GOTHIC LETTER QAIRTHRA;Lo;0;L;;;;;N;;;;;
+10336;GOTHIC LETTER IUJA;Lo;0;L;;;;;N;;;;;
+10337;GOTHIC LETTER HAGL;Lo;0;L;;;;;N;;;;;
+10338;GOTHIC LETTER THIUTH;Lo;0;L;;;;;N;;;;;
+10339;GOTHIC LETTER EIS;Lo;0;L;;;;;N;;;;;
+1033A;GOTHIC LETTER KUSMA;Lo;0;L;;;;;N;;;;;
+1033B;GOTHIC LETTER LAGUS;Lo;0;L;;;;;N;;;;;
+1033C;GOTHIC LETTER MANNA;Lo;0;L;;;;;N;;;;;
+1033D;GOTHIC LETTER NAUTHS;Lo;0;L;;;;;N;;;;;
+1033E;GOTHIC LETTER JER;Lo;0;L;;;;;N;;;;;
+1033F;GOTHIC LETTER URUS;Lo;0;L;;;;;N;;;;;
+10340;GOTHIC LETTER PAIRTHRA;Lo;0;L;;;;;N;;;;;
+10341;GOTHIC LETTER NINETY;Nl;0;L;;;;90;N;;;;;
+10342;GOTHIC LETTER RAIDA;Lo;0;L;;;;;N;;;;;
+10343;GOTHIC LETTER SAUIL;Lo;0;L;;;;;N;;;;;
+10344;GOTHIC LETTER TEIWS;Lo;0;L;;;;;N;;;;;
+10345;GOTHIC LETTER WINJA;Lo;0;L;;;;;N;;;;;
+10346;GOTHIC LETTER FAIHU;Lo;0;L;;;;;N;;;;;
+10347;GOTHIC LETTER IGGWS;Lo;0;L;;;;;N;;;;;
+10348;GOTHIC LETTER HWAIR;Lo;0;L;;;;;N;;;;;
+10349;GOTHIC LETTER OTHAL;Lo;0;L;;;;;N;;;;;
+1034A;GOTHIC LETTER NINE HUNDRED;Nl;0;L;;;;900;N;;;;;
+10350;OLD PERMIC LETTER AN;Lo;0;L;;;;;N;;;;;
+10351;OLD PERMIC LETTER BUR;Lo;0;L;;;;;N;;;;;
+10352;OLD PERMIC LETTER GAI;Lo;0;L;;;;;N;;;;;
+10353;OLD PERMIC LETTER DOI;Lo;0;L;;;;;N;;;;;
+10354;OLD PERMIC LETTER E;Lo;0;L;;;;;N;;;;;
+10355;OLD PERMIC LETTER ZHOI;Lo;0;L;;;;;N;;;;;
+10356;OLD PERMIC LETTER DZHOI;Lo;0;L;;;;;N;;;;;
+10357;OLD PERMIC LETTER ZATA;Lo;0;L;;;;;N;;;;;
+10358;OLD PERMIC LETTER DZITA;Lo;0;L;;;;;N;;;;;
+10359;OLD PERMIC LETTER I;Lo;0;L;;;;;N;;;;;
+1035A;OLD PERMIC LETTER KOKE;Lo;0;L;;;;;N;;;;;
+1035B;OLD PERMIC LETTER LEI;Lo;0;L;;;;;N;;;;;
+1035C;OLD PERMIC LETTER MENOE;Lo;0;L;;;;;N;;;;;
+1035D;OLD PERMIC LETTER NENOE;Lo;0;L;;;;;N;;;;;
+1035E;OLD PERMIC LETTER VOOI;Lo;0;L;;;;;N;;;;;
+1035F;OLD PERMIC LETTER PEEI;Lo;0;L;;;;;N;;;;;
+10360;OLD PERMIC LETTER REI;Lo;0;L;;;;;N;;;;;
+10361;OLD PERMIC LETTER SII;Lo;0;L;;;;;N;;;;;
+10362;OLD PERMIC LETTER TAI;Lo;0;L;;;;;N;;;;;
+10363;OLD PERMIC LETTER U;Lo;0;L;;;;;N;;;;;
+10364;OLD PERMIC LETTER CHERY;Lo;0;L;;;;;N;;;;;
+10365;OLD PERMIC LETTER SHOOI;Lo;0;L;;;;;N;;;;;
+10366;OLD PERMIC LETTER SHCHOOI;Lo;0;L;;;;;N;;;;;
+10367;OLD PERMIC LETTER YRY;Lo;0;L;;;;;N;;;;;
+10368;OLD PERMIC LETTER YERU;Lo;0;L;;;;;N;;;;;
+10369;OLD PERMIC LETTER O;Lo;0;L;;;;;N;;;;;
+1036A;OLD PERMIC LETTER OO;Lo;0;L;;;;;N;;;;;
+1036B;OLD PERMIC LETTER EF;Lo;0;L;;;;;N;;;;;
+1036C;OLD PERMIC LETTER HA;Lo;0;L;;;;;N;;;;;
+1036D;OLD PERMIC LETTER TSIU;Lo;0;L;;;;;N;;;;;
+1036E;OLD PERMIC LETTER VER;Lo;0;L;;;;;N;;;;;
+1036F;OLD PERMIC LETTER YER;Lo;0;L;;;;;N;;;;;
+10370;OLD PERMIC LETTER YERI;Lo;0;L;;;;;N;;;;;
+10371;OLD PERMIC LETTER YAT;Lo;0;L;;;;;N;;;;;
+10372;OLD PERMIC LETTER IE;Lo;0;L;;;;;N;;;;;
+10373;OLD PERMIC LETTER YU;Lo;0;L;;;;;N;;;;;
+10374;OLD PERMIC LETTER YA;Lo;0;L;;;;;N;;;;;
+10375;OLD PERMIC LETTER IA;Lo;0;L;;;;;N;;;;;
+10376;COMBINING OLD PERMIC LETTER AN;Mn;230;NSM;;;;;N;;;;;
+10377;COMBINING OLD PERMIC LETTER DOI;Mn;230;NSM;;;;;N;;;;;
+10378;COMBINING OLD PERMIC LETTER ZATA;Mn;230;NSM;;;;;N;;;;;
+10379;COMBINING OLD PERMIC LETTER NENOE;Mn;230;NSM;;;;;N;;;;;
+1037A;COMBINING OLD PERMIC LETTER SII;Mn;230;NSM;;;;;N;;;;;
+10380;UGARITIC LETTER ALPA;Lo;0;L;;;;;N;;;;;
+10381;UGARITIC LETTER BETA;Lo;0;L;;;;;N;;;;;
+10382;UGARITIC LETTER GAMLA;Lo;0;L;;;;;N;;;;;
+10383;UGARITIC LETTER KHA;Lo;0;L;;;;;N;;;;;
+10384;UGARITIC LETTER DELTA;Lo;0;L;;;;;N;;;;;
+10385;UGARITIC LETTER HO;Lo;0;L;;;;;N;;;;;
+10386;UGARITIC LETTER WO;Lo;0;L;;;;;N;;;;;
+10387;UGARITIC LETTER ZETA;Lo;0;L;;;;;N;;;;;
+10388;UGARITIC LETTER HOTA;Lo;0;L;;;;;N;;;;;
+10389;UGARITIC LETTER TET;Lo;0;L;;;;;N;;;;;
+1038A;UGARITIC LETTER YOD;Lo;0;L;;;;;N;;;;;
+1038B;UGARITIC LETTER KAF;Lo;0;L;;;;;N;;;;;
+1038C;UGARITIC LETTER SHIN;Lo;0;L;;;;;N;;;;;
+1038D;UGARITIC LETTER LAMDA;Lo;0;L;;;;;N;;;;;
+1038E;UGARITIC LETTER MEM;Lo;0;L;;;;;N;;;;;
+1038F;UGARITIC LETTER DHAL;Lo;0;L;;;;;N;;;;;
+10390;UGARITIC LETTER NUN;Lo;0;L;;;;;N;;;;;
+10391;UGARITIC LETTER ZU;Lo;0;L;;;;;N;;;;;
+10392;UGARITIC LETTER SAMKA;Lo;0;L;;;;;N;;;;;
+10393;UGARITIC LETTER AIN;Lo;0;L;;;;;N;;;;;
+10394;UGARITIC LETTER PU;Lo;0;L;;;;;N;;;;;
+10395;UGARITIC LETTER SADE;Lo;0;L;;;;;N;;;;;
+10396;UGARITIC LETTER QOPA;Lo;0;L;;;;;N;;;;;
+10397;UGARITIC LETTER RASHA;Lo;0;L;;;;;N;;;;;
+10398;UGARITIC LETTER THANNA;Lo;0;L;;;;;N;;;;;
+10399;UGARITIC LETTER GHAIN;Lo;0;L;;;;;N;;;;;
+1039A;UGARITIC LETTER TO;Lo;0;L;;;;;N;;;;;
+1039B;UGARITIC LETTER I;Lo;0;L;;;;;N;;;;;
+1039C;UGARITIC LETTER U;Lo;0;L;;;;;N;;;;;
+1039D;UGARITIC LETTER SSU;Lo;0;L;;;;;N;;;;;
+1039F;UGARITIC WORD DIVIDER;Po;0;L;;;;;N;;;;;
+103A0;OLD PERSIAN SIGN A;Lo;0;L;;;;;N;;;;;
+103A1;OLD PERSIAN SIGN I;Lo;0;L;;;;;N;;;;;
+103A2;OLD PERSIAN SIGN U;Lo;0;L;;;;;N;;;;;
+103A3;OLD PERSIAN SIGN KA;Lo;0;L;;;;;N;;;;;
+103A4;OLD PERSIAN SIGN KU;Lo;0;L;;;;;N;;;;;
+103A5;OLD PERSIAN SIGN GA;Lo;0;L;;;;;N;;;;;
+103A6;OLD PERSIAN SIGN GU;Lo;0;L;;;;;N;;;;;
+103A7;OLD PERSIAN SIGN XA;Lo;0;L;;;;;N;;;;;
+103A8;OLD PERSIAN SIGN CA;Lo;0;L;;;;;N;;;;;
+103A9;OLD PERSIAN SIGN JA;Lo;0;L;;;;;N;;;;;
+103AA;OLD PERSIAN SIGN JI;Lo;0;L;;;;;N;;;;;
+103AB;OLD PERSIAN SIGN TA;Lo;0;L;;;;;N;;;;;
+103AC;OLD PERSIAN SIGN TU;Lo;0;L;;;;;N;;;;;
+103AD;OLD PERSIAN SIGN DA;Lo;0;L;;;;;N;;;;;
+103AE;OLD PERSIAN SIGN DI;Lo;0;L;;;;;N;;;;;
+103AF;OLD PERSIAN SIGN DU;Lo;0;L;;;;;N;;;;;
+103B0;OLD PERSIAN SIGN THA;Lo;0;L;;;;;N;;;;;
+103B1;OLD PERSIAN SIGN PA;Lo;0;L;;;;;N;;;;;
+103B2;OLD PERSIAN SIGN BA;Lo;0;L;;;;;N;;;;;
+103B3;OLD PERSIAN SIGN FA;Lo;0;L;;;;;N;;;;;
+103B4;OLD PERSIAN SIGN NA;Lo;0;L;;;;;N;;;;;
+103B5;OLD PERSIAN SIGN NU;Lo;0;L;;;;;N;;;;;
+103B6;OLD PERSIAN SIGN MA;Lo;0;L;;;;;N;;;;;
+103B7;OLD PERSIAN SIGN MI;Lo;0;L;;;;;N;;;;;
+103B8;OLD PERSIAN SIGN MU;Lo;0;L;;;;;N;;;;;
+103B9;OLD PERSIAN SIGN YA;Lo;0;L;;;;;N;;;;;
+103BA;OLD PERSIAN SIGN VA;Lo;0;L;;;;;N;;;;;
+103BB;OLD PERSIAN SIGN VI;Lo;0;L;;;;;N;;;;;
+103BC;OLD PERSIAN SIGN RA;Lo;0;L;;;;;N;;;;;
+103BD;OLD PERSIAN SIGN RU;Lo;0;L;;;;;N;;;;;
+103BE;OLD PERSIAN SIGN LA;Lo;0;L;;;;;N;;;;;
+103BF;OLD PERSIAN SIGN SA;Lo;0;L;;;;;N;;;;;
+103C0;OLD PERSIAN SIGN ZA;Lo;0;L;;;;;N;;;;;
+103C1;OLD PERSIAN SIGN SHA;Lo;0;L;;;;;N;;;;;
+103C2;OLD PERSIAN SIGN SSA;Lo;0;L;;;;;N;;;;;
+103C3;OLD PERSIAN SIGN HA;Lo;0;L;;;;;N;;;;;
+103C8;OLD PERSIAN SIGN AURAMAZDAA;Lo;0;L;;;;;N;;;;;
+103C9;OLD PERSIAN SIGN AURAMAZDAA-2;Lo;0;L;;;;;N;;;;;
+103CA;OLD PERSIAN SIGN AURAMAZDAAHA;Lo;0;L;;;;;N;;;;;
+103CB;OLD PERSIAN SIGN XSHAAYATHIYA;Lo;0;L;;;;;N;;;;;
+103CC;OLD PERSIAN SIGN DAHYAAUSH;Lo;0;L;;;;;N;;;;;
+103CD;OLD PERSIAN SIGN DAHYAAUSH-2;Lo;0;L;;;;;N;;;;;
+103CE;OLD PERSIAN SIGN BAGA;Lo;0;L;;;;;N;;;;;
+103CF;OLD PERSIAN SIGN BUUMISH;Lo;0;L;;;;;N;;;;;
+103D0;OLD PERSIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
+103D1;OLD PERSIAN NUMBER ONE;Nl;0;L;;;;1;N;;;;;
+103D2;OLD PERSIAN NUMBER TWO;Nl;0;L;;;;2;N;;;;;
+103D3;OLD PERSIAN NUMBER TEN;Nl;0;L;;;;10;N;;;;;
+103D4;OLD PERSIAN NUMBER TWENTY;Nl;0;L;;;;20;N;;;;;
+103D5;OLD PERSIAN NUMBER HUNDRED;Nl;0;L;;;;100;N;;;;;
+10400;DESERET CAPITAL LETTER LONG I;Lu;0;L;;;;;N;;;;10428;
+10401;DESERET CAPITAL LETTER LONG E;Lu;0;L;;;;;N;;;;10429;
+10402;DESERET CAPITAL LETTER LONG A;Lu;0;L;;;;;N;;;;1042A;
+10403;DESERET CAPITAL LETTER LONG AH;Lu;0;L;;;;;N;;;;1042B;
+10404;DESERET CAPITAL LETTER LONG O;Lu;0;L;;;;;N;;;;1042C;
+10405;DESERET CAPITAL LETTER LONG OO;Lu;0;L;;;;;N;;;;1042D;
+10406;DESERET CAPITAL LETTER SHORT I;Lu;0;L;;;;;N;;;;1042E;
+10407;DESERET CAPITAL LETTER SHORT E;Lu;0;L;;;;;N;;;;1042F;
+10408;DESERET CAPITAL LETTER SHORT A;Lu;0;L;;;;;N;;;;10430;
+10409;DESERET CAPITAL LETTER SHORT AH;Lu;0;L;;;;;N;;;;10431;
+1040A;DESERET CAPITAL LETTER SHORT O;Lu;0;L;;;;;N;;;;10432;
+1040B;DESERET CAPITAL LETTER SHORT OO;Lu;0;L;;;;;N;;;;10433;
+1040C;DESERET CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;10434;
+1040D;DESERET CAPITAL LETTER OW;Lu;0;L;;;;;N;;;;10435;
+1040E;DESERET CAPITAL LETTER WU;Lu;0;L;;;;;N;;;;10436;
+1040F;DESERET CAPITAL LETTER YEE;Lu;0;L;;;;;N;;;;10437;
+10410;DESERET CAPITAL LETTER H;Lu;0;L;;;;;N;;;;10438;
+10411;DESERET CAPITAL LETTER PEE;Lu;0;L;;;;;N;;;;10439;
+10412;DESERET CAPITAL LETTER BEE;Lu;0;L;;;;;N;;;;1043A;
+10413;DESERET CAPITAL LETTER TEE;Lu;0;L;;;;;N;;;;1043B;
+10414;DESERET CAPITAL LETTER DEE;Lu;0;L;;;;;N;;;;1043C;
+10415;DESERET CAPITAL LETTER CHEE;Lu;0;L;;;;;N;;;;1043D;
+10416;DESERET CAPITAL LETTER JEE;Lu;0;L;;;;;N;;;;1043E;
+10417;DESERET CAPITAL LETTER KAY;Lu;0;L;;;;;N;;;;1043F;
+10418;DESERET CAPITAL LETTER GAY;Lu;0;L;;;;;N;;;;10440;
+10419;DESERET CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;10441;
+1041A;DESERET CAPITAL LETTER VEE;Lu;0;L;;;;;N;;;;10442;
+1041B;DESERET CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;10443;
+1041C;DESERET CAPITAL LETTER THEE;Lu;0;L;;;;;N;;;;10444;
+1041D;DESERET CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;10445;
+1041E;DESERET CAPITAL LETTER ZEE;Lu;0;L;;;;;N;;;;10446;
+1041F;DESERET CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;10447;
+10420;DESERET CAPITAL LETTER ZHEE;Lu;0;L;;;;;N;;;;10448;
+10421;DESERET CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;10449;
+10422;DESERET CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;1044A;
+10423;DESERET CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;1044B;
+10424;DESERET CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;1044C;
+10425;DESERET CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;1044D;
+10426;DESERET CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;1044E;
+10427;DESERET CAPITAL LETTER EW;Lu;0;L;;;;;N;;;;1044F;
+10428;DESERET SMALL LETTER LONG I;Ll;0;L;;;;;N;;;10400;;10400
+10429;DESERET SMALL LETTER LONG E;Ll;0;L;;;;;N;;;10401;;10401
+1042A;DESERET SMALL LETTER LONG A;Ll;0;L;;;;;N;;;10402;;10402
+1042B;DESERET SMALL LETTER LONG AH;Ll;0;L;;;;;N;;;10403;;10403
+1042C;DESERET SMALL LETTER LONG O;Ll;0;L;;;;;N;;;10404;;10404
+1042D;DESERET SMALL LETTER LONG OO;Ll;0;L;;;;;N;;;10405;;10405
+1042E;DESERET SMALL LETTER SHORT I;Ll;0;L;;;;;N;;;10406;;10406
+1042F;DESERET SMALL LETTER SHORT E;Ll;0;L;;;;;N;;;10407;;10407
+10430;DESERET SMALL LETTER SHORT A;Ll;0;L;;;;;N;;;10408;;10408
+10431;DESERET SMALL LETTER SHORT AH;Ll;0;L;;;;;N;;;10409;;10409
+10432;DESERET SMALL LETTER SHORT O;Ll;0;L;;;;;N;;;1040A;;1040A
+10433;DESERET SMALL LETTER SHORT OO;Ll;0;L;;;;;N;;;1040B;;1040B
+10434;DESERET SMALL LETTER AY;Ll;0;L;;;;;N;;;1040C;;1040C
+10435;DESERET SMALL LETTER OW;Ll;0;L;;;;;N;;;1040D;;1040D
+10436;DESERET SMALL LETTER WU;Ll;0;L;;;;;N;;;1040E;;1040E
+10437;DESERET SMALL LETTER YEE;Ll;0;L;;;;;N;;;1040F;;1040F
+10438;DESERET SMALL LETTER H;Ll;0;L;;;;;N;;;10410;;10410
+10439;DESERET SMALL LETTER PEE;Ll;0;L;;;;;N;;;10411;;10411
+1043A;DESERET SMALL LETTER BEE;Ll;0;L;;;;;N;;;10412;;10412
+1043B;DESERET SMALL LETTER TEE;Ll;0;L;;;;;N;;;10413;;10413
+1043C;DESERET SMALL LETTER DEE;Ll;0;L;;;;;N;;;10414;;10414
+1043D;DESERET SMALL LETTER CHEE;Ll;0;L;;;;;N;;;10415;;10415
+1043E;DESERET SMALL LETTER JEE;Ll;0;L;;;;;N;;;10416;;10416
+1043F;DESERET SMALL LETTER KAY;Ll;0;L;;;;;N;;;10417;;10417
+10440;DESERET SMALL LETTER GAY;Ll;0;L;;;;;N;;;10418;;10418
+10441;DESERET SMALL LETTER EF;Ll;0;L;;;;;N;;;10419;;10419
+10442;DESERET SMALL LETTER VEE;Ll;0;L;;;;;N;;;1041A;;1041A
+10443;DESERET SMALL LETTER ETH;Ll;0;L;;;;;N;;;1041B;;1041B
+10444;DESERET SMALL LETTER THEE;Ll;0;L;;;;;N;;;1041C;;1041C
+10445;DESERET SMALL LETTER ES;Ll;0;L;;;;;N;;;1041D;;1041D
+10446;DESERET SMALL LETTER ZEE;Ll;0;L;;;;;N;;;1041E;;1041E
+10447;DESERET SMALL LETTER ESH;Ll;0;L;;;;;N;;;1041F;;1041F
+10448;DESERET SMALL LETTER ZHEE;Ll;0;L;;;;;N;;;10420;;10420
+10449;DESERET SMALL LETTER ER;Ll;0;L;;;;;N;;;10421;;10421
+1044A;DESERET SMALL LETTER EL;Ll;0;L;;;;;N;;;10422;;10422
+1044B;DESERET SMALL LETTER EM;Ll;0;L;;;;;N;;;10423;;10423
+1044C;DESERET SMALL LETTER EN;Ll;0;L;;;;;N;;;10424;;10424
+1044D;DESERET SMALL LETTER ENG;Ll;0;L;;;;;N;;;10425;;10425
+1044E;DESERET SMALL LETTER OI;Ll;0;L;;;;;N;;;10426;;10426
+1044F;DESERET SMALL LETTER EW;Ll;0;L;;;;;N;;;10427;;10427
+10450;SHAVIAN LETTER PEEP;Lo;0;L;;;;;N;;;;;
+10451;SHAVIAN LETTER TOT;Lo;0;L;;;;;N;;;;;
+10452;SHAVIAN LETTER KICK;Lo;0;L;;;;;N;;;;;
+10453;SHAVIAN LETTER FEE;Lo;0;L;;;;;N;;;;;
+10454;SHAVIAN LETTER THIGH;Lo;0;L;;;;;N;;;;;
+10455;SHAVIAN LETTER SO;Lo;0;L;;;;;N;;;;;
+10456;SHAVIAN LETTER SURE;Lo;0;L;;;;;N;;;;;
+10457;SHAVIAN LETTER CHURCH;Lo;0;L;;;;;N;;;;;
+10458;SHAVIAN LETTER YEA;Lo;0;L;;;;;N;;;;;
+10459;SHAVIAN LETTER HUNG;Lo;0;L;;;;;N;;;;;
+1045A;SHAVIAN LETTER BIB;Lo;0;L;;;;;N;;;;;
+1045B;SHAVIAN LETTER DEAD;Lo;0;L;;;;;N;;;;;
+1045C;SHAVIAN LETTER GAG;Lo;0;L;;;;;N;;;;;
+1045D;SHAVIAN LETTER VOW;Lo;0;L;;;;;N;;;;;
+1045E;SHAVIAN LETTER THEY;Lo;0;L;;;;;N;;;;;
+1045F;SHAVIAN LETTER ZOO;Lo;0;L;;;;;N;;;;;
+10460;SHAVIAN LETTER MEASURE;Lo;0;L;;;;;N;;;;;
+10461;SHAVIAN LETTER JUDGE;Lo;0;L;;;;;N;;;;;
+10462;SHAVIAN LETTER WOE;Lo;0;L;;;;;N;;;;;
+10463;SHAVIAN LETTER HA-HA;Lo;0;L;;;;;N;;;;;
+10464;SHAVIAN LETTER LOLL;Lo;0;L;;;;;N;;;;;
+10465;SHAVIAN LETTER MIME;Lo;0;L;;;;;N;;;;;
+10466;SHAVIAN LETTER IF;Lo;0;L;;;;;N;;;;;
+10467;SHAVIAN LETTER EGG;Lo;0;L;;;;;N;;;;;
+10468;SHAVIAN LETTER ASH;Lo;0;L;;;;;N;;;;;
+10469;SHAVIAN LETTER ADO;Lo;0;L;;;;;N;;;;;
+1046A;SHAVIAN LETTER ON;Lo;0;L;;;;;N;;;;;
+1046B;SHAVIAN LETTER WOOL;Lo;0;L;;;;;N;;;;;
+1046C;SHAVIAN LETTER OUT;Lo;0;L;;;;;N;;;;;
+1046D;SHAVIAN LETTER AH;Lo;0;L;;;;;N;;;;;
+1046E;SHAVIAN LETTER ROAR;Lo;0;L;;;;;N;;;;;
+1046F;SHAVIAN LETTER NUN;Lo;0;L;;;;;N;;;;;
+10470;SHAVIAN LETTER EAT;Lo;0;L;;;;;N;;;;;
+10471;SHAVIAN LETTER AGE;Lo;0;L;;;;;N;;;;;
+10472;SHAVIAN LETTER ICE;Lo;0;L;;;;;N;;;;;
+10473;SHAVIAN LETTER UP;Lo;0;L;;;;;N;;;;;
+10474;SHAVIAN LETTER OAK;Lo;0;L;;;;;N;;;;;
+10475;SHAVIAN LETTER OOZE;Lo;0;L;;;;;N;;;;;
+10476;SHAVIAN LETTER OIL;Lo;0;L;;;;;N;;;;;
+10477;SHAVIAN LETTER AWE;Lo;0;L;;;;;N;;;;;
+10478;SHAVIAN LETTER ARE;Lo;0;L;;;;;N;;;;;
+10479;SHAVIAN LETTER OR;Lo;0;L;;;;;N;;;;;
+1047A;SHAVIAN LETTER AIR;Lo;0;L;;;;;N;;;;;
+1047B;SHAVIAN LETTER ERR;Lo;0;L;;;;;N;;;;;
+1047C;SHAVIAN LETTER ARRAY;Lo;0;L;;;;;N;;;;;
+1047D;SHAVIAN LETTER EAR;Lo;0;L;;;;;N;;;;;
+1047E;SHAVIAN LETTER IAN;Lo;0;L;;;;;N;;;;;
+1047F;SHAVIAN LETTER YEW;Lo;0;L;;;;;N;;;;;
+10480;OSMANYA LETTER ALEF;Lo;0;L;;;;;N;;;;;
+10481;OSMANYA LETTER BA;Lo;0;L;;;;;N;;;;;
+10482;OSMANYA LETTER TA;Lo;0;L;;;;;N;;;;;
+10483;OSMANYA LETTER JA;Lo;0;L;;;;;N;;;;;
+10484;OSMANYA LETTER XA;Lo;0;L;;;;;N;;;;;
+10485;OSMANYA LETTER KHA;Lo;0;L;;;;;N;;;;;
+10486;OSMANYA LETTER DEEL;Lo;0;L;;;;;N;;;;;
+10487;OSMANYA LETTER RA;Lo;0;L;;;;;N;;;;;
+10488;OSMANYA LETTER SA;Lo;0;L;;;;;N;;;;;
+10489;OSMANYA LETTER SHIIN;Lo;0;L;;;;;N;;;;;
+1048A;OSMANYA LETTER DHA;Lo;0;L;;;;;N;;;;;
+1048B;OSMANYA LETTER CAYN;Lo;0;L;;;;;N;;;;;
+1048C;OSMANYA LETTER GA;Lo;0;L;;;;;N;;;;;
+1048D;OSMANYA LETTER FA;Lo;0;L;;;;;N;;;;;
+1048E;OSMANYA LETTER QAAF;Lo;0;L;;;;;N;;;;;
+1048F;OSMANYA LETTER KAAF;Lo;0;L;;;;;N;;;;;
+10490;OSMANYA LETTER LAAN;Lo;0;L;;;;;N;;;;;
+10491;OSMANYA LETTER MIIN;Lo;0;L;;;;;N;;;;;
+10492;OSMANYA LETTER NUUN;Lo;0;L;;;;;N;;;;;
+10493;OSMANYA LETTER WAW;Lo;0;L;;;;;N;;;;;
+10494;OSMANYA LETTER HA;Lo;0;L;;;;;N;;;;;
+10495;OSMANYA LETTER YA;Lo;0;L;;;;;N;;;;;
+10496;OSMANYA LETTER A;Lo;0;L;;;;;N;;;;;
+10497;OSMANYA LETTER E;Lo;0;L;;;;;N;;;;;
+10498;OSMANYA LETTER I;Lo;0;L;;;;;N;;;;;
+10499;OSMANYA LETTER O;Lo;0;L;;;;;N;;;;;
+1049A;OSMANYA LETTER U;Lo;0;L;;;;;N;;;;;
+1049B;OSMANYA LETTER AA;Lo;0;L;;;;;N;;;;;
+1049C;OSMANYA LETTER EE;Lo;0;L;;;;;N;;;;;
+1049D;OSMANYA LETTER OO;Lo;0;L;;;;;N;;;;;
+104A0;OSMANYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+104A1;OSMANYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+104A2;OSMANYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+104A3;OSMANYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+104A4;OSMANYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+104A5;OSMANYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+104A6;OSMANYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+104A7;OSMANYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+104A8;OSMANYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+104A9;OSMANYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+104B0;OSAGE CAPITAL LETTER A;Lu;0;L;;;;;N;;;;104D8;
+104B1;OSAGE CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;104D9;
+104B2;OSAGE CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;104DA;
+104B3;OSAGE CAPITAL LETTER AH;Lu;0;L;;;;;N;;;;104DB;
+104B4;OSAGE CAPITAL LETTER BRA;Lu;0;L;;;;;N;;;;104DC;
+104B5;OSAGE CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;104DD;
+104B6;OSAGE CAPITAL LETTER EHCHA;Lu;0;L;;;;;N;;;;104DE;
+104B7;OSAGE CAPITAL LETTER E;Lu;0;L;;;;;N;;;;104DF;
+104B8;OSAGE CAPITAL LETTER EIN;Lu;0;L;;;;;N;;;;104E0;
+104B9;OSAGE CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;104E1;
+104BA;OSAGE CAPITAL LETTER HYA;Lu;0;L;;;;;N;;;;104E2;
+104BB;OSAGE CAPITAL LETTER I;Lu;0;L;;;;;N;;;;104E3;
+104BC;OSAGE CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;104E4;
+104BD;OSAGE CAPITAL LETTER EHKA;Lu;0;L;;;;;N;;;;104E5;
+104BE;OSAGE CAPITAL LETTER KYA;Lu;0;L;;;;;N;;;;104E6;
+104BF;OSAGE CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;104E7;
+104C0;OSAGE CAPITAL LETTER MA;Lu;0;L;;;;;N;;;;104E8;
+104C1;OSAGE CAPITAL LETTER NA;Lu;0;L;;;;;N;;;;104E9;
+104C2;OSAGE CAPITAL LETTER O;Lu;0;L;;;;;N;;;;104EA;
+104C3;OSAGE CAPITAL LETTER OIN;Lu;0;L;;;;;N;;;;104EB;
+104C4;OSAGE CAPITAL LETTER PA;Lu;0;L;;;;;N;;;;104EC;
+104C5;OSAGE CAPITAL LETTER EHPA;Lu;0;L;;;;;N;;;;104ED;
+104C6;OSAGE CAPITAL LETTER SA;Lu;0;L;;;;;N;;;;104EE;
+104C7;OSAGE CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;104EF;
+104C8;OSAGE CAPITAL LETTER TA;Lu;0;L;;;;;N;;;;104F0;
+104C9;OSAGE CAPITAL LETTER EHTA;Lu;0;L;;;;;N;;;;104F1;
+104CA;OSAGE CAPITAL LETTER TSA;Lu;0;L;;;;;N;;;;104F2;
+104CB;OSAGE CAPITAL LETTER EHTSA;Lu;0;L;;;;;N;;;;104F3;
+104CC;OSAGE CAPITAL LETTER TSHA;Lu;0;L;;;;;N;;;;104F4;
+104CD;OSAGE CAPITAL LETTER DHA;Lu;0;L;;;;;N;;;;104F5;
+104CE;OSAGE CAPITAL LETTER U;Lu;0;L;;;;;N;;;;104F6;
+104CF;OSAGE CAPITAL LETTER WA;Lu;0;L;;;;;N;;;;104F7;
+104D0;OSAGE CAPITAL LETTER KHA;Lu;0;L;;;;;N;;;;104F8;
+104D1;OSAGE CAPITAL LETTER GHA;Lu;0;L;;;;;N;;;;104F9;
+104D2;OSAGE CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;104FA;
+104D3;OSAGE CAPITAL LETTER ZHA;Lu;0;L;;;;;N;;;;104FB;
+104D8;OSAGE SMALL LETTER A;Ll;0;L;;;;;N;;;104B0;;104B0
+104D9;OSAGE SMALL LETTER AI;Ll;0;L;;;;;N;;;104B1;;104B1
+104DA;OSAGE SMALL LETTER AIN;Ll;0;L;;;;;N;;;104B2;;104B2
+104DB;OSAGE SMALL LETTER AH;Ll;0;L;;;;;N;;;104B3;;104B3
+104DC;OSAGE SMALL LETTER BRA;Ll;0;L;;;;;N;;;104B4;;104B4
+104DD;OSAGE SMALL LETTER CHA;Ll;0;L;;;;;N;;;104B5;;104B5
+104DE;OSAGE SMALL LETTER EHCHA;Ll;0;L;;;;;N;;;104B6;;104B6
+104DF;OSAGE SMALL LETTER E;Ll;0;L;;;;;N;;;104B7;;104B7
+104E0;OSAGE SMALL LETTER EIN;Ll;0;L;;;;;N;;;104B8;;104B8
+104E1;OSAGE SMALL LETTER HA;Ll;0;L;;;;;N;;;104B9;;104B9
+104E2;OSAGE SMALL LETTER HYA;Ll;0;L;;;;;N;;;104BA;;104BA
+104E3;OSAGE SMALL LETTER I;Ll;0;L;;;;;N;;;104BB;;104BB
+104E4;OSAGE SMALL LETTER KA;Ll;0;L;;;;;N;;;104BC;;104BC
+104E5;OSAGE SMALL LETTER EHKA;Ll;0;L;;;;;N;;;104BD;;104BD
+104E6;OSAGE SMALL LETTER KYA;Ll;0;L;;;;;N;;;104BE;;104BE
+104E7;OSAGE SMALL LETTER LA;Ll;0;L;;;;;N;;;104BF;;104BF
+104E8;OSAGE SMALL LETTER MA;Ll;0;L;;;;;N;;;104C0;;104C0
+104E9;OSAGE SMALL LETTER NA;Ll;0;L;;;;;N;;;104C1;;104C1
+104EA;OSAGE SMALL LETTER O;Ll;0;L;;;;;N;;;104C2;;104C2
+104EB;OSAGE SMALL LETTER OIN;Ll;0;L;;;;;N;;;104C3;;104C3
+104EC;OSAGE SMALL LETTER PA;Ll;0;L;;;;;N;;;104C4;;104C4
+104ED;OSAGE SMALL LETTER EHPA;Ll;0;L;;;;;N;;;104C5;;104C5
+104EE;OSAGE SMALL LETTER SA;Ll;0;L;;;;;N;;;104C6;;104C6
+104EF;OSAGE SMALL LETTER SHA;Ll;0;L;;;;;N;;;104C7;;104C7
+104F0;OSAGE SMALL LETTER TA;Ll;0;L;;;;;N;;;104C8;;104C8
+104F1;OSAGE SMALL LETTER EHTA;Ll;0;L;;;;;N;;;104C9;;104C9
+104F2;OSAGE SMALL LETTER TSA;Ll;0;L;;;;;N;;;104CA;;104CA
+104F3;OSAGE SMALL LETTER EHTSA;Ll;0;L;;;;;N;;;104CB;;104CB
+104F4;OSAGE SMALL LETTER TSHA;Ll;0;L;;;;;N;;;104CC;;104CC
+104F5;OSAGE SMALL LETTER DHA;Ll;0;L;;;;;N;;;104CD;;104CD
+104F6;OSAGE SMALL LETTER U;Ll;0;L;;;;;N;;;104CE;;104CE
+104F7;OSAGE SMALL LETTER WA;Ll;0;L;;;;;N;;;104CF;;104CF
+104F8;OSAGE SMALL LETTER KHA;Ll;0;L;;;;;N;;;104D0;;104D0
+104F9;OSAGE SMALL LETTER GHA;Ll;0;L;;;;;N;;;104D1;;104D1
+104FA;OSAGE SMALL LETTER ZA;Ll;0;L;;;;;N;;;104D2;;104D2
+104FB;OSAGE SMALL LETTER ZHA;Ll;0;L;;;;;N;;;104D3;;104D3
+10500;ELBASAN LETTER A;Lo;0;L;;;;;N;;;;;
+10501;ELBASAN LETTER BE;Lo;0;L;;;;;N;;;;;
+10502;ELBASAN LETTER CE;Lo;0;L;;;;;N;;;;;
+10503;ELBASAN LETTER CHE;Lo;0;L;;;;;N;;;;;
+10504;ELBASAN LETTER DE;Lo;0;L;;;;;N;;;;;
+10505;ELBASAN LETTER NDE;Lo;0;L;;;;;N;;;;;
+10506;ELBASAN LETTER DHE;Lo;0;L;;;;;N;;;;;
+10507;ELBASAN LETTER EI;Lo;0;L;;;;;N;;;;;
+10508;ELBASAN LETTER E;Lo;0;L;;;;;N;;;;;
+10509;ELBASAN LETTER FE;Lo;0;L;;;;;N;;;;;
+1050A;ELBASAN LETTER GE;Lo;0;L;;;;;N;;;;;
+1050B;ELBASAN LETTER GJE;Lo;0;L;;;;;N;;;;;
+1050C;ELBASAN LETTER HE;Lo;0;L;;;;;N;;;;;
+1050D;ELBASAN LETTER I;Lo;0;L;;;;;N;;;;;
+1050E;ELBASAN LETTER JE;Lo;0;L;;;;;N;;;;;
+1050F;ELBASAN LETTER KE;Lo;0;L;;;;;N;;;;;
+10510;ELBASAN LETTER LE;Lo;0;L;;;;;N;;;;;
+10511;ELBASAN LETTER LLE;Lo;0;L;;;;;N;;;;;
+10512;ELBASAN LETTER ME;Lo;0;L;;;;;N;;;;;
+10513;ELBASAN LETTER NE;Lo;0;L;;;;;N;;;;;
+10514;ELBASAN LETTER NA;Lo;0;L;;;;;N;;;;;
+10515;ELBASAN LETTER NJE;Lo;0;L;;;;;N;;;;;
+10516;ELBASAN LETTER O;Lo;0;L;;;;;N;;;;;
+10517;ELBASAN LETTER PE;Lo;0;L;;;;;N;;;;;
+10518;ELBASAN LETTER QE;Lo;0;L;;;;;N;;;;;
+10519;ELBASAN LETTER RE;Lo;0;L;;;;;N;;;;;
+1051A;ELBASAN LETTER RRE;Lo;0;L;;;;;N;;;;;
+1051B;ELBASAN LETTER SE;Lo;0;L;;;;;N;;;;;
+1051C;ELBASAN LETTER SHE;Lo;0;L;;;;;N;;;;;
+1051D;ELBASAN LETTER TE;Lo;0;L;;;;;N;;;;;
+1051E;ELBASAN LETTER THE;Lo;0;L;;;;;N;;;;;
+1051F;ELBASAN LETTER U;Lo;0;L;;;;;N;;;;;
+10520;ELBASAN LETTER VE;Lo;0;L;;;;;N;;;;;
+10521;ELBASAN LETTER XE;Lo;0;L;;;;;N;;;;;
+10522;ELBASAN LETTER Y;Lo;0;L;;;;;N;;;;;
+10523;ELBASAN LETTER ZE;Lo;0;L;;;;;N;;;;;
+10524;ELBASAN LETTER ZHE;Lo;0;L;;;;;N;;;;;
+10525;ELBASAN LETTER GHE;Lo;0;L;;;;;N;;;;;
+10526;ELBASAN LETTER GHAMMA;Lo;0;L;;;;;N;;;;;
+10527;ELBASAN LETTER KHE;Lo;0;L;;;;;N;;;;;
+10530;CAUCASIAN ALBANIAN LETTER ALT;Lo;0;L;;;;;N;;;;;
+10531;CAUCASIAN ALBANIAN LETTER BET;Lo;0;L;;;;;N;;;;;
+10532;CAUCASIAN ALBANIAN LETTER GIM;Lo;0;L;;;;;N;;;;;
+10533;CAUCASIAN ALBANIAN LETTER DAT;Lo;0;L;;;;;N;;;;;
+10534;CAUCASIAN ALBANIAN LETTER EB;Lo;0;L;;;;;N;;;;;
+10535;CAUCASIAN ALBANIAN LETTER ZARL;Lo;0;L;;;;;N;;;;;
+10536;CAUCASIAN ALBANIAN LETTER EYN;Lo;0;L;;;;;N;;;;;
+10537;CAUCASIAN ALBANIAN LETTER ZHIL;Lo;0;L;;;;;N;;;;;
+10538;CAUCASIAN ALBANIAN LETTER TAS;Lo;0;L;;;;;N;;;;;
+10539;CAUCASIAN ALBANIAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+1053A;CAUCASIAN ALBANIAN LETTER YOWD;Lo;0;L;;;;;N;;;;;
+1053B;CAUCASIAN ALBANIAN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+1053C;CAUCASIAN ALBANIAN LETTER IRB;Lo;0;L;;;;;N;;;;;
+1053D;CAUCASIAN ALBANIAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+1053E;CAUCASIAN ALBANIAN LETTER LAN;Lo;0;L;;;;;N;;;;;
+1053F;CAUCASIAN ALBANIAN LETTER INYA;Lo;0;L;;;;;N;;;;;
+10540;CAUCASIAN ALBANIAN LETTER XEYN;Lo;0;L;;;;;N;;;;;
+10541;CAUCASIAN ALBANIAN LETTER DYAN;Lo;0;L;;;;;N;;;;;
+10542;CAUCASIAN ALBANIAN LETTER CAR;Lo;0;L;;;;;N;;;;;
+10543;CAUCASIAN ALBANIAN LETTER JHOX;Lo;0;L;;;;;N;;;;;
+10544;CAUCASIAN ALBANIAN LETTER KAR;Lo;0;L;;;;;N;;;;;
+10545;CAUCASIAN ALBANIAN LETTER LYIT;Lo;0;L;;;;;N;;;;;
+10546;CAUCASIAN ALBANIAN LETTER HEYT;Lo;0;L;;;;;N;;;;;
+10547;CAUCASIAN ALBANIAN LETTER QAY;Lo;0;L;;;;;N;;;;;
+10548;CAUCASIAN ALBANIAN LETTER AOR;Lo;0;L;;;;;N;;;;;
+10549;CAUCASIAN ALBANIAN LETTER CHOY;Lo;0;L;;;;;N;;;;;
+1054A;CAUCASIAN ALBANIAN LETTER CHI;Lo;0;L;;;;;N;;;;;
+1054B;CAUCASIAN ALBANIAN LETTER CYAY;Lo;0;L;;;;;N;;;;;
+1054C;CAUCASIAN ALBANIAN LETTER MAQ;Lo;0;L;;;;;N;;;;;
+1054D;CAUCASIAN ALBANIAN LETTER QAR;Lo;0;L;;;;;N;;;;;
+1054E;CAUCASIAN ALBANIAN LETTER NOWC;Lo;0;L;;;;;N;;;;;
+1054F;CAUCASIAN ALBANIAN LETTER DZYAY;Lo;0;L;;;;;N;;;;;
+10550;CAUCASIAN ALBANIAN LETTER SHAK;Lo;0;L;;;;;N;;;;;
+10551;CAUCASIAN ALBANIAN LETTER JAYN;Lo;0;L;;;;;N;;;;;
+10552;CAUCASIAN ALBANIAN LETTER ON;Lo;0;L;;;;;N;;;;;
+10553;CAUCASIAN ALBANIAN LETTER TYAY;Lo;0;L;;;;;N;;;;;
+10554;CAUCASIAN ALBANIAN LETTER FAM;Lo;0;L;;;;;N;;;;;
+10555;CAUCASIAN ALBANIAN LETTER DZAY;Lo;0;L;;;;;N;;;;;
+10556;CAUCASIAN ALBANIAN LETTER CHAT;Lo;0;L;;;;;N;;;;;
+10557;CAUCASIAN ALBANIAN LETTER PEN;Lo;0;L;;;;;N;;;;;
+10558;CAUCASIAN ALBANIAN LETTER GHEYS;Lo;0;L;;;;;N;;;;;
+10559;CAUCASIAN ALBANIAN LETTER RAT;Lo;0;L;;;;;N;;;;;
+1055A;CAUCASIAN ALBANIAN LETTER SEYK;Lo;0;L;;;;;N;;;;;
+1055B;CAUCASIAN ALBANIAN LETTER VEYZ;Lo;0;L;;;;;N;;;;;
+1055C;CAUCASIAN ALBANIAN LETTER TIWR;Lo;0;L;;;;;N;;;;;
+1055D;CAUCASIAN ALBANIAN LETTER SHOY;Lo;0;L;;;;;N;;;;;
+1055E;CAUCASIAN ALBANIAN LETTER IWN;Lo;0;L;;;;;N;;;;;
+1055F;CAUCASIAN ALBANIAN LETTER CYAW;Lo;0;L;;;;;N;;;;;
+10560;CAUCASIAN ALBANIAN LETTER CAYN;Lo;0;L;;;;;N;;;;;
+10561;CAUCASIAN ALBANIAN LETTER YAYD;Lo;0;L;;;;;N;;;;;
+10562;CAUCASIAN ALBANIAN LETTER PIWR;Lo;0;L;;;;;N;;;;;
+10563;CAUCASIAN ALBANIAN LETTER KIW;Lo;0;L;;;;;N;;;;;
+1056F;CAUCASIAN ALBANIAN CITATION MARK;Po;0;L;;;;;N;;;;;
+10600;LINEAR A SIGN AB001;Lo;0;L;;;;;N;;;;;
+10601;LINEAR A SIGN AB002;Lo;0;L;;;;;N;;;;;
+10602;LINEAR A SIGN AB003;Lo;0;L;;;;;N;;;;;
+10603;LINEAR A SIGN AB004;Lo;0;L;;;;;N;;;;;
+10604;LINEAR A SIGN AB005;Lo;0;L;;;;;N;;;;;
+10605;LINEAR A SIGN AB006;Lo;0;L;;;;;N;;;;;
+10606;LINEAR A SIGN AB007;Lo;0;L;;;;;N;;;;;
+10607;LINEAR A SIGN AB008;Lo;0;L;;;;;N;;;;;
+10608;LINEAR A SIGN AB009;Lo;0;L;;;;;N;;;;;
+10609;LINEAR A SIGN AB010;Lo;0;L;;;;;N;;;;;
+1060A;LINEAR A SIGN AB011;Lo;0;L;;;;;N;;;;;
+1060B;LINEAR A SIGN AB013;Lo;0;L;;;;;N;;;;;
+1060C;LINEAR A SIGN AB016;Lo;0;L;;;;;N;;;;;
+1060D;LINEAR A SIGN AB017;Lo;0;L;;;;;N;;;;;
+1060E;LINEAR A SIGN AB020;Lo;0;L;;;;;N;;;;;
+1060F;LINEAR A SIGN AB021;Lo;0;L;;;;;N;;;;;
+10610;LINEAR A SIGN AB021F;Lo;0;L;;;;;N;;;;;
+10611;LINEAR A SIGN AB021M;Lo;0;L;;;;;N;;;;;
+10612;LINEAR A SIGN AB022;Lo;0;L;;;;;N;;;;;
+10613;LINEAR A SIGN AB022F;Lo;0;L;;;;;N;;;;;
+10614;LINEAR A SIGN AB022M;Lo;0;L;;;;;N;;;;;
+10615;LINEAR A SIGN AB023;Lo;0;L;;;;;N;;;;;
+10616;LINEAR A SIGN AB023M;Lo;0;L;;;;;N;;;;;
+10617;LINEAR A SIGN AB024;Lo;0;L;;;;;N;;;;;
+10618;LINEAR A SIGN AB026;Lo;0;L;;;;;N;;;;;
+10619;LINEAR A SIGN AB027;Lo;0;L;;;;;N;;;;;
+1061A;LINEAR A SIGN AB028;Lo;0;L;;;;;N;;;;;
+1061B;LINEAR A SIGN A028B;Lo;0;L;;;;;N;;;;;
+1061C;LINEAR A SIGN AB029;Lo;0;L;;;;;N;;;;;
+1061D;LINEAR A SIGN AB030;Lo;0;L;;;;;N;;;;;
+1061E;LINEAR A SIGN AB031;Lo;0;L;;;;;N;;;;;
+1061F;LINEAR A SIGN AB034;Lo;0;L;;;;;N;;;;;
+10620;LINEAR A SIGN AB037;Lo;0;L;;;;;N;;;;;
+10621;LINEAR A SIGN AB038;Lo;0;L;;;;;N;;;;;
+10622;LINEAR A SIGN AB039;Lo;0;L;;;;;N;;;;;
+10623;LINEAR A SIGN AB040;Lo;0;L;;;;;N;;;;;
+10624;LINEAR A SIGN AB041;Lo;0;L;;;;;N;;;;;
+10625;LINEAR A SIGN AB044;Lo;0;L;;;;;N;;;;;
+10626;LINEAR A SIGN AB045;Lo;0;L;;;;;N;;;;;
+10627;LINEAR A SIGN AB046;Lo;0;L;;;;;N;;;;;
+10628;LINEAR A SIGN AB047;Lo;0;L;;;;;N;;;;;
+10629;LINEAR A SIGN AB048;Lo;0;L;;;;;N;;;;;
+1062A;LINEAR A SIGN AB049;Lo;0;L;;;;;N;;;;;
+1062B;LINEAR A SIGN AB050;Lo;0;L;;;;;N;;;;;
+1062C;LINEAR A SIGN AB051;Lo;0;L;;;;;N;;;;;
+1062D;LINEAR A SIGN AB053;Lo;0;L;;;;;N;;;;;
+1062E;LINEAR A SIGN AB054;Lo;0;L;;;;;N;;;;;
+1062F;LINEAR A SIGN AB055;Lo;0;L;;;;;N;;;;;
+10630;LINEAR A SIGN AB056;Lo;0;L;;;;;N;;;;;
+10631;LINEAR A SIGN AB057;Lo;0;L;;;;;N;;;;;
+10632;LINEAR A SIGN AB058;Lo;0;L;;;;;N;;;;;
+10633;LINEAR A SIGN AB059;Lo;0;L;;;;;N;;;;;
+10634;LINEAR A SIGN AB060;Lo;0;L;;;;;N;;;;;
+10635;LINEAR A SIGN AB061;Lo;0;L;;;;;N;;;;;
+10636;LINEAR A SIGN AB065;Lo;0;L;;;;;N;;;;;
+10637;LINEAR A SIGN AB066;Lo;0;L;;;;;N;;;;;
+10638;LINEAR A SIGN AB067;Lo;0;L;;;;;N;;;;;
+10639;LINEAR A SIGN AB069;Lo;0;L;;;;;N;;;;;
+1063A;LINEAR A SIGN AB070;Lo;0;L;;;;;N;;;;;
+1063B;LINEAR A SIGN AB073;Lo;0;L;;;;;N;;;;;
+1063C;LINEAR A SIGN AB074;Lo;0;L;;;;;N;;;;;
+1063D;LINEAR A SIGN AB076;Lo;0;L;;;;;N;;;;;
+1063E;LINEAR A SIGN AB077;Lo;0;L;;;;;N;;;;;
+1063F;LINEAR A SIGN AB078;Lo;0;L;;;;;N;;;;;
+10640;LINEAR A SIGN AB079;Lo;0;L;;;;;N;;;;;
+10641;LINEAR A SIGN AB080;Lo;0;L;;;;;N;;;;;
+10642;LINEAR A SIGN AB081;Lo;0;L;;;;;N;;;;;
+10643;LINEAR A SIGN AB082;Lo;0;L;;;;;N;;;;;
+10644;LINEAR A SIGN AB085;Lo;0;L;;;;;N;;;;;
+10645;LINEAR A SIGN AB086;Lo;0;L;;;;;N;;;;;
+10646;LINEAR A SIGN AB087;Lo;0;L;;;;;N;;;;;
+10647;LINEAR A SIGN A100-102;Lo;0;L;;;;;N;;;;;
+10648;LINEAR A SIGN AB118;Lo;0;L;;;;;N;;;;;
+10649;LINEAR A SIGN AB120;Lo;0;L;;;;;N;;;;;
+1064A;LINEAR A SIGN A120B;Lo;0;L;;;;;N;;;;;
+1064B;LINEAR A SIGN AB122;Lo;0;L;;;;;N;;;;;
+1064C;LINEAR A SIGN AB123;Lo;0;L;;;;;N;;;;;
+1064D;LINEAR A SIGN AB131A;Lo;0;L;;;;;N;;;;;
+1064E;LINEAR A SIGN AB131B;Lo;0;L;;;;;N;;;;;
+1064F;LINEAR A SIGN A131C;Lo;0;L;;;;;N;;;;;
+10650;LINEAR A SIGN AB164;Lo;0;L;;;;;N;;;;;
+10651;LINEAR A SIGN AB171;Lo;0;L;;;;;N;;;;;
+10652;LINEAR A SIGN AB180;Lo;0;L;;;;;N;;;;;
+10653;LINEAR A SIGN AB188;Lo;0;L;;;;;N;;;;;
+10654;LINEAR A SIGN AB191;Lo;0;L;;;;;N;;;;;
+10655;LINEAR A SIGN A301;Lo;0;L;;;;;N;;;;;
+10656;LINEAR A SIGN A302;Lo;0;L;;;;;N;;;;;
+10657;LINEAR A SIGN A303;Lo;0;L;;;;;N;;;;;
+10658;LINEAR A SIGN A304;Lo;0;L;;;;;N;;;;;
+10659;LINEAR A SIGN A305;Lo;0;L;;;;;N;;;;;
+1065A;LINEAR A SIGN A306;Lo;0;L;;;;;N;;;;;
+1065B;LINEAR A SIGN A307;Lo;0;L;;;;;N;;;;;
+1065C;LINEAR A SIGN A308;Lo;0;L;;;;;N;;;;;
+1065D;LINEAR A SIGN A309A;Lo;0;L;;;;;N;;;;;
+1065E;LINEAR A SIGN A309B;Lo;0;L;;;;;N;;;;;
+1065F;LINEAR A SIGN A309C;Lo;0;L;;;;;N;;;;;
+10660;LINEAR A SIGN A310;Lo;0;L;;;;;N;;;;;
+10661;LINEAR A SIGN A311;Lo;0;L;;;;;N;;;;;
+10662;LINEAR A SIGN A312;Lo;0;L;;;;;N;;;;;
+10663;LINEAR A SIGN A313A;Lo;0;L;;;;;N;;;;;
+10664;LINEAR A SIGN A313B;Lo;0;L;;;;;N;;;;;
+10665;LINEAR A SIGN A313C;Lo;0;L;;;;;N;;;;;
+10666;LINEAR A SIGN A314;Lo;0;L;;;;;N;;;;;
+10667;LINEAR A SIGN A315;Lo;0;L;;;;;N;;;;;
+10668;LINEAR A SIGN A316;Lo;0;L;;;;;N;;;;;
+10669;LINEAR A SIGN A317;Lo;0;L;;;;;N;;;;;
+1066A;LINEAR A SIGN A318;Lo;0;L;;;;;N;;;;;
+1066B;LINEAR A SIGN A319;Lo;0;L;;;;;N;;;;;
+1066C;LINEAR A SIGN A320;Lo;0;L;;;;;N;;;;;
+1066D;LINEAR A SIGN A321;Lo;0;L;;;;;N;;;;;
+1066E;LINEAR A SIGN A322;Lo;0;L;;;;;N;;;;;
+1066F;LINEAR A SIGN A323;Lo;0;L;;;;;N;;;;;
+10670;LINEAR A SIGN A324;Lo;0;L;;;;;N;;;;;
+10671;LINEAR A SIGN A325;Lo;0;L;;;;;N;;;;;
+10672;LINEAR A SIGN A326;Lo;0;L;;;;;N;;;;;
+10673;LINEAR A SIGN A327;Lo;0;L;;;;;N;;;;;
+10674;LINEAR A SIGN A328;Lo;0;L;;;;;N;;;;;
+10675;LINEAR A SIGN A329;Lo;0;L;;;;;N;;;;;
+10676;LINEAR A SIGN A330;Lo;0;L;;;;;N;;;;;
+10677;LINEAR A SIGN A331;Lo;0;L;;;;;N;;;;;
+10678;LINEAR A SIGN A332;Lo;0;L;;;;;N;;;;;
+10679;LINEAR A SIGN A333;Lo;0;L;;;;;N;;;;;
+1067A;LINEAR A SIGN A334;Lo;0;L;;;;;N;;;;;
+1067B;LINEAR A SIGN A335;Lo;0;L;;;;;N;;;;;
+1067C;LINEAR A SIGN A336;Lo;0;L;;;;;N;;;;;
+1067D;LINEAR A SIGN A337;Lo;0;L;;;;;N;;;;;
+1067E;LINEAR A SIGN A338;Lo;0;L;;;;;N;;;;;
+1067F;LINEAR A SIGN A339;Lo;0;L;;;;;N;;;;;
+10680;LINEAR A SIGN A340;Lo;0;L;;;;;N;;;;;
+10681;LINEAR A SIGN A341;Lo;0;L;;;;;N;;;;;
+10682;LINEAR A SIGN A342;Lo;0;L;;;;;N;;;;;
+10683;LINEAR A SIGN A343;Lo;0;L;;;;;N;;;;;
+10684;LINEAR A SIGN A344;Lo;0;L;;;;;N;;;;;
+10685;LINEAR A SIGN A345;Lo;0;L;;;;;N;;;;;
+10686;LINEAR A SIGN A346;Lo;0;L;;;;;N;;;;;
+10687;LINEAR A SIGN A347;Lo;0;L;;;;;N;;;;;
+10688;LINEAR A SIGN A348;Lo;0;L;;;;;N;;;;;
+10689;LINEAR A SIGN A349;Lo;0;L;;;;;N;;;;;
+1068A;LINEAR A SIGN A350;Lo;0;L;;;;;N;;;;;
+1068B;LINEAR A SIGN A351;Lo;0;L;;;;;N;;;;;
+1068C;LINEAR A SIGN A352;Lo;0;L;;;;;N;;;;;
+1068D;LINEAR A SIGN A353;Lo;0;L;;;;;N;;;;;
+1068E;LINEAR A SIGN A354;Lo;0;L;;;;;N;;;;;
+1068F;LINEAR A SIGN A355;Lo;0;L;;;;;N;;;;;
+10690;LINEAR A SIGN A356;Lo;0;L;;;;;N;;;;;
+10691;LINEAR A SIGN A357;Lo;0;L;;;;;N;;;;;
+10692;LINEAR A SIGN A358;Lo;0;L;;;;;N;;;;;
+10693;LINEAR A SIGN A359;Lo;0;L;;;;;N;;;;;
+10694;LINEAR A SIGN A360;Lo;0;L;;;;;N;;;;;
+10695;LINEAR A SIGN A361;Lo;0;L;;;;;N;;;;;
+10696;LINEAR A SIGN A362;Lo;0;L;;;;;N;;;;;
+10697;LINEAR A SIGN A363;Lo;0;L;;;;;N;;;;;
+10698;LINEAR A SIGN A364;Lo;0;L;;;;;N;;;;;
+10699;LINEAR A SIGN A365;Lo;0;L;;;;;N;;;;;
+1069A;LINEAR A SIGN A366;Lo;0;L;;;;;N;;;;;
+1069B;LINEAR A SIGN A367;Lo;0;L;;;;;N;;;;;
+1069C;LINEAR A SIGN A368;Lo;0;L;;;;;N;;;;;
+1069D;LINEAR A SIGN A369;Lo;0;L;;;;;N;;;;;
+1069E;LINEAR A SIGN A370;Lo;0;L;;;;;N;;;;;
+1069F;LINEAR A SIGN A371;Lo;0;L;;;;;N;;;;;
+106A0;LINEAR A SIGN A400-VAS;Lo;0;L;;;;;N;;;;;
+106A1;LINEAR A SIGN A401-VAS;Lo;0;L;;;;;N;;;;;
+106A2;LINEAR A SIGN A402-VAS;Lo;0;L;;;;;N;;;;;
+106A3;LINEAR A SIGN A403-VAS;Lo;0;L;;;;;N;;;;;
+106A4;LINEAR A SIGN A404-VAS;Lo;0;L;;;;;N;;;;;
+106A5;LINEAR A SIGN A405-VAS;Lo;0;L;;;;;N;;;;;
+106A6;LINEAR A SIGN A406-VAS;Lo;0;L;;;;;N;;;;;
+106A7;LINEAR A SIGN A407-VAS;Lo;0;L;;;;;N;;;;;
+106A8;LINEAR A SIGN A408-VAS;Lo;0;L;;;;;N;;;;;
+106A9;LINEAR A SIGN A409-VAS;Lo;0;L;;;;;N;;;;;
+106AA;LINEAR A SIGN A410-VAS;Lo;0;L;;;;;N;;;;;
+106AB;LINEAR A SIGN A411-VAS;Lo;0;L;;;;;N;;;;;
+106AC;LINEAR A SIGN A412-VAS;Lo;0;L;;;;;N;;;;;
+106AD;LINEAR A SIGN A413-VAS;Lo;0;L;;;;;N;;;;;
+106AE;LINEAR A SIGN A414-VAS;Lo;0;L;;;;;N;;;;;
+106AF;LINEAR A SIGN A415-VAS;Lo;0;L;;;;;N;;;;;
+106B0;LINEAR A SIGN A416-VAS;Lo;0;L;;;;;N;;;;;
+106B1;LINEAR A SIGN A417-VAS;Lo;0;L;;;;;N;;;;;
+106B2;LINEAR A SIGN A418-VAS;Lo;0;L;;;;;N;;;;;
+106B3;LINEAR A SIGN A501;Lo;0;L;;;;;N;;;;;
+106B4;LINEAR A SIGN A502;Lo;0;L;;;;;N;;;;;
+106B5;LINEAR A SIGN A503;Lo;0;L;;;;;N;;;;;
+106B6;LINEAR A SIGN A504;Lo;0;L;;;;;N;;;;;
+106B7;LINEAR A SIGN A505;Lo;0;L;;;;;N;;;;;
+106B8;LINEAR A SIGN A506;Lo;0;L;;;;;N;;;;;
+106B9;LINEAR A SIGN A508;Lo;0;L;;;;;N;;;;;
+106BA;LINEAR A SIGN A509;Lo;0;L;;;;;N;;;;;
+106BB;LINEAR A SIGN A510;Lo;0;L;;;;;N;;;;;
+106BC;LINEAR A SIGN A511;Lo;0;L;;;;;N;;;;;
+106BD;LINEAR A SIGN A512;Lo;0;L;;;;;N;;;;;
+106BE;LINEAR A SIGN A513;Lo;0;L;;;;;N;;;;;
+106BF;LINEAR A SIGN A515;Lo;0;L;;;;;N;;;;;
+106C0;LINEAR A SIGN A516;Lo;0;L;;;;;N;;;;;
+106C1;LINEAR A SIGN A520;Lo;0;L;;;;;N;;;;;
+106C2;LINEAR A SIGN A521;Lo;0;L;;;;;N;;;;;
+106C3;LINEAR A SIGN A523;Lo;0;L;;;;;N;;;;;
+106C4;LINEAR A SIGN A524;Lo;0;L;;;;;N;;;;;
+106C5;LINEAR A SIGN A525;Lo;0;L;;;;;N;;;;;
+106C6;LINEAR A SIGN A526;Lo;0;L;;;;;N;;;;;
+106C7;LINEAR A SIGN A527;Lo;0;L;;;;;N;;;;;
+106C8;LINEAR A SIGN A528;Lo;0;L;;;;;N;;;;;
+106C9;LINEAR A SIGN A529;Lo;0;L;;;;;N;;;;;
+106CA;LINEAR A SIGN A530;Lo;0;L;;;;;N;;;;;
+106CB;LINEAR A SIGN A531;Lo;0;L;;;;;N;;;;;
+106CC;LINEAR A SIGN A532;Lo;0;L;;;;;N;;;;;
+106CD;LINEAR A SIGN A534;Lo;0;L;;;;;N;;;;;
+106CE;LINEAR A SIGN A535;Lo;0;L;;;;;N;;;;;
+106CF;LINEAR A SIGN A536;Lo;0;L;;;;;N;;;;;
+106D0;LINEAR A SIGN A537;Lo;0;L;;;;;N;;;;;
+106D1;LINEAR A SIGN A538;Lo;0;L;;;;;N;;;;;
+106D2;LINEAR A SIGN A539;Lo;0;L;;;;;N;;;;;
+106D3;LINEAR A SIGN A540;Lo;0;L;;;;;N;;;;;
+106D4;LINEAR A SIGN A541;Lo;0;L;;;;;N;;;;;
+106D5;LINEAR A SIGN A542;Lo;0;L;;;;;N;;;;;
+106D6;LINEAR A SIGN A545;Lo;0;L;;;;;N;;;;;
+106D7;LINEAR A SIGN A547;Lo;0;L;;;;;N;;;;;
+106D8;LINEAR A SIGN A548;Lo;0;L;;;;;N;;;;;
+106D9;LINEAR A SIGN A549;Lo;0;L;;;;;N;;;;;
+106DA;LINEAR A SIGN A550;Lo;0;L;;;;;N;;;;;
+106DB;LINEAR A SIGN A551;Lo;0;L;;;;;N;;;;;
+106DC;LINEAR A SIGN A552;Lo;0;L;;;;;N;;;;;
+106DD;LINEAR A SIGN A553;Lo;0;L;;;;;N;;;;;
+106DE;LINEAR A SIGN A554;Lo;0;L;;;;;N;;;;;
+106DF;LINEAR A SIGN A555;Lo;0;L;;;;;N;;;;;
+106E0;LINEAR A SIGN A556;Lo;0;L;;;;;N;;;;;
+106E1;LINEAR A SIGN A557;Lo;0;L;;;;;N;;;;;
+106E2;LINEAR A SIGN A559;Lo;0;L;;;;;N;;;;;
+106E3;LINEAR A SIGN A563;Lo;0;L;;;;;N;;;;;
+106E4;LINEAR A SIGN A564;Lo;0;L;;;;;N;;;;;
+106E5;LINEAR A SIGN A565;Lo;0;L;;;;;N;;;;;
+106E6;LINEAR A SIGN A566;Lo;0;L;;;;;N;;;;;
+106E7;LINEAR A SIGN A568;Lo;0;L;;;;;N;;;;;
+106E8;LINEAR A SIGN A569;Lo;0;L;;;;;N;;;;;
+106E9;LINEAR A SIGN A570;Lo;0;L;;;;;N;;;;;
+106EA;LINEAR A SIGN A571;Lo;0;L;;;;;N;;;;;
+106EB;LINEAR A SIGN A572;Lo;0;L;;;;;N;;;;;
+106EC;LINEAR A SIGN A573;Lo;0;L;;;;;N;;;;;
+106ED;LINEAR A SIGN A574;Lo;0;L;;;;;N;;;;;
+106EE;LINEAR A SIGN A575;Lo;0;L;;;;;N;;;;;
+106EF;LINEAR A SIGN A576;Lo;0;L;;;;;N;;;;;
+106F0;LINEAR A SIGN A577;Lo;0;L;;;;;N;;;;;
+106F1;LINEAR A SIGN A578;Lo;0;L;;;;;N;;;;;
+106F2;LINEAR A SIGN A579;Lo;0;L;;;;;N;;;;;
+106F3;LINEAR A SIGN A580;Lo;0;L;;;;;N;;;;;
+106F4;LINEAR A SIGN A581;Lo;0;L;;;;;N;;;;;
+106F5;LINEAR A SIGN A582;Lo;0;L;;;;;N;;;;;
+106F6;LINEAR A SIGN A583;Lo;0;L;;;;;N;;;;;
+106F7;LINEAR A SIGN A584;Lo;0;L;;;;;N;;;;;
+106F8;LINEAR A SIGN A585;Lo;0;L;;;;;N;;;;;
+106F9;LINEAR A SIGN A586;Lo;0;L;;;;;N;;;;;
+106FA;LINEAR A SIGN A587;Lo;0;L;;;;;N;;;;;
+106FB;LINEAR A SIGN A588;Lo;0;L;;;;;N;;;;;
+106FC;LINEAR A SIGN A589;Lo;0;L;;;;;N;;;;;
+106FD;LINEAR A SIGN A591;Lo;0;L;;;;;N;;;;;
+106FE;LINEAR A SIGN A592;Lo;0;L;;;;;N;;;;;
+106FF;LINEAR A SIGN A594;Lo;0;L;;;;;N;;;;;
+10700;LINEAR A SIGN A595;Lo;0;L;;;;;N;;;;;
+10701;LINEAR A SIGN A596;Lo;0;L;;;;;N;;;;;
+10702;LINEAR A SIGN A598;Lo;0;L;;;;;N;;;;;
+10703;LINEAR A SIGN A600;Lo;0;L;;;;;N;;;;;
+10704;LINEAR A SIGN A601;Lo;0;L;;;;;N;;;;;
+10705;LINEAR A SIGN A602;Lo;0;L;;;;;N;;;;;
+10706;LINEAR A SIGN A603;Lo;0;L;;;;;N;;;;;
+10707;LINEAR A SIGN A604;Lo;0;L;;;;;N;;;;;
+10708;LINEAR A SIGN A606;Lo;0;L;;;;;N;;;;;
+10709;LINEAR A SIGN A608;Lo;0;L;;;;;N;;;;;
+1070A;LINEAR A SIGN A609;Lo;0;L;;;;;N;;;;;
+1070B;LINEAR A SIGN A610;Lo;0;L;;;;;N;;;;;
+1070C;LINEAR A SIGN A611;Lo;0;L;;;;;N;;;;;
+1070D;LINEAR A SIGN A612;Lo;0;L;;;;;N;;;;;
+1070E;LINEAR A SIGN A613;Lo;0;L;;;;;N;;;;;
+1070F;LINEAR A SIGN A614;Lo;0;L;;;;;N;;;;;
+10710;LINEAR A SIGN A615;Lo;0;L;;;;;N;;;;;
+10711;LINEAR A SIGN A616;Lo;0;L;;;;;N;;;;;
+10712;LINEAR A SIGN A617;Lo;0;L;;;;;N;;;;;
+10713;LINEAR A SIGN A618;Lo;0;L;;;;;N;;;;;
+10714;LINEAR A SIGN A619;Lo;0;L;;;;;N;;;;;
+10715;LINEAR A SIGN A620;Lo;0;L;;;;;N;;;;;
+10716;LINEAR A SIGN A621;Lo;0;L;;;;;N;;;;;
+10717;LINEAR A SIGN A622;Lo;0;L;;;;;N;;;;;
+10718;LINEAR A SIGN A623;Lo;0;L;;;;;N;;;;;
+10719;LINEAR A SIGN A624;Lo;0;L;;;;;N;;;;;
+1071A;LINEAR A SIGN A626;Lo;0;L;;;;;N;;;;;
+1071B;LINEAR A SIGN A627;Lo;0;L;;;;;N;;;;;
+1071C;LINEAR A SIGN A628;Lo;0;L;;;;;N;;;;;
+1071D;LINEAR A SIGN A629;Lo;0;L;;;;;N;;;;;
+1071E;LINEAR A SIGN A634;Lo;0;L;;;;;N;;;;;
+1071F;LINEAR A SIGN A637;Lo;0;L;;;;;N;;;;;
+10720;LINEAR A SIGN A638;Lo;0;L;;;;;N;;;;;
+10721;LINEAR A SIGN A640;Lo;0;L;;;;;N;;;;;
+10722;LINEAR A SIGN A642;Lo;0;L;;;;;N;;;;;
+10723;LINEAR A SIGN A643;Lo;0;L;;;;;N;;;;;
+10724;LINEAR A SIGN A644;Lo;0;L;;;;;N;;;;;
+10725;LINEAR A SIGN A645;Lo;0;L;;;;;N;;;;;
+10726;LINEAR A SIGN A646;Lo;0;L;;;;;N;;;;;
+10727;LINEAR A SIGN A648;Lo;0;L;;;;;N;;;;;
+10728;LINEAR A SIGN A649;Lo;0;L;;;;;N;;;;;
+10729;LINEAR A SIGN A651;Lo;0;L;;;;;N;;;;;
+1072A;LINEAR A SIGN A652;Lo;0;L;;;;;N;;;;;
+1072B;LINEAR A SIGN A653;Lo;0;L;;;;;N;;;;;
+1072C;LINEAR A SIGN A654;Lo;0;L;;;;;N;;;;;
+1072D;LINEAR A SIGN A655;Lo;0;L;;;;;N;;;;;
+1072E;LINEAR A SIGN A656;Lo;0;L;;;;;N;;;;;
+1072F;LINEAR A SIGN A657;Lo;0;L;;;;;N;;;;;
+10730;LINEAR A SIGN A658;Lo;0;L;;;;;N;;;;;
+10731;LINEAR A SIGN A659;Lo;0;L;;;;;N;;;;;
+10732;LINEAR A SIGN A660;Lo;0;L;;;;;N;;;;;
+10733;LINEAR A SIGN A661;Lo;0;L;;;;;N;;;;;
+10734;LINEAR A SIGN A662;Lo;0;L;;;;;N;;;;;
+10735;LINEAR A SIGN A663;Lo;0;L;;;;;N;;;;;
+10736;LINEAR A SIGN A664;Lo;0;L;;;;;N;;;;;
+10740;LINEAR A SIGN A701 A;Lo;0;L;;;;;N;;;;;
+10741;LINEAR A SIGN A702 B;Lo;0;L;;;;;N;;;;;
+10742;LINEAR A SIGN A703 D;Lo;0;L;;;;;N;;;;;
+10743;LINEAR A SIGN A704 E;Lo;0;L;;;;;N;;;;;
+10744;LINEAR A SIGN A705 F;Lo;0;L;;;;;N;;;;;
+10745;LINEAR A SIGN A706 H;Lo;0;L;;;;;N;;;;;
+10746;LINEAR A SIGN A707 J;Lo;0;L;;;;;N;;;;;
+10747;LINEAR A SIGN A708 K;Lo;0;L;;;;;N;;;;;
+10748;LINEAR A SIGN A709 L;Lo;0;L;;;;;N;;;;;
+10749;LINEAR A SIGN A709-2 L2;Lo;0;L;;;;;N;;;;;
+1074A;LINEAR A SIGN A709-3 L3;Lo;0;L;;;;;N;;;;;
+1074B;LINEAR A SIGN A709-4 L4;Lo;0;L;;;;;N;;;;;
+1074C;LINEAR A SIGN A709-6 L6;Lo;0;L;;;;;N;;;;;
+1074D;LINEAR A SIGN A710 W;Lo;0;L;;;;;N;;;;;
+1074E;LINEAR A SIGN A711 X;Lo;0;L;;;;;N;;;;;
+1074F;LINEAR A SIGN A712 Y;Lo;0;L;;;;;N;;;;;
+10750;LINEAR A SIGN A713 OMEGA;Lo;0;L;;;;;N;;;;;
+10751;LINEAR A SIGN A714 ABB;Lo;0;L;;;;;N;;;;;
+10752;LINEAR A SIGN A715 BB;Lo;0;L;;;;;N;;;;;
+10753;LINEAR A SIGN A717 DD;Lo;0;L;;;;;N;;;;;
+10754;LINEAR A SIGN A726 EYYY;Lo;0;L;;;;;N;;;;;
+10755;LINEAR A SIGN A732 JE;Lo;0;L;;;;;N;;;;;
+10760;LINEAR A SIGN A800;Lo;0;L;;;;;N;;;;;
+10761;LINEAR A SIGN A801;Lo;0;L;;;;;N;;;;;
+10762;LINEAR A SIGN A802;Lo;0;L;;;;;N;;;;;
+10763;LINEAR A SIGN A803;Lo;0;L;;;;;N;;;;;
+10764;LINEAR A SIGN A804;Lo;0;L;;;;;N;;;;;
+10765;LINEAR A SIGN A805;Lo;0;L;;;;;N;;;;;
+10766;LINEAR A SIGN A806;Lo;0;L;;;;;N;;;;;
+10767;LINEAR A SIGN A807;Lo;0;L;;;;;N;;;;;
+10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;;
+10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;;
+10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;;
+10803;CYPRIOT SYLLABLE O;Lo;0;R;;;;;N;;;;;
+10804;CYPRIOT SYLLABLE U;Lo;0;R;;;;;N;;;;;
+10805;CYPRIOT SYLLABLE JA;Lo;0;R;;;;;N;;;;;
+10808;CYPRIOT SYLLABLE JO;Lo;0;R;;;;;N;;;;;
+1080A;CYPRIOT SYLLABLE KA;Lo;0;R;;;;;N;;;;;
+1080B;CYPRIOT SYLLABLE KE;Lo;0;R;;;;;N;;;;;
+1080C;CYPRIOT SYLLABLE KI;Lo;0;R;;;;;N;;;;;
+1080D;CYPRIOT SYLLABLE KO;Lo;0;R;;;;;N;;;;;
+1080E;CYPRIOT SYLLABLE KU;Lo;0;R;;;;;N;;;;;
+1080F;CYPRIOT SYLLABLE LA;Lo;0;R;;;;;N;;;;;
+10810;CYPRIOT SYLLABLE LE;Lo;0;R;;;;;N;;;;;
+10811;CYPRIOT SYLLABLE LI;Lo;0;R;;;;;N;;;;;
+10812;CYPRIOT SYLLABLE LO;Lo;0;R;;;;;N;;;;;
+10813;CYPRIOT SYLLABLE LU;Lo;0;R;;;;;N;;;;;
+10814;CYPRIOT SYLLABLE MA;Lo;0;R;;;;;N;;;;;
+10815;CYPRIOT SYLLABLE ME;Lo;0;R;;;;;N;;;;;
+10816;CYPRIOT SYLLABLE MI;Lo;0;R;;;;;N;;;;;
+10817;CYPRIOT SYLLABLE MO;Lo;0;R;;;;;N;;;;;
+10818;CYPRIOT SYLLABLE MU;Lo;0;R;;;;;N;;;;;
+10819;CYPRIOT SYLLABLE NA;Lo;0;R;;;;;N;;;;;
+1081A;CYPRIOT SYLLABLE NE;Lo;0;R;;;;;N;;;;;
+1081B;CYPRIOT SYLLABLE NI;Lo;0;R;;;;;N;;;;;
+1081C;CYPRIOT SYLLABLE NO;Lo;0;R;;;;;N;;;;;
+1081D;CYPRIOT SYLLABLE NU;Lo;0;R;;;;;N;;;;;
+1081E;CYPRIOT SYLLABLE PA;Lo;0;R;;;;;N;;;;;
+1081F;CYPRIOT SYLLABLE PE;Lo;0;R;;;;;N;;;;;
+10820;CYPRIOT SYLLABLE PI;Lo;0;R;;;;;N;;;;;
+10821;CYPRIOT SYLLABLE PO;Lo;0;R;;;;;N;;;;;
+10822;CYPRIOT SYLLABLE PU;Lo;0;R;;;;;N;;;;;
+10823;CYPRIOT SYLLABLE RA;Lo;0;R;;;;;N;;;;;
+10824;CYPRIOT SYLLABLE RE;Lo;0;R;;;;;N;;;;;
+10825;CYPRIOT SYLLABLE RI;Lo;0;R;;;;;N;;;;;
+10826;CYPRIOT SYLLABLE RO;Lo;0;R;;;;;N;;;;;
+10827;CYPRIOT SYLLABLE RU;Lo;0;R;;;;;N;;;;;
+10828;CYPRIOT SYLLABLE SA;Lo;0;R;;;;;N;;;;;
+10829;CYPRIOT SYLLABLE SE;Lo;0;R;;;;;N;;;;;
+1082A;CYPRIOT SYLLABLE SI;Lo;0;R;;;;;N;;;;;
+1082B;CYPRIOT SYLLABLE SO;Lo;0;R;;;;;N;;;;;
+1082C;CYPRIOT SYLLABLE SU;Lo;0;R;;;;;N;;;;;
+1082D;CYPRIOT SYLLABLE TA;Lo;0;R;;;;;N;;;;;
+1082E;CYPRIOT SYLLABLE TE;Lo;0;R;;;;;N;;;;;
+1082F;CYPRIOT SYLLABLE TI;Lo;0;R;;;;;N;;;;;
+10830;CYPRIOT SYLLABLE TO;Lo;0;R;;;;;N;;;;;
+10831;CYPRIOT SYLLABLE TU;Lo;0;R;;;;;N;;;;;
+10832;CYPRIOT SYLLABLE WA;Lo;0;R;;;;;N;;;;;
+10833;CYPRIOT SYLLABLE WE;Lo;0;R;;;;;N;;;;;
+10834;CYPRIOT SYLLABLE WI;Lo;0;R;;;;;N;;;;;
+10835;CYPRIOT SYLLABLE WO;Lo;0;R;;;;;N;;;;;
+10837;CYPRIOT SYLLABLE XA;Lo;0;R;;;;;N;;;;;
+10838;CYPRIOT SYLLABLE XE;Lo;0;R;;;;;N;;;;;
+1083C;CYPRIOT SYLLABLE ZA;Lo;0;R;;;;;N;;;;;
+1083F;CYPRIOT SYLLABLE ZO;Lo;0;R;;;;;N;;;;;
+10840;IMPERIAL ARAMAIC LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10841;IMPERIAL ARAMAIC LETTER BETH;Lo;0;R;;;;;N;;;;;
+10842;IMPERIAL ARAMAIC LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10843;IMPERIAL ARAMAIC LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10844;IMPERIAL ARAMAIC LETTER HE;Lo;0;R;;;;;N;;;;;
+10845;IMPERIAL ARAMAIC LETTER WAW;Lo;0;R;;;;;N;;;;;
+10846;IMPERIAL ARAMAIC LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10847;IMPERIAL ARAMAIC LETTER HETH;Lo;0;R;;;;;N;;;;;
+10848;IMPERIAL ARAMAIC LETTER TETH;Lo;0;R;;;;;N;;;;;
+10849;IMPERIAL ARAMAIC LETTER YODH;Lo;0;R;;;;;N;;;;;
+1084A;IMPERIAL ARAMAIC LETTER KAPH;Lo;0;R;;;;;N;;;;;
+1084B;IMPERIAL ARAMAIC LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+1084C;IMPERIAL ARAMAIC LETTER MEM;Lo;0;R;;;;;N;;;;;
+1084D;IMPERIAL ARAMAIC LETTER NUN;Lo;0;R;;;;;N;;;;;
+1084E;IMPERIAL ARAMAIC LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+1084F;IMPERIAL ARAMAIC LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10850;IMPERIAL ARAMAIC LETTER PE;Lo;0;R;;;;;N;;;;;
+10851;IMPERIAL ARAMAIC LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10852;IMPERIAL ARAMAIC LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10853;IMPERIAL ARAMAIC LETTER RESH;Lo;0;R;;;;;N;;;;;
+10854;IMPERIAL ARAMAIC LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10855;IMPERIAL ARAMAIC LETTER TAW;Lo;0;R;;;;;N;;;;;
+10857;IMPERIAL ARAMAIC SECTION SIGN;Po;0;R;;;;;N;;;;;
+10858;IMPERIAL ARAMAIC NUMBER ONE;No;0;R;;;;1;N;;;;;
+10859;IMPERIAL ARAMAIC NUMBER TWO;No;0;R;;;;2;N;;;;;
+1085A;IMPERIAL ARAMAIC NUMBER THREE;No;0;R;;;;3;N;;;;;
+1085B;IMPERIAL ARAMAIC NUMBER TEN;No;0;R;;;;10;N;;;;;
+1085C;IMPERIAL ARAMAIC NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+1085D;IMPERIAL ARAMAIC NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1085E;IMPERIAL ARAMAIC NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+1085F;IMPERIAL ARAMAIC NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;;
+10860;PALMYRENE LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10861;PALMYRENE LETTER BETH;Lo;0;R;;;;;N;;;;;
+10862;PALMYRENE LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10863;PALMYRENE LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10864;PALMYRENE LETTER HE;Lo;0;R;;;;;N;;;;;
+10865;PALMYRENE LETTER WAW;Lo;0;R;;;;;N;;;;;
+10866;PALMYRENE LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10867;PALMYRENE LETTER HETH;Lo;0;R;;;;;N;;;;;
+10868;PALMYRENE LETTER TETH;Lo;0;R;;;;;N;;;;;
+10869;PALMYRENE LETTER YODH;Lo;0;R;;;;;N;;;;;
+1086A;PALMYRENE LETTER KAPH;Lo;0;R;;;;;N;;;;;
+1086B;PALMYRENE LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+1086C;PALMYRENE LETTER MEM;Lo;0;R;;;;;N;;;;;
+1086D;PALMYRENE LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+1086E;PALMYRENE LETTER NUN;Lo;0;R;;;;;N;;;;;
+1086F;PALMYRENE LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10870;PALMYRENE LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10871;PALMYRENE LETTER PE;Lo;0;R;;;;;N;;;;;
+10872;PALMYRENE LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10873;PALMYRENE LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10874;PALMYRENE LETTER RESH;Lo;0;R;;;;;N;;;;;
+10875;PALMYRENE LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10876;PALMYRENE LETTER TAW;Lo;0;R;;;;;N;;;;;
+10877;PALMYRENE LEFT-POINTING FLEURON;So;0;R;;;;;N;;;;;
+10878;PALMYRENE RIGHT-POINTING FLEURON;So;0;R;;;;;N;;;;;
+10879;PALMYRENE NUMBER ONE;No;0;R;;;;1;N;;;;;
+1087A;PALMYRENE NUMBER TWO;No;0;R;;;;2;N;;;;;
+1087B;PALMYRENE NUMBER THREE;No;0;R;;;;3;N;;;;;
+1087C;PALMYRENE NUMBER FOUR;No;0;R;;;;4;N;;;;;
+1087D;PALMYRENE NUMBER FIVE;No;0;R;;;;5;N;;;;;
+1087E;PALMYRENE NUMBER TEN;No;0;R;;;;10;N;;;;;
+1087F;PALMYRENE NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10880;NABATAEAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;;
+10881;NABATAEAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10882;NABATAEAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;;
+10883;NABATAEAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10884;NABATAEAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10885;NABATAEAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10886;NABATAEAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;;
+10887;NABATAEAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10888;NABATAEAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10889;NABATAEAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+1088A;NABATAEAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+1088B;NABATAEAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+1088C;NABATAEAN LETTER FINAL YODH;Lo;0;R;;;;;N;;;;;
+1088D;NABATAEAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+1088E;NABATAEAN LETTER FINAL KAPH;Lo;0;R;;;;;N;;;;;
+1088F;NABATAEAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10890;NABATAEAN LETTER FINAL LAMEDH;Lo;0;R;;;;;N;;;;;
+10891;NABATAEAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10892;NABATAEAN LETTER FINAL MEM;Lo;0;R;;;;;N;;;;;
+10893;NABATAEAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10894;NABATAEAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+10895;NABATAEAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10896;NABATAEAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10897;NABATAEAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10898;NABATAEAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10899;NABATAEAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+1089A;NABATAEAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+1089B;NABATAEAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+1089C;NABATAEAN LETTER FINAL SHIN;Lo;0;R;;;;;N;;;;;
+1089D;NABATAEAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+1089E;NABATAEAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+108A7;NABATAEAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+108A8;NABATAEAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+108A9;NABATAEAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+108AA;NABATAEAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+108AB;NABATAEAN CRUCIFORM NUMBER FOUR;No;0;R;;;;4;N;;;;;
+108AC;NABATAEAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+108AD;NABATAEAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+108AE;NABATAEAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+108AF;NABATAEAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+108E0;HATRAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+108E1;HATRAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+108E2;HATRAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+108E3;HATRAN LETTER DALETH-RESH;Lo;0;R;;;;;N;;;;;
+108E4;HATRAN LETTER HE;Lo;0;R;;;;;N;;;;;
+108E5;HATRAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+108E6;HATRAN LETTER ZAYN;Lo;0;R;;;;;N;;;;;
+108E7;HATRAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+108E8;HATRAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+108E9;HATRAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+108EA;HATRAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+108EB;HATRAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+108EC;HATRAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+108ED;HATRAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+108EE;HATRAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+108EF;HATRAN LETTER AYN;Lo;0;R;;;;;N;;;;;
+108F0;HATRAN LETTER PE;Lo;0;R;;;;;N;;;;;
+108F1;HATRAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+108F2;HATRAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+108F4;HATRAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+108F5;HATRAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+108FB;HATRAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+108FC;HATRAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+108FD;HATRAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+108FE;HATRAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+108FF;HATRAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10900;PHOENICIAN LETTER ALF;Lo;0;R;;;;;N;;;;;
+10901;PHOENICIAN LETTER BET;Lo;0;R;;;;;N;;;;;
+10902;PHOENICIAN LETTER GAML;Lo;0;R;;;;;N;;;;;
+10903;PHOENICIAN LETTER DELT;Lo;0;R;;;;;N;;;;;
+10904;PHOENICIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10905;PHOENICIAN LETTER WAU;Lo;0;R;;;;;N;;;;;
+10906;PHOENICIAN LETTER ZAI;Lo;0;R;;;;;N;;;;;
+10907;PHOENICIAN LETTER HET;Lo;0;R;;;;;N;;;;;
+10908;PHOENICIAN LETTER TET;Lo;0;R;;;;;N;;;;;
+10909;PHOENICIAN LETTER YOD;Lo;0;R;;;;;N;;;;;
+1090A;PHOENICIAN LETTER KAF;Lo;0;R;;;;;N;;;;;
+1090B;PHOENICIAN LETTER LAMD;Lo;0;R;;;;;N;;;;;
+1090C;PHOENICIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+1090D;PHOENICIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+1090E;PHOENICIAN LETTER SEMK;Lo;0;R;;;;;N;;;;;
+1090F;PHOENICIAN LETTER AIN;Lo;0;R;;;;;N;;;;;
+10910;PHOENICIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10911;PHOENICIAN LETTER SADE;Lo;0;R;;;;;N;;;;;
+10912;PHOENICIAN LETTER QOF;Lo;0;R;;;;;N;;;;;
+10913;PHOENICIAN LETTER ROSH;Lo;0;R;;;;;N;;;;;
+10914;PHOENICIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10915;PHOENICIAN LETTER TAU;Lo;0;R;;;;;N;;;;;
+10916;PHOENICIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10917;PHOENICIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10918;PHOENICIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10919;PHOENICIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1091A;PHOENICIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+1091B;PHOENICIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+1091F;PHOENICIAN WORD SEPARATOR;Po;0;ON;;;;;N;;;;;
+10920;LYDIAN LETTER A;Lo;0;R;;;;;N;;;;;
+10921;LYDIAN LETTER B;Lo;0;R;;;;;N;;;;;
+10922;LYDIAN LETTER G;Lo;0;R;;;;;N;;;;;
+10923;LYDIAN LETTER D;Lo;0;R;;;;;N;;;;;
+10924;LYDIAN LETTER E;Lo;0;R;;;;;N;;;;;
+10925;LYDIAN LETTER V;Lo;0;R;;;;;N;;;;;
+10926;LYDIAN LETTER I;Lo;0;R;;;;;N;;;;;
+10927;LYDIAN LETTER Y;Lo;0;R;;;;;N;;;;;
+10928;LYDIAN LETTER K;Lo;0;R;;;;;N;;;;;
+10929;LYDIAN LETTER L;Lo;0;R;;;;;N;;;;;
+1092A;LYDIAN LETTER M;Lo;0;R;;;;;N;;;;;
+1092B;LYDIAN LETTER N;Lo;0;R;;;;;N;;;;;
+1092C;LYDIAN LETTER O;Lo;0;R;;;;;N;;;;;
+1092D;LYDIAN LETTER R;Lo;0;R;;;;;N;;;;;
+1092E;LYDIAN LETTER SS;Lo;0;R;;;;;N;;;;;
+1092F;LYDIAN LETTER T;Lo;0;R;;;;;N;;;;;
+10930;LYDIAN LETTER U;Lo;0;R;;;;;N;;;;;
+10931;LYDIAN LETTER F;Lo;0;R;;;;;N;;;;;
+10932;LYDIAN LETTER Q;Lo;0;R;;;;;N;;;;;
+10933;LYDIAN LETTER S;Lo;0;R;;;;;N;;;;;
+10934;LYDIAN LETTER TT;Lo;0;R;;;;;N;;;;;
+10935;LYDIAN LETTER AN;Lo;0;R;;;;;N;;;;;
+10936;LYDIAN LETTER EN;Lo;0;R;;;;;N;;;;;
+10937;LYDIAN LETTER LY;Lo;0;R;;;;;N;;;;;
+10938;LYDIAN LETTER NN;Lo;0;R;;;;;N;;;;;
+10939;LYDIAN LETTER C;Lo;0;R;;;;;N;;;;;
+1093F;LYDIAN TRIANGULAR MARK;Po;0;R;;;;;N;;;;;
+10980;MEROITIC HIEROGLYPHIC LETTER A;Lo;0;R;;;;;N;;;;;
+10981;MEROITIC HIEROGLYPHIC LETTER E;Lo;0;R;;;;;N;;;;;
+10982;MEROITIC HIEROGLYPHIC LETTER I;Lo;0;R;;;;;N;;;;;
+10983;MEROITIC HIEROGLYPHIC LETTER O;Lo;0;R;;;;;N;;;;;
+10984;MEROITIC HIEROGLYPHIC LETTER YA;Lo;0;R;;;;;N;;;;;
+10985;MEROITIC HIEROGLYPHIC LETTER WA;Lo;0;R;;;;;N;;;;;
+10986;MEROITIC HIEROGLYPHIC LETTER BA;Lo;0;R;;;;;N;;;;;
+10987;MEROITIC HIEROGLYPHIC LETTER BA-2;Lo;0;R;;;;;N;;;;;
+10988;MEROITIC HIEROGLYPHIC LETTER PA;Lo;0;R;;;;;N;;;;;
+10989;MEROITIC HIEROGLYPHIC LETTER MA;Lo;0;R;;;;;N;;;;;
+1098A;MEROITIC HIEROGLYPHIC LETTER NA;Lo;0;R;;;;;N;;;;;
+1098B;MEROITIC HIEROGLYPHIC LETTER NA-2;Lo;0;R;;;;;N;;;;;
+1098C;MEROITIC HIEROGLYPHIC LETTER NE;Lo;0;R;;;;;N;;;;;
+1098D;MEROITIC HIEROGLYPHIC LETTER NE-2;Lo;0;R;;;;;N;;;;;
+1098E;MEROITIC HIEROGLYPHIC LETTER RA;Lo;0;R;;;;;N;;;;;
+1098F;MEROITIC HIEROGLYPHIC LETTER RA-2;Lo;0;R;;;;;N;;;;;
+10990;MEROITIC HIEROGLYPHIC LETTER LA;Lo;0;R;;;;;N;;;;;
+10991;MEROITIC HIEROGLYPHIC LETTER KHA;Lo;0;R;;;;;N;;;;;
+10992;MEROITIC HIEROGLYPHIC LETTER HHA;Lo;0;R;;;;;N;;;;;
+10993;MEROITIC HIEROGLYPHIC LETTER SA;Lo;0;R;;;;;N;;;;;
+10994;MEROITIC HIEROGLYPHIC LETTER SA-2;Lo;0;R;;;;;N;;;;;
+10995;MEROITIC HIEROGLYPHIC LETTER SE;Lo;0;R;;;;;N;;;;;
+10996;MEROITIC HIEROGLYPHIC LETTER KA;Lo;0;R;;;;;N;;;;;
+10997;MEROITIC HIEROGLYPHIC LETTER QA;Lo;0;R;;;;;N;;;;;
+10998;MEROITIC HIEROGLYPHIC LETTER TA;Lo;0;R;;;;;N;;;;;
+10999;MEROITIC HIEROGLYPHIC LETTER TA-2;Lo;0;R;;;;;N;;;;;
+1099A;MEROITIC HIEROGLYPHIC LETTER TE;Lo;0;R;;;;;N;;;;;
+1099B;MEROITIC HIEROGLYPHIC LETTER TE-2;Lo;0;R;;;;;N;;;;;
+1099C;MEROITIC HIEROGLYPHIC LETTER TO;Lo;0;R;;;;;N;;;;;
+1099D;MEROITIC HIEROGLYPHIC LETTER DA;Lo;0;R;;;;;N;;;;;
+1099E;MEROITIC HIEROGLYPHIC SYMBOL VIDJ;Lo;0;R;;;;;N;;;;;
+1099F;MEROITIC HIEROGLYPHIC SYMBOL VIDJ-2;Lo;0;R;;;;;N;;;;;
+109A0;MEROITIC CURSIVE LETTER A;Lo;0;R;;;;;N;;;;;
+109A1;MEROITIC CURSIVE LETTER E;Lo;0;R;;;;;N;;;;;
+109A2;MEROITIC CURSIVE LETTER I;Lo;0;R;;;;;N;;;;;
+109A3;MEROITIC CURSIVE LETTER O;Lo;0;R;;;;;N;;;;;
+109A4;MEROITIC CURSIVE LETTER YA;Lo;0;R;;;;;N;;;;;
+109A5;MEROITIC CURSIVE LETTER WA;Lo;0;R;;;;;N;;;;;
+109A6;MEROITIC CURSIVE LETTER BA;Lo;0;R;;;;;N;;;;;
+109A7;MEROITIC CURSIVE LETTER PA;Lo;0;R;;;;;N;;;;;
+109A8;MEROITIC CURSIVE LETTER MA;Lo;0;R;;;;;N;;;;;
+109A9;MEROITIC CURSIVE LETTER NA;Lo;0;R;;;;;N;;;;;
+109AA;MEROITIC CURSIVE LETTER NE;Lo;0;R;;;;;N;;;;;
+109AB;MEROITIC CURSIVE LETTER RA;Lo;0;R;;;;;N;;;;;
+109AC;MEROITIC CURSIVE LETTER LA;Lo;0;R;;;;;N;;;;;
+109AD;MEROITIC CURSIVE LETTER KHA;Lo;0;R;;;;;N;;;;;
+109AE;MEROITIC CURSIVE LETTER HHA;Lo;0;R;;;;;N;;;;;
+109AF;MEROITIC CURSIVE LETTER SA;Lo;0;R;;;;;N;;;;;
+109B0;MEROITIC CURSIVE LETTER ARCHAIC SA;Lo;0;R;;;;;N;;;;;
+109B1;MEROITIC CURSIVE LETTER SE;Lo;0;R;;;;;N;;;;;
+109B2;MEROITIC CURSIVE LETTER KA;Lo;0;R;;;;;N;;;;;
+109B3;MEROITIC CURSIVE LETTER QA;Lo;0;R;;;;;N;;;;;
+109B4;MEROITIC CURSIVE LETTER TA;Lo;0;R;;;;;N;;;;;
+109B5;MEROITIC CURSIVE LETTER TE;Lo;0;R;;;;;N;;;;;
+109B6;MEROITIC CURSIVE LETTER TO;Lo;0;R;;;;;N;;;;;
+109B7;MEROITIC CURSIVE LETTER DA;Lo;0;R;;;;;N;;;;;
+109BC;MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS;No;0;R;;;;11/12;N;;;;;
+109BD;MEROITIC CURSIVE FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
+109BE;MEROITIC CURSIVE LOGOGRAM RMT;Lo;0;R;;;;;N;;;;;
+109BF;MEROITIC CURSIVE LOGOGRAM IMN;Lo;0;R;;;;;N;;;;;
+109C0;MEROITIC CURSIVE NUMBER ONE;No;0;R;;;;1;N;;;;;
+109C1;MEROITIC CURSIVE NUMBER TWO;No;0;R;;;;2;N;;;;;
+109C2;MEROITIC CURSIVE NUMBER THREE;No;0;R;;;;3;N;;;;;
+109C3;MEROITIC CURSIVE NUMBER FOUR;No;0;R;;;;4;N;;;;;
+109C4;MEROITIC CURSIVE NUMBER FIVE;No;0;R;;;;5;N;;;;;
+109C5;MEROITIC CURSIVE NUMBER SIX;No;0;R;;;;6;N;;;;;
+109C6;MEROITIC CURSIVE NUMBER SEVEN;No;0;R;;;;7;N;;;;;
+109C7;MEROITIC CURSIVE NUMBER EIGHT;No;0;R;;;;8;N;;;;;
+109C8;MEROITIC CURSIVE NUMBER NINE;No;0;R;;;;9;N;;;;;
+109C9;MEROITIC CURSIVE NUMBER TEN;No;0;R;;;;10;N;;;;;
+109CA;MEROITIC CURSIVE NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+109CB;MEROITIC CURSIVE NUMBER THIRTY;No;0;R;;;;30;N;;;;;
+109CC;MEROITIC CURSIVE NUMBER FORTY;No;0;R;;;;40;N;;;;;
+109CD;MEROITIC CURSIVE NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+109CE;MEROITIC CURSIVE NUMBER SIXTY;No;0;R;;;;60;N;;;;;
+109CF;MEROITIC CURSIVE NUMBER SEVENTY;No;0;R;;;;70;N;;;;;
+109D2;MEROITIC CURSIVE NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+109D3;MEROITIC CURSIVE NUMBER TWO HUNDRED;No;0;R;;;;200;N;;;;;
+109D4;MEROITIC CURSIVE NUMBER THREE HUNDRED;No;0;R;;;;300;N;;;;;
+109D5;MEROITIC CURSIVE NUMBER FOUR HUNDRED;No;0;R;;;;400;N;;;;;
+109D6;MEROITIC CURSIVE NUMBER FIVE HUNDRED;No;0;R;;;;500;N;;;;;
+109D7;MEROITIC CURSIVE NUMBER SIX HUNDRED;No;0;R;;;;600;N;;;;;
+109D8;MEROITIC CURSIVE NUMBER SEVEN HUNDRED;No;0;R;;;;700;N;;;;;
+109D9;MEROITIC CURSIVE NUMBER EIGHT HUNDRED;No;0;R;;;;800;N;;;;;
+109DA;MEROITIC CURSIVE NUMBER NINE HUNDRED;No;0;R;;;;900;N;;;;;
+109DB;MEROITIC CURSIVE NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+109DC;MEROITIC CURSIVE NUMBER TWO THOUSAND;No;0;R;;;;2000;N;;;;;
+109DD;MEROITIC CURSIVE NUMBER THREE THOUSAND;No;0;R;;;;3000;N;;;;;
+109DE;MEROITIC CURSIVE NUMBER FOUR THOUSAND;No;0;R;;;;4000;N;;;;;
+109DF;MEROITIC CURSIVE NUMBER FIVE THOUSAND;No;0;R;;;;5000;N;;;;;
+109E0;MEROITIC CURSIVE NUMBER SIX THOUSAND;No;0;R;;;;6000;N;;;;;
+109E1;MEROITIC CURSIVE NUMBER SEVEN THOUSAND;No;0;R;;;;7000;N;;;;;
+109E2;MEROITIC CURSIVE NUMBER EIGHT THOUSAND;No;0;R;;;;8000;N;;;;;
+109E3;MEROITIC CURSIVE NUMBER NINE THOUSAND;No;0;R;;;;9000;N;;;;;
+109E4;MEROITIC CURSIVE NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;;
+109E5;MEROITIC CURSIVE NUMBER TWENTY THOUSAND;No;0;R;;;;20000;N;;;;;
+109E6;MEROITIC CURSIVE NUMBER THIRTY THOUSAND;No;0;R;;;;30000;N;;;;;
+109E7;MEROITIC CURSIVE NUMBER FORTY THOUSAND;No;0;R;;;;40000;N;;;;;
+109E8;MEROITIC CURSIVE NUMBER FIFTY THOUSAND;No;0;R;;;;50000;N;;;;;
+109E9;MEROITIC CURSIVE NUMBER SIXTY THOUSAND;No;0;R;;;;60000;N;;;;;
+109EA;MEROITIC CURSIVE NUMBER SEVENTY THOUSAND;No;0;R;;;;70000;N;;;;;
+109EB;MEROITIC CURSIVE NUMBER EIGHTY THOUSAND;No;0;R;;;;80000;N;;;;;
+109EC;MEROITIC CURSIVE NUMBER NINETY THOUSAND;No;0;R;;;;90000;N;;;;;
+109ED;MEROITIC CURSIVE NUMBER ONE HUNDRED THOUSAND;No;0;R;;;;100000;N;;;;;
+109EE;MEROITIC CURSIVE NUMBER TWO HUNDRED THOUSAND;No;0;R;;;;200000;N;;;;;
+109EF;MEROITIC CURSIVE NUMBER THREE HUNDRED THOUSAND;No;0;R;;;;300000;N;;;;;
+109F0;MEROITIC CURSIVE NUMBER FOUR HUNDRED THOUSAND;No;0;R;;;;400000;N;;;;;
+109F1;MEROITIC CURSIVE NUMBER FIVE HUNDRED THOUSAND;No;0;R;;;;500000;N;;;;;
+109F2;MEROITIC CURSIVE NUMBER SIX HUNDRED THOUSAND;No;0;R;;;;600000;N;;;;;
+109F3;MEROITIC CURSIVE NUMBER SEVEN HUNDRED THOUSAND;No;0;R;;;;700000;N;;;;;
+109F4;MEROITIC CURSIVE NUMBER EIGHT HUNDRED THOUSAND;No;0;R;;;;800000;N;;;;;
+109F5;MEROITIC CURSIVE NUMBER NINE HUNDRED THOUSAND;No;0;R;;;;900000;N;;;;;
+109F6;MEROITIC CURSIVE FRACTION ONE TWELFTH;No;0;R;;;;1/12;N;;;;;
+109F7;MEROITIC CURSIVE FRACTION TWO TWELFTHS;No;0;R;;;;2/12;N;;;;;
+109F8;MEROITIC CURSIVE FRACTION THREE TWELFTHS;No;0;R;;;;3/12;N;;;;;
+109F9;MEROITIC CURSIVE FRACTION FOUR TWELFTHS;No;0;R;;;;4/12;N;;;;;
+109FA;MEROITIC CURSIVE FRACTION FIVE TWELFTHS;No;0;R;;;;5/12;N;;;;;
+109FB;MEROITIC CURSIVE FRACTION SIX TWELFTHS;No;0;R;;;;6/12;N;;;;;
+109FC;MEROITIC CURSIVE FRACTION SEVEN TWELFTHS;No;0;R;;;;7/12;N;;;;;
+109FD;MEROITIC CURSIVE FRACTION EIGHT TWELFTHS;No;0;R;;;;8/12;N;;;;;
+109FE;MEROITIC CURSIVE FRACTION NINE TWELFTHS;No;0;R;;;;9/12;N;;;;;
+109FF;MEROITIC CURSIVE FRACTION TEN TWELFTHS;No;0;R;;;;10/12;N;;;;;
+10A00;KHAROSHTHI LETTER A;Lo;0;R;;;;;N;;;;;
+10A01;KHAROSHTHI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+10A02;KHAROSHTHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+10A03;KHAROSHTHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+10A05;KHAROSHTHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+10A06;KHAROSHTHI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+10A0C;KHAROSHTHI VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+10A0D;KHAROSHTHI SIGN DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
+10A0E;KHAROSHTHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+10A0F;KHAROSHTHI SIGN VISARGA;Mn;230;NSM;;;;;N;;;;;
+10A10;KHAROSHTHI LETTER KA;Lo;0;R;;;;;N;;;;;
+10A11;KHAROSHTHI LETTER KHA;Lo;0;R;;;;;N;;;;;
+10A12;KHAROSHTHI LETTER GA;Lo;0;R;;;;;N;;;;;
+10A13;KHAROSHTHI LETTER GHA;Lo;0;R;;;;;N;;;;;
+10A15;KHAROSHTHI LETTER CA;Lo;0;R;;;;;N;;;;;
+10A16;KHAROSHTHI LETTER CHA;Lo;0;R;;;;;N;;;;;
+10A17;KHAROSHTHI LETTER JA;Lo;0;R;;;;;N;;;;;
+10A19;KHAROSHTHI LETTER NYA;Lo;0;R;;;;;N;;;;;
+10A1A;KHAROSHTHI LETTER TTA;Lo;0;R;;;;;N;;;;;
+10A1B;KHAROSHTHI LETTER TTHA;Lo;0;R;;;;;N;;;;;
+10A1C;KHAROSHTHI LETTER DDA;Lo;0;R;;;;;N;;;;;
+10A1D;KHAROSHTHI LETTER DDHA;Lo;0;R;;;;;N;;;;;
+10A1E;KHAROSHTHI LETTER NNA;Lo;0;R;;;;;N;;;;;
+10A1F;KHAROSHTHI LETTER TA;Lo;0;R;;;;;N;;;;;
+10A20;KHAROSHTHI LETTER THA;Lo;0;R;;;;;N;;;;;
+10A21;KHAROSHTHI LETTER DA;Lo;0;R;;;;;N;;;;;
+10A22;KHAROSHTHI LETTER DHA;Lo;0;R;;;;;N;;;;;
+10A23;KHAROSHTHI LETTER NA;Lo;0;R;;;;;N;;;;;
+10A24;KHAROSHTHI LETTER PA;Lo;0;R;;;;;N;;;;;
+10A25;KHAROSHTHI LETTER PHA;Lo;0;R;;;;;N;;;;;
+10A26;KHAROSHTHI LETTER BA;Lo;0;R;;;;;N;;;;;
+10A27;KHAROSHTHI LETTER BHA;Lo;0;R;;;;;N;;;;;
+10A28;KHAROSHTHI LETTER MA;Lo;0;R;;;;;N;;;;;
+10A29;KHAROSHTHI LETTER YA;Lo;0;R;;;;;N;;;;;
+10A2A;KHAROSHTHI LETTER RA;Lo;0;R;;;;;N;;;;;
+10A2B;KHAROSHTHI LETTER LA;Lo;0;R;;;;;N;;;;;
+10A2C;KHAROSHTHI LETTER VA;Lo;0;R;;;;;N;;;;;
+10A2D;KHAROSHTHI LETTER SHA;Lo;0;R;;;;;N;;;;;
+10A2E;KHAROSHTHI LETTER SSA;Lo;0;R;;;;;N;;;;;
+10A2F;KHAROSHTHI LETTER SA;Lo;0;R;;;;;N;;;;;
+10A30;KHAROSHTHI LETTER ZA;Lo;0;R;;;;;N;;;;;
+10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;;
+10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;;
+10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;;
+10A34;KHAROSHTHI LETTER TTTA;Lo;0;R;;;;;N;;;;;
+10A35;KHAROSHTHI LETTER VHA;Lo;0;R;;;;;N;;;;;
+10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;;
+10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;;
+10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10A3F;KHAROSHTHI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+10A40;KHAROSHTHI DIGIT ONE;No;0;R;;;1;1;N;;;;;
+10A41;KHAROSHTHI DIGIT TWO;No;0;R;;;2;2;N;;;;;
+10A42;KHAROSHTHI DIGIT THREE;No;0;R;;;3;3;N;;;;;
+10A43;KHAROSHTHI DIGIT FOUR;No;0;R;;;4;4;N;;;;;
+10A44;KHAROSHTHI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10A48;KHAROSHTHI FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
+10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
+10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;;
+10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;;
+10A53;KHAROSHTHI PUNCTUATION CRESCENT BAR;Po;0;R;;;;;N;;;;;
+10A54;KHAROSHTHI PUNCTUATION MANGALAM;Po;0;R;;;;;N;;;;;
+10A55;KHAROSHTHI PUNCTUATION LOTUS;Po;0;R;;;;;N;;;;;
+10A56;KHAROSHTHI PUNCTUATION DANDA;Po;0;R;;;;;N;;;;;
+10A57;KHAROSHTHI PUNCTUATION DOUBLE DANDA;Po;0;R;;;;;N;;;;;
+10A58;KHAROSHTHI PUNCTUATION LINES;Po;0;R;;;;;N;;;;;
+10A60;OLD SOUTH ARABIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10A61;OLD SOUTH ARABIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10A62;OLD SOUTH ARABIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10A63;OLD SOUTH ARABIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10A64;OLD SOUTH ARABIAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10A65;OLD SOUTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10A66;OLD SOUTH ARABIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10A67;OLD SOUTH ARABIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10A68;OLD SOUTH ARABIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10A69;OLD SOUTH ARABIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10A6A;OLD SOUTH ARABIAN LETTER SAT;Lo;0;R;;;;;N;;;;;
+10A6B;OLD SOUTH ARABIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10A6C;OLD SOUTH ARABIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10A6D;OLD SOUTH ARABIAN LETTER KHETH;Lo;0;R;;;;;N;;;;;
+10A6E;OLD SOUTH ARABIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10A6F;OLD SOUTH ARABIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10A70;OLD SOUTH ARABIAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10A71;OLD SOUTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;;
+10A72;OLD SOUTH ARABIAN LETTER AYN;Lo;0;R;;;;;N;;;;;
+10A73;OLD SOUTH ARABIAN LETTER DHADHE;Lo;0;R;;;;;N;;;;;
+10A74;OLD SOUTH ARABIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10A75;OLD SOUTH ARABIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10A76;OLD SOUTH ARABIAN LETTER GHAYN;Lo;0;R;;;;;N;;;;;
+10A77;OLD SOUTH ARABIAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10A78;OLD SOUTH ARABIAN LETTER ZAYN;Lo;0;R;;;;;N;;;;;
+10A79;OLD SOUTH ARABIAN LETTER DHALETH;Lo;0;R;;;;;N;;;;;
+10A7A;OLD SOUTH ARABIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10A7B;OLD SOUTH ARABIAN LETTER THAW;Lo;0;R;;;;;N;;;;;
+10A7C;OLD SOUTH ARABIAN LETTER THETH;Lo;0;R;;;;;N;;;;;
+10A7D;OLD SOUTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10A7E;OLD SOUTH ARABIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+10A7F;OLD SOUTH ARABIAN NUMERIC INDICATOR;Po;0;R;;;;;N;;;;;
+10A80;OLD NORTH ARABIAN LETTER HEH;Lo;0;R;;;;;N;;;;;
+10A81;OLD NORTH ARABIAN LETTER LAM;Lo;0;R;;;;;N;;;;;
+10A82;OLD NORTH ARABIAN LETTER HAH;Lo;0;R;;;;;N;;;;;
+10A83;OLD NORTH ARABIAN LETTER MEEM;Lo;0;R;;;;;N;;;;;
+10A84;OLD NORTH ARABIAN LETTER QAF;Lo;0;R;;;;;N;;;;;
+10A85;OLD NORTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10A86;OLD NORTH ARABIAN LETTER ES-2;Lo;0;R;;;;;N;;;;;
+10A87;OLD NORTH ARABIAN LETTER REH;Lo;0;R;;;;;N;;;;;
+10A88;OLD NORTH ARABIAN LETTER BEH;Lo;0;R;;;;;N;;;;;
+10A89;OLD NORTH ARABIAN LETTER TEH;Lo;0;R;;;;;N;;;;;
+10A8A;OLD NORTH ARABIAN LETTER ES-1;Lo;0;R;;;;;N;;;;;
+10A8B;OLD NORTH ARABIAN LETTER KAF;Lo;0;R;;;;;N;;;;;
+10A8C;OLD NORTH ARABIAN LETTER NOON;Lo;0;R;;;;;N;;;;;
+10A8D;OLD NORTH ARABIAN LETTER KHAH;Lo;0;R;;;;;N;;;;;
+10A8E;OLD NORTH ARABIAN LETTER SAD;Lo;0;R;;;;;N;;;;;
+10A8F;OLD NORTH ARABIAN LETTER ES-3;Lo;0;R;;;;;N;;;;;
+10A90;OLD NORTH ARABIAN LETTER FEH;Lo;0;R;;;;;N;;;;;
+10A91;OLD NORTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;;
+10A92;OLD NORTH ARABIAN LETTER AIN;Lo;0;R;;;;;N;;;;;
+10A93;OLD NORTH ARABIAN LETTER DAD;Lo;0;R;;;;;N;;;;;
+10A94;OLD NORTH ARABIAN LETTER GEEM;Lo;0;R;;;;;N;;;;;
+10A95;OLD NORTH ARABIAN LETTER DAL;Lo;0;R;;;;;N;;;;;
+10A96;OLD NORTH ARABIAN LETTER GHAIN;Lo;0;R;;;;;N;;;;;
+10A97;OLD NORTH ARABIAN LETTER TAH;Lo;0;R;;;;;N;;;;;
+10A98;OLD NORTH ARABIAN LETTER ZAIN;Lo;0;R;;;;;N;;;;;
+10A99;OLD NORTH ARABIAN LETTER THAL;Lo;0;R;;;;;N;;;;;
+10A9A;OLD NORTH ARABIAN LETTER YEH;Lo;0;R;;;;;N;;;;;
+10A9B;OLD NORTH ARABIAN LETTER THEH;Lo;0;R;;;;;N;;;;;
+10A9C;OLD NORTH ARABIAN LETTER ZAH;Lo;0;R;;;;;N;;;;;
+10A9D;OLD NORTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10A9E;OLD NORTH ARABIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10A9F;OLD NORTH ARABIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10AC0;MANICHAEAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10AC1;MANICHAEAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10AC2;MANICHAEAN LETTER BHETH;Lo;0;R;;;;;N;;;;;
+10AC3;MANICHAEAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10AC4;MANICHAEAN LETTER GHIMEL;Lo;0;R;;;;;N;;;;;
+10AC5;MANICHAEAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10AC6;MANICHAEAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10AC7;MANICHAEAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10AC8;MANICHAEAN SIGN UD;So;0;R;;;;;N;;;;;
+10AC9;MANICHAEAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10ACA;MANICHAEAN LETTER ZHAYIN;Lo;0;R;;;;;N;;;;;
+10ACB;MANICHAEAN LETTER JAYIN;Lo;0;R;;;;;N;;;;;
+10ACC;MANICHAEAN LETTER JHAYIN;Lo;0;R;;;;;N;;;;;
+10ACD;MANICHAEAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10ACE;MANICHAEAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10ACF;MANICHAEAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10AD0;MANICHAEAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10AD1;MANICHAEAN LETTER XAPH;Lo;0;R;;;;;N;;;;;
+10AD2;MANICHAEAN LETTER KHAPH;Lo;0;R;;;;;N;;;;;
+10AD3;MANICHAEAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10AD4;MANICHAEAN LETTER DHAMEDH;Lo;0;R;;;;;N;;;;;
+10AD5;MANICHAEAN LETTER THAMEDH;Lo;0;R;;;;;N;;;;;
+10AD6;MANICHAEAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10AD7;MANICHAEAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10AD8;MANICHAEAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10AD9;MANICHAEAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10ADA;MANICHAEAN LETTER AAYIN;Lo;0;R;;;;;N;;;;;
+10ADB;MANICHAEAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10ADC;MANICHAEAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10ADD;MANICHAEAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10ADE;MANICHAEAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10ADF;MANICHAEAN LETTER XOPH;Lo;0;R;;;;;N;;;;;
+10AE0;MANICHAEAN LETTER QHOPH;Lo;0;R;;;;;N;;;;;
+10AE1;MANICHAEAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10AE2;MANICHAEAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10AE3;MANICHAEAN LETTER SSHIN;Lo;0;R;;;;;N;;;;;
+10AE4;MANICHAEAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10AE5;MANICHAEAN ABBREVIATION MARK ABOVE;Mn;230;NSM;;;;;N;;;;;
+10AE6;MANICHAEAN ABBREVIATION MARK BELOW;Mn;220;NSM;;;;;N;;;;;
+10AEB;MANICHAEAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10AEC;MANICHAEAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10AED;MANICHAEAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10AEE;MANICHAEAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10AEF;MANICHAEAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10AF0;MANICHAEAN PUNCTUATION STAR;Po;0;R;;;;;N;;;;;
+10AF1;MANICHAEAN PUNCTUATION FLEURON;Po;0;R;;;;;N;;;;;
+10AF2;MANICHAEAN PUNCTUATION DOUBLE DOT WITHIN DOT;Po;0;R;;;;;N;;;;;
+10AF3;MANICHAEAN PUNCTUATION DOT WITHIN DOT;Po;0;R;;;;;N;;;;;
+10AF4;MANICHAEAN PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
+10AF5;MANICHAEAN PUNCTUATION TWO DOTS;Po;0;R;;;;;N;;;;;
+10AF6;MANICHAEAN PUNCTUATION LINE FILLER;Po;0;R;;;;;N;;;;;
+10B00;AVESTAN LETTER A;Lo;0;R;;;;;N;;;;;
+10B01;AVESTAN LETTER AA;Lo;0;R;;;;;N;;;;;
+10B02;AVESTAN LETTER AO;Lo;0;R;;;;;N;;;;;
+10B03;AVESTAN LETTER AAO;Lo;0;R;;;;;N;;;;;
+10B04;AVESTAN LETTER AN;Lo;0;R;;;;;N;;;;;
+10B05;AVESTAN LETTER AAN;Lo;0;R;;;;;N;;;;;
+10B06;AVESTAN LETTER AE;Lo;0;R;;;;;N;;;;;
+10B07;AVESTAN LETTER AEE;Lo;0;R;;;;;N;;;;;
+10B08;AVESTAN LETTER E;Lo;0;R;;;;;N;;;;;
+10B09;AVESTAN LETTER EE;Lo;0;R;;;;;N;;;;;
+10B0A;AVESTAN LETTER O;Lo;0;R;;;;;N;;;;;
+10B0B;AVESTAN LETTER OO;Lo;0;R;;;;;N;;;;;
+10B0C;AVESTAN LETTER I;Lo;0;R;;;;;N;;;;;
+10B0D;AVESTAN LETTER II;Lo;0;R;;;;;N;;;;;
+10B0E;AVESTAN LETTER U;Lo;0;R;;;;;N;;;;;
+10B0F;AVESTAN LETTER UU;Lo;0;R;;;;;N;;;;;
+10B10;AVESTAN LETTER KE;Lo;0;R;;;;;N;;;;;
+10B11;AVESTAN LETTER XE;Lo;0;R;;;;;N;;;;;
+10B12;AVESTAN LETTER XYE;Lo;0;R;;;;;N;;;;;
+10B13;AVESTAN LETTER XVE;Lo;0;R;;;;;N;;;;;
+10B14;AVESTAN LETTER GE;Lo;0;R;;;;;N;;;;;
+10B15;AVESTAN LETTER GGE;Lo;0;R;;;;;N;;;;;
+10B16;AVESTAN LETTER GHE;Lo;0;R;;;;;N;;;;;
+10B17;AVESTAN LETTER CE;Lo;0;R;;;;;N;;;;;
+10B18;AVESTAN LETTER JE;Lo;0;R;;;;;N;;;;;
+10B19;AVESTAN LETTER TE;Lo;0;R;;;;;N;;;;;
+10B1A;AVESTAN LETTER THE;Lo;0;R;;;;;N;;;;;
+10B1B;AVESTAN LETTER DE;Lo;0;R;;;;;N;;;;;
+10B1C;AVESTAN LETTER DHE;Lo;0;R;;;;;N;;;;;
+10B1D;AVESTAN LETTER TTE;Lo;0;R;;;;;N;;;;;
+10B1E;AVESTAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10B1F;AVESTAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10B20;AVESTAN LETTER BE;Lo;0;R;;;;;N;;;;;
+10B21;AVESTAN LETTER BHE;Lo;0;R;;;;;N;;;;;
+10B22;AVESTAN LETTER NGE;Lo;0;R;;;;;N;;;;;
+10B23;AVESTAN LETTER NGYE;Lo;0;R;;;;;N;;;;;
+10B24;AVESTAN LETTER NGVE;Lo;0;R;;;;;N;;;;;
+10B25;AVESTAN LETTER NE;Lo;0;R;;;;;N;;;;;
+10B26;AVESTAN LETTER NYE;Lo;0;R;;;;;N;;;;;
+10B27;AVESTAN LETTER NNE;Lo;0;R;;;;;N;;;;;
+10B28;AVESTAN LETTER ME;Lo;0;R;;;;;N;;;;;
+10B29;AVESTAN LETTER HME;Lo;0;R;;;;;N;;;;;
+10B2A;AVESTAN LETTER YYE;Lo;0;R;;;;;N;;;;;
+10B2B;AVESTAN LETTER YE;Lo;0;R;;;;;N;;;;;
+10B2C;AVESTAN LETTER VE;Lo;0;R;;;;;N;;;;;
+10B2D;AVESTAN LETTER RE;Lo;0;R;;;;;N;;;;;
+10B2E;AVESTAN LETTER LE;Lo;0;R;;;;;N;;;;;
+10B2F;AVESTAN LETTER SE;Lo;0;R;;;;;N;;;;;
+10B30;AVESTAN LETTER ZE;Lo;0;R;;;;;N;;;;;
+10B31;AVESTAN LETTER SHE;Lo;0;R;;;;;N;;;;;
+10B32;AVESTAN LETTER ZHE;Lo;0;R;;;;;N;;;;;
+10B33;AVESTAN LETTER SHYE;Lo;0;R;;;;;N;;;;;
+10B34;AVESTAN LETTER SSHE;Lo;0;R;;;;;N;;;;;
+10B35;AVESTAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10B39;AVESTAN ABBREVIATION MARK;Po;0;ON;;;;;N;;;;;
+10B3A;TINY TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3B;SMALL TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3C;LARGE TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3D;LARGE ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3E;LARGE TWO RINGS OVER ONE RING PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3F;LARGE ONE RING OVER TWO RINGS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B40;INSCRIPTIONAL PARTHIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B41;INSCRIPTIONAL PARTHIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B42;INSCRIPTIONAL PARTHIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B43;INSCRIPTIONAL PARTHIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B44;INSCRIPTIONAL PARTHIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10B45;INSCRIPTIONAL PARTHIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10B46;INSCRIPTIONAL PARTHIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B47;INSCRIPTIONAL PARTHIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B48;INSCRIPTIONAL PARTHIAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10B49;INSCRIPTIONAL PARTHIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B4A;INSCRIPTIONAL PARTHIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B4B;INSCRIPTIONAL PARTHIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B4C;INSCRIPTIONAL PARTHIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10B4D;INSCRIPTIONAL PARTHIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B4E;INSCRIPTIONAL PARTHIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B4F;INSCRIPTIONAL PARTHIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10B50;INSCRIPTIONAL PARTHIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10B51;INSCRIPTIONAL PARTHIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B52;INSCRIPTIONAL PARTHIAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10B53;INSCRIPTIONAL PARTHIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10B54;INSCRIPTIONAL PARTHIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B55;INSCRIPTIONAL PARTHIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B58;INSCRIPTIONAL PARTHIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10B59;INSCRIPTIONAL PARTHIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10B5A;INSCRIPTIONAL PARTHIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10B5B;INSCRIPTIONAL PARTHIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10B5C;INSCRIPTIONAL PARTHIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10B5D;INSCRIPTIONAL PARTHIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10B5E;INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10B5F;INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10B60;INSCRIPTIONAL PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B61;INSCRIPTIONAL PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B62;INSCRIPTIONAL PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B63;INSCRIPTIONAL PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B64;INSCRIPTIONAL PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;;
+10B65;INSCRIPTIONAL PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;;
+10B66;INSCRIPTIONAL PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B67;INSCRIPTIONAL PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B68;INSCRIPTIONAL PAHLAVI LETTER TETH;Lo;0;R;;;;;N;;;;;
+10B69;INSCRIPTIONAL PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B6A;INSCRIPTIONAL PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B6B;INSCRIPTIONAL PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B6C;INSCRIPTIONAL PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;;
+10B6D;INSCRIPTIONAL PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B6E;INSCRIPTIONAL PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B6F;INSCRIPTIONAL PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;;
+10B70;INSCRIPTIONAL PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B71;INSCRIPTIONAL PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B72;INSCRIPTIONAL PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B78;INSCRIPTIONAL PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;;
+10B79;INSCRIPTIONAL PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;;
+10B7A;INSCRIPTIONAL PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;;
+10B7B;INSCRIPTIONAL PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10B7C;INSCRIPTIONAL PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10B7D;INSCRIPTIONAL PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10B7E;INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10B7F;INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10B80;PSALTER PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B81;PSALTER PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B82;PSALTER PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B83;PSALTER PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B84;PSALTER PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;;
+10B85;PSALTER PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;;
+10B86;PSALTER PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B87;PSALTER PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B88;PSALTER PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B89;PSALTER PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B8A;PSALTER PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B8B;PSALTER PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;;
+10B8C;PSALTER PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B8D;PSALTER PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B8E;PSALTER PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;;
+10B8F;PSALTER PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B90;PSALTER PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B91;PSALTER PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B99;PSALTER PAHLAVI SECTION MARK;Po;0;R;;;;;N;;;;;
+10B9A;PSALTER PAHLAVI TURNED SECTION MARK;Po;0;R;;;;;N;;;;;
+10B9B;PSALTER PAHLAVI FOUR DOTS WITH CROSS;Po;0;R;;;;;N;;;;;
+10B9C;PSALTER PAHLAVI FOUR DOTS WITH DOT;Po;0;R;;;;;N;;;;;
+10BA9;PSALTER PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;;
+10BAA;PSALTER PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;;
+10BAB;PSALTER PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;;
+10BAC;PSALTER PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10BAD;PSALTER PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10BAE;PSALTER PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10BAF;PSALTER PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10C00;OLD TURKIC LETTER ORKHON A;Lo;0;R;;;;;N;;;;;
+10C01;OLD TURKIC LETTER YENISEI A;Lo;0;R;;;;;N;;;;;
+10C02;OLD TURKIC LETTER YENISEI AE;Lo;0;R;;;;;N;;;;;
+10C03;OLD TURKIC LETTER ORKHON I;Lo;0;R;;;;;N;;;;;
+10C04;OLD TURKIC LETTER YENISEI I;Lo;0;R;;;;;N;;;;;
+10C05;OLD TURKIC LETTER YENISEI E;Lo;0;R;;;;;N;;;;;
+10C06;OLD TURKIC LETTER ORKHON O;Lo;0;R;;;;;N;;;;;
+10C07;OLD TURKIC LETTER ORKHON OE;Lo;0;R;;;;;N;;;;;
+10C08;OLD TURKIC LETTER YENISEI OE;Lo;0;R;;;;;N;;;;;
+10C09;OLD TURKIC LETTER ORKHON AB;Lo;0;R;;;;;N;;;;;
+10C0A;OLD TURKIC LETTER YENISEI AB;Lo;0;R;;;;;N;;;;;
+10C0B;OLD TURKIC LETTER ORKHON AEB;Lo;0;R;;;;;N;;;;;
+10C0C;OLD TURKIC LETTER YENISEI AEB;Lo;0;R;;;;;N;;;;;
+10C0D;OLD TURKIC LETTER ORKHON AG;Lo;0;R;;;;;N;;;;;
+10C0E;OLD TURKIC LETTER YENISEI AG;Lo;0;R;;;;;N;;;;;
+10C0F;OLD TURKIC LETTER ORKHON AEG;Lo;0;R;;;;;N;;;;;
+10C10;OLD TURKIC LETTER YENISEI AEG;Lo;0;R;;;;;N;;;;;
+10C11;OLD TURKIC LETTER ORKHON AD;Lo;0;R;;;;;N;;;;;
+10C12;OLD TURKIC LETTER YENISEI AD;Lo;0;R;;;;;N;;;;;
+10C13;OLD TURKIC LETTER ORKHON AED;Lo;0;R;;;;;N;;;;;
+10C14;OLD TURKIC LETTER ORKHON EZ;Lo;0;R;;;;;N;;;;;
+10C15;OLD TURKIC LETTER YENISEI EZ;Lo;0;R;;;;;N;;;;;
+10C16;OLD TURKIC LETTER ORKHON AY;Lo;0;R;;;;;N;;;;;
+10C17;OLD TURKIC LETTER YENISEI AY;Lo;0;R;;;;;N;;;;;
+10C18;OLD TURKIC LETTER ORKHON AEY;Lo;0;R;;;;;N;;;;;
+10C19;OLD TURKIC LETTER YENISEI AEY;Lo;0;R;;;;;N;;;;;
+10C1A;OLD TURKIC LETTER ORKHON AEK;Lo;0;R;;;;;N;;;;;
+10C1B;OLD TURKIC LETTER YENISEI AEK;Lo;0;R;;;;;N;;;;;
+10C1C;OLD TURKIC LETTER ORKHON OEK;Lo;0;R;;;;;N;;;;;
+10C1D;OLD TURKIC LETTER YENISEI OEK;Lo;0;R;;;;;N;;;;;
+10C1E;OLD TURKIC LETTER ORKHON AL;Lo;0;R;;;;;N;;;;;
+10C1F;OLD TURKIC LETTER YENISEI AL;Lo;0;R;;;;;N;;;;;
+10C20;OLD TURKIC LETTER ORKHON AEL;Lo;0;R;;;;;N;;;;;
+10C21;OLD TURKIC LETTER ORKHON ELT;Lo;0;R;;;;;N;;;;;
+10C22;OLD TURKIC LETTER ORKHON EM;Lo;0;R;;;;;N;;;;;
+10C23;OLD TURKIC LETTER ORKHON AN;Lo;0;R;;;;;N;;;;;
+10C24;OLD TURKIC LETTER ORKHON AEN;Lo;0;R;;;;;N;;;;;
+10C25;OLD TURKIC LETTER YENISEI AEN;Lo;0;R;;;;;N;;;;;
+10C26;OLD TURKIC LETTER ORKHON ENT;Lo;0;R;;;;;N;;;;;
+10C27;OLD TURKIC LETTER YENISEI ENT;Lo;0;R;;;;;N;;;;;
+10C28;OLD TURKIC LETTER ORKHON ENC;Lo;0;R;;;;;N;;;;;
+10C29;OLD TURKIC LETTER YENISEI ENC;Lo;0;R;;;;;N;;;;;
+10C2A;OLD TURKIC LETTER ORKHON ENY;Lo;0;R;;;;;N;;;;;
+10C2B;OLD TURKIC LETTER YENISEI ENY;Lo;0;R;;;;;N;;;;;
+10C2C;OLD TURKIC LETTER YENISEI ANG;Lo;0;R;;;;;N;;;;;
+10C2D;OLD TURKIC LETTER ORKHON ENG;Lo;0;R;;;;;N;;;;;
+10C2E;OLD TURKIC LETTER YENISEI AENG;Lo;0;R;;;;;N;;;;;
+10C2F;OLD TURKIC LETTER ORKHON EP;Lo;0;R;;;;;N;;;;;
+10C30;OLD TURKIC LETTER ORKHON OP;Lo;0;R;;;;;N;;;;;
+10C31;OLD TURKIC LETTER ORKHON IC;Lo;0;R;;;;;N;;;;;
+10C32;OLD TURKIC LETTER ORKHON EC;Lo;0;R;;;;;N;;;;;
+10C33;OLD TURKIC LETTER YENISEI EC;Lo;0;R;;;;;N;;;;;
+10C34;OLD TURKIC LETTER ORKHON AQ;Lo;0;R;;;;;N;;;;;
+10C35;OLD TURKIC LETTER YENISEI AQ;Lo;0;R;;;;;N;;;;;
+10C36;OLD TURKIC LETTER ORKHON IQ;Lo;0;R;;;;;N;;;;;
+10C37;OLD TURKIC LETTER YENISEI IQ;Lo;0;R;;;;;N;;;;;
+10C38;OLD TURKIC LETTER ORKHON OQ;Lo;0;R;;;;;N;;;;;
+10C39;OLD TURKIC LETTER YENISEI OQ;Lo;0;R;;;;;N;;;;;
+10C3A;OLD TURKIC LETTER ORKHON AR;Lo;0;R;;;;;N;;;;;
+10C3B;OLD TURKIC LETTER YENISEI AR;Lo;0;R;;;;;N;;;;;
+10C3C;OLD TURKIC LETTER ORKHON AER;Lo;0;R;;;;;N;;;;;
+10C3D;OLD TURKIC LETTER ORKHON AS;Lo;0;R;;;;;N;;;;;
+10C3E;OLD TURKIC LETTER ORKHON AES;Lo;0;R;;;;;N;;;;;
+10C3F;OLD TURKIC LETTER ORKHON ASH;Lo;0;R;;;;;N;;;;;
+10C40;OLD TURKIC LETTER YENISEI ASH;Lo;0;R;;;;;N;;;;;
+10C41;OLD TURKIC LETTER ORKHON ESH;Lo;0;R;;;;;N;;;;;
+10C42;OLD TURKIC LETTER YENISEI ESH;Lo;0;R;;;;;N;;;;;
+10C43;OLD TURKIC LETTER ORKHON AT;Lo;0;R;;;;;N;;;;;
+10C44;OLD TURKIC LETTER YENISEI AT;Lo;0;R;;;;;N;;;;;
+10C45;OLD TURKIC LETTER ORKHON AET;Lo;0;R;;;;;N;;;;;
+10C46;OLD TURKIC LETTER YENISEI AET;Lo;0;R;;;;;N;;;;;
+10C47;OLD TURKIC LETTER ORKHON OT;Lo;0;R;;;;;N;;;;;
+10C48;OLD TURKIC LETTER ORKHON BASH;Lo;0;R;;;;;N;;;;;
+10C80;OLD HUNGARIAN CAPITAL LETTER A;Lu;0;R;;;;;N;;;;10CC0;
+10C81;OLD HUNGARIAN CAPITAL LETTER AA;Lu;0;R;;;;;N;;;;10CC1;
+10C82;OLD HUNGARIAN CAPITAL LETTER EB;Lu;0;R;;;;;N;;;;10CC2;
+10C83;OLD HUNGARIAN CAPITAL LETTER AMB;Lu;0;R;;;;;N;;;;10CC3;
+10C84;OLD HUNGARIAN CAPITAL LETTER EC;Lu;0;R;;;;;N;;;;10CC4;
+10C85;OLD HUNGARIAN CAPITAL LETTER ENC;Lu;0;R;;;;;N;;;;10CC5;
+10C86;OLD HUNGARIAN CAPITAL LETTER ECS;Lu;0;R;;;;;N;;;;10CC6;
+10C87;OLD HUNGARIAN CAPITAL LETTER ED;Lu;0;R;;;;;N;;;;10CC7;
+10C88;OLD HUNGARIAN CAPITAL LETTER AND;Lu;0;R;;;;;N;;;;10CC8;
+10C89;OLD HUNGARIAN CAPITAL LETTER E;Lu;0;R;;;;;N;;;;10CC9;
+10C8A;OLD HUNGARIAN CAPITAL LETTER CLOSE E;Lu;0;R;;;;;N;;;;10CCA;
+10C8B;OLD HUNGARIAN CAPITAL LETTER EE;Lu;0;R;;;;;N;;;;10CCB;
+10C8C;OLD HUNGARIAN CAPITAL LETTER EF;Lu;0;R;;;;;N;;;;10CCC;
+10C8D;OLD HUNGARIAN CAPITAL LETTER EG;Lu;0;R;;;;;N;;;;10CCD;
+10C8E;OLD HUNGARIAN CAPITAL LETTER EGY;Lu;0;R;;;;;N;;;;10CCE;
+10C8F;OLD HUNGARIAN CAPITAL LETTER EH;Lu;0;R;;;;;N;;;;10CCF;
+10C90;OLD HUNGARIAN CAPITAL LETTER I;Lu;0;R;;;;;N;;;;10CD0;
+10C91;OLD HUNGARIAN CAPITAL LETTER II;Lu;0;R;;;;;N;;;;10CD1;
+10C92;OLD HUNGARIAN CAPITAL LETTER EJ;Lu;0;R;;;;;N;;;;10CD2;
+10C93;OLD HUNGARIAN CAPITAL LETTER EK;Lu;0;R;;;;;N;;;;10CD3;
+10C94;OLD HUNGARIAN CAPITAL LETTER AK;Lu;0;R;;;;;N;;;;10CD4;
+10C95;OLD HUNGARIAN CAPITAL LETTER UNK;Lu;0;R;;;;;N;;;;10CD5;
+10C96;OLD HUNGARIAN CAPITAL LETTER EL;Lu;0;R;;;;;N;;;;10CD6;
+10C97;OLD HUNGARIAN CAPITAL LETTER ELY;Lu;0;R;;;;;N;;;;10CD7;
+10C98;OLD HUNGARIAN CAPITAL LETTER EM;Lu;0;R;;;;;N;;;;10CD8;
+10C99;OLD HUNGARIAN CAPITAL LETTER EN;Lu;0;R;;;;;N;;;;10CD9;
+10C9A;OLD HUNGARIAN CAPITAL LETTER ENY;Lu;0;R;;;;;N;;;;10CDA;
+10C9B;OLD HUNGARIAN CAPITAL LETTER O;Lu;0;R;;;;;N;;;;10CDB;
+10C9C;OLD HUNGARIAN CAPITAL LETTER OO;Lu;0;R;;;;;N;;;;10CDC;
+10C9D;OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE;Lu;0;R;;;;;N;;;;10CDD;
+10C9E;OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE;Lu;0;R;;;;;N;;;;10CDE;
+10C9F;OLD HUNGARIAN CAPITAL LETTER OEE;Lu;0;R;;;;;N;;;;10CDF;
+10CA0;OLD HUNGARIAN CAPITAL LETTER EP;Lu;0;R;;;;;N;;;;10CE0;
+10CA1;OLD HUNGARIAN CAPITAL LETTER EMP;Lu;0;R;;;;;N;;;;10CE1;
+10CA2;OLD HUNGARIAN CAPITAL LETTER ER;Lu;0;R;;;;;N;;;;10CE2;
+10CA3;OLD HUNGARIAN CAPITAL LETTER SHORT ER;Lu;0;R;;;;;N;;;;10CE3;
+10CA4;OLD HUNGARIAN CAPITAL LETTER ES;Lu;0;R;;;;;N;;;;10CE4;
+10CA5;OLD HUNGARIAN CAPITAL LETTER ESZ;Lu;0;R;;;;;N;;;;10CE5;
+10CA6;OLD HUNGARIAN CAPITAL LETTER ET;Lu;0;R;;;;;N;;;;10CE6;
+10CA7;OLD HUNGARIAN CAPITAL LETTER ENT;Lu;0;R;;;;;N;;;;10CE7;
+10CA8;OLD HUNGARIAN CAPITAL LETTER ETY;Lu;0;R;;;;;N;;;;10CE8;
+10CA9;OLD HUNGARIAN CAPITAL LETTER ECH;Lu;0;R;;;;;N;;;;10CE9;
+10CAA;OLD HUNGARIAN CAPITAL LETTER U;Lu;0;R;;;;;N;;;;10CEA;
+10CAB;OLD HUNGARIAN CAPITAL LETTER UU;Lu;0;R;;;;;N;;;;10CEB;
+10CAC;OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE;Lu;0;R;;;;;N;;;;10CEC;
+10CAD;OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE;Lu;0;R;;;;;N;;;;10CED;
+10CAE;OLD HUNGARIAN CAPITAL LETTER EV;Lu;0;R;;;;;N;;;;10CEE;
+10CAF;OLD HUNGARIAN CAPITAL LETTER EZ;Lu;0;R;;;;;N;;;;10CEF;
+10CB0;OLD HUNGARIAN CAPITAL LETTER EZS;Lu;0;R;;;;;N;;;;10CF0;
+10CB1;OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN;Lu;0;R;;;;;N;;;;10CF1;
+10CB2;OLD HUNGARIAN CAPITAL LETTER US;Lu;0;R;;;;;N;;;;10CF2;
+10CC0;OLD HUNGARIAN SMALL LETTER A;Ll;0;R;;;;;N;;;10C80;;10C80
+10CC1;OLD HUNGARIAN SMALL LETTER AA;Ll;0;R;;;;;N;;;10C81;;10C81
+10CC2;OLD HUNGARIAN SMALL LETTER EB;Ll;0;R;;;;;N;;;10C82;;10C82
+10CC3;OLD HUNGARIAN SMALL LETTER AMB;Ll;0;R;;;;;N;;;10C83;;10C83
+10CC4;OLD HUNGARIAN SMALL LETTER EC;Ll;0;R;;;;;N;;;10C84;;10C84
+10CC5;OLD HUNGARIAN SMALL LETTER ENC;Ll;0;R;;;;;N;;;10C85;;10C85
+10CC6;OLD HUNGARIAN SMALL LETTER ECS;Ll;0;R;;;;;N;;;10C86;;10C86
+10CC7;OLD HUNGARIAN SMALL LETTER ED;Ll;0;R;;;;;N;;;10C87;;10C87
+10CC8;OLD HUNGARIAN SMALL LETTER AND;Ll;0;R;;;;;N;;;10C88;;10C88
+10CC9;OLD HUNGARIAN SMALL LETTER E;Ll;0;R;;;;;N;;;10C89;;10C89
+10CCA;OLD HUNGARIAN SMALL LETTER CLOSE E;Ll;0;R;;;;;N;;;10C8A;;10C8A
+10CCB;OLD HUNGARIAN SMALL LETTER EE;Ll;0;R;;;;;N;;;10C8B;;10C8B
+10CCC;OLD HUNGARIAN SMALL LETTER EF;Ll;0;R;;;;;N;;;10C8C;;10C8C
+10CCD;OLD HUNGARIAN SMALL LETTER EG;Ll;0;R;;;;;N;;;10C8D;;10C8D
+10CCE;OLD HUNGARIAN SMALL LETTER EGY;Ll;0;R;;;;;N;;;10C8E;;10C8E
+10CCF;OLD HUNGARIAN SMALL LETTER EH;Ll;0;R;;;;;N;;;10C8F;;10C8F
+10CD0;OLD HUNGARIAN SMALL LETTER I;Ll;0;R;;;;;N;;;10C90;;10C90
+10CD1;OLD HUNGARIAN SMALL LETTER II;Ll;0;R;;;;;N;;;10C91;;10C91
+10CD2;OLD HUNGARIAN SMALL LETTER EJ;Ll;0;R;;;;;N;;;10C92;;10C92
+10CD3;OLD HUNGARIAN SMALL LETTER EK;Ll;0;R;;;;;N;;;10C93;;10C93
+10CD4;OLD HUNGARIAN SMALL LETTER AK;Ll;0;R;;;;;N;;;10C94;;10C94
+10CD5;OLD HUNGARIAN SMALL LETTER UNK;Ll;0;R;;;;;N;;;10C95;;10C95
+10CD6;OLD HUNGARIAN SMALL LETTER EL;Ll;0;R;;;;;N;;;10C96;;10C96
+10CD7;OLD HUNGARIAN SMALL LETTER ELY;Ll;0;R;;;;;N;;;10C97;;10C97
+10CD8;OLD HUNGARIAN SMALL LETTER EM;Ll;0;R;;;;;N;;;10C98;;10C98
+10CD9;OLD HUNGARIAN SMALL LETTER EN;Ll;0;R;;;;;N;;;10C99;;10C99
+10CDA;OLD HUNGARIAN SMALL LETTER ENY;Ll;0;R;;;;;N;;;10C9A;;10C9A
+10CDB;OLD HUNGARIAN SMALL LETTER O;Ll;0;R;;;;;N;;;10C9B;;10C9B
+10CDC;OLD HUNGARIAN SMALL LETTER OO;Ll;0;R;;;;;N;;;10C9C;;10C9C
+10CDD;OLD HUNGARIAN SMALL LETTER NIKOLSBURG OE;Ll;0;R;;;;;N;;;10C9D;;10C9D
+10CDE;OLD HUNGARIAN SMALL LETTER RUDIMENTA OE;Ll;0;R;;;;;N;;;10C9E;;10C9E
+10CDF;OLD HUNGARIAN SMALL LETTER OEE;Ll;0;R;;;;;N;;;10C9F;;10C9F
+10CE0;OLD HUNGARIAN SMALL LETTER EP;Ll;0;R;;;;;N;;;10CA0;;10CA0
+10CE1;OLD HUNGARIAN SMALL LETTER EMP;Ll;0;R;;;;;N;;;10CA1;;10CA1
+10CE2;OLD HUNGARIAN SMALL LETTER ER;Ll;0;R;;;;;N;;;10CA2;;10CA2
+10CE3;OLD HUNGARIAN SMALL LETTER SHORT ER;Ll;0;R;;;;;N;;;10CA3;;10CA3
+10CE4;OLD HUNGARIAN SMALL LETTER ES;Ll;0;R;;;;;N;;;10CA4;;10CA4
+10CE5;OLD HUNGARIAN SMALL LETTER ESZ;Ll;0;R;;;;;N;;;10CA5;;10CA5
+10CE6;OLD HUNGARIAN SMALL LETTER ET;Ll;0;R;;;;;N;;;10CA6;;10CA6
+10CE7;OLD HUNGARIAN SMALL LETTER ENT;Ll;0;R;;;;;N;;;10CA7;;10CA7
+10CE8;OLD HUNGARIAN SMALL LETTER ETY;Ll;0;R;;;;;N;;;10CA8;;10CA8
+10CE9;OLD HUNGARIAN SMALL LETTER ECH;Ll;0;R;;;;;N;;;10CA9;;10CA9
+10CEA;OLD HUNGARIAN SMALL LETTER U;Ll;0;R;;;;;N;;;10CAA;;10CAA
+10CEB;OLD HUNGARIAN SMALL LETTER UU;Ll;0;R;;;;;N;;;10CAB;;10CAB
+10CEC;OLD HUNGARIAN SMALL LETTER NIKOLSBURG UE;Ll;0;R;;;;;N;;;10CAC;;10CAC
+10CED;OLD HUNGARIAN SMALL LETTER RUDIMENTA UE;Ll;0;R;;;;;N;;;10CAD;;10CAD
+10CEE;OLD HUNGARIAN SMALL LETTER EV;Ll;0;R;;;;;N;;;10CAE;;10CAE
+10CEF;OLD HUNGARIAN SMALL LETTER EZ;Ll;0;R;;;;;N;;;10CAF;;10CAF
+10CF0;OLD HUNGARIAN SMALL LETTER EZS;Ll;0;R;;;;;N;;;10CB0;;10CB0
+10CF1;OLD HUNGARIAN SMALL LETTER ENT-SHAPED SIGN;Ll;0;R;;;;;N;;;10CB1;;10CB1
+10CF2;OLD HUNGARIAN SMALL LETTER US;Ll;0;R;;;;;N;;;10CB2;;10CB2
+10CFA;OLD HUNGARIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10CFB;OLD HUNGARIAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10CFC;OLD HUNGARIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10CFD;OLD HUNGARIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+10CFE;OLD HUNGARIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10CFF;OLD HUNGARIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10D00;HANIFI ROHINGYA LETTER A;Lo;0;AL;;;;;N;;;;;
+10D01;HANIFI ROHINGYA LETTER BA;Lo;0;AL;;;;;N;;;;;
+10D02;HANIFI ROHINGYA LETTER PA;Lo;0;AL;;;;;N;;;;;
+10D03;HANIFI ROHINGYA LETTER TA;Lo;0;AL;;;;;N;;;;;
+10D04;HANIFI ROHINGYA LETTER TTA;Lo;0;AL;;;;;N;;;;;
+10D05;HANIFI ROHINGYA LETTER JA;Lo;0;AL;;;;;N;;;;;
+10D06;HANIFI ROHINGYA LETTER CA;Lo;0;AL;;;;;N;;;;;
+10D07;HANIFI ROHINGYA LETTER HA;Lo;0;AL;;;;;N;;;;;
+10D08;HANIFI ROHINGYA LETTER KHA;Lo;0;AL;;;;;N;;;;;
+10D09;HANIFI ROHINGYA LETTER FA;Lo;0;AL;;;;;N;;;;;
+10D0A;HANIFI ROHINGYA LETTER DA;Lo;0;AL;;;;;N;;;;;
+10D0B;HANIFI ROHINGYA LETTER DDA;Lo;0;AL;;;;;N;;;;;
+10D0C;HANIFI ROHINGYA LETTER RA;Lo;0;AL;;;;;N;;;;;
+10D0D;HANIFI ROHINGYA LETTER RRA;Lo;0;AL;;;;;N;;;;;
+10D0E;HANIFI ROHINGYA LETTER ZA;Lo;0;AL;;;;;N;;;;;
+10D0F;HANIFI ROHINGYA LETTER SA;Lo;0;AL;;;;;N;;;;;
+10D10;HANIFI ROHINGYA LETTER SHA;Lo;0;AL;;;;;N;;;;;
+10D11;HANIFI ROHINGYA LETTER KA;Lo;0;AL;;;;;N;;;;;
+10D12;HANIFI ROHINGYA LETTER GA;Lo;0;AL;;;;;N;;;;;
+10D13;HANIFI ROHINGYA LETTER LA;Lo;0;AL;;;;;N;;;;;
+10D14;HANIFI ROHINGYA LETTER MA;Lo;0;AL;;;;;N;;;;;
+10D15;HANIFI ROHINGYA LETTER NA;Lo;0;AL;;;;;N;;;;;
+10D16;HANIFI ROHINGYA LETTER WA;Lo;0;AL;;;;;N;;;;;
+10D17;HANIFI ROHINGYA LETTER KINNA WA;Lo;0;AL;;;;;N;;;;;
+10D18;HANIFI ROHINGYA LETTER YA;Lo;0;AL;;;;;N;;;;;
+10D19;HANIFI ROHINGYA LETTER KINNA YA;Lo;0;AL;;;;;N;;;;;
+10D1A;HANIFI ROHINGYA LETTER NGA;Lo;0;AL;;;;;N;;;;;
+10D1B;HANIFI ROHINGYA LETTER NYA;Lo;0;AL;;;;;N;;;;;
+10D1C;HANIFI ROHINGYA LETTER VA;Lo;0;AL;;;;;N;;;;;
+10D1D;HANIFI ROHINGYA VOWEL A;Lo;0;AL;;;;;N;;;;;
+10D1E;HANIFI ROHINGYA VOWEL I;Lo;0;AL;;;;;N;;;;;
+10D1F;HANIFI ROHINGYA VOWEL U;Lo;0;AL;;;;;N;;;;;
+10D20;HANIFI ROHINGYA VOWEL E;Lo;0;AL;;;;;N;;;;;
+10D21;HANIFI ROHINGYA VOWEL O;Lo;0;AL;;;;;N;;;;;
+10D22;HANIFI ROHINGYA MARK SAKIN;Lo;0;AL;;;;;N;;;;;
+10D23;HANIFI ROHINGYA MARK NA KHONNA;Lo;0;AL;;;;;N;;;;;
+10D24;HANIFI ROHINGYA SIGN HARBAHAY;Mn;230;NSM;;;;;N;;;;;
+10D25;HANIFI ROHINGYA SIGN TAHALA;Mn;230;NSM;;;;;N;;;;;
+10D26;HANIFI ROHINGYA SIGN TANA;Mn;230;NSM;;;;;N;;;;;
+10D27;HANIFI ROHINGYA SIGN TASSI;Mn;230;NSM;;;;;N;;;;;
+10D30;HANIFI ROHINGYA DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+10D31;HANIFI ROHINGYA DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
+10D32;HANIFI ROHINGYA DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
+10D33;HANIFI ROHINGYA DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
+10D34;HANIFI ROHINGYA DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
+10D35;HANIFI ROHINGYA DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
+10D36;HANIFI ROHINGYA DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
+10D37;HANIFI ROHINGYA DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
+10D38;HANIFI ROHINGYA DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
+10D39;HANIFI ROHINGYA DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
+10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;;
+10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;;
+10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;;
+10E63;RUMI DIGIT FOUR;No;0;AN;;;4;4;N;;;;;
+10E64;RUMI DIGIT FIVE;No;0;AN;;;5;5;N;;;;;
+10E65;RUMI DIGIT SIX;No;0;AN;;;6;6;N;;;;;
+10E66;RUMI DIGIT SEVEN;No;0;AN;;;7;7;N;;;;;
+10E67;RUMI DIGIT EIGHT;No;0;AN;;;8;8;N;;;;;
+10E68;RUMI DIGIT NINE;No;0;AN;;;9;9;N;;;;;
+10E69;RUMI NUMBER TEN;No;0;AN;;;;10;N;;;;;
+10E6A;RUMI NUMBER TWENTY;No;0;AN;;;;20;N;;;;;
+10E6B;RUMI NUMBER THIRTY;No;0;AN;;;;30;N;;;;;
+10E6C;RUMI NUMBER FORTY;No;0;AN;;;;40;N;;;;;
+10E6D;RUMI NUMBER FIFTY;No;0;AN;;;;50;N;;;;;
+10E6E;RUMI NUMBER SIXTY;No;0;AN;;;;60;N;;;;;
+10E6F;RUMI NUMBER SEVENTY;No;0;AN;;;;70;N;;;;;
+10E70;RUMI NUMBER EIGHTY;No;0;AN;;;;80;N;;;;;
+10E71;RUMI NUMBER NINETY;No;0;AN;;;;90;N;;;;;
+10E72;RUMI NUMBER ONE HUNDRED;No;0;AN;;;;100;N;;;;;
+10E73;RUMI NUMBER TWO HUNDRED;No;0;AN;;;;200;N;;;;;
+10E74;RUMI NUMBER THREE HUNDRED;No;0;AN;;;;300;N;;;;;
+10E75;RUMI NUMBER FOUR HUNDRED;No;0;AN;;;;400;N;;;;;
+10E76;RUMI NUMBER FIVE HUNDRED;No;0;AN;;;;500;N;;;;;
+10E77;RUMI NUMBER SIX HUNDRED;No;0;AN;;;;600;N;;;;;
+10E78;RUMI NUMBER SEVEN HUNDRED;No;0;AN;;;;700;N;;;;;
+10E79;RUMI NUMBER EIGHT HUNDRED;No;0;AN;;;;800;N;;;;;
+10E7A;RUMI NUMBER NINE HUNDRED;No;0;AN;;;;900;N;;;;;
+10E7B;RUMI FRACTION ONE HALF;No;0;AN;;;;1/2;N;;;;;
+10E7C;RUMI FRACTION ONE QUARTER;No;0;AN;;;;1/4;N;;;;;
+10E7D;RUMI FRACTION ONE THIRD;No;0;AN;;;;1/3;N;;;;;
+10E7E;RUMI FRACTION TWO THIRDS;No;0;AN;;;;2/3;N;;;;;
+10E80;YEZIDI LETTER ELIF;Lo;0;R;;;;;N;;;;;
+10E81;YEZIDI LETTER BE;Lo;0;R;;;;;N;;;;;
+10E82;YEZIDI LETTER PE;Lo;0;R;;;;;N;;;;;
+10E83;YEZIDI LETTER PHE;Lo;0;R;;;;;N;;;;;
+10E84;YEZIDI LETTER THE;Lo;0;R;;;;;N;;;;;
+10E85;YEZIDI LETTER SE;Lo;0;R;;;;;N;;;;;
+10E86;YEZIDI LETTER CIM;Lo;0;R;;;;;N;;;;;
+10E87;YEZIDI LETTER CHIM;Lo;0;R;;;;;N;;;;;
+10E88;YEZIDI LETTER CHHIM;Lo;0;R;;;;;N;;;;;
+10E89;YEZIDI LETTER HHA;Lo;0;R;;;;;N;;;;;
+10E8A;YEZIDI LETTER XA;Lo;0;R;;;;;N;;;;;
+10E8B;YEZIDI LETTER DAL;Lo;0;R;;;;;N;;;;;
+10E8C;YEZIDI LETTER ZAL;Lo;0;R;;;;;N;;;;;
+10E8D;YEZIDI LETTER RA;Lo;0;R;;;;;N;;;;;
+10E8E;YEZIDI LETTER RHA;Lo;0;R;;;;;N;;;;;
+10E8F;YEZIDI LETTER ZA;Lo;0;R;;;;;N;;;;;
+10E90;YEZIDI LETTER JA;Lo;0;R;;;;;N;;;;;
+10E91;YEZIDI LETTER SIN;Lo;0;R;;;;;N;;;;;
+10E92;YEZIDI LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10E93;YEZIDI LETTER SAD;Lo;0;R;;;;;N;;;;;
+10E94;YEZIDI LETTER DAD;Lo;0;R;;;;;N;;;;;
+10E95;YEZIDI LETTER TA;Lo;0;R;;;;;N;;;;;
+10E96;YEZIDI LETTER ZE;Lo;0;R;;;;;N;;;;;
+10E97;YEZIDI LETTER EYN;Lo;0;R;;;;;N;;;;;
+10E98;YEZIDI LETTER XHEYN;Lo;0;R;;;;;N;;;;;
+10E99;YEZIDI LETTER FA;Lo;0;R;;;;;N;;;;;
+10E9A;YEZIDI LETTER VA;Lo;0;R;;;;;N;;;;;
+10E9B;YEZIDI LETTER VA ALTERNATE FORM;Lo;0;R;;;;;N;;;;;
+10E9C;YEZIDI LETTER QAF;Lo;0;R;;;;;N;;;;;
+10E9D;YEZIDI LETTER KAF;Lo;0;R;;;;;N;;;;;
+10E9E;YEZIDI LETTER KHAF;Lo;0;R;;;;;N;;;;;
+10E9F;YEZIDI LETTER GAF;Lo;0;R;;;;;N;;;;;
+10EA0;YEZIDI LETTER LAM;Lo;0;R;;;;;N;;;;;
+10EA1;YEZIDI LETTER MIM;Lo;0;R;;;;;N;;;;;
+10EA2;YEZIDI LETTER NUN;Lo;0;R;;;;;N;;;;;
+10EA3;YEZIDI LETTER UM;Lo;0;R;;;;;N;;;;;
+10EA4;YEZIDI LETTER WAW;Lo;0;R;;;;;N;;;;;
+10EA5;YEZIDI LETTER OW;Lo;0;R;;;;;N;;;;;
+10EA6;YEZIDI LETTER EW;Lo;0;R;;;;;N;;;;;
+10EA7;YEZIDI LETTER HAY;Lo;0;R;;;;;N;;;;;
+10EA8;YEZIDI LETTER YOT;Lo;0;R;;;;;N;;;;;
+10EA9;YEZIDI LETTER ET;Lo;0;R;;;;;N;;;;;
+10EAB;YEZIDI COMBINING HAMZA MARK;Mn;230;NSM;;;;;N;;;;;
+10EAC;YEZIDI COMBINING MADDA MARK;Mn;230;NSM;;;;;N;;;;;
+10EAD;YEZIDI HYPHENATION MARK;Pd;0;R;;;;;N;;;;;
+10EB0;YEZIDI LETTER LAM WITH DOT ABOVE;Lo;0;R;;;;;N;;;;;
+10EB1;YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE;Lo;0;R;;;;;N;;;;;
+10F00;OLD SOGDIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10F01;OLD SOGDIAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;;
+10F02;OLD SOGDIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10F03;OLD SOGDIAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;;
+10F04;OLD SOGDIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10F05;OLD SOGDIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10F06;OLD SOGDIAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;;
+10F07;OLD SOGDIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10F08;OLD SOGDIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10F09;OLD SOGDIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10F0A;OLD SOGDIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10F0B;OLD SOGDIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10F0C;OLD SOGDIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10F0D;OLD SOGDIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10F0E;OLD SOGDIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10F0F;OLD SOGDIAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+10F10;OLD SOGDIAN LETTER FINAL NUN WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F11;OLD SOGDIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10F12;OLD SOGDIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10F13;OLD SOGDIAN LETTER ALTERNATE AYIN;Lo;0;R;;;;;N;;;;;
+10F14;OLD SOGDIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10F15;OLD SOGDIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10F16;OLD SOGDIAN LETTER FINAL SADHE;Lo;0;R;;;;;N;;;;;
+10F17;OLD SOGDIAN LETTER FINAL SADHE WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F18;OLD SOGDIAN LETTER RESH-AYIN-DALETH;Lo;0;R;;;;;N;;;;;
+10F19;OLD SOGDIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10F1A;OLD SOGDIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10F1B;OLD SOGDIAN LETTER FINAL TAW;Lo;0;R;;;;;N;;;;;
+10F1C;OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F1D;OLD SOGDIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10F1E;OLD SOGDIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10F1F;OLD SOGDIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10F20;OLD SOGDIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10F21;OLD SOGDIAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10F22;OLD SOGDIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10F23;OLD SOGDIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10F24;OLD SOGDIAN NUMBER THIRTY;No;0;R;;;;30;N;;;;;
+10F25;OLD SOGDIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10F26;OLD SOGDIAN FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
+10F27;OLD SOGDIAN LIGATURE AYIN-DALETH;Lo;0;R;;;;;N;;;;;
+10F30;SOGDIAN LETTER ALEPH;Lo;0;AL;;;;;N;;;;;
+10F31;SOGDIAN LETTER BETH;Lo;0;AL;;;;;N;;;;;
+10F32;SOGDIAN LETTER GIMEL;Lo;0;AL;;;;;N;;;;;
+10F33;SOGDIAN LETTER HE;Lo;0;AL;;;;;N;;;;;
+10F34;SOGDIAN LETTER WAW;Lo;0;AL;;;;;N;;;;;
+10F35;SOGDIAN LETTER ZAYIN;Lo;0;AL;;;;;N;;;;;
+10F36;SOGDIAN LETTER HETH;Lo;0;AL;;;;;N;;;;;
+10F37;SOGDIAN LETTER YODH;Lo;0;AL;;;;;N;;;;;
+10F38;SOGDIAN LETTER KAPH;Lo;0;AL;;;;;N;;;;;
+10F39;SOGDIAN LETTER LAMEDH;Lo;0;AL;;;;;N;;;;;
+10F3A;SOGDIAN LETTER MEM;Lo;0;AL;;;;;N;;;;;
+10F3B;SOGDIAN LETTER NUN;Lo;0;AL;;;;;N;;;;;
+10F3C;SOGDIAN LETTER SAMEKH;Lo;0;AL;;;;;N;;;;;
+10F3D;SOGDIAN LETTER AYIN;Lo;0;AL;;;;;N;;;;;
+10F3E;SOGDIAN LETTER PE;Lo;0;AL;;;;;N;;;;;
+10F3F;SOGDIAN LETTER SADHE;Lo;0;AL;;;;;N;;;;;
+10F40;SOGDIAN LETTER RESH-AYIN;Lo;0;AL;;;;;N;;;;;
+10F41;SOGDIAN LETTER SHIN;Lo;0;AL;;;;;N;;;;;
+10F42;SOGDIAN LETTER TAW;Lo;0;AL;;;;;N;;;;;
+10F43;SOGDIAN LETTER FETH;Lo;0;AL;;;;;N;;;;;
+10F44;SOGDIAN LETTER LESH;Lo;0;AL;;;;;N;;;;;
+10F45;SOGDIAN INDEPENDENT SHIN;Lo;0;AL;;;;;N;;;;;
+10F46;SOGDIAN COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10F47;SOGDIAN COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+10F48;SOGDIAN COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F49;SOGDIAN COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4A;SOGDIAN COMBINING CURVE ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4B;SOGDIAN COMBINING CURVE BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4C;SOGDIAN COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4D;SOGDIAN COMBINING HOOK BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4E;SOGDIAN COMBINING LONG HOOK BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4F;SOGDIAN COMBINING RESH BELOW;Mn;220;NSM;;;;;N;;;;;
+10F50;SOGDIAN COMBINING STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+10F51;SOGDIAN NUMBER ONE;No;0;AL;;;;1;N;;;;;
+10F52;SOGDIAN NUMBER TEN;No;0;AL;;;;10;N;;;;;
+10F53;SOGDIAN NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+10F54;SOGDIAN NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+10F55;SOGDIAN PUNCTUATION TWO VERTICAL BARS;Po;0;AL;;;;;N;;;;;
+10F56;SOGDIAN PUNCTUATION TWO VERTICAL BARS WITH DOTS;Po;0;AL;;;;;N;;;;;
+10F57;SOGDIAN PUNCTUATION CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;;
+10F58;SOGDIAN PUNCTUATION TWO CIRCLES WITH DOTS;Po;0;AL;;;;;N;;;;;
+10F59;SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;;
+10FB0;CHORASMIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10FB1;CHORASMIAN LETTER SMALL ALEPH;Lo;0;R;;;;;N;;;;;
+10FB2;CHORASMIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10FB3;CHORASMIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10FB4;CHORASMIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10FB5;CHORASMIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10FB6;CHORASMIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10FB7;CHORASMIAN LETTER CURLED WAW;Lo;0;R;;;;;N;;;;;
+10FB8;CHORASMIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10FB9;CHORASMIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10FBA;CHORASMIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10FBB;CHORASMIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10FBC;CHORASMIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10FBD;CHORASMIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10FBE;CHORASMIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10FBF;CHORASMIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10FC0;CHORASMIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10FC1;CHORASMIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10FC2;CHORASMIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10FC3;CHORASMIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10FC4;CHORASMIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10FC5;CHORASMIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10FC6;CHORASMIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10FC7;CHORASMIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10FC8;CHORASMIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10FC9;CHORASMIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10FCA;CHORASMIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10FCB;CHORASMIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10FE0;ELYMAIC LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10FE1;ELYMAIC LETTER BETH;Lo;0;R;;;;;N;;;;;
+10FE2;ELYMAIC LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10FE3;ELYMAIC LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10FE4;ELYMAIC LETTER HE;Lo;0;R;;;;;N;;;;;
+10FE5;ELYMAIC LETTER WAW;Lo;0;R;;;;;N;;;;;
+10FE6;ELYMAIC LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10FE7;ELYMAIC LETTER HETH;Lo;0;R;;;;;N;;;;;
+10FE8;ELYMAIC LETTER TETH;Lo;0;R;;;;;N;;;;;
+10FE9;ELYMAIC LETTER YODH;Lo;0;R;;;;;N;;;;;
+10FEA;ELYMAIC LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10FEB;ELYMAIC LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10FEC;ELYMAIC LETTER MEM;Lo;0;R;;;;;N;;;;;
+10FED;ELYMAIC LETTER NUN;Lo;0;R;;;;;N;;;;;
+10FEE;ELYMAIC LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10FEF;ELYMAIC LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10FF0;ELYMAIC LETTER PE;Lo;0;R;;;;;N;;;;;
+10FF1;ELYMAIC LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10FF2;ELYMAIC LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10FF3;ELYMAIC LETTER RESH;Lo;0;R;;;;;N;;;;;
+10FF4;ELYMAIC LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10FF5;ELYMAIC LETTER TAW;Lo;0;R;;;;;N;;;;;
+10FF6;ELYMAIC LIGATURE ZAYIN-YODH;Lo;0;R;;;;;N;;;;;
+11000;BRAHMI SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
+11001;BRAHMI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11002;BRAHMI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11003;BRAHMI SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+11004;BRAHMI SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+11005;BRAHMI LETTER A;Lo;0;L;;;;;N;;;;;
+11006;BRAHMI LETTER AA;Lo;0;L;;;;;N;;;;;
+11007;BRAHMI LETTER I;Lo;0;L;;;;;N;;;;;
+11008;BRAHMI LETTER II;Lo;0;L;;;;;N;;;;;
+11009;BRAHMI LETTER U;Lo;0;L;;;;;N;;;;;
+1100A;BRAHMI LETTER UU;Lo;0;L;;;;;N;;;;;
+1100B;BRAHMI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1100C;BRAHMI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1100D;BRAHMI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1100E;BRAHMI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1100F;BRAHMI LETTER E;Lo;0;L;;;;;N;;;;;
+11010;BRAHMI LETTER AI;Lo;0;L;;;;;N;;;;;
+11011;BRAHMI LETTER O;Lo;0;L;;;;;N;;;;;
+11012;BRAHMI LETTER AU;Lo;0;L;;;;;N;;;;;
+11013;BRAHMI LETTER KA;Lo;0;L;;;;;N;;;;;
+11014;BRAHMI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11015;BRAHMI LETTER GA;Lo;0;L;;;;;N;;;;;
+11016;BRAHMI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11017;BRAHMI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11018;BRAHMI LETTER CA;Lo;0;L;;;;;N;;;;;
+11019;BRAHMI LETTER CHA;Lo;0;L;;;;;N;;;;;
+1101A;BRAHMI LETTER JA;Lo;0;L;;;;;N;;;;;
+1101B;BRAHMI LETTER JHA;Lo;0;L;;;;;N;;;;;
+1101C;BRAHMI LETTER NYA;Lo;0;L;;;;;N;;;;;
+1101D;BRAHMI LETTER TTA;Lo;0;L;;;;;N;;;;;
+1101E;BRAHMI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1101F;BRAHMI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11020;BRAHMI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11021;BRAHMI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11022;BRAHMI LETTER TA;Lo;0;L;;;;;N;;;;;
+11023;BRAHMI LETTER THA;Lo;0;L;;;;;N;;;;;
+11024;BRAHMI LETTER DA;Lo;0;L;;;;;N;;;;;
+11025;BRAHMI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11026;BRAHMI LETTER NA;Lo;0;L;;;;;N;;;;;
+11027;BRAHMI LETTER PA;Lo;0;L;;;;;N;;;;;
+11028;BRAHMI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11029;BRAHMI LETTER BA;Lo;0;L;;;;;N;;;;;
+1102A;BRAHMI LETTER BHA;Lo;0;L;;;;;N;;;;;
+1102B;BRAHMI LETTER MA;Lo;0;L;;;;;N;;;;;
+1102C;BRAHMI LETTER YA;Lo;0;L;;;;;N;;;;;
+1102D;BRAHMI LETTER RA;Lo;0;L;;;;;N;;;;;
+1102E;BRAHMI LETTER LA;Lo;0;L;;;;;N;;;;;
+1102F;BRAHMI LETTER VA;Lo;0;L;;;;;N;;;;;
+11030;BRAHMI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11031;BRAHMI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11032;BRAHMI LETTER SA;Lo;0;L;;;;;N;;;;;
+11033;BRAHMI LETTER HA;Lo;0;L;;;;;N;;;;;
+11034;BRAHMI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11035;BRAHMI LETTER OLD TAMIL LLLA;Lo;0;L;;;;;N;;;;;
+11036;BRAHMI LETTER OLD TAMIL RRA;Lo;0;L;;;;;N;;;;;
+11037;BRAHMI LETTER OLD TAMIL NNNA;Lo;0;L;;;;;N;;;;;
+11038;BRAHMI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11039;BRAHMI VOWEL SIGN BHATTIPROLU AA;Mn;0;NSM;;;;;N;;;;;
+1103A;BRAHMI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1103B;BRAHMI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1103C;BRAHMI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1103D;BRAHMI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1103E;BRAHMI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+1103F;BRAHMI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11040;BRAHMI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11041;BRAHMI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+11042;BRAHMI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11043;BRAHMI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11044;BRAHMI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11045;BRAHMI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11046;BRAHMI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11047;BRAHMI DANDA;Po;0;L;;;;;N;;;;;
+11048;BRAHMI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11049;BRAHMI PUNCTUATION DOT;Po;0;L;;;;;N;;;;;
+1104A;BRAHMI PUNCTUATION DOUBLE DOT;Po;0;L;;;;;N;;;;;
+1104B;BRAHMI PUNCTUATION LINE;Po;0;L;;;;;N;;;;;
+1104C;BRAHMI PUNCTUATION CRESCENT BAR;Po;0;L;;;;;N;;;;;
+1104D;BRAHMI PUNCTUATION LOTUS;Po;0;L;;;;;N;;;;;
+11052;BRAHMI NUMBER ONE;No;0;ON;;;1;1;N;;;;;
+11053;BRAHMI NUMBER TWO;No;0;ON;;;2;2;N;;;;;
+11054;BRAHMI NUMBER THREE;No;0;ON;;;3;3;N;;;;;
+11055;BRAHMI NUMBER FOUR;No;0;ON;;;4;4;N;;;;;
+11056;BRAHMI NUMBER FIVE;No;0;ON;;;5;5;N;;;;;
+11057;BRAHMI NUMBER SIX;No;0;ON;;;6;6;N;;;;;
+11058;BRAHMI NUMBER SEVEN;No;0;ON;;;7;7;N;;;;;
+11059;BRAHMI NUMBER EIGHT;No;0;ON;;;8;8;N;;;;;
+1105A;BRAHMI NUMBER NINE;No;0;ON;;;9;9;N;;;;;
+1105B;BRAHMI NUMBER TEN;No;0;ON;;;;10;N;;;;;
+1105C;BRAHMI NUMBER TWENTY;No;0;ON;;;;20;N;;;;;
+1105D;BRAHMI NUMBER THIRTY;No;0;ON;;;;30;N;;;;;
+1105E;BRAHMI NUMBER FORTY;No;0;ON;;;;40;N;;;;;
+1105F;BRAHMI NUMBER FIFTY;No;0;ON;;;;50;N;;;;;
+11060;BRAHMI NUMBER SIXTY;No;0;ON;;;;60;N;;;;;
+11061;BRAHMI NUMBER SEVENTY;No;0;ON;;;;70;N;;;;;
+11062;BRAHMI NUMBER EIGHTY;No;0;ON;;;;80;N;;;;;
+11063;BRAHMI NUMBER NINETY;No;0;ON;;;;90;N;;;;;
+11064;BRAHMI NUMBER ONE HUNDRED;No;0;ON;;;;100;N;;;;;
+11065;BRAHMI NUMBER ONE THOUSAND;No;0;ON;;;;1000;N;;;;;
+11066;BRAHMI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11067;BRAHMI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11068;BRAHMI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11069;BRAHMI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1106A;BRAHMI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1106B;BRAHMI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1106C;BRAHMI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1106D;BRAHMI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1106E;BRAHMI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1106F;BRAHMI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1107F;BRAHMI NUMBER JOINER;Mn;9;NSM;;;;;N;;;;;
+11080;KAITHI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11081;KAITHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11082;KAITHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11083;KAITHI LETTER A;Lo;0;L;;;;;N;;;;;
+11084;KAITHI LETTER AA;Lo;0;L;;;;;N;;;;;
+11085;KAITHI LETTER I;Lo;0;L;;;;;N;;;;;
+11086;KAITHI LETTER II;Lo;0;L;;;;;N;;;;;
+11087;KAITHI LETTER U;Lo;0;L;;;;;N;;;;;
+11088;KAITHI LETTER UU;Lo;0;L;;;;;N;;;;;
+11089;KAITHI LETTER E;Lo;0;L;;;;;N;;;;;
+1108A;KAITHI LETTER AI;Lo;0;L;;;;;N;;;;;
+1108B;KAITHI LETTER O;Lo;0;L;;;;;N;;;;;
+1108C;KAITHI LETTER AU;Lo;0;L;;;;;N;;;;;
+1108D;KAITHI LETTER KA;Lo;0;L;;;;;N;;;;;
+1108E;KAITHI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1108F;KAITHI LETTER GA;Lo;0;L;;;;;N;;;;;
+11090;KAITHI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11091;KAITHI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11092;KAITHI LETTER CA;Lo;0;L;;;;;N;;;;;
+11093;KAITHI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11094;KAITHI LETTER JA;Lo;0;L;;;;;N;;;;;
+11095;KAITHI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11096;KAITHI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11097;KAITHI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11098;KAITHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11099;KAITHI LETTER DDA;Lo;0;L;;;;;N;;;;;
+1109A;KAITHI LETTER DDDHA;Lo;0;L;11099 110BA;;;;N;;;;;
+1109B;KAITHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1109C;KAITHI LETTER RHA;Lo;0;L;1109B 110BA;;;;N;;;;;
+1109D;KAITHI LETTER NNA;Lo;0;L;;;;;N;;;;;
+1109E;KAITHI LETTER TA;Lo;0;L;;;;;N;;;;;
+1109F;KAITHI LETTER THA;Lo;0;L;;;;;N;;;;;
+110A0;KAITHI LETTER DA;Lo;0;L;;;;;N;;;;;
+110A1;KAITHI LETTER DHA;Lo;0;L;;;;;N;;;;;
+110A2;KAITHI LETTER NA;Lo;0;L;;;;;N;;;;;
+110A3;KAITHI LETTER PA;Lo;0;L;;;;;N;;;;;
+110A4;KAITHI LETTER PHA;Lo;0;L;;;;;N;;;;;
+110A5;KAITHI LETTER BA;Lo;0;L;;;;;N;;;;;
+110A6;KAITHI LETTER BHA;Lo;0;L;;;;;N;;;;;
+110A7;KAITHI LETTER MA;Lo;0;L;;;;;N;;;;;
+110A8;KAITHI LETTER YA;Lo;0;L;;;;;N;;;;;
+110A9;KAITHI LETTER RA;Lo;0;L;;;;;N;;;;;
+110AA;KAITHI LETTER LA;Lo;0;L;;;;;N;;;;;
+110AB;KAITHI LETTER VA;Lo;0;L;110A5 110BA;;;;N;;;;;
+110AC;KAITHI LETTER SHA;Lo;0;L;;;;;N;;;;;
+110AD;KAITHI LETTER SSA;Lo;0;L;;;;;N;;;;;
+110AE;KAITHI LETTER SA;Lo;0;L;;;;;N;;;;;
+110AF;KAITHI LETTER HA;Lo;0;L;;;;;N;;;;;
+110B0;KAITHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+110B1;KAITHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+110B2;KAITHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+110B3;KAITHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+110B4;KAITHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+110B5;KAITHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+110B6;KAITHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+110B7;KAITHI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+110B8;KAITHI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+110B9;KAITHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+110BA;KAITHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+110BB;KAITHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+110BC;KAITHI ENUMERATION SIGN;Po;0;L;;;;;N;;;;;
+110BD;KAITHI NUMBER SIGN;Cf;0;L;;;;;N;;;;;
+110BE;KAITHI SECTION MARK;Po;0;L;;;;;N;;;;;
+110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
+110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;;
+110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+110CD;KAITHI NUMBER SIGN ABOVE;Cf;0;L;;;;;N;;;;;
+110D0;SORA SOMPENG LETTER SAH;Lo;0;L;;;;;N;;;;;
+110D1;SORA SOMPENG LETTER TAH;Lo;0;L;;;;;N;;;;;
+110D2;SORA SOMPENG LETTER BAH;Lo;0;L;;;;;N;;;;;
+110D3;SORA SOMPENG LETTER CAH;Lo;0;L;;;;;N;;;;;
+110D4;SORA SOMPENG LETTER DAH;Lo;0;L;;;;;N;;;;;
+110D5;SORA SOMPENG LETTER GAH;Lo;0;L;;;;;N;;;;;
+110D6;SORA SOMPENG LETTER MAH;Lo;0;L;;;;;N;;;;;
+110D7;SORA SOMPENG LETTER NGAH;Lo;0;L;;;;;N;;;;;
+110D8;SORA SOMPENG LETTER LAH;Lo;0;L;;;;;N;;;;;
+110D9;SORA SOMPENG LETTER NAH;Lo;0;L;;;;;N;;;;;
+110DA;SORA SOMPENG LETTER VAH;Lo;0;L;;;;;N;;;;;
+110DB;SORA SOMPENG LETTER PAH;Lo;0;L;;;;;N;;;;;
+110DC;SORA SOMPENG LETTER YAH;Lo;0;L;;;;;N;;;;;
+110DD;SORA SOMPENG LETTER RAH;Lo;0;L;;;;;N;;;;;
+110DE;SORA SOMPENG LETTER HAH;Lo;0;L;;;;;N;;;;;
+110DF;SORA SOMPENG LETTER KAH;Lo;0;L;;;;;N;;;;;
+110E0;SORA SOMPENG LETTER JAH;Lo;0;L;;;;;N;;;;;
+110E1;SORA SOMPENG LETTER NYAH;Lo;0;L;;;;;N;;;;;
+110E2;SORA SOMPENG LETTER AH;Lo;0;L;;;;;N;;;;;
+110E3;SORA SOMPENG LETTER EEH;Lo;0;L;;;;;N;;;;;
+110E4;SORA SOMPENG LETTER IH;Lo;0;L;;;;;N;;;;;
+110E5;SORA SOMPENG LETTER UH;Lo;0;L;;;;;N;;;;;
+110E6;SORA SOMPENG LETTER OH;Lo;0;L;;;;;N;;;;;
+110E7;SORA SOMPENG LETTER EH;Lo;0;L;;;;;N;;;;;
+110E8;SORA SOMPENG LETTER MAE;Lo;0;L;;;;;N;;;;;
+110F0;SORA SOMPENG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+110F1;SORA SOMPENG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+110F2;SORA SOMPENG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+110F3;SORA SOMPENG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+110F4;SORA SOMPENG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+110F5;SORA SOMPENG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+110F6;SORA SOMPENG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+110F7;SORA SOMPENG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+110F8;SORA SOMPENG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+110F9;SORA SOMPENG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11100;CHAKMA SIGN CANDRABINDU;Mn;230;NSM;;;;;N;;;;;
+11101;CHAKMA SIGN ANUSVARA;Mn;230;NSM;;;;;N;;;;;
+11102;CHAKMA SIGN VISARGA;Mn;230;NSM;;;;;N;;;;;
+11103;CHAKMA LETTER AA;Lo;0;L;;;;;N;;;;;
+11104;CHAKMA LETTER I;Lo;0;L;;;;;N;;;;;
+11105;CHAKMA LETTER U;Lo;0;L;;;;;N;;;;;
+11106;CHAKMA LETTER E;Lo;0;L;;;;;N;;;;;
+11107;CHAKMA LETTER KAA;Lo;0;L;;;;;N;;;;;
+11108;CHAKMA LETTER KHAA;Lo;0;L;;;;;N;;;;;
+11109;CHAKMA LETTER GAA;Lo;0;L;;;;;N;;;;;
+1110A;CHAKMA LETTER GHAA;Lo;0;L;;;;;N;;;;;
+1110B;CHAKMA LETTER NGAA;Lo;0;L;;;;;N;;;;;
+1110C;CHAKMA LETTER CAA;Lo;0;L;;;;;N;;;;;
+1110D;CHAKMA LETTER CHAA;Lo;0;L;;;;;N;;;;;
+1110E;CHAKMA LETTER JAA;Lo;0;L;;;;;N;;;;;
+1110F;CHAKMA LETTER JHAA;Lo;0;L;;;;;N;;;;;
+11110;CHAKMA LETTER NYAA;Lo;0;L;;;;;N;;;;;
+11111;CHAKMA LETTER TTAA;Lo;0;L;;;;;N;;;;;
+11112;CHAKMA LETTER TTHAA;Lo;0;L;;;;;N;;;;;
+11113;CHAKMA LETTER DDAA;Lo;0;L;;;;;N;;;;;
+11114;CHAKMA LETTER DDHAA;Lo;0;L;;;;;N;;;;;
+11115;CHAKMA LETTER NNAA;Lo;0;L;;;;;N;;;;;
+11116;CHAKMA LETTER TAA;Lo;0;L;;;;;N;;;;;
+11117;CHAKMA LETTER THAA;Lo;0;L;;;;;N;;;;;
+11118;CHAKMA LETTER DAA;Lo;0;L;;;;;N;;;;;
+11119;CHAKMA LETTER DHAA;Lo;0;L;;;;;N;;;;;
+1111A;CHAKMA LETTER NAA;Lo;0;L;;;;;N;;;;;
+1111B;CHAKMA LETTER PAA;Lo;0;L;;;;;N;;;;;
+1111C;CHAKMA LETTER PHAA;Lo;0;L;;;;;N;;;;;
+1111D;CHAKMA LETTER BAA;Lo;0;L;;;;;N;;;;;
+1111E;CHAKMA LETTER BHAA;Lo;0;L;;;;;N;;;;;
+1111F;CHAKMA LETTER MAA;Lo;0;L;;;;;N;;;;;
+11120;CHAKMA LETTER YYAA;Lo;0;L;;;;;N;;;;;
+11121;CHAKMA LETTER YAA;Lo;0;L;;;;;N;;;;;
+11122;CHAKMA LETTER RAA;Lo;0;L;;;;;N;;;;;
+11123;CHAKMA LETTER LAA;Lo;0;L;;;;;N;;;;;
+11124;CHAKMA LETTER WAA;Lo;0;L;;;;;N;;;;;
+11125;CHAKMA LETTER SAA;Lo;0;L;;;;;N;;;;;
+11126;CHAKMA LETTER HAA;Lo;0;L;;;;;N;;;;;
+11127;CHAKMA VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;;
+11128;CHAKMA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11129;CHAKMA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1112A;CHAKMA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1112B;CHAKMA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1112C;CHAKMA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1112D;CHAKMA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1112E;CHAKMA VOWEL SIGN O;Mn;0;NSM;11131 11127;;;;N;;;;;
+1112F;CHAKMA VOWEL SIGN AU;Mn;0;NSM;11132 11127;;;;N;;;;;
+11130;CHAKMA VOWEL SIGN OI;Mn;0;NSM;;;;;N;;;;;
+11131;CHAKMA O MARK;Mn;0;NSM;;;;;N;;;;;
+11132;CHAKMA AU MARK;Mn;0;NSM;;;;;N;;;;;
+11133;CHAKMA VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11134;CHAKMA MAAYYAA;Mn;9;NSM;;;;;N;;;;;
+11136;CHAKMA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11137;CHAKMA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11138;CHAKMA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11139;CHAKMA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1113A;CHAKMA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1113B;CHAKMA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1113C;CHAKMA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1113D;CHAKMA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1113E;CHAKMA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1113F;CHAKMA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11140;CHAKMA SECTION MARK;Po;0;L;;;;;N;;;;;
+11141;CHAKMA DANDA;Po;0;L;;;;;N;;;;;
+11142;CHAKMA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11143;CHAKMA QUESTION MARK;Po;0;L;;;;;N;;;;;
+11144;CHAKMA LETTER LHAA;Lo;0;L;;;;;N;;;;;
+11145;CHAKMA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11146;CHAKMA VOWEL SIGN EI;Mc;0;L;;;;;N;;;;;
+11147;CHAKMA LETTER VAA;Lo;0;L;;;;;N;;;;;
+11150;MAHAJANI LETTER A;Lo;0;L;;;;;N;;;;;
+11151;MAHAJANI LETTER I;Lo;0;L;;;;;N;;;;;
+11152;MAHAJANI LETTER U;Lo;0;L;;;;;N;;;;;
+11153;MAHAJANI LETTER E;Lo;0;L;;;;;N;;;;;
+11154;MAHAJANI LETTER O;Lo;0;L;;;;;N;;;;;
+11155;MAHAJANI LETTER KA;Lo;0;L;;;;;N;;;;;
+11156;MAHAJANI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11157;MAHAJANI LETTER GA;Lo;0;L;;;;;N;;;;;
+11158;MAHAJANI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11159;MAHAJANI LETTER CA;Lo;0;L;;;;;N;;;;;
+1115A;MAHAJANI LETTER CHA;Lo;0;L;;;;;N;;;;;
+1115B;MAHAJANI LETTER JA;Lo;0;L;;;;;N;;;;;
+1115C;MAHAJANI LETTER JHA;Lo;0;L;;;;;N;;;;;
+1115D;MAHAJANI LETTER NYA;Lo;0;L;;;;;N;;;;;
+1115E;MAHAJANI LETTER TTA;Lo;0;L;;;;;N;;;;;
+1115F;MAHAJANI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11160;MAHAJANI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11161;MAHAJANI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11162;MAHAJANI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11163;MAHAJANI LETTER TA;Lo;0;L;;;;;N;;;;;
+11164;MAHAJANI LETTER THA;Lo;0;L;;;;;N;;;;;
+11165;MAHAJANI LETTER DA;Lo;0;L;;;;;N;;;;;
+11166;MAHAJANI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11167;MAHAJANI LETTER NA;Lo;0;L;;;;;N;;;;;
+11168;MAHAJANI LETTER PA;Lo;0;L;;;;;N;;;;;
+11169;MAHAJANI LETTER PHA;Lo;0;L;;;;;N;;;;;
+1116A;MAHAJANI LETTER BA;Lo;0;L;;;;;N;;;;;
+1116B;MAHAJANI LETTER BHA;Lo;0;L;;;;;N;;;;;
+1116C;MAHAJANI LETTER MA;Lo;0;L;;;;;N;;;;;
+1116D;MAHAJANI LETTER RA;Lo;0;L;;;;;N;;;;;
+1116E;MAHAJANI LETTER LA;Lo;0;L;;;;;N;;;;;
+1116F;MAHAJANI LETTER VA;Lo;0;L;;;;;N;;;;;
+11170;MAHAJANI LETTER SA;Lo;0;L;;;;;N;;;;;
+11171;MAHAJANI LETTER HA;Lo;0;L;;;;;N;;;;;
+11172;MAHAJANI LETTER RRA;Lo;0;L;;;;;N;;;;;
+11173;MAHAJANI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11174;MAHAJANI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11175;MAHAJANI SECTION MARK;Po;0;L;;;;;N;;;;;
+11176;MAHAJANI LIGATURE SHRI;Lo;0;L;;;;;N;;;;;
+11180;SHARADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11181;SHARADA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11182;SHARADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11183;SHARADA LETTER A;Lo;0;L;;;;;N;;;;;
+11184;SHARADA LETTER AA;Lo;0;L;;;;;N;;;;;
+11185;SHARADA LETTER I;Lo;0;L;;;;;N;;;;;
+11186;SHARADA LETTER II;Lo;0;L;;;;;N;;;;;
+11187;SHARADA LETTER U;Lo;0;L;;;;;N;;;;;
+11188;SHARADA LETTER UU;Lo;0;L;;;;;N;;;;;
+11189;SHARADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1118A;SHARADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1118B;SHARADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1118C;SHARADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1118D;SHARADA LETTER E;Lo;0;L;;;;;N;;;;;
+1118E;SHARADA LETTER AI;Lo;0;L;;;;;N;;;;;
+1118F;SHARADA LETTER O;Lo;0;L;;;;;N;;;;;
+11190;SHARADA LETTER AU;Lo;0;L;;;;;N;;;;;
+11191;SHARADA LETTER KA;Lo;0;L;;;;;N;;;;;
+11192;SHARADA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11193;SHARADA LETTER GA;Lo;0;L;;;;;N;;;;;
+11194;SHARADA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11195;SHARADA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11196;SHARADA LETTER CA;Lo;0;L;;;;;N;;;;;
+11197;SHARADA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11198;SHARADA LETTER JA;Lo;0;L;;;;;N;;;;;
+11199;SHARADA LETTER JHA;Lo;0;L;;;;;N;;;;;
+1119A;SHARADA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1119B;SHARADA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1119C;SHARADA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1119D;SHARADA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1119E;SHARADA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1119F;SHARADA LETTER NNA;Lo;0;L;;;;;N;;;;;
+111A0;SHARADA LETTER TA;Lo;0;L;;;;;N;;;;;
+111A1;SHARADA LETTER THA;Lo;0;L;;;;;N;;;;;
+111A2;SHARADA LETTER DA;Lo;0;L;;;;;N;;;;;
+111A3;SHARADA LETTER DHA;Lo;0;L;;;;;N;;;;;
+111A4;SHARADA LETTER NA;Lo;0;L;;;;;N;;;;;
+111A5;SHARADA LETTER PA;Lo;0;L;;;;;N;;;;;
+111A6;SHARADA LETTER PHA;Lo;0;L;;;;;N;;;;;
+111A7;SHARADA LETTER BA;Lo;0;L;;;;;N;;;;;
+111A8;SHARADA LETTER BHA;Lo;0;L;;;;;N;;;;;
+111A9;SHARADA LETTER MA;Lo;0;L;;;;;N;;;;;
+111AA;SHARADA LETTER YA;Lo;0;L;;;;;N;;;;;
+111AB;SHARADA LETTER RA;Lo;0;L;;;;;N;;;;;
+111AC;SHARADA LETTER LA;Lo;0;L;;;;;N;;;;;
+111AD;SHARADA LETTER LLA;Lo;0;L;;;;;N;;;;;
+111AE;SHARADA LETTER VA;Lo;0;L;;;;;N;;;;;
+111AF;SHARADA LETTER SHA;Lo;0;L;;;;;N;;;;;
+111B0;SHARADA LETTER SSA;Lo;0;L;;;;;N;;;;;
+111B1;SHARADA LETTER SA;Lo;0;L;;;;;N;;;;;
+111B2;SHARADA LETTER HA;Lo;0;L;;;;;N;;;;;
+111B3;SHARADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+111B4;SHARADA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+111B5;SHARADA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+111B6;SHARADA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+111B7;SHARADA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+111B8;SHARADA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+111B9;SHARADA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+111BA;SHARADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+111BB;SHARADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+111BC;SHARADA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+111BD;SHARADA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+111BE;SHARADA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+111BF;SHARADA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+111C0;SHARADA SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+111C1;SHARADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+111C2;SHARADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+111C3;SHARADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+111C4;SHARADA OM;Lo;0;L;;;;;N;;;;;
+111C5;SHARADA DANDA;Po;0;L;;;;;N;;;;;
+111C6;SHARADA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+111C7;SHARADA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+111C8;SHARADA SEPARATOR;Po;0;L;;;;;N;;;;;
+111C9;SHARADA SANDHI MARK;Mn;0;NSM;;;;;N;;;;;
+111CA;SHARADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+111CB;SHARADA VOWEL MODIFIER MARK;Mn;0;NSM;;;;;N;;;;;
+111CC;SHARADA EXTRA SHORT VOWEL MARK;Mn;0;NSM;;;;;N;;;;;
+111CD;SHARADA SUTRA MARK;Po;0;L;;;;;N;;;;;
+111CE;SHARADA VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;;
+111CF;SHARADA SIGN INVERTED CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+111D0;SHARADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+111D1;SHARADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+111D2;SHARADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+111D3;SHARADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+111D4;SHARADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+111D5;SHARADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+111D6;SHARADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+111D7;SHARADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+111D8;SHARADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+111D9;SHARADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+111DA;SHARADA EKAM;Lo;0;L;;;;;N;;;;;
+111DB;SHARADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+111DC;SHARADA HEADSTROKE;Lo;0;L;;;;;N;;;;;
+111DD;SHARADA CONTINUATION SIGN;Po;0;L;;;;;N;;;;;
+111DE;SHARADA SECTION MARK-1;Po;0;L;;;;;N;;;;;
+111DF;SHARADA SECTION MARK-2;Po;0;L;;;;;N;;;;;
+111E1;SINHALA ARCHAIC DIGIT ONE;No;0;L;;;;1;N;;;;;
+111E2;SINHALA ARCHAIC DIGIT TWO;No;0;L;;;;2;N;;;;;
+111E3;SINHALA ARCHAIC DIGIT THREE;No;0;L;;;;3;N;;;;;
+111E4;SINHALA ARCHAIC DIGIT FOUR;No;0;L;;;;4;N;;;;;
+111E5;SINHALA ARCHAIC DIGIT FIVE;No;0;L;;;;5;N;;;;;
+111E6;SINHALA ARCHAIC DIGIT SIX;No;0;L;;;;6;N;;;;;
+111E7;SINHALA ARCHAIC DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+111E8;SINHALA ARCHAIC DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+111E9;SINHALA ARCHAIC DIGIT NINE;No;0;L;;;;9;N;;;;;
+111EA;SINHALA ARCHAIC NUMBER TEN;No;0;L;;;;10;N;;;;;
+111EB;SINHALA ARCHAIC NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+111EC;SINHALA ARCHAIC NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+111ED;SINHALA ARCHAIC NUMBER FORTY;No;0;L;;;;40;N;;;;;
+111EE;SINHALA ARCHAIC NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+111EF;SINHALA ARCHAIC NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+111F0;SINHALA ARCHAIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+111F1;SINHALA ARCHAIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+111F2;SINHALA ARCHAIC NUMBER NINETY;No;0;L;;;;90;N;;;;;
+111F3;SINHALA ARCHAIC NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+111F4;SINHALA ARCHAIC NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+11200;KHOJKI LETTER A;Lo;0;L;;;;;N;;;;;
+11201;KHOJKI LETTER AA;Lo;0;L;;;;;N;;;;;
+11202;KHOJKI LETTER I;Lo;0;L;;;;;N;;;;;
+11203;KHOJKI LETTER U;Lo;0;L;;;;;N;;;;;
+11204;KHOJKI LETTER E;Lo;0;L;;;;;N;;;;;
+11205;KHOJKI LETTER AI;Lo;0;L;;;;;N;;;;;
+11206;KHOJKI LETTER O;Lo;0;L;;;;;N;;;;;
+11207;KHOJKI LETTER AU;Lo;0;L;;;;;N;;;;;
+11208;KHOJKI LETTER KA;Lo;0;L;;;;;N;;;;;
+11209;KHOJKI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1120A;KHOJKI LETTER GA;Lo;0;L;;;;;N;;;;;
+1120B;KHOJKI LETTER GGA;Lo;0;L;;;;;N;;;;;
+1120C;KHOJKI LETTER GHA;Lo;0;L;;;;;N;;;;;
+1120D;KHOJKI LETTER NGA;Lo;0;L;;;;;N;;;;;
+1120E;KHOJKI LETTER CA;Lo;0;L;;;;;N;;;;;
+1120F;KHOJKI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11210;KHOJKI LETTER JA;Lo;0;L;;;;;N;;;;;
+11211;KHOJKI LETTER JJA;Lo;0;L;;;;;N;;;;;
+11213;KHOJKI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11214;KHOJKI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11215;KHOJKI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11216;KHOJKI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11217;KHOJKI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11218;KHOJKI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11219;KHOJKI LETTER TA;Lo;0;L;;;;;N;;;;;
+1121A;KHOJKI LETTER THA;Lo;0;L;;;;;N;;;;;
+1121B;KHOJKI LETTER DA;Lo;0;L;;;;;N;;;;;
+1121C;KHOJKI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+1121D;KHOJKI LETTER DHA;Lo;0;L;;;;;N;;;;;
+1121E;KHOJKI LETTER NA;Lo;0;L;;;;;N;;;;;
+1121F;KHOJKI LETTER PA;Lo;0;L;;;;;N;;;;;
+11220;KHOJKI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11221;KHOJKI LETTER BA;Lo;0;L;;;;;N;;;;;
+11222;KHOJKI LETTER BBA;Lo;0;L;;;;;N;;;;;
+11223;KHOJKI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11224;KHOJKI LETTER MA;Lo;0;L;;;;;N;;;;;
+11225;KHOJKI LETTER YA;Lo;0;L;;;;;N;;;;;
+11226;KHOJKI LETTER RA;Lo;0;L;;;;;N;;;;;
+11227;KHOJKI LETTER LA;Lo;0;L;;;;;N;;;;;
+11228;KHOJKI LETTER VA;Lo;0;L;;;;;N;;;;;
+11229;KHOJKI LETTER SA;Lo;0;L;;;;;N;;;;;
+1122A;KHOJKI LETTER HA;Lo;0;L;;;;;N;;;;;
+1122B;KHOJKI LETTER LLA;Lo;0;L;;;;;N;;;;;
+1122C;KHOJKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1122D;KHOJKI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1122E;KHOJKI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+1122F;KHOJKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11230;KHOJKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11231;KHOJKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11232;KHOJKI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11233;KHOJKI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11234;KHOJKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11235;KHOJKI SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+11236;KHOJKI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11237;KHOJKI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;;
+11238;KHOJKI DANDA;Po;0;L;;;;;N;;;;;
+11239;KHOJKI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+1123A;KHOJKI WORD SEPARATOR;Po;0;L;;;;;N;;;;;
+1123B;KHOJKI SECTION MARK;Po;0;L;;;;;N;;;;;
+1123C;KHOJKI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
+1123D;KHOJKI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+1123E;KHOJKI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
+11280;MULTANI LETTER A;Lo;0;L;;;;;N;;;;;
+11281;MULTANI LETTER I;Lo;0;L;;;;;N;;;;;
+11282;MULTANI LETTER U;Lo;0;L;;;;;N;;;;;
+11283;MULTANI LETTER E;Lo;0;L;;;;;N;;;;;
+11284;MULTANI LETTER KA;Lo;0;L;;;;;N;;;;;
+11285;MULTANI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11286;MULTANI LETTER GA;Lo;0;L;;;;;N;;;;;
+11288;MULTANI LETTER GHA;Lo;0;L;;;;;N;;;;;
+1128A;MULTANI LETTER CA;Lo;0;L;;;;;N;;;;;
+1128B;MULTANI LETTER CHA;Lo;0;L;;;;;N;;;;;
+1128C;MULTANI LETTER JA;Lo;0;L;;;;;N;;;;;
+1128D;MULTANI LETTER JJA;Lo;0;L;;;;;N;;;;;
+1128F;MULTANI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11290;MULTANI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11291;MULTANI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11292;MULTANI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11293;MULTANI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+11294;MULTANI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11295;MULTANI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11296;MULTANI LETTER TA;Lo;0;L;;;;;N;;;;;
+11297;MULTANI LETTER THA;Lo;0;L;;;;;N;;;;;
+11298;MULTANI LETTER DA;Lo;0;L;;;;;N;;;;;
+11299;MULTANI LETTER DHA;Lo;0;L;;;;;N;;;;;
+1129A;MULTANI LETTER NA;Lo;0;L;;;;;N;;;;;
+1129B;MULTANI LETTER PA;Lo;0;L;;;;;N;;;;;
+1129C;MULTANI LETTER PHA;Lo;0;L;;;;;N;;;;;
+1129D;MULTANI LETTER BA;Lo;0;L;;;;;N;;;;;
+1129F;MULTANI LETTER BHA;Lo;0;L;;;;;N;;;;;
+112A0;MULTANI LETTER MA;Lo;0;L;;;;;N;;;;;
+112A1;MULTANI LETTER YA;Lo;0;L;;;;;N;;;;;
+112A2;MULTANI LETTER RA;Lo;0;L;;;;;N;;;;;
+112A3;MULTANI LETTER LA;Lo;0;L;;;;;N;;;;;
+112A4;MULTANI LETTER VA;Lo;0;L;;;;;N;;;;;
+112A5;MULTANI LETTER SA;Lo;0;L;;;;;N;;;;;
+112A6;MULTANI LETTER HA;Lo;0;L;;;;;N;;;;;
+112A7;MULTANI LETTER RRA;Lo;0;L;;;;;N;;;;;
+112A8;MULTANI LETTER RHA;Lo;0;L;;;;;N;;;;;
+112A9;MULTANI SECTION MARK;Po;0;L;;;;;N;;;;;
+112B0;KHUDAWADI LETTER A;Lo;0;L;;;;;N;;;;;
+112B1;KHUDAWADI LETTER AA;Lo;0;L;;;;;N;;;;;
+112B2;KHUDAWADI LETTER I;Lo;0;L;;;;;N;;;;;
+112B3;KHUDAWADI LETTER II;Lo;0;L;;;;;N;;;;;
+112B4;KHUDAWADI LETTER U;Lo;0;L;;;;;N;;;;;
+112B5;KHUDAWADI LETTER UU;Lo;0;L;;;;;N;;;;;
+112B6;KHUDAWADI LETTER E;Lo;0;L;;;;;N;;;;;
+112B7;KHUDAWADI LETTER AI;Lo;0;L;;;;;N;;;;;
+112B8;KHUDAWADI LETTER O;Lo;0;L;;;;;N;;;;;
+112B9;KHUDAWADI LETTER AU;Lo;0;L;;;;;N;;;;;
+112BA;KHUDAWADI LETTER KA;Lo;0;L;;;;;N;;;;;
+112BB;KHUDAWADI LETTER KHA;Lo;0;L;;;;;N;;;;;
+112BC;KHUDAWADI LETTER GA;Lo;0;L;;;;;N;;;;;
+112BD;KHUDAWADI LETTER GGA;Lo;0;L;;;;;N;;;;;
+112BE;KHUDAWADI LETTER GHA;Lo;0;L;;;;;N;;;;;
+112BF;KHUDAWADI LETTER NGA;Lo;0;L;;;;;N;;;;;
+112C0;KHUDAWADI LETTER CA;Lo;0;L;;;;;N;;;;;
+112C1;KHUDAWADI LETTER CHA;Lo;0;L;;;;;N;;;;;
+112C2;KHUDAWADI LETTER JA;Lo;0;L;;;;;N;;;;;
+112C3;KHUDAWADI LETTER JJA;Lo;0;L;;;;;N;;;;;
+112C4;KHUDAWADI LETTER JHA;Lo;0;L;;;;;N;;;;;
+112C5;KHUDAWADI LETTER NYA;Lo;0;L;;;;;N;;;;;
+112C6;KHUDAWADI LETTER TTA;Lo;0;L;;;;;N;;;;;
+112C7;KHUDAWADI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+112C8;KHUDAWADI LETTER DDA;Lo;0;L;;;;;N;;;;;
+112C9;KHUDAWADI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+112CA;KHUDAWADI LETTER RRA;Lo;0;L;;;;;N;;;;;
+112CB;KHUDAWADI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+112CC;KHUDAWADI LETTER NNA;Lo;0;L;;;;;N;;;;;
+112CD;KHUDAWADI LETTER TA;Lo;0;L;;;;;N;;;;;
+112CE;KHUDAWADI LETTER THA;Lo;0;L;;;;;N;;;;;
+112CF;KHUDAWADI LETTER DA;Lo;0;L;;;;;N;;;;;
+112D0;KHUDAWADI LETTER DHA;Lo;0;L;;;;;N;;;;;
+112D1;KHUDAWADI LETTER NA;Lo;0;L;;;;;N;;;;;
+112D2;KHUDAWADI LETTER PA;Lo;0;L;;;;;N;;;;;
+112D3;KHUDAWADI LETTER PHA;Lo;0;L;;;;;N;;;;;
+112D4;KHUDAWADI LETTER BA;Lo;0;L;;;;;N;;;;;
+112D5;KHUDAWADI LETTER BBA;Lo;0;L;;;;;N;;;;;
+112D6;KHUDAWADI LETTER BHA;Lo;0;L;;;;;N;;;;;
+112D7;KHUDAWADI LETTER MA;Lo;0;L;;;;;N;;;;;
+112D8;KHUDAWADI LETTER YA;Lo;0;L;;;;;N;;;;;
+112D9;KHUDAWADI LETTER RA;Lo;0;L;;;;;N;;;;;
+112DA;KHUDAWADI LETTER LA;Lo;0;L;;;;;N;;;;;
+112DB;KHUDAWADI LETTER VA;Lo;0;L;;;;;N;;;;;
+112DC;KHUDAWADI LETTER SHA;Lo;0;L;;;;;N;;;;;
+112DD;KHUDAWADI LETTER SA;Lo;0;L;;;;;N;;;;;
+112DE;KHUDAWADI LETTER HA;Lo;0;L;;;;;N;;;;;
+112DF;KHUDAWADI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+112E0;KHUDAWADI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+112E1;KHUDAWADI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+112E2;KHUDAWADI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+112E3;KHUDAWADI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+112E4;KHUDAWADI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+112E5;KHUDAWADI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+112E6;KHUDAWADI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+112E7;KHUDAWADI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+112E8;KHUDAWADI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+112E9;KHUDAWADI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+112EA;KHUDAWADI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+112F0;KHUDAWADI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+112F1;KHUDAWADI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+112F2;KHUDAWADI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+112F3;KHUDAWADI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+112F4;KHUDAWADI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+112F5;KHUDAWADI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+112F6;KHUDAWADI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+112F7;KHUDAWADI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+112F8;KHUDAWADI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+112F9;KHUDAWADI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11300;GRANTHA SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
+11301;GRANTHA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11302;GRANTHA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+11303;GRANTHA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11305;GRANTHA LETTER A;Lo;0;L;;;;;N;;;;;
+11306;GRANTHA LETTER AA;Lo;0;L;;;;;N;;;;;
+11307;GRANTHA LETTER I;Lo;0;L;;;;;N;;;;;
+11308;GRANTHA LETTER II;Lo;0;L;;;;;N;;;;;
+11309;GRANTHA LETTER U;Lo;0;L;;;;;N;;;;;
+1130A;GRANTHA LETTER UU;Lo;0;L;;;;;N;;;;;
+1130B;GRANTHA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1130C;GRANTHA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1130F;GRANTHA LETTER EE;Lo;0;L;;;;;N;;;;;
+11310;GRANTHA LETTER AI;Lo;0;L;;;;;N;;;;;
+11313;GRANTHA LETTER OO;Lo;0;L;;;;;N;;;;;
+11314;GRANTHA LETTER AU;Lo;0;L;;;;;N;;;;;
+11315;GRANTHA LETTER KA;Lo;0;L;;;;;N;;;;;
+11316;GRANTHA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11317;GRANTHA LETTER GA;Lo;0;L;;;;;N;;;;;
+11318;GRANTHA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11319;GRANTHA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1131A;GRANTHA LETTER CA;Lo;0;L;;;;;N;;;;;
+1131B;GRANTHA LETTER CHA;Lo;0;L;;;;;N;;;;;
+1131C;GRANTHA LETTER JA;Lo;0;L;;;;;N;;;;;
+1131D;GRANTHA LETTER JHA;Lo;0;L;;;;;N;;;;;
+1131E;GRANTHA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1131F;GRANTHA LETTER TTA;Lo;0;L;;;;;N;;;;;
+11320;GRANTHA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11321;GRANTHA LETTER DDA;Lo;0;L;;;;;N;;;;;
+11322;GRANTHA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11323;GRANTHA LETTER NNA;Lo;0;L;;;;;N;;;;;
+11324;GRANTHA LETTER TA;Lo;0;L;;;;;N;;;;;
+11325;GRANTHA LETTER THA;Lo;0;L;;;;;N;;;;;
+11326;GRANTHA LETTER DA;Lo;0;L;;;;;N;;;;;
+11327;GRANTHA LETTER DHA;Lo;0;L;;;;;N;;;;;
+11328;GRANTHA LETTER NA;Lo;0;L;;;;;N;;;;;
+1132A;GRANTHA LETTER PA;Lo;0;L;;;;;N;;;;;
+1132B;GRANTHA LETTER PHA;Lo;0;L;;;;;N;;;;;
+1132C;GRANTHA LETTER BA;Lo;0;L;;;;;N;;;;;
+1132D;GRANTHA LETTER BHA;Lo;0;L;;;;;N;;;;;
+1132E;GRANTHA LETTER MA;Lo;0;L;;;;;N;;;;;
+1132F;GRANTHA LETTER YA;Lo;0;L;;;;;N;;;;;
+11330;GRANTHA LETTER RA;Lo;0;L;;;;;N;;;;;
+11332;GRANTHA LETTER LA;Lo;0;L;;;;;N;;;;;
+11333;GRANTHA LETTER LLA;Lo;0;L;;;;;N;;;;;
+11335;GRANTHA LETTER VA;Lo;0;L;;;;;N;;;;;
+11336;GRANTHA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11337;GRANTHA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11338;GRANTHA LETTER SA;Lo;0;L;;;;;N;;;;;
+11339;GRANTHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1133B;COMBINING BINDU BELOW;Mn;7;NSM;;;;;N;;;;;
+1133C;GRANTHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1133D;GRANTHA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+1133E;GRANTHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1133F;GRANTHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11340;GRANTHA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11341;GRANTHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+11342;GRANTHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+11343;GRANTHA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+11344;GRANTHA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+11347;GRANTHA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+11348;GRANTHA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1134B;GRANTHA VOWEL SIGN OO;Mc;0;L;11347 1133E;;;;N;;;;;
+1134C;GRANTHA VOWEL SIGN AU;Mc;0;L;11347 11357;;;;N;;;;;
+1134D;GRANTHA SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+11350;GRANTHA OM;Lo;0;L;;;;;N;;;;;
+11357;GRANTHA AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+1135D;GRANTHA SIGN PLUTA;Lo;0;L;;;;;N;;;;;
+1135E;GRANTHA LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+1135F;GRANTHA LETTER VEDIC DOUBLE ANUSVARA;Lo;0;L;;;;;N;;;;;
+11360;GRANTHA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11361;GRANTHA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+11362;GRANTHA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;;
+11363;GRANTHA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;;
+11366;COMBINING GRANTHA DIGIT ZERO;Mn;230;NSM;;;;;N;;;;;
+11367;COMBINING GRANTHA DIGIT ONE;Mn;230;NSM;;;;;N;;;;;
+11368;COMBINING GRANTHA DIGIT TWO;Mn;230;NSM;;;;;N;;;;;
+11369;COMBINING GRANTHA DIGIT THREE;Mn;230;NSM;;;;;N;;;;;
+1136A;COMBINING GRANTHA DIGIT FOUR;Mn;230;NSM;;;;;N;;;;;
+1136B;COMBINING GRANTHA DIGIT FIVE;Mn;230;NSM;;;;;N;;;;;
+1136C;COMBINING GRANTHA DIGIT SIX;Mn;230;NSM;;;;;N;;;;;
+11370;COMBINING GRANTHA LETTER A;Mn;230;NSM;;;;;N;;;;;
+11371;COMBINING GRANTHA LETTER KA;Mn;230;NSM;;;;;N;;;;;
+11372;COMBINING GRANTHA LETTER NA;Mn;230;NSM;;;;;N;;;;;
+11373;COMBINING GRANTHA LETTER VI;Mn;230;NSM;;;;;N;;;;;
+11374;COMBINING GRANTHA LETTER PA;Mn;230;NSM;;;;;N;;;;;
+11400;NEWA LETTER A;Lo;0;L;;;;;N;;;;;
+11401;NEWA LETTER AA;Lo;0;L;;;;;N;;;;;
+11402;NEWA LETTER I;Lo;0;L;;;;;N;;;;;
+11403;NEWA LETTER II;Lo;0;L;;;;;N;;;;;
+11404;NEWA LETTER U;Lo;0;L;;;;;N;;;;;
+11405;NEWA LETTER UU;Lo;0;L;;;;;N;;;;;
+11406;NEWA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11407;NEWA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11408;NEWA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11409;NEWA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1140A;NEWA LETTER E;Lo;0;L;;;;;N;;;;;
+1140B;NEWA LETTER AI;Lo;0;L;;;;;N;;;;;
+1140C;NEWA LETTER O;Lo;0;L;;;;;N;;;;;
+1140D;NEWA LETTER AU;Lo;0;L;;;;;N;;;;;
+1140E;NEWA LETTER KA;Lo;0;L;;;;;N;;;;;
+1140F;NEWA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11410;NEWA LETTER GA;Lo;0;L;;;;;N;;;;;
+11411;NEWA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11412;NEWA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11413;NEWA LETTER NGHA;Lo;0;L;;;;;N;;;;;
+11414;NEWA LETTER CA;Lo;0;L;;;;;N;;;;;
+11415;NEWA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11416;NEWA LETTER JA;Lo;0;L;;;;;N;;;;;
+11417;NEWA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11418;NEWA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11419;NEWA LETTER NYHA;Lo;0;L;;;;;N;;;;;
+1141A;NEWA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1141B;NEWA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1141C;NEWA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1141D;NEWA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1141E;NEWA LETTER NNA;Lo;0;L;;;;;N;;;;;
+1141F;NEWA LETTER TA;Lo;0;L;;;;;N;;;;;
+11420;NEWA LETTER THA;Lo;0;L;;;;;N;;;;;
+11421;NEWA LETTER DA;Lo;0;L;;;;;N;;;;;
+11422;NEWA LETTER DHA;Lo;0;L;;;;;N;;;;;
+11423;NEWA LETTER NA;Lo;0;L;;;;;N;;;;;
+11424;NEWA LETTER NHA;Lo;0;L;;;;;N;;;;;
+11425;NEWA LETTER PA;Lo;0;L;;;;;N;;;;;
+11426;NEWA LETTER PHA;Lo;0;L;;;;;N;;;;;
+11427;NEWA LETTER BA;Lo;0;L;;;;;N;;;;;
+11428;NEWA LETTER BHA;Lo;0;L;;;;;N;;;;;
+11429;NEWA LETTER MA;Lo;0;L;;;;;N;;;;;
+1142A;NEWA LETTER MHA;Lo;0;L;;;;;N;;;;;
+1142B;NEWA LETTER YA;Lo;0;L;;;;;N;;;;;
+1142C;NEWA LETTER RA;Lo;0;L;;;;;N;;;;;
+1142D;NEWA LETTER RHA;Lo;0;L;;;;;N;;;;;
+1142E;NEWA LETTER LA;Lo;0;L;;;;;N;;;;;
+1142F;NEWA LETTER LHA;Lo;0;L;;;;;N;;;;;
+11430;NEWA LETTER WA;Lo;0;L;;;;;N;;;;;
+11431;NEWA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11432;NEWA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11433;NEWA LETTER SA;Lo;0;L;;;;;N;;;;;
+11434;NEWA LETTER HA;Lo;0;L;;;;;N;;;;;
+11435;NEWA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11436;NEWA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11437;NEWA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11438;NEWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11439;NEWA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1143A;NEWA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+1143B;NEWA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+1143C;NEWA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+1143D;NEWA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+1143E;NEWA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1143F;NEWA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11440;NEWA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11441;NEWA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11442;NEWA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11443;NEWA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11444;NEWA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11445;NEWA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11446;NEWA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11447;NEWA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+11448;NEWA SIGN FINAL ANUSVARA;Lo;0;L;;;;;N;;;;;
+11449;NEWA OM;Lo;0;L;;;;;N;;;;;
+1144A;NEWA SIDDHI;Lo;0;L;;;;;N;;;;;
+1144B;NEWA DANDA;Po;0;L;;;;;N;;;;;
+1144C;NEWA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+1144D;NEWA COMMA;Po;0;L;;;;;N;;;;;
+1144E;NEWA GAP FILLER;Po;0;L;;;;;N;;;;;
+1144F;NEWA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11450;NEWA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11451;NEWA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11452;NEWA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11453;NEWA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11454;NEWA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11455;NEWA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11456;NEWA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11457;NEWA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11458;NEWA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11459;NEWA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1145A;NEWA DOUBLE COMMA;Po;0;L;;;;;N;;;;;
+1145B;NEWA PLACEHOLDER MARK;Po;0;L;;;;;N;;;;;
+1145D;NEWA INSERTION SIGN;Po;0;L;;;;;N;;;;;
+1145E;NEWA SANDHI MARK;Mn;230;NSM;;;;;N;;;;;
+1145F;NEWA LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+11460;NEWA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+11461;NEWA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+11480;TIRHUTA ANJI;Lo;0;L;;;;;N;;;;;
+11481;TIRHUTA LETTER A;Lo;0;L;;;;;N;;;;;
+11482;TIRHUTA LETTER AA;Lo;0;L;;;;;N;;;;;
+11483;TIRHUTA LETTER I;Lo;0;L;;;;;N;;;;;
+11484;TIRHUTA LETTER II;Lo;0;L;;;;;N;;;;;
+11485;TIRHUTA LETTER U;Lo;0;L;;;;;N;;;;;
+11486;TIRHUTA LETTER UU;Lo;0;L;;;;;N;;;;;
+11487;TIRHUTA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11488;TIRHUTA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11489;TIRHUTA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1148A;TIRHUTA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1148B;TIRHUTA LETTER E;Lo;0;L;;;;;N;;;;;
+1148C;TIRHUTA LETTER AI;Lo;0;L;;;;;N;;;;;
+1148D;TIRHUTA LETTER O;Lo;0;L;;;;;N;;;;;
+1148E;TIRHUTA LETTER AU;Lo;0;L;;;;;N;;;;;
+1148F;TIRHUTA LETTER KA;Lo;0;L;;;;;N;;;;;
+11490;TIRHUTA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11491;TIRHUTA LETTER GA;Lo;0;L;;;;;N;;;;;
+11492;TIRHUTA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11493;TIRHUTA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11494;TIRHUTA LETTER CA;Lo;0;L;;;;;N;;;;;
+11495;TIRHUTA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11496;TIRHUTA LETTER JA;Lo;0;L;;;;;N;;;;;
+11497;TIRHUTA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11498;TIRHUTA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11499;TIRHUTA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1149A;TIRHUTA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1149B;TIRHUTA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1149C;TIRHUTA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1149D;TIRHUTA LETTER NNA;Lo;0;L;;;;;N;;;;;
+1149E;TIRHUTA LETTER TA;Lo;0;L;;;;;N;;;;;
+1149F;TIRHUTA LETTER THA;Lo;0;L;;;;;N;;;;;
+114A0;TIRHUTA LETTER DA;Lo;0;L;;;;;N;;;;;
+114A1;TIRHUTA LETTER DHA;Lo;0;L;;;;;N;;;;;
+114A2;TIRHUTA LETTER NA;Lo;0;L;;;;;N;;;;;
+114A3;TIRHUTA LETTER PA;Lo;0;L;;;;;N;;;;;
+114A4;TIRHUTA LETTER PHA;Lo;0;L;;;;;N;;;;;
+114A5;TIRHUTA LETTER BA;Lo;0;L;;;;;N;;;;;
+114A6;TIRHUTA LETTER BHA;Lo;0;L;;;;;N;;;;;
+114A7;TIRHUTA LETTER MA;Lo;0;L;;;;;N;;;;;
+114A8;TIRHUTA LETTER YA;Lo;0;L;;;;;N;;;;;
+114A9;TIRHUTA LETTER RA;Lo;0;L;;;;;N;;;;;
+114AA;TIRHUTA LETTER LA;Lo;0;L;;;;;N;;;;;
+114AB;TIRHUTA LETTER VA;Lo;0;L;;;;;N;;;;;
+114AC;TIRHUTA LETTER SHA;Lo;0;L;;;;;N;;;;;
+114AD;TIRHUTA LETTER SSA;Lo;0;L;;;;;N;;;;;
+114AE;TIRHUTA LETTER SA;Lo;0;L;;;;;N;;;;;
+114AF;TIRHUTA LETTER HA;Lo;0;L;;;;;N;;;;;
+114B0;TIRHUTA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+114B1;TIRHUTA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+114B2;TIRHUTA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+114B3;TIRHUTA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+114B4;TIRHUTA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+114B5;TIRHUTA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+114B6;TIRHUTA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+114B7;TIRHUTA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+114B8;TIRHUTA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+114B9;TIRHUTA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+114BA;TIRHUTA VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
+114BB;TIRHUTA VOWEL SIGN AI;Mc;0;L;114B9 114BA;;;;N;;;;;
+114BC;TIRHUTA VOWEL SIGN O;Mc;0;L;114B9 114B0;;;;N;;;;;
+114BD;TIRHUTA VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
+114BE;TIRHUTA VOWEL SIGN AU;Mc;0;L;114B9 114BD;;;;N;;;;;
+114BF;TIRHUTA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+114C0;TIRHUTA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+114C1;TIRHUTA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+114C2;TIRHUTA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+114C3;TIRHUTA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+114C4;TIRHUTA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+114C5;TIRHUTA GVANG;Lo;0;L;;;;;N;;;;;
+114C6;TIRHUTA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+114C7;TIRHUTA OM;Lo;0;L;;;;;N;;;;;
+114D0;TIRHUTA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+114D1;TIRHUTA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+114D2;TIRHUTA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+114D3;TIRHUTA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+114D4;TIRHUTA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+114D5;TIRHUTA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+114D6;TIRHUTA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+114D7;TIRHUTA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+114D8;TIRHUTA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+114D9;TIRHUTA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11580;SIDDHAM LETTER A;Lo;0;L;;;;;N;;;;;
+11581;SIDDHAM LETTER AA;Lo;0;L;;;;;N;;;;;
+11582;SIDDHAM LETTER I;Lo;0;L;;;;;N;;;;;
+11583;SIDDHAM LETTER II;Lo;0;L;;;;;N;;;;;
+11584;SIDDHAM LETTER U;Lo;0;L;;;;;N;;;;;
+11585;SIDDHAM LETTER UU;Lo;0;L;;;;;N;;;;;
+11586;SIDDHAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11587;SIDDHAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11588;SIDDHAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11589;SIDDHAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1158A;SIDDHAM LETTER E;Lo;0;L;;;;;N;;;;;
+1158B;SIDDHAM LETTER AI;Lo;0;L;;;;;N;;;;;
+1158C;SIDDHAM LETTER O;Lo;0;L;;;;;N;;;;;
+1158D;SIDDHAM LETTER AU;Lo;0;L;;;;;N;;;;;
+1158E;SIDDHAM LETTER KA;Lo;0;L;;;;;N;;;;;
+1158F;SIDDHAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+11590;SIDDHAM LETTER GA;Lo;0;L;;;;;N;;;;;
+11591;SIDDHAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+11592;SIDDHAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+11593;SIDDHAM LETTER CA;Lo;0;L;;;;;N;;;;;
+11594;SIDDHAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+11595;SIDDHAM LETTER JA;Lo;0;L;;;;;N;;;;;
+11596;SIDDHAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+11597;SIDDHAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+11598;SIDDHAM LETTER TTA;Lo;0;L;;;;;N;;;;;
+11599;SIDDHAM LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1159A;SIDDHAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+1159B;SIDDHAM LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1159C;SIDDHAM LETTER NNA;Lo;0;L;;;;;N;;;;;
+1159D;SIDDHAM LETTER TA;Lo;0;L;;;;;N;;;;;
+1159E;SIDDHAM LETTER THA;Lo;0;L;;;;;N;;;;;
+1159F;SIDDHAM LETTER DA;Lo;0;L;;;;;N;;;;;
+115A0;SIDDHAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+115A1;SIDDHAM LETTER NA;Lo;0;L;;;;;N;;;;;
+115A2;SIDDHAM LETTER PA;Lo;0;L;;;;;N;;;;;
+115A3;SIDDHAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+115A4;SIDDHAM LETTER BA;Lo;0;L;;;;;N;;;;;
+115A5;SIDDHAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+115A6;SIDDHAM LETTER MA;Lo;0;L;;;;;N;;;;;
+115A7;SIDDHAM LETTER YA;Lo;0;L;;;;;N;;;;;
+115A8;SIDDHAM LETTER RA;Lo;0;L;;;;;N;;;;;
+115A9;SIDDHAM LETTER LA;Lo;0;L;;;;;N;;;;;
+115AA;SIDDHAM LETTER VA;Lo;0;L;;;;;N;;;;;
+115AB;SIDDHAM LETTER SHA;Lo;0;L;;;;;N;;;;;
+115AC;SIDDHAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+115AD;SIDDHAM LETTER SA;Lo;0;L;;;;;N;;;;;
+115AE;SIDDHAM LETTER HA;Lo;0;L;;;;;N;;;;;
+115AF;SIDDHAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+115B0;SIDDHAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+115B1;SIDDHAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+115B2;SIDDHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+115B3;SIDDHAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+115B4;SIDDHAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+115B5;SIDDHAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+115B8;SIDDHAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+115B9;SIDDHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+115BA;SIDDHAM VOWEL SIGN O;Mc;0;L;115B8 115AF;;;;N;;;;;
+115BB;SIDDHAM VOWEL SIGN AU;Mc;0;L;115B9 115AF;;;;N;;;;;
+115BC;SIDDHAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+115BD;SIDDHAM SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+115BE;SIDDHAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+115BF;SIDDHAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+115C0;SIDDHAM SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+115C1;SIDDHAM SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+115C2;SIDDHAM DANDA;Po;0;L;;;;;N;;;;;
+115C3;SIDDHAM DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+115C4;SIDDHAM SEPARATOR DOT;Po;0;L;;;;;N;;;;;
+115C5;SIDDHAM SEPARATOR BAR;Po;0;L;;;;;N;;;;;
+115C6;SIDDHAM REPETITION MARK-1;Po;0;L;;;;;N;;;;;
+115C7;SIDDHAM REPETITION MARK-2;Po;0;L;;;;;N;;;;;
+115C8;SIDDHAM REPETITION MARK-3;Po;0;L;;;;;N;;;;;
+115C9;SIDDHAM END OF TEXT MARK;Po;0;L;;;;;N;;;;;
+115CA;SIDDHAM SECTION MARK WITH TRIDENT AND U-SHAPED ORNAMENTS;Po;0;L;;;;;N;;;;;
+115CB;SIDDHAM SECTION MARK WITH TRIDENT AND DOTTED CRESCENTS;Po;0;L;;;;;N;;;;;
+115CC;SIDDHAM SECTION MARK WITH RAYS AND DOTTED CRESCENTS;Po;0;L;;;;;N;;;;;
+115CD;SIDDHAM SECTION MARK WITH RAYS AND DOTTED DOUBLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115CE;SIDDHAM SECTION MARK WITH RAYS AND DOTTED TRIPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115CF;SIDDHAM SECTION MARK DOUBLE RING;Po;0;L;;;;;N;;;;;
+115D0;SIDDHAM SECTION MARK DOUBLE RING WITH RAYS;Po;0;L;;;;;N;;;;;
+115D1;SIDDHAM SECTION MARK WITH DOUBLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D2;SIDDHAM SECTION MARK WITH TRIPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D3;SIDDHAM SECTION MARK WITH QUADRUPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D4;SIDDHAM SECTION MARK WITH SEPTUPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D5;SIDDHAM SECTION MARK WITH CIRCLES AND RAYS;Po;0;L;;;;;N;;;;;
+115D6;SIDDHAM SECTION MARK WITH CIRCLES AND TWO ENCLOSURES;Po;0;L;;;;;N;;;;;
+115D7;SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES;Po;0;L;;;;;N;;;;;
+115D8;SIDDHAM LETTER THREE-CIRCLE ALTERNATE I;Lo;0;L;;;;;N;;;;;
+115D9;SIDDHAM LETTER TWO-CIRCLE ALTERNATE I;Lo;0;L;;;;;N;;;;;
+115DA;SIDDHAM LETTER TWO-CIRCLE ALTERNATE II;Lo;0;L;;;;;N;;;;;
+115DB;SIDDHAM LETTER ALTERNATE U;Lo;0;L;;;;;N;;;;;
+115DC;SIDDHAM VOWEL SIGN ALTERNATE U;Mn;0;NSM;;;;;N;;;;;
+115DD;SIDDHAM VOWEL SIGN ALTERNATE UU;Mn;0;NSM;;;;;N;;;;;
+11600;MODI LETTER A;Lo;0;L;;;;;N;;;;;
+11601;MODI LETTER AA;Lo;0;L;;;;;N;;;;;
+11602;MODI LETTER I;Lo;0;L;;;;;N;;;;;
+11603;MODI LETTER II;Lo;0;L;;;;;N;;;;;
+11604;MODI LETTER U;Lo;0;L;;;;;N;;;;;
+11605;MODI LETTER UU;Lo;0;L;;;;;N;;;;;
+11606;MODI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11607;MODI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11608;MODI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11609;MODI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1160A;MODI LETTER E;Lo;0;L;;;;;N;;;;;
+1160B;MODI LETTER AI;Lo;0;L;;;;;N;;;;;
+1160C;MODI LETTER O;Lo;0;L;;;;;N;;;;;
+1160D;MODI LETTER AU;Lo;0;L;;;;;N;;;;;
+1160E;MODI LETTER KA;Lo;0;L;;;;;N;;;;;
+1160F;MODI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11610;MODI LETTER GA;Lo;0;L;;;;;N;;;;;
+11611;MODI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11612;MODI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11613;MODI LETTER CA;Lo;0;L;;;;;N;;;;;
+11614;MODI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11615;MODI LETTER JA;Lo;0;L;;;;;N;;;;;
+11616;MODI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11617;MODI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11618;MODI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11619;MODI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1161A;MODI LETTER DDA;Lo;0;L;;;;;N;;;;;
+1161B;MODI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1161C;MODI LETTER NNA;Lo;0;L;;;;;N;;;;;
+1161D;MODI LETTER TA;Lo;0;L;;;;;N;;;;;
+1161E;MODI LETTER THA;Lo;0;L;;;;;N;;;;;
+1161F;MODI LETTER DA;Lo;0;L;;;;;N;;;;;
+11620;MODI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11621;MODI LETTER NA;Lo;0;L;;;;;N;;;;;
+11622;MODI LETTER PA;Lo;0;L;;;;;N;;;;;
+11623;MODI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11624;MODI LETTER BA;Lo;0;L;;;;;N;;;;;
+11625;MODI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11626;MODI LETTER MA;Lo;0;L;;;;;N;;;;;
+11627;MODI LETTER YA;Lo;0;L;;;;;N;;;;;
+11628;MODI LETTER RA;Lo;0;L;;;;;N;;;;;
+11629;MODI LETTER LA;Lo;0;L;;;;;N;;;;;
+1162A;MODI LETTER VA;Lo;0;L;;;;;N;;;;;
+1162B;MODI LETTER SHA;Lo;0;L;;;;;N;;;;;
+1162C;MODI LETTER SSA;Lo;0;L;;;;;N;;;;;
+1162D;MODI LETTER SA;Lo;0;L;;;;;N;;;;;
+1162E;MODI LETTER HA;Lo;0;L;;;;;N;;;;;
+1162F;MODI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11630;MODI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11631;MODI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11632;MODI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11633;MODI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11634;MODI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11635;MODI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11636;MODI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11637;MODI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11638;MODI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+11639;MODI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1163A;MODI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1163B;MODI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1163C;MODI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+1163D;MODI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1163E;MODI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+1163F;MODI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11640;MODI SIGN ARDHACANDRA;Mn;0;NSM;;;;;N;;;;;
+11641;MODI DANDA;Po;0;L;;;;;N;;;;;
+11642;MODI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11643;MODI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11644;MODI SIGN HUVA;Lo;0;L;;;;;N;;;;;
+11650;MODI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11651;MODI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11652;MODI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11653;MODI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11654;MODI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11655;MODI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11656;MODI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11657;MODI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11658;MODI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11659;MODI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11660;MONGOLIAN BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11661;MONGOLIAN ROTATED BIRGA;Po;0;ON;;;;;N;;;;;
+11662;MONGOLIAN DOUBLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11663;MONGOLIAN TRIPLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11664;MONGOLIAN BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11665;MONGOLIAN ROTATED BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11666;MONGOLIAN ROTATED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11667;MONGOLIAN INVERTED BIRGA;Po;0;ON;;;;;N;;;;;
+11668;MONGOLIAN INVERTED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11669;MONGOLIAN SWIRL BIRGA;Po;0;ON;;;;;N;;;;;
+1166A;MONGOLIAN SWIRL BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+1166B;MONGOLIAN SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+1166C;MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11680;TAKRI LETTER A;Lo;0;L;;;;;N;;;;;
+11681;TAKRI LETTER AA;Lo;0;L;;;;;N;;;;;
+11682;TAKRI LETTER I;Lo;0;L;;;;;N;;;;;
+11683;TAKRI LETTER II;Lo;0;L;;;;;N;;;;;
+11684;TAKRI LETTER U;Lo;0;L;;;;;N;;;;;
+11685;TAKRI LETTER UU;Lo;0;L;;;;;N;;;;;
+11686;TAKRI LETTER E;Lo;0;L;;;;;N;;;;;
+11687;TAKRI LETTER AI;Lo;0;L;;;;;N;;;;;
+11688;TAKRI LETTER O;Lo;0;L;;;;;N;;;;;
+11689;TAKRI LETTER AU;Lo;0;L;;;;;N;;;;;
+1168A;TAKRI LETTER KA;Lo;0;L;;;;;N;;;;;
+1168B;TAKRI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1168C;TAKRI LETTER GA;Lo;0;L;;;;;N;;;;;
+1168D;TAKRI LETTER GHA;Lo;0;L;;;;;N;;;;;
+1168E;TAKRI LETTER NGA;Lo;0;L;;;;;N;;;;;
+1168F;TAKRI LETTER CA;Lo;0;L;;;;;N;;;;;
+11690;TAKRI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11691;TAKRI LETTER JA;Lo;0;L;;;;;N;;;;;
+11692;TAKRI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11693;TAKRI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11694;TAKRI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11695;TAKRI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11696;TAKRI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11697;TAKRI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11698;TAKRI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11699;TAKRI LETTER TA;Lo;0;L;;;;;N;;;;;
+1169A;TAKRI LETTER THA;Lo;0;L;;;;;N;;;;;
+1169B;TAKRI LETTER DA;Lo;0;L;;;;;N;;;;;
+1169C;TAKRI LETTER DHA;Lo;0;L;;;;;N;;;;;
+1169D;TAKRI LETTER NA;Lo;0;L;;;;;N;;;;;
+1169E;TAKRI LETTER PA;Lo;0;L;;;;;N;;;;;
+1169F;TAKRI LETTER PHA;Lo;0;L;;;;;N;;;;;
+116A0;TAKRI LETTER BA;Lo;0;L;;;;;N;;;;;
+116A1;TAKRI LETTER BHA;Lo;0;L;;;;;N;;;;;
+116A2;TAKRI LETTER MA;Lo;0;L;;;;;N;;;;;
+116A3;TAKRI LETTER YA;Lo;0;L;;;;;N;;;;;
+116A4;TAKRI LETTER RA;Lo;0;L;;;;;N;;;;;
+116A5;TAKRI LETTER LA;Lo;0;L;;;;;N;;;;;
+116A6;TAKRI LETTER VA;Lo;0;L;;;;;N;;;;;
+116A7;TAKRI LETTER SHA;Lo;0;L;;;;;N;;;;;
+116A8;TAKRI LETTER SA;Lo;0;L;;;;;N;;;;;
+116A9;TAKRI LETTER HA;Lo;0;L;;;;;N;;;;;
+116AA;TAKRI LETTER RRA;Lo;0;L;;;;;N;;;;;
+116AB;TAKRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+116AC;TAKRI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+116AD;TAKRI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+116AE;TAKRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+116AF;TAKRI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+116B0;TAKRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+116B1;TAKRI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+116B2;TAKRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+116B3;TAKRI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+116B4;TAKRI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+116B5;TAKRI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+116B6;TAKRI SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+116B7;TAKRI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+116B8;TAKRI LETTER ARCHAIC KHA;Lo;0;L;;;;;N;;;;;
+116C0;TAKRI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+116C1;TAKRI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+116C2;TAKRI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+116C3;TAKRI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+116C4;TAKRI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+116C5;TAKRI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+116C6;TAKRI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+116C7;TAKRI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+116C8;TAKRI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+116C9;TAKRI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11700;AHOM LETTER KA;Lo;0;L;;;;;N;;;;;
+11701;AHOM LETTER KHA;Lo;0;L;;;;;N;;;;;
+11702;AHOM LETTER NGA;Lo;0;L;;;;;N;;;;;
+11703;AHOM LETTER NA;Lo;0;L;;;;;N;;;;;
+11704;AHOM LETTER TA;Lo;0;L;;;;;N;;;;;
+11705;AHOM LETTER ALTERNATE TA;Lo;0;L;;;;;N;;;;;
+11706;AHOM LETTER PA;Lo;0;L;;;;;N;;;;;
+11707;AHOM LETTER PHA;Lo;0;L;;;;;N;;;;;
+11708;AHOM LETTER BA;Lo;0;L;;;;;N;;;;;
+11709;AHOM LETTER MA;Lo;0;L;;;;;N;;;;;
+1170A;AHOM LETTER JA;Lo;0;L;;;;;N;;;;;
+1170B;AHOM LETTER CHA;Lo;0;L;;;;;N;;;;;
+1170C;AHOM LETTER THA;Lo;0;L;;;;;N;;;;;
+1170D;AHOM LETTER RA;Lo;0;L;;;;;N;;;;;
+1170E;AHOM LETTER LA;Lo;0;L;;;;;N;;;;;
+1170F;AHOM LETTER SA;Lo;0;L;;;;;N;;;;;
+11710;AHOM LETTER NYA;Lo;0;L;;;;;N;;;;;
+11711;AHOM LETTER HA;Lo;0;L;;;;;N;;;;;
+11712;AHOM LETTER A;Lo;0;L;;;;;N;;;;;
+11713;AHOM LETTER DA;Lo;0;L;;;;;N;;;;;
+11714;AHOM LETTER DHA;Lo;0;L;;;;;N;;;;;
+11715;AHOM LETTER GA;Lo;0;L;;;;;N;;;;;
+11716;AHOM LETTER ALTERNATE GA;Lo;0;L;;;;;N;;;;;
+11717;AHOM LETTER GHA;Lo;0;L;;;;;N;;;;;
+11718;AHOM LETTER BHA;Lo;0;L;;;;;N;;;;;
+11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;;
+1171A;AHOM LETTER ALTERNATE BA;Lo;0;L;;;;;N;;;;;
+1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1171E;AHOM CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;;
+1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;;
+11720;AHOM VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+11721;AHOM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11722;AHOM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11723;AHOM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11724;AHOM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11725;AHOM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11726;AHOM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11727;AHOM VOWEL SIGN AW;Mn;0;NSM;;;;;N;;;;;
+11728;AHOM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11729;AHOM VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1172A;AHOM VOWEL SIGN AM;Mn;0;NSM;;;;;N;;;;;
+1172B;AHOM SIGN KILLER;Mn;9;NSM;;;;;N;;;;;
+11730;AHOM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11731;AHOM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11732;AHOM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11733;AHOM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11734;AHOM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11735;AHOM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11736;AHOM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11737;AHOM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11738;AHOM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11739;AHOM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1173A;AHOM NUMBER TEN;No;0;L;;;;10;N;;;;;
+1173B;AHOM NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+1173C;AHOM SIGN SMALL SECTION;Po;0;L;;;;;N;;;;;
+1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;;
+1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;;
+1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;;
+11800;DOGRA LETTER A;Lo;0;L;;;;;N;;;;;
+11801;DOGRA LETTER AA;Lo;0;L;;;;;N;;;;;
+11802;DOGRA LETTER I;Lo;0;L;;;;;N;;;;;
+11803;DOGRA LETTER II;Lo;0;L;;;;;N;;;;;
+11804;DOGRA LETTER U;Lo;0;L;;;;;N;;;;;
+11805;DOGRA LETTER UU;Lo;0;L;;;;;N;;;;;
+11806;DOGRA LETTER E;Lo;0;L;;;;;N;;;;;
+11807;DOGRA LETTER AI;Lo;0;L;;;;;N;;;;;
+11808;DOGRA LETTER O;Lo;0;L;;;;;N;;;;;
+11809;DOGRA LETTER AU;Lo;0;L;;;;;N;;;;;
+1180A;DOGRA LETTER KA;Lo;0;L;;;;;N;;;;;
+1180B;DOGRA LETTER KHA;Lo;0;L;;;;;N;;;;;
+1180C;DOGRA LETTER GA;Lo;0;L;;;;;N;;;;;
+1180D;DOGRA LETTER GHA;Lo;0;L;;;;;N;;;;;
+1180E;DOGRA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1180F;DOGRA LETTER CA;Lo;0;L;;;;;N;;;;;
+11810;DOGRA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11811;DOGRA LETTER JA;Lo;0;L;;;;;N;;;;;
+11812;DOGRA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11813;DOGRA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11814;DOGRA LETTER TTA;Lo;0;L;;;;;N;;;;;
+11815;DOGRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11816;DOGRA LETTER DDA;Lo;0;L;;;;;N;;;;;
+11817;DOGRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11818;DOGRA LETTER NNA;Lo;0;L;;;;;N;;;;;
+11819;DOGRA LETTER TA;Lo;0;L;;;;;N;;;;;
+1181A;DOGRA LETTER THA;Lo;0;L;;;;;N;;;;;
+1181B;DOGRA LETTER DA;Lo;0;L;;;;;N;;;;;
+1181C;DOGRA LETTER DHA;Lo;0;L;;;;;N;;;;;
+1181D;DOGRA LETTER NA;Lo;0;L;;;;;N;;;;;
+1181E;DOGRA LETTER PA;Lo;0;L;;;;;N;;;;;
+1181F;DOGRA LETTER PHA;Lo;0;L;;;;;N;;;;;
+11820;DOGRA LETTER BA;Lo;0;L;;;;;N;;;;;
+11821;DOGRA LETTER BHA;Lo;0;L;;;;;N;;;;;
+11822;DOGRA LETTER MA;Lo;0;L;;;;;N;;;;;
+11823;DOGRA LETTER YA;Lo;0;L;;;;;N;;;;;
+11824;DOGRA LETTER RA;Lo;0;L;;;;;N;;;;;
+11825;DOGRA LETTER LA;Lo;0;L;;;;;N;;;;;
+11826;DOGRA LETTER VA;Lo;0;L;;;;;N;;;;;
+11827;DOGRA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11828;DOGRA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11829;DOGRA LETTER SA;Lo;0;L;;;;;N;;;;;
+1182A;DOGRA LETTER HA;Lo;0;L;;;;;N;;;;;
+1182B;DOGRA LETTER RRA;Lo;0;L;;;;;N;;;;;
+1182C;DOGRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1182D;DOGRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1182E;DOGRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+1182F;DOGRA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11830;DOGRA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11831;DOGRA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11832;DOGRA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11833;DOGRA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11834;DOGRA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11835;DOGRA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11836;DOGRA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11837;DOGRA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11838;DOGRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11839;DOGRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1183A;DOGRA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1183B;DOGRA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+118A0;WARANG CITI CAPITAL LETTER NGAA;Lu;0;L;;;;;N;;;;118C0;
+118A1;WARANG CITI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;118C1;
+118A2;WARANG CITI CAPITAL LETTER WI;Lu;0;L;;;;;N;;;;118C2;
+118A3;WARANG CITI CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;118C3;
+118A4;WARANG CITI CAPITAL LETTER YA;Lu;0;L;;;;;N;;;;118C4;
+118A5;WARANG CITI CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;118C5;
+118A6;WARANG CITI CAPITAL LETTER II;Lu;0;L;;;;;N;;;;118C6;
+118A7;WARANG CITI CAPITAL LETTER UU;Lu;0;L;;;;;N;;;;118C7;
+118A8;WARANG CITI CAPITAL LETTER E;Lu;0;L;;;;;N;;;;118C8;
+118A9;WARANG CITI CAPITAL LETTER O;Lu;0;L;;;;;N;;;;118C9;
+118AA;WARANG CITI CAPITAL LETTER ANG;Lu;0;L;;;;;N;;;;118CA;
+118AB;WARANG CITI CAPITAL LETTER GA;Lu;0;L;;;;;N;;;;118CB;
+118AC;WARANG CITI CAPITAL LETTER KO;Lu;0;L;;;;;N;;;;118CC;
+118AD;WARANG CITI CAPITAL LETTER ENY;Lu;0;L;;;;;N;;;;118CD;
+118AE;WARANG CITI CAPITAL LETTER YUJ;Lu;0;L;;;;;N;;;;118CE;
+118AF;WARANG CITI CAPITAL LETTER UC;Lu;0;L;;;;;N;;;;118CF;
+118B0;WARANG CITI CAPITAL LETTER ENN;Lu;0;L;;;;;N;;;;118D0;
+118B1;WARANG CITI CAPITAL LETTER ODD;Lu;0;L;;;;;N;;;;118D1;
+118B2;WARANG CITI CAPITAL LETTER TTE;Lu;0;L;;;;;N;;;;118D2;
+118B3;WARANG CITI CAPITAL LETTER NUNG;Lu;0;L;;;;;N;;;;118D3;
+118B4;WARANG CITI CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;118D4;
+118B5;WARANG CITI CAPITAL LETTER AT;Lu;0;L;;;;;N;;;;118D5;
+118B6;WARANG CITI CAPITAL LETTER AM;Lu;0;L;;;;;N;;;;118D6;
+118B7;WARANG CITI CAPITAL LETTER BU;Lu;0;L;;;;;N;;;;118D7;
+118B8;WARANG CITI CAPITAL LETTER PU;Lu;0;L;;;;;N;;;;118D8;
+118B9;WARANG CITI CAPITAL LETTER HIYO;Lu;0;L;;;;;N;;;;118D9;
+118BA;WARANG CITI CAPITAL LETTER HOLO;Lu;0;L;;;;;N;;;;118DA;
+118BB;WARANG CITI CAPITAL LETTER HORR;Lu;0;L;;;;;N;;;;118DB;
+118BC;WARANG CITI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;118DC;
+118BD;WARANG CITI CAPITAL LETTER SSUU;Lu;0;L;;;;;N;;;;118DD;
+118BE;WARANG CITI CAPITAL LETTER SII;Lu;0;L;;;;;N;;;;118DE;
+118BF;WARANG CITI CAPITAL LETTER VIYO;Lu;0;L;;;;;N;;;;118DF;
+118C0;WARANG CITI SMALL LETTER NGAA;Ll;0;L;;;;;N;;;118A0;;118A0
+118C1;WARANG CITI SMALL LETTER A;Ll;0;L;;;;;N;;;118A1;;118A1
+118C2;WARANG CITI SMALL LETTER WI;Ll;0;L;;;;;N;;;118A2;;118A2
+118C3;WARANG CITI SMALL LETTER YU;Ll;0;L;;;;;N;;;118A3;;118A3
+118C4;WARANG CITI SMALL LETTER YA;Ll;0;L;;;;;N;;;118A4;;118A4
+118C5;WARANG CITI SMALL LETTER YO;Ll;0;L;;;;;N;;;118A5;;118A5
+118C6;WARANG CITI SMALL LETTER II;Ll;0;L;;;;;N;;;118A6;;118A6
+118C7;WARANG CITI SMALL LETTER UU;Ll;0;L;;;;;N;;;118A7;;118A7
+118C8;WARANG CITI SMALL LETTER E;Ll;0;L;;;;;N;;;118A8;;118A8
+118C9;WARANG CITI SMALL LETTER O;Ll;0;L;;;;;N;;;118A9;;118A9
+118CA;WARANG CITI SMALL LETTER ANG;Ll;0;L;;;;;N;;;118AA;;118AA
+118CB;WARANG CITI SMALL LETTER GA;Ll;0;L;;;;;N;;;118AB;;118AB
+118CC;WARANG CITI SMALL LETTER KO;Ll;0;L;;;;;N;;;118AC;;118AC
+118CD;WARANG CITI SMALL LETTER ENY;Ll;0;L;;;;;N;;;118AD;;118AD
+118CE;WARANG CITI SMALL LETTER YUJ;Ll;0;L;;;;;N;;;118AE;;118AE
+118CF;WARANG CITI SMALL LETTER UC;Ll;0;L;;;;;N;;;118AF;;118AF
+118D0;WARANG CITI SMALL LETTER ENN;Ll;0;L;;;;;N;;;118B0;;118B0
+118D1;WARANG CITI SMALL LETTER ODD;Ll;0;L;;;;;N;;;118B1;;118B1
+118D2;WARANG CITI SMALL LETTER TTE;Ll;0;L;;;;;N;;;118B2;;118B2
+118D3;WARANG CITI SMALL LETTER NUNG;Ll;0;L;;;;;N;;;118B3;;118B3
+118D4;WARANG CITI SMALL LETTER DA;Ll;0;L;;;;;N;;;118B4;;118B4
+118D5;WARANG CITI SMALL LETTER AT;Ll;0;L;;;;;N;;;118B5;;118B5
+118D6;WARANG CITI SMALL LETTER AM;Ll;0;L;;;;;N;;;118B6;;118B6
+118D7;WARANG CITI SMALL LETTER BU;Ll;0;L;;;;;N;;;118B7;;118B7
+118D8;WARANG CITI SMALL LETTER PU;Ll;0;L;;;;;N;;;118B8;;118B8
+118D9;WARANG CITI SMALL LETTER HIYO;Ll;0;L;;;;;N;;;118B9;;118B9
+118DA;WARANG CITI SMALL LETTER HOLO;Ll;0;L;;;;;N;;;118BA;;118BA
+118DB;WARANG CITI SMALL LETTER HORR;Ll;0;L;;;;;N;;;118BB;;118BB
+118DC;WARANG CITI SMALL LETTER HAR;Ll;0;L;;;;;N;;;118BC;;118BC
+118DD;WARANG CITI SMALL LETTER SSUU;Ll;0;L;;;;;N;;;118BD;;118BD
+118DE;WARANG CITI SMALL LETTER SII;Ll;0;L;;;;;N;;;118BE;;118BE
+118DF;WARANG CITI SMALL LETTER VIYO;Ll;0;L;;;;;N;;;118BF;;118BF
+118E0;WARANG CITI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+118E1;WARANG CITI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+118E2;WARANG CITI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+118E3;WARANG CITI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+118E4;WARANG CITI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+118E5;WARANG CITI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+118E6;WARANG CITI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+118E7;WARANG CITI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+118E8;WARANG CITI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+118E9;WARANG CITI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+118EA;WARANG CITI NUMBER TEN;No;0;L;;;;10;N;;;;;
+118EB;WARANG CITI NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+118EC;WARANG CITI NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+118ED;WARANG CITI NUMBER FORTY;No;0;L;;;;40;N;;;;;
+118EE;WARANG CITI NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+118EF;WARANG CITI NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+118F0;WARANG CITI NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+118F1;WARANG CITI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+118F2;WARANG CITI NUMBER NINETY;No;0;L;;;;90;N;;;;;
+118FF;WARANG CITI OM;Lo;0;L;;;;;N;;;;;
+11900;DIVES AKURU LETTER A;Lo;0;L;;;;;N;;;;;
+11901;DIVES AKURU LETTER AA;Lo;0;L;;;;;N;;;;;
+11902;DIVES AKURU LETTER I;Lo;0;L;;;;;N;;;;;
+11903;DIVES AKURU LETTER II;Lo;0;L;;;;;N;;;;;
+11904;DIVES AKURU LETTER U;Lo;0;L;;;;;N;;;;;
+11905;DIVES AKURU LETTER UU;Lo;0;L;;;;;N;;;;;
+11906;DIVES AKURU LETTER E;Lo;0;L;;;;;N;;;;;
+11909;DIVES AKURU LETTER O;Lo;0;L;;;;;N;;;;;
+1190C;DIVES AKURU LETTER KA;Lo;0;L;;;;;N;;;;;
+1190D;DIVES AKURU LETTER KHA;Lo;0;L;;;;;N;;;;;
+1190E;DIVES AKURU LETTER GA;Lo;0;L;;;;;N;;;;;
+1190F;DIVES AKURU LETTER GHA;Lo;0;L;;;;;N;;;;;
+11910;DIVES AKURU LETTER NGA;Lo;0;L;;;;;N;;;;;
+11911;DIVES AKURU LETTER CA;Lo;0;L;;;;;N;;;;;
+11912;DIVES AKURU LETTER CHA;Lo;0;L;;;;;N;;;;;
+11913;DIVES AKURU LETTER JA;Lo;0;L;;;;;N;;;;;
+11915;DIVES AKURU LETTER NYA;Lo;0;L;;;;;N;;;;;
+11916;DIVES AKURU LETTER TTA;Lo;0;L;;;;;N;;;;;
+11918;DIVES AKURU LETTER DDA;Lo;0;L;;;;;N;;;;;
+11919;DIVES AKURU LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1191A;DIVES AKURU LETTER NNA;Lo;0;L;;;;;N;;;;;
+1191B;DIVES AKURU LETTER TA;Lo;0;L;;;;;N;;;;;
+1191C;DIVES AKURU LETTER THA;Lo;0;L;;;;;N;;;;;
+1191D;DIVES AKURU LETTER DA;Lo;0;L;;;;;N;;;;;
+1191E;DIVES AKURU LETTER DHA;Lo;0;L;;;;;N;;;;;
+1191F;DIVES AKURU LETTER NA;Lo;0;L;;;;;N;;;;;
+11920;DIVES AKURU LETTER PA;Lo;0;L;;;;;N;;;;;
+11921;DIVES AKURU LETTER PHA;Lo;0;L;;;;;N;;;;;
+11922;DIVES AKURU LETTER BA;Lo;0;L;;;;;N;;;;;
+11923;DIVES AKURU LETTER BHA;Lo;0;L;;;;;N;;;;;
+11924;DIVES AKURU LETTER MA;Lo;0;L;;;;;N;;;;;
+11925;DIVES AKURU LETTER YA;Lo;0;L;;;;;N;;;;;
+11926;DIVES AKURU LETTER YYA;Lo;0;L;;;;;N;;;;;
+11927;DIVES AKURU LETTER RA;Lo;0;L;;;;;N;;;;;
+11928;DIVES AKURU LETTER LA;Lo;0;L;;;;;N;;;;;
+11929;DIVES AKURU LETTER VA;Lo;0;L;;;;;N;;;;;
+1192A;DIVES AKURU LETTER SHA;Lo;0;L;;;;;N;;;;;
+1192B;DIVES AKURU LETTER SSA;Lo;0;L;;;;;N;;;;;
+1192C;DIVES AKURU LETTER SA;Lo;0;L;;;;;N;;;;;
+1192D;DIVES AKURU LETTER HA;Lo;0;L;;;;;N;;;;;
+1192E;DIVES AKURU LETTER LLA;Lo;0;L;;;;;N;;;;;
+1192F;DIVES AKURU LETTER ZA;Lo;0;L;;;;;N;;;;;
+11930;DIVES AKURU VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11931;DIVES AKURU VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11932;DIVES AKURU VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11933;DIVES AKURU VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+11934;DIVES AKURU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+11935;DIVES AKURU VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11937;DIVES AKURU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11938;DIVES AKURU VOWEL SIGN O;Mc;0;L;11935 11930;;;;N;;;;;
+1193B;DIVES AKURU SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1193C;DIVES AKURU SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+1193D;DIVES AKURU SIGN HALANTA;Mc;9;L;;;;;N;;;;;
+1193E;DIVES AKURU VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1193F;DIVES AKURU PREFIXED NASAL SIGN;Lo;0;L;;;;;N;;;;;
+11940;DIVES AKURU MEDIAL YA;Mc;0;L;;;;;N;;;;;
+11941;DIVES AKURU INITIAL RA;Lo;0;L;;;;;N;;;;;
+11942;DIVES AKURU MEDIAL RA;Mc;0;L;;;;;N;;;;;
+11943;DIVES AKURU SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11944;DIVES AKURU DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11945;DIVES AKURU GAP FILLER;Po;0;L;;;;;N;;;;;
+11946;DIVES AKURU END OF TEXT MARK;Po;0;L;;;;;N;;;;;
+11950;DIVES AKURU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11951;DIVES AKURU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11952;DIVES AKURU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11953;DIVES AKURU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11954;DIVES AKURU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11955;DIVES AKURU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11956;DIVES AKURU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11957;DIVES AKURU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11958;DIVES AKURU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11959;DIVES AKURU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+119A0;NANDINAGARI LETTER A;Lo;0;L;;;;;N;;;;;
+119A1;NANDINAGARI LETTER AA;Lo;0;L;;;;;N;;;;;
+119A2;NANDINAGARI LETTER I;Lo;0;L;;;;;N;;;;;
+119A3;NANDINAGARI LETTER II;Lo;0;L;;;;;N;;;;;
+119A4;NANDINAGARI LETTER U;Lo;0;L;;;;;N;;;;;
+119A5;NANDINAGARI LETTER UU;Lo;0;L;;;;;N;;;;;
+119A6;NANDINAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+119A7;NANDINAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+119AA;NANDINAGARI LETTER E;Lo;0;L;;;;;N;;;;;
+119AB;NANDINAGARI LETTER AI;Lo;0;L;;;;;N;;;;;
+119AC;NANDINAGARI LETTER O;Lo;0;L;;;;;N;;;;;
+119AD;NANDINAGARI LETTER AU;Lo;0;L;;;;;N;;;;;
+119AE;NANDINAGARI LETTER KA;Lo;0;L;;;;;N;;;;;
+119AF;NANDINAGARI LETTER KHA;Lo;0;L;;;;;N;;;;;
+119B0;NANDINAGARI LETTER GA;Lo;0;L;;;;;N;;;;;
+119B1;NANDINAGARI LETTER GHA;Lo;0;L;;;;;N;;;;;
+119B2;NANDINAGARI LETTER NGA;Lo;0;L;;;;;N;;;;;
+119B3;NANDINAGARI LETTER CA;Lo;0;L;;;;;N;;;;;
+119B4;NANDINAGARI LETTER CHA;Lo;0;L;;;;;N;;;;;
+119B5;NANDINAGARI LETTER JA;Lo;0;L;;;;;N;;;;;
+119B6;NANDINAGARI LETTER JHA;Lo;0;L;;;;;N;;;;;
+119B7;NANDINAGARI LETTER NYA;Lo;0;L;;;;;N;;;;;
+119B8;NANDINAGARI LETTER TTA;Lo;0;L;;;;;N;;;;;
+119B9;NANDINAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+119BA;NANDINAGARI LETTER DDA;Lo;0;L;;;;;N;;;;;
+119BB;NANDINAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+119BC;NANDINAGARI LETTER NNA;Lo;0;L;;;;;N;;;;;
+119BD;NANDINAGARI LETTER TA;Lo;0;L;;;;;N;;;;;
+119BE;NANDINAGARI LETTER THA;Lo;0;L;;;;;N;;;;;
+119BF;NANDINAGARI LETTER DA;Lo;0;L;;;;;N;;;;;
+119C0;NANDINAGARI LETTER DHA;Lo;0;L;;;;;N;;;;;
+119C1;NANDINAGARI LETTER NA;Lo;0;L;;;;;N;;;;;
+119C2;NANDINAGARI LETTER PA;Lo;0;L;;;;;N;;;;;
+119C3;NANDINAGARI LETTER PHA;Lo;0;L;;;;;N;;;;;
+119C4;NANDINAGARI LETTER BA;Lo;0;L;;;;;N;;;;;
+119C5;NANDINAGARI LETTER BHA;Lo;0;L;;;;;N;;;;;
+119C6;NANDINAGARI LETTER MA;Lo;0;L;;;;;N;;;;;
+119C7;NANDINAGARI LETTER YA;Lo;0;L;;;;;N;;;;;
+119C8;NANDINAGARI LETTER RA;Lo;0;L;;;;;N;;;;;
+119C9;NANDINAGARI LETTER LA;Lo;0;L;;;;;N;;;;;
+119CA;NANDINAGARI LETTER VA;Lo;0;L;;;;;N;;;;;
+119CB;NANDINAGARI LETTER SHA;Lo;0;L;;;;;N;;;;;
+119CC;NANDINAGARI LETTER SSA;Lo;0;L;;;;;N;;;;;
+119CD;NANDINAGARI LETTER SA;Lo;0;L;;;;;N;;;;;
+119CE;NANDINAGARI LETTER HA;Lo;0;L;;;;;N;;;;;
+119CF;NANDINAGARI LETTER LLA;Lo;0;L;;;;;N;;;;;
+119D0;NANDINAGARI LETTER RRA;Lo;0;L;;;;;N;;;;;
+119D1;NANDINAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+119D2;NANDINAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+119D3;NANDINAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+119D4;NANDINAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+119D5;NANDINAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+119D6;NANDINAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+119D7;NANDINAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+119DA;NANDINAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+119DB;NANDINAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+119DC;NANDINAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+119DD;NANDINAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+119DE;NANDINAGARI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+119DF;NANDINAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+119E0;NANDINAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+119E1;NANDINAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+119E2;NANDINAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+119E3;NANDINAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;;
+119E4;NANDINAGARI VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;;
+11A00;ZANABAZAR SQUARE LETTER A;Lo;0;L;;;;;N;;;;;
+11A01;ZANABAZAR SQUARE VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11A02;ZANABAZAR SQUARE VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11A03;ZANABAZAR SQUARE VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11A04;ZANABAZAR SQUARE VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11A05;ZANABAZAR SQUARE VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11A06;ZANABAZAR SQUARE VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mn;0;L;;;;;N;;;;;
+11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mn;0;L;;;;;N;;;;;
+11A09;ZANABAZAR SQUARE VOWEL SIGN REVERSED I;Mn;0;NSM;;;;;N;;;;;
+11A0A;ZANABAZAR SQUARE VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+11A0B;ZANABAZAR SQUARE LETTER KA;Lo;0;L;;;;;N;;;;;
+11A0C;ZANABAZAR SQUARE LETTER KHA;Lo;0;L;;;;;N;;;;;
+11A0D;ZANABAZAR SQUARE LETTER GA;Lo;0;L;;;;;N;;;;;
+11A0E;ZANABAZAR SQUARE LETTER GHA;Lo;0;L;;;;;N;;;;;
+11A0F;ZANABAZAR SQUARE LETTER NGA;Lo;0;L;;;;;N;;;;;
+11A10;ZANABAZAR SQUARE LETTER CA;Lo;0;L;;;;;N;;;;;
+11A11;ZANABAZAR SQUARE LETTER CHA;Lo;0;L;;;;;N;;;;;
+11A12;ZANABAZAR SQUARE LETTER JA;Lo;0;L;;;;;N;;;;;
+11A13;ZANABAZAR SQUARE LETTER NYA;Lo;0;L;;;;;N;;;;;
+11A14;ZANABAZAR SQUARE LETTER TTA;Lo;0;L;;;;;N;;;;;
+11A15;ZANABAZAR SQUARE LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11A16;ZANABAZAR SQUARE LETTER DDA;Lo;0;L;;;;;N;;;;;
+11A17;ZANABAZAR SQUARE LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11A18;ZANABAZAR SQUARE LETTER NNA;Lo;0;L;;;;;N;;;;;
+11A19;ZANABAZAR SQUARE LETTER TA;Lo;0;L;;;;;N;;;;;
+11A1A;ZANABAZAR SQUARE LETTER THA;Lo;0;L;;;;;N;;;;;
+11A1B;ZANABAZAR SQUARE LETTER DA;Lo;0;L;;;;;N;;;;;
+11A1C;ZANABAZAR SQUARE LETTER DHA;Lo;0;L;;;;;N;;;;;
+11A1D;ZANABAZAR SQUARE LETTER NA;Lo;0;L;;;;;N;;;;;
+11A1E;ZANABAZAR SQUARE LETTER PA;Lo;0;L;;;;;N;;;;;
+11A1F;ZANABAZAR SQUARE LETTER PHA;Lo;0;L;;;;;N;;;;;
+11A20;ZANABAZAR SQUARE LETTER BA;Lo;0;L;;;;;N;;;;;
+11A21;ZANABAZAR SQUARE LETTER BHA;Lo;0;L;;;;;N;;;;;
+11A22;ZANABAZAR SQUARE LETTER MA;Lo;0;L;;;;;N;;;;;
+11A23;ZANABAZAR SQUARE LETTER TSA;Lo;0;L;;;;;N;;;;;
+11A24;ZANABAZAR SQUARE LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11A25;ZANABAZAR SQUARE LETTER DZA;Lo;0;L;;;;;N;;;;;
+11A26;ZANABAZAR SQUARE LETTER DZHA;Lo;0;L;;;;;N;;;;;
+11A27;ZANABAZAR SQUARE LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11A28;ZANABAZAR SQUARE LETTER ZA;Lo;0;L;;;;;N;;;;;
+11A29;ZANABAZAR SQUARE LETTER -A;Lo;0;L;;;;;N;;;;;
+11A2A;ZANABAZAR SQUARE LETTER YA;Lo;0;L;;;;;N;;;;;
+11A2B;ZANABAZAR SQUARE LETTER RA;Lo;0;L;;;;;N;;;;;
+11A2C;ZANABAZAR SQUARE LETTER LA;Lo;0;L;;;;;N;;;;;
+11A2D;ZANABAZAR SQUARE LETTER VA;Lo;0;L;;;;;N;;;;;
+11A2E;ZANABAZAR SQUARE LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A2F;ZANABAZAR SQUARE LETTER SSA;Lo;0;L;;;;;N;;;;;
+11A30;ZANABAZAR SQUARE LETTER SA;Lo;0;L;;;;;N;;;;;
+11A31;ZANABAZAR SQUARE LETTER HA;Lo;0;L;;;;;N;;;;;
+11A32;ZANABAZAR SQUARE LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11A33;ZANABAZAR SQUARE FINAL CONSONANT MARK;Mn;0;NSM;;;;;N;;;;;
+11A34;ZANABAZAR SQUARE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11A35;ZANABAZAR SQUARE SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11A36;ZANABAZAR SQUARE SIGN CANDRABINDU WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;;
+11A37;ZANABAZAR SQUARE SIGN CANDRA WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;;
+11A38;ZANABAZAR SQUARE SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11A39;ZANABAZAR SQUARE SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11A3A;ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;;
+11A3B;ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA;Mn;0;NSM;;;;;N;;;;;
+11A3C;ZANABAZAR SQUARE CLUSTER-FINAL LETTER RA;Mn;0;NSM;;;;;N;;;;;
+11A3D;ZANABAZAR SQUARE CLUSTER-FINAL LETTER LA;Mn;0;NSM;;;;;N;;;;;
+11A3E;ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA;Mn;0;NSM;;;;;N;;;;;
+11A3F;ZANABAZAR SQUARE INITIAL HEAD MARK;Po;0;L;;;;;N;;;;;
+11A40;ZANABAZAR SQUARE CLOSING HEAD MARK;Po;0;L;;;;;N;;;;;
+11A41;ZANABAZAR SQUARE MARK TSHEG;Po;0;L;;;;;N;;;;;
+11A42;ZANABAZAR SQUARE MARK SHAD;Po;0;L;;;;;N;;;;;
+11A43;ZANABAZAR SQUARE MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A44;ZANABAZAR SQUARE MARK LONG TSHEG;Po;0;L;;;;;N;;;;;
+11A45;ZANABAZAR SQUARE INITIAL DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;;
+11A46;ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;;
+11A47;ZANABAZAR SQUARE SUBJOINER;Mn;9;NSM;;;;;N;;;;;
+11A50;SOYOMBO LETTER A;Lo;0;L;;;;;N;;;;;
+11A51;SOYOMBO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11A52;SOYOMBO VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11A53;SOYOMBO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11A54;SOYOMBO VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11A55;SOYOMBO VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11A56;SOYOMBO VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11A57;SOYOMBO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11A58;SOYOMBO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A59;SOYOMBO VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11A5A;SOYOMBO VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11A5B;SOYOMBO VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+11A5C;SOYOMBO LETTER KA;Lo;0;L;;;;;N;;;;;
+11A5D;SOYOMBO LETTER KHA;Lo;0;L;;;;;N;;;;;
+11A5E;SOYOMBO LETTER GA;Lo;0;L;;;;;N;;;;;
+11A5F;SOYOMBO LETTER GHA;Lo;0;L;;;;;N;;;;;
+11A60;SOYOMBO LETTER NGA;Lo;0;L;;;;;N;;;;;
+11A61;SOYOMBO LETTER CA;Lo;0;L;;;;;N;;;;;
+11A62;SOYOMBO LETTER CHA;Lo;0;L;;;;;N;;;;;
+11A63;SOYOMBO LETTER JA;Lo;0;L;;;;;N;;;;;
+11A64;SOYOMBO LETTER JHA;Lo;0;L;;;;;N;;;;;
+11A65;SOYOMBO LETTER NYA;Lo;0;L;;;;;N;;;;;
+11A66;SOYOMBO LETTER TTA;Lo;0;L;;;;;N;;;;;
+11A67;SOYOMBO LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11A68;SOYOMBO LETTER DDA;Lo;0;L;;;;;N;;;;;
+11A69;SOYOMBO LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11A6A;SOYOMBO LETTER NNA;Lo;0;L;;;;;N;;;;;
+11A6B;SOYOMBO LETTER TA;Lo;0;L;;;;;N;;;;;
+11A6C;SOYOMBO LETTER THA;Lo;0;L;;;;;N;;;;;
+11A6D;SOYOMBO LETTER DA;Lo;0;L;;;;;N;;;;;
+11A6E;SOYOMBO LETTER DHA;Lo;0;L;;;;;N;;;;;
+11A6F;SOYOMBO LETTER NA;Lo;0;L;;;;;N;;;;;
+11A70;SOYOMBO LETTER PA;Lo;0;L;;;;;N;;;;;
+11A71;SOYOMBO LETTER PHA;Lo;0;L;;;;;N;;;;;
+11A72;SOYOMBO LETTER BA;Lo;0;L;;;;;N;;;;;
+11A73;SOYOMBO LETTER BHA;Lo;0;L;;;;;N;;;;;
+11A74;SOYOMBO LETTER MA;Lo;0;L;;;;;N;;;;;
+11A75;SOYOMBO LETTER TSA;Lo;0;L;;;;;N;;;;;
+11A76;SOYOMBO LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11A77;SOYOMBO LETTER DZA;Lo;0;L;;;;;N;;;;;
+11A78;SOYOMBO LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11A79;SOYOMBO LETTER ZA;Lo;0;L;;;;;N;;;;;
+11A7A;SOYOMBO LETTER -A;Lo;0;L;;;;;N;;;;;
+11A7B;SOYOMBO LETTER YA;Lo;0;L;;;;;N;;;;;
+11A7C;SOYOMBO LETTER RA;Lo;0;L;;;;;N;;;;;
+11A7D;SOYOMBO LETTER LA;Lo;0;L;;;;;N;;;;;
+11A7E;SOYOMBO LETTER VA;Lo;0;L;;;;;N;;;;;
+11A7F;SOYOMBO LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A80;SOYOMBO LETTER SSA;Lo;0;L;;;;;N;;;;;
+11A81;SOYOMBO LETTER SA;Lo;0;L;;;;;N;;;;;
+11A82;SOYOMBO LETTER HA;Lo;0;L;;;;;N;;;;;
+11A83;SOYOMBO LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11A84;SOYOMBO SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+11A85;SOYOMBO SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+11A86;SOYOMBO CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;;
+11A87;SOYOMBO CLUSTER-INITIAL LETTER LA;Lo;0;L;;;;;N;;;;;
+11A88;SOYOMBO CLUSTER-INITIAL LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A89;SOYOMBO CLUSTER-INITIAL LETTER SA;Lo;0;L;;;;;N;;;;;
+11A8A;SOYOMBO FINAL CONSONANT SIGN G;Mn;0;NSM;;;;;N;;;;;
+11A8B;SOYOMBO FINAL CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
+11A8C;SOYOMBO FINAL CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+11A8D;SOYOMBO FINAL CONSONANT SIGN D;Mn;0;NSM;;;;;N;;;;;
+11A8E;SOYOMBO FINAL CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+11A8F;SOYOMBO FINAL CONSONANT SIGN B;Mn;0;NSM;;;;;N;;;;;
+11A90;SOYOMBO FINAL CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
+11A91;SOYOMBO FINAL CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+11A92;SOYOMBO FINAL CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
+11A93;SOYOMBO FINAL CONSONANT SIGN SH;Mn;0;NSM;;;;;N;;;;;
+11A94;SOYOMBO FINAL CONSONANT SIGN S;Mn;0;NSM;;;;;N;;;;;
+11A95;SOYOMBO FINAL CONSONANT SIGN -A;Mn;0;NSM;;;;;N;;;;;
+11A96;SOYOMBO SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11A97;SOYOMBO SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11A98;SOYOMBO GEMINATION MARK;Mn;0;NSM;;;;;N;;;;;
+11A99;SOYOMBO SUBJOINER;Mn;9;NSM;;;;;N;;;;;
+11A9A;SOYOMBO MARK TSHEG;Po;0;L;;;;;N;;;;;
+11A9B;SOYOMBO MARK SHAD;Po;0;L;;;;;N;;;;;
+11A9C;SOYOMBO MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A9D;SOYOMBO MARK PLUTA;Lo;0;L;;;;;N;;;;;
+11A9E;SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME;Po;0;L;;;;;N;;;;;
+11A9F;SOYOMBO HEAD MARK WITH MOON AND SUN AND FLAME;Po;0;L;;;;;N;;;;;
+11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;;
+11AA1;SOYOMBO TERMINAL MARK-1;Po;0;L;;;;;N;;;;;
+11AA2;SOYOMBO TERMINAL MARK-2;Po;0;L;;;;;N;;;;;
+11AC0;PAU CIN HAU LETTER PA;Lo;0;L;;;;;N;;;;;
+11AC1;PAU CIN HAU LETTER KA;Lo;0;L;;;;;N;;;;;
+11AC2;PAU CIN HAU LETTER LA;Lo;0;L;;;;;N;;;;;
+11AC3;PAU CIN HAU LETTER MA;Lo;0;L;;;;;N;;;;;
+11AC4;PAU CIN HAU LETTER DA;Lo;0;L;;;;;N;;;;;
+11AC5;PAU CIN HAU LETTER ZA;Lo;0;L;;;;;N;;;;;
+11AC6;PAU CIN HAU LETTER VA;Lo;0;L;;;;;N;;;;;
+11AC7;PAU CIN HAU LETTER NGA;Lo;0;L;;;;;N;;;;;
+11AC8;PAU CIN HAU LETTER HA;Lo;0;L;;;;;N;;;;;
+11AC9;PAU CIN HAU LETTER GA;Lo;0;L;;;;;N;;;;;
+11ACA;PAU CIN HAU LETTER KHA;Lo;0;L;;;;;N;;;;;
+11ACB;PAU CIN HAU LETTER SA;Lo;0;L;;;;;N;;;;;
+11ACC;PAU CIN HAU LETTER BA;Lo;0;L;;;;;N;;;;;
+11ACD;PAU CIN HAU LETTER CA;Lo;0;L;;;;;N;;;;;
+11ACE;PAU CIN HAU LETTER TA;Lo;0;L;;;;;N;;;;;
+11ACF;PAU CIN HAU LETTER THA;Lo;0;L;;;;;N;;;;;
+11AD0;PAU CIN HAU LETTER NA;Lo;0;L;;;;;N;;;;;
+11AD1;PAU CIN HAU LETTER PHA;Lo;0;L;;;;;N;;;;;
+11AD2;PAU CIN HAU LETTER RA;Lo;0;L;;;;;N;;;;;
+11AD3;PAU CIN HAU LETTER FA;Lo;0;L;;;;;N;;;;;
+11AD4;PAU CIN HAU LETTER CHA;Lo;0;L;;;;;N;;;;;
+11AD5;PAU CIN HAU LETTER A;Lo;0;L;;;;;N;;;;;
+11AD6;PAU CIN HAU LETTER E;Lo;0;L;;;;;N;;;;;
+11AD7;PAU CIN HAU LETTER I;Lo;0;L;;;;;N;;;;;
+11AD8;PAU CIN HAU LETTER O;Lo;0;L;;;;;N;;;;;
+11AD9;PAU CIN HAU LETTER U;Lo;0;L;;;;;N;;;;;
+11ADA;PAU CIN HAU LETTER UA;Lo;0;L;;;;;N;;;;;
+11ADB;PAU CIN HAU LETTER IA;Lo;0;L;;;;;N;;;;;
+11ADC;PAU CIN HAU LETTER FINAL P;Lo;0;L;;;;;N;;;;;
+11ADD;PAU CIN HAU LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+11ADE;PAU CIN HAU LETTER FINAL T;Lo;0;L;;;;;N;;;;;
+11ADF;PAU CIN HAU LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+11AE0;PAU CIN HAU LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+11AE1;PAU CIN HAU LETTER FINAL L;Lo;0;L;;;;;N;;;;;
+11AE2;PAU CIN HAU LETTER FINAL W;Lo;0;L;;;;;N;;;;;
+11AE3;PAU CIN HAU LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+11AE4;PAU CIN HAU LETTER FINAL Y;Lo;0;L;;;;;N;;;;;
+11AE5;PAU CIN HAU RISING TONE LONG;Lo;0;L;;;;;N;;;;;
+11AE6;PAU CIN HAU RISING TONE;Lo;0;L;;;;;N;;;;;
+11AE7;PAU CIN HAU SANDHI GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+11AE8;PAU CIN HAU RISING TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AE9;PAU CIN HAU RISING TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AEA;PAU CIN HAU SANDHI GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;;
+11AEB;PAU CIN HAU SANDHI TONE LONG;Lo;0;L;;;;;N;;;;;
+11AEC;PAU CIN HAU SANDHI TONE;Lo;0;L;;;;;N;;;;;
+11AED;PAU CIN HAU SANDHI TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AEE;PAU CIN HAU SANDHI TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AEF;PAU CIN HAU MID-LEVEL TONE;Lo;0;L;;;;;N;;;;;
+11AF0;PAU CIN HAU GLOTTAL STOP VARIANT;Lo;0;L;;;;;N;;;;;
+11AF1;PAU CIN HAU MID-LEVEL TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AF2;PAU CIN HAU MID-LEVEL TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AF3;PAU CIN HAU LOW-FALLING TONE LONG;Lo;0;L;;;;;N;;;;;
+11AF4;PAU CIN HAU LOW-FALLING TONE;Lo;0;L;;;;;N;;;;;
+11AF5;PAU CIN HAU GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+11AF6;PAU CIN HAU LOW-FALLING TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AF7;PAU CIN HAU LOW-FALLING TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AF8;PAU CIN HAU GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;;
+11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;;
+11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;;
+11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;;
+11C03;BHAIKSUKI LETTER II;Lo;0;L;;;;;N;;;;;
+11C04;BHAIKSUKI LETTER U;Lo;0;L;;;;;N;;;;;
+11C05;BHAIKSUKI LETTER UU;Lo;0;L;;;;;N;;;;;
+11C06;BHAIKSUKI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11C07;BHAIKSUKI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11C08;BHAIKSUKI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11C0A;BHAIKSUKI LETTER E;Lo;0;L;;;;;N;;;;;
+11C0B;BHAIKSUKI LETTER AI;Lo;0;L;;;;;N;;;;;
+11C0C;BHAIKSUKI LETTER O;Lo;0;L;;;;;N;;;;;
+11C0D;BHAIKSUKI LETTER AU;Lo;0;L;;;;;N;;;;;
+11C0E;BHAIKSUKI LETTER KA;Lo;0;L;;;;;N;;;;;
+11C0F;BHAIKSUKI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11C10;BHAIKSUKI LETTER GA;Lo;0;L;;;;;N;;;;;
+11C11;BHAIKSUKI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11C12;BHAIKSUKI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11C13;BHAIKSUKI LETTER CA;Lo;0;L;;;;;N;;;;;
+11C14;BHAIKSUKI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11C15;BHAIKSUKI LETTER JA;Lo;0;L;;;;;N;;;;;
+11C16;BHAIKSUKI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11C17;BHAIKSUKI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11C18;BHAIKSUKI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11C19;BHAIKSUKI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11C1A;BHAIKSUKI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11C1B;BHAIKSUKI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11C1C;BHAIKSUKI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11C1D;BHAIKSUKI LETTER TA;Lo;0;L;;;;;N;;;;;
+11C1E;BHAIKSUKI LETTER THA;Lo;0;L;;;;;N;;;;;
+11C1F;BHAIKSUKI LETTER DA;Lo;0;L;;;;;N;;;;;
+11C20;BHAIKSUKI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11C21;BHAIKSUKI LETTER NA;Lo;0;L;;;;;N;;;;;
+11C22;BHAIKSUKI LETTER PA;Lo;0;L;;;;;N;;;;;
+11C23;BHAIKSUKI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11C24;BHAIKSUKI LETTER BA;Lo;0;L;;;;;N;;;;;
+11C25;BHAIKSUKI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11C26;BHAIKSUKI LETTER MA;Lo;0;L;;;;;N;;;;;
+11C27;BHAIKSUKI LETTER YA;Lo;0;L;;;;;N;;;;;
+11C28;BHAIKSUKI LETTER RA;Lo;0;L;;;;;N;;;;;
+11C29;BHAIKSUKI LETTER LA;Lo;0;L;;;;;N;;;;;
+11C2A;BHAIKSUKI LETTER VA;Lo;0;L;;;;;N;;;;;
+11C2B;BHAIKSUKI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11C2C;BHAIKSUKI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11C2D;BHAIKSUKI LETTER SA;Lo;0;L;;;;;N;;;;;
+11C2E;BHAIKSUKI LETTER HA;Lo;0;L;;;;;N;;;;;
+11C2F;BHAIKSUKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11C30;BHAIKSUKI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11C31;BHAIKSUKI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11C32;BHAIKSUKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11C33;BHAIKSUKI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11C34;BHAIKSUKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11C35;BHAIKSUKI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11C36;BHAIKSUKI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11C38;BHAIKSUKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11C39;BHAIKSUKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11C3A;BHAIKSUKI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11C3B;BHAIKSUKI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11C3C;BHAIKSUKI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11C3D;BHAIKSUKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11C3E;BHAIKSUKI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11C3F;BHAIKSUKI SIGN VIRAMA;Mn;9;L;;;;;N;;;;;
+11C40;BHAIKSUKI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+11C41;BHAIKSUKI DANDA;Po;0;L;;;;;N;;;;;
+11C42;BHAIKSUKI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11C43;BHAIKSUKI WORD SEPARATOR;Po;0;L;;;;;N;;;;;
+11C44;BHAIKSUKI GAP FILLER-1;Po;0;L;;;;;N;;;;;
+11C45;BHAIKSUKI GAP FILLER-2;Po;0;L;;;;;N;;;;;
+11C50;BHAIKSUKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11C51;BHAIKSUKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11C52;BHAIKSUKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11C53;BHAIKSUKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11C54;BHAIKSUKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11C55;BHAIKSUKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11C56;BHAIKSUKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11C57;BHAIKSUKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11C58;BHAIKSUKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11C59;BHAIKSUKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11C5A;BHAIKSUKI NUMBER ONE;No;0;L;;;;1;N;;;;;
+11C5B;BHAIKSUKI NUMBER TWO;No;0;L;;;;2;N;;;;;
+11C5C;BHAIKSUKI NUMBER THREE;No;0;L;;;;3;N;;;;;
+11C5D;BHAIKSUKI NUMBER FOUR;No;0;L;;;;4;N;;;;;
+11C5E;BHAIKSUKI NUMBER FIVE;No;0;L;;;;5;N;;;;;
+11C5F;BHAIKSUKI NUMBER SIX;No;0;L;;;;6;N;;;;;
+11C60;BHAIKSUKI NUMBER SEVEN;No;0;L;;;;7;N;;;;;
+11C61;BHAIKSUKI NUMBER EIGHT;No;0;L;;;;8;N;;;;;
+11C62;BHAIKSUKI NUMBER NINE;No;0;L;;;;9;N;;;;;
+11C63;BHAIKSUKI NUMBER TEN;No;0;L;;;;10;N;;;;;
+11C64;BHAIKSUKI NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+11C65;BHAIKSUKI NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+11C66;BHAIKSUKI NUMBER FORTY;No;0;L;;;;40;N;;;;;
+11C67;BHAIKSUKI NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+11C68;BHAIKSUKI NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+11C69;BHAIKSUKI NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+11C6A;BHAIKSUKI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+11C6B;BHAIKSUKI NUMBER NINETY;No;0;L;;;;90;N;;;;;
+11C6C;BHAIKSUKI HUNDREDS UNIT MARK;No;0;L;;;;100;N;;;;;
+11C70;MARCHEN HEAD MARK;Po;0;L;;;;;N;;;;;
+11C71;MARCHEN MARK SHAD;Po;0;L;;;;;N;;;;;
+11C72;MARCHEN LETTER KA;Lo;0;L;;;;;N;;;;;
+11C73;MARCHEN LETTER KHA;Lo;0;L;;;;;N;;;;;
+11C74;MARCHEN LETTER GA;Lo;0;L;;;;;N;;;;;
+11C75;MARCHEN LETTER NGA;Lo;0;L;;;;;N;;;;;
+11C76;MARCHEN LETTER CA;Lo;0;L;;;;;N;;;;;
+11C77;MARCHEN LETTER CHA;Lo;0;L;;;;;N;;;;;
+11C78;MARCHEN LETTER JA;Lo;0;L;;;;;N;;;;;
+11C79;MARCHEN LETTER NYA;Lo;0;L;;;;;N;;;;;
+11C7A;MARCHEN LETTER TA;Lo;0;L;;;;;N;;;;;
+11C7B;MARCHEN LETTER THA;Lo;0;L;;;;;N;;;;;
+11C7C;MARCHEN LETTER DA;Lo;0;L;;;;;N;;;;;
+11C7D;MARCHEN LETTER NA;Lo;0;L;;;;;N;;;;;
+11C7E;MARCHEN LETTER PA;Lo;0;L;;;;;N;;;;;
+11C7F;MARCHEN LETTER PHA;Lo;0;L;;;;;N;;;;;
+11C80;MARCHEN LETTER BA;Lo;0;L;;;;;N;;;;;
+11C81;MARCHEN LETTER MA;Lo;0;L;;;;;N;;;;;
+11C82;MARCHEN LETTER TSA;Lo;0;L;;;;;N;;;;;
+11C83;MARCHEN LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11C84;MARCHEN LETTER DZA;Lo;0;L;;;;;N;;;;;
+11C85;MARCHEN LETTER WA;Lo;0;L;;;;;N;;;;;
+11C86;MARCHEN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11C87;MARCHEN LETTER ZA;Lo;0;L;;;;;N;;;;;
+11C88;MARCHEN LETTER -A;Lo;0;L;;;;;N;;;;;
+11C89;MARCHEN LETTER YA;Lo;0;L;;;;;N;;;;;
+11C8A;MARCHEN LETTER RA;Lo;0;L;;;;;N;;;;;
+11C8B;MARCHEN LETTER LA;Lo;0;L;;;;;N;;;;;
+11C8C;MARCHEN LETTER SHA;Lo;0;L;;;;;N;;;;;
+11C8D;MARCHEN LETTER SA;Lo;0;L;;;;;N;;;;;
+11C8E;MARCHEN LETTER HA;Lo;0;L;;;;;N;;;;;
+11C8F;MARCHEN LETTER A;Lo;0;L;;;;;N;;;;;
+11C92;MARCHEN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
+11C93;MARCHEN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
+11C94;MARCHEN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
+11C95;MARCHEN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
+11C96;MARCHEN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
+11C97;MARCHEN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
+11C98;MARCHEN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
+11C99;MARCHEN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
+11C9A;MARCHEN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
+11C9B;MARCHEN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
+11C9C;MARCHEN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
+11C9D;MARCHEN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
+11C9E;MARCHEN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
+11C9F;MARCHEN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
+11CA0;MARCHEN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
+11CA1;MARCHEN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
+11CA2;MARCHEN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
+11CA3;MARCHEN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
+11CA4;MARCHEN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
+11CA5;MARCHEN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;;
+11CA6;MARCHEN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
+11CA7;MARCHEN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
+11CA9;MARCHEN SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+11CAA;MARCHEN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;;
+11CAB;MARCHEN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
+11CAC;MARCHEN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
+11CAD;MARCHEN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
+11CAE;MARCHEN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
+11CAF;MARCHEN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
+11CB0;MARCHEN VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11CB1;MARCHEN VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11CB2;MARCHEN VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11CB3;MARCHEN VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11CB4;MARCHEN VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11CB5;MARCHEN SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11CB6;MARCHEN SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11D00;MASARAM GONDI LETTER A;Lo;0;L;;;;;N;;;;;
+11D01;MASARAM GONDI LETTER AA;Lo;0;L;;;;;N;;;;;
+11D02;MASARAM GONDI LETTER I;Lo;0;L;;;;;N;;;;;
+11D03;MASARAM GONDI LETTER II;Lo;0;L;;;;;N;;;;;
+11D04;MASARAM GONDI LETTER U;Lo;0;L;;;;;N;;;;;
+11D05;MASARAM GONDI LETTER UU;Lo;0;L;;;;;N;;;;;
+11D06;MASARAM GONDI LETTER E;Lo;0;L;;;;;N;;;;;
+11D08;MASARAM GONDI LETTER AI;Lo;0;L;;;;;N;;;;;
+11D09;MASARAM GONDI LETTER O;Lo;0;L;;;;;N;;;;;
+11D0B;MASARAM GONDI LETTER AU;Lo;0;L;;;;;N;;;;;
+11D0C;MASARAM GONDI LETTER KA;Lo;0;L;;;;;N;;;;;
+11D0D;MASARAM GONDI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11D0E;MASARAM GONDI LETTER GA;Lo;0;L;;;;;N;;;;;
+11D0F;MASARAM GONDI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11D10;MASARAM GONDI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11D11;MASARAM GONDI LETTER CA;Lo;0;L;;;;;N;;;;;
+11D12;MASARAM GONDI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11D13;MASARAM GONDI LETTER JA;Lo;0;L;;;;;N;;;;;
+11D14;MASARAM GONDI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11D15;MASARAM GONDI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11D16;MASARAM GONDI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11D17;MASARAM GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11D18;MASARAM GONDI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11D19;MASARAM GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11D1A;MASARAM GONDI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11D1B;MASARAM GONDI LETTER TA;Lo;0;L;;;;;N;;;;;
+11D1C;MASARAM GONDI LETTER THA;Lo;0;L;;;;;N;;;;;
+11D1D;MASARAM GONDI LETTER DA;Lo;0;L;;;;;N;;;;;
+11D1E;MASARAM GONDI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11D1F;MASARAM GONDI LETTER NA;Lo;0;L;;;;;N;;;;;
+11D20;MASARAM GONDI LETTER PA;Lo;0;L;;;;;N;;;;;
+11D21;MASARAM GONDI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11D22;MASARAM GONDI LETTER BA;Lo;0;L;;;;;N;;;;;
+11D23;MASARAM GONDI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11D24;MASARAM GONDI LETTER MA;Lo;0;L;;;;;N;;;;;
+11D25;MASARAM GONDI LETTER YA;Lo;0;L;;;;;N;;;;;
+11D26;MASARAM GONDI LETTER RA;Lo;0;L;;;;;N;;;;;
+11D27;MASARAM GONDI LETTER LA;Lo;0;L;;;;;N;;;;;
+11D28;MASARAM GONDI LETTER VA;Lo;0;L;;;;;N;;;;;
+11D29;MASARAM GONDI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11D2A;MASARAM GONDI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11D2B;MASARAM GONDI LETTER SA;Lo;0;L;;;;;N;;;;;
+11D2C;MASARAM GONDI LETTER HA;Lo;0;L;;;;;N;;;;;
+11D2D;MASARAM GONDI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11D2E;MASARAM GONDI LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11D2F;MASARAM GONDI LETTER JNYA;Lo;0;L;;;;;N;;;;;
+11D30;MASARAM GONDI LETTER TRA;Lo;0;L;;;;;N;;;;;
+11D31;MASARAM GONDI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11D32;MASARAM GONDI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11D33;MASARAM GONDI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11D34;MASARAM GONDI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11D35;MASARAM GONDI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11D36;MASARAM GONDI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11D3A;MASARAM GONDI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11D3C;MASARAM GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11D3D;MASARAM GONDI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11D3F;MASARAM GONDI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11D40;MASARAM GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11D41;MASARAM GONDI SIGN VISARGA;Mn;0;NSM;;;;;N;;;;;
+11D42;MASARAM GONDI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11D43;MASARAM GONDI SIGN CANDRA;Mn;0;NSM;;;;;N;;;;;
+11D44;MASARAM GONDI SIGN HALANTA;Mn;9;NSM;;;;;N;;;;;
+11D45;MASARAM GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11D46;MASARAM GONDI REPHA;Lo;0;L;;;;;N;;;;;
+11D47;MASARAM GONDI RA-KARA;Mn;0;NSM;;;;;N;;;;;
+11D50;MASARAM GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11D51;MASARAM GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11D52;MASARAM GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11D53;MASARAM GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11D54;MASARAM GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11D55;MASARAM GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11D56;MASARAM GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11D57;MASARAM GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11D58;MASARAM GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11D59;MASARAM GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11D60;GUNJALA GONDI LETTER A;Lo;0;L;;;;;N;;;;;
+11D61;GUNJALA GONDI LETTER AA;Lo;0;L;;;;;N;;;;;
+11D62;GUNJALA GONDI LETTER I;Lo;0;L;;;;;N;;;;;
+11D63;GUNJALA GONDI LETTER II;Lo;0;L;;;;;N;;;;;
+11D64;GUNJALA GONDI LETTER U;Lo;0;L;;;;;N;;;;;
+11D65;GUNJALA GONDI LETTER UU;Lo;0;L;;;;;N;;;;;
+11D67;GUNJALA GONDI LETTER EE;Lo;0;L;;;;;N;;;;;
+11D68;GUNJALA GONDI LETTER AI;Lo;0;L;;;;;N;;;;;
+11D6A;GUNJALA GONDI LETTER OO;Lo;0;L;;;;;N;;;;;
+11D6B;GUNJALA GONDI LETTER AU;Lo;0;L;;;;;N;;;;;
+11D6C;GUNJALA GONDI LETTER YA;Lo;0;L;;;;;N;;;;;
+11D6D;GUNJALA GONDI LETTER VA;Lo;0;L;;;;;N;;;;;
+11D6E;GUNJALA GONDI LETTER BA;Lo;0;L;;;;;N;;;;;
+11D6F;GUNJALA GONDI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11D70;GUNJALA GONDI LETTER MA;Lo;0;L;;;;;N;;;;;
+11D71;GUNJALA GONDI LETTER KA;Lo;0;L;;;;;N;;;;;
+11D72;GUNJALA GONDI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11D73;GUNJALA GONDI LETTER TA;Lo;0;L;;;;;N;;;;;
+11D74;GUNJALA GONDI LETTER THA;Lo;0;L;;;;;N;;;;;
+11D75;GUNJALA GONDI LETTER LA;Lo;0;L;;;;;N;;;;;
+11D76;GUNJALA GONDI LETTER GA;Lo;0;L;;;;;N;;;;;
+11D77;GUNJALA GONDI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11D78;GUNJALA GONDI LETTER DA;Lo;0;L;;;;;N;;;;;
+11D79;GUNJALA GONDI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11D7A;GUNJALA GONDI LETTER NA;Lo;0;L;;;;;N;;;;;
+11D7B;GUNJALA GONDI LETTER CA;Lo;0;L;;;;;N;;;;;
+11D7C;GUNJALA GONDI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11D7D;GUNJALA GONDI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11D7E;GUNJALA GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11D7F;GUNJALA GONDI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11D80;GUNJALA GONDI LETTER JA;Lo;0;L;;;;;N;;;;;
+11D81;GUNJALA GONDI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11D82;GUNJALA GONDI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11D83;GUNJALA GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11D84;GUNJALA GONDI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11D85;GUNJALA GONDI LETTER PA;Lo;0;L;;;;;N;;;;;
+11D86;GUNJALA GONDI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11D87;GUNJALA GONDI LETTER HA;Lo;0;L;;;;;N;;;;;
+11D88;GUNJALA GONDI LETTER RA;Lo;0;L;;;;;N;;;;;
+11D89;GUNJALA GONDI LETTER SA;Lo;0;L;;;;;N;;;;;
+11D8A;GUNJALA GONDI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11D8B;GUNJALA GONDI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11D8C;GUNJALA GONDI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11D8D;GUNJALA GONDI VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+11D8E;GUNJALA GONDI VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+11D90;GUNJALA GONDI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+11D91;GUNJALA GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11D93;GUNJALA GONDI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+11D94;GUNJALA GONDI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11D95;GUNJALA GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11D96;GUNJALA GONDI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11D97;GUNJALA GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11D98;GUNJALA GONDI OM;Lo;0;L;;;;;N;;;;;
+11DA0;GUNJALA GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11DA1;GUNJALA GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11DA2;GUNJALA GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11DA3;GUNJALA GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11DA4;GUNJALA GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11DA5;GUNJALA GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11DA6;GUNJALA GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11DA7;GUNJALA GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11DA8;GUNJALA GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11DA9;GUNJALA GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11EE0;MAKASAR LETTER KA;Lo;0;L;;;;;N;;;;;
+11EE1;MAKASAR LETTER GA;Lo;0;L;;;;;N;;;;;
+11EE2;MAKASAR LETTER NGA;Lo;0;L;;;;;N;;;;;
+11EE3;MAKASAR LETTER PA;Lo;0;L;;;;;N;;;;;
+11EE4;MAKASAR LETTER BA;Lo;0;L;;;;;N;;;;;
+11EE5;MAKASAR LETTER MA;Lo;0;L;;;;;N;;;;;
+11EE6;MAKASAR LETTER TA;Lo;0;L;;;;;N;;;;;
+11EE7;MAKASAR LETTER DA;Lo;0;L;;;;;N;;;;;
+11EE8;MAKASAR LETTER NA;Lo;0;L;;;;;N;;;;;
+11EE9;MAKASAR LETTER CA;Lo;0;L;;;;;N;;;;;
+11EEA;MAKASAR LETTER JA;Lo;0;L;;;;;N;;;;;
+11EEB;MAKASAR LETTER NYA;Lo;0;L;;;;;N;;;;;
+11EEC;MAKASAR LETTER YA;Lo;0;L;;;;;N;;;;;
+11EED;MAKASAR LETTER RA;Lo;0;L;;;;;N;;;;;
+11EEE;MAKASAR LETTER LA;Lo;0;L;;;;;N;;;;;
+11EEF;MAKASAR LETTER VA;Lo;0;L;;;;;N;;;;;
+11EF0;MAKASAR LETTER SA;Lo;0;L;;;;;N;;;;;
+11EF1;MAKASAR LETTER A;Lo;0;L;;;;;N;;;;;
+11EF2;MAKASAR ANGKA;Lo;0;L;;;;;N;;;;;
+11EF3;MAKASAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11EF4;MAKASAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11EF5;MAKASAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11EF6;MAKASAR VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11EF7;MAKASAR PASSIMBANG;Po;0;L;;;;;N;;;;;
+11EF8;MAKASAR END OF SECTION;Po;0;L;;;;;N;;;;;
+11FB0;LISU LETTER YHA;Lo;0;L;;;;;N;;;;;
+11FC0;TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH;No;0;L;;;;1/320;N;;;;;
+11FC1;TAMIL FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;;
+11FC2;TAMIL FRACTION ONE EIGHTIETH;No;0;L;;;;1/80;N;;;;;
+11FC3;TAMIL FRACTION ONE SIXTY-FOURTH;No;0;L;;;;1/64;N;;;;;
+11FC4;TAMIL FRACTION ONE FORTIETH;No;0;L;;;;1/40;N;;;;;
+11FC5;TAMIL FRACTION ONE THIRTY-SECOND;No;0;L;;;;1/32;N;;;;;
+11FC6;TAMIL FRACTION THREE EIGHTIETHS;No;0;L;;;;3/80;N;;;;;
+11FC7;TAMIL FRACTION THREE SIXTY-FOURTHS;No;0;L;;;;3/64;N;;;;;
+11FC8;TAMIL FRACTION ONE TWENTIETH;No;0;L;;;;1/20;N;;;;;
+11FC9;TAMIL FRACTION ONE SIXTEENTH-1;No;0;L;;;;1/16;N;;;;;
+11FCA;TAMIL FRACTION ONE SIXTEENTH-2;No;0;L;;;;1/16;N;;;;;
+11FCB;TAMIL FRACTION ONE TENTH;No;0;L;;;;1/10;N;;;;;
+11FCC;TAMIL FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+11FCD;TAMIL FRACTION THREE TWENTIETHS;No;0;L;;;;3/20;N;;;;;
+11FCE;TAMIL FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+11FCF;TAMIL FRACTION ONE FIFTH;No;0;L;;;;1/5;N;;;;;
+11FD0;TAMIL FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+11FD1;TAMIL FRACTION ONE HALF-1;No;0;L;;;;1/2;N;;;;;
+11FD2;TAMIL FRACTION ONE HALF-2;No;0;L;;;;1/2;N;;;;;
+11FD3;TAMIL FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+11FD4;TAMIL FRACTION DOWNSCALING FACTOR KIIZH;No;0;L;;;;1/320;N;;;;;
+11FD5;TAMIL SIGN NEL;So;0;ON;;;;;N;;;;;
+11FD6;TAMIL SIGN CEVITU;So;0;ON;;;;;N;;;;;
+11FD7;TAMIL SIGN AAZHAAKKU;So;0;ON;;;;;N;;;;;
+11FD8;TAMIL SIGN UZHAKKU;So;0;ON;;;;;N;;;;;
+11FD9;TAMIL SIGN MUUVUZHAKKU;So;0;ON;;;;;N;;;;;
+11FDA;TAMIL SIGN KURUNI;So;0;ON;;;;;N;;;;;
+11FDB;TAMIL SIGN PATHAKKU;So;0;ON;;;;;N;;;;;
+11FDC;TAMIL SIGN MUKKURUNI;So;0;ON;;;;;N;;;;;
+11FDD;TAMIL SIGN KAACU;Sc;0;ET;;;;;N;;;;;
+11FDE;TAMIL SIGN PANAM;Sc;0;ET;;;;;N;;;;;
+11FDF;TAMIL SIGN PON;Sc;0;ET;;;;;N;;;;;
+11FE0;TAMIL SIGN VARAAKAN;Sc;0;ET;;;;;N;;;;;
+11FE1;TAMIL SIGN PAARAM;So;0;ON;;;;;N;;;;;
+11FE2;TAMIL SIGN KUZHI;So;0;ON;;;;;N;;;;;
+11FE3;TAMIL SIGN VELI;So;0;ON;;;;;N;;;;;
+11FE4;TAMIL WET CULTIVATION SIGN;So;0;ON;;;;;N;;;;;
+11FE5;TAMIL DRY CULTIVATION SIGN;So;0;ON;;;;;N;;;;;
+11FE6;TAMIL LAND SIGN;So;0;ON;;;;;N;;;;;
+11FE7;TAMIL SALT PAN SIGN;So;0;ON;;;;;N;;;;;
+11FE8;TAMIL TRADITIONAL CREDIT SIGN;So;0;ON;;;;;N;;;;;
+11FE9;TAMIL TRADITIONAL NUMBER SIGN;So;0;ON;;;;;N;;;;;
+11FEA;TAMIL CURRENT SIGN;So;0;ON;;;;;N;;;;;
+11FEB;TAMIL AND ODD SIGN;So;0;ON;;;;;N;;;;;
+11FEC;TAMIL SPENT SIGN;So;0;ON;;;;;N;;;;;
+11FED;TAMIL TOTAL SIGN;So;0;ON;;;;;N;;;;;
+11FEE;TAMIL IN POSSESSION SIGN;So;0;ON;;;;;N;;;;;
+11FEF;TAMIL STARTING FROM SIGN;So;0;ON;;;;;N;;;;;
+11FF0;TAMIL SIGN MUTHALIYA;So;0;ON;;;;;N;;;;;
+11FF1;TAMIL SIGN VAKAIYARAA;So;0;ON;;;;;N;;;;;
+11FFF;TAMIL PUNCTUATION END OF TEXT;Po;0;L;;;;;N;;;;;
+12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
+12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
+12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
+12003;CUNEIFORM SIGN A TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12004;CUNEIFORM SIGN A TIMES HA;Lo;0;L;;;;;N;;;;;
+12005;CUNEIFORM SIGN A TIMES IGI;Lo;0;L;;;;;N;;;;;
+12006;CUNEIFORM SIGN A TIMES LAGAR GUNU;Lo;0;L;;;;;N;;;;;
+12007;CUNEIFORM SIGN A TIMES MUSH;Lo;0;L;;;;;N;;;;;
+12008;CUNEIFORM SIGN A TIMES SAG;Lo;0;L;;;;;N;;;;;
+12009;CUNEIFORM SIGN A2;Lo;0;L;;;;;N;;;;;
+1200A;CUNEIFORM SIGN AB;Lo;0;L;;;;;N;;;;;
+1200B;CUNEIFORM SIGN AB TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1200C;CUNEIFORM SIGN AB TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+1200D;CUNEIFORM SIGN AB TIMES GAL;Lo;0;L;;;;;N;;;;;
+1200E;CUNEIFORM SIGN AB TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1200F;CUNEIFORM SIGN AB TIMES HA;Lo;0;L;;;;;N;;;;;
+12010;CUNEIFORM SIGN AB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12011;CUNEIFORM SIGN AB TIMES IMIN;Lo;0;L;;;;;N;;;;;
+12012;CUNEIFORM SIGN AB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+12013;CUNEIFORM SIGN AB TIMES SHESH;Lo;0;L;;;;;N;;;;;
+12014;CUNEIFORM SIGN AB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+12015;CUNEIFORM SIGN AB GUNU;Lo;0;L;;;;;N;;;;;
+12016;CUNEIFORM SIGN AB2;Lo;0;L;;;;;N;;;;;
+12017;CUNEIFORM SIGN AB2 TIMES BALAG;Lo;0;L;;;;;N;;;;;
+12018;CUNEIFORM SIGN AB2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12019;CUNEIFORM SIGN AB2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+1201A;CUNEIFORM SIGN AB2 TIMES SHA3;Lo;0;L;;;;;N;;;;;
+1201B;CUNEIFORM SIGN AB2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1201C;CUNEIFORM SIGN AD;Lo;0;L;;;;;N;;;;;
+1201D;CUNEIFORM SIGN AK;Lo;0;L;;;;;N;;;;;
+1201E;CUNEIFORM SIGN AK TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+1201F;CUNEIFORM SIGN AK TIMES SHITA PLUS GISH;Lo;0;L;;;;;N;;;;;
+12020;CUNEIFORM SIGN AL;Lo;0;L;;;;;N;;;;;
+12021;CUNEIFORM SIGN AL TIMES AL;Lo;0;L;;;;;N;;;;;
+12022;CUNEIFORM SIGN AL TIMES DIM2;Lo;0;L;;;;;N;;;;;
+12023;CUNEIFORM SIGN AL TIMES GISH;Lo;0;L;;;;;N;;;;;
+12024;CUNEIFORM SIGN AL TIMES HA;Lo;0;L;;;;;N;;;;;
+12025;CUNEIFORM SIGN AL TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12026;CUNEIFORM SIGN AL TIMES KI;Lo;0;L;;;;;N;;;;;
+12027;CUNEIFORM SIGN AL TIMES SHE;Lo;0;L;;;;;N;;;;;
+12028;CUNEIFORM SIGN AL TIMES USH;Lo;0;L;;;;;N;;;;;
+12029;CUNEIFORM SIGN ALAN;Lo;0;L;;;;;N;;;;;
+1202A;CUNEIFORM SIGN ALEPH;Lo;0;L;;;;;N;;;;;
+1202B;CUNEIFORM SIGN AMAR;Lo;0;L;;;;;N;;;;;
+1202C;CUNEIFORM SIGN AMAR TIMES SHE;Lo;0;L;;;;;N;;;;;
+1202D;CUNEIFORM SIGN AN;Lo;0;L;;;;;N;;;;;
+1202E;CUNEIFORM SIGN AN OVER AN;Lo;0;L;;;;;N;;;;;
+1202F;CUNEIFORM SIGN AN THREE TIMES;Lo;0;L;;;;;N;;;;;
+12030;CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA;Lo;0;L;;;;;N;;;;;
+12031;CUNEIFORM SIGN AN PLUS NAGA SQUARED;Lo;0;L;;;;;N;;;;;
+12032;CUNEIFORM SIGN ANSHE;Lo;0;L;;;;;N;;;;;
+12033;CUNEIFORM SIGN APIN;Lo;0;L;;;;;N;;;;;
+12034;CUNEIFORM SIGN ARAD;Lo;0;L;;;;;N;;;;;
+12035;CUNEIFORM SIGN ARAD TIMES KUR;Lo;0;L;;;;;N;;;;;
+12036;CUNEIFORM SIGN ARKAB;Lo;0;L;;;;;N;;;;;
+12037;CUNEIFORM SIGN ASAL2;Lo;0;L;;;;;N;;;;;
+12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;;N;;;;;
+12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+1203A;CUNEIFORM SIGN ASH KABA TENU;Lo;0;L;;;;;N;;;;;
+1203B;CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP;Lo;0;L;;;;;N;;;;;
+1203C;CUNEIFORM SIGN ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
+1203D;CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
+1203E;CUNEIFORM SIGN ASH2;Lo;0;L;;;;;N;;;;;
+1203F;CUNEIFORM SIGN ASHGAB;Lo;0;L;;;;;N;;;;;
+12040;CUNEIFORM SIGN BA;Lo;0;L;;;;;N;;;;;
+12041;CUNEIFORM SIGN BAD;Lo;0;L;;;;;N;;;;;
+12042;CUNEIFORM SIGN BAG3;Lo;0;L;;;;;N;;;;;
+12043;CUNEIFORM SIGN BAHAR2;Lo;0;L;;;;;N;;;;;
+12044;CUNEIFORM SIGN BAL;Lo;0;L;;;;;N;;;;;
+12045;CUNEIFORM SIGN BAL OVER BAL;Lo;0;L;;;;;N;;;;;
+12046;CUNEIFORM SIGN BALAG;Lo;0;L;;;;;N;;;;;
+12047;CUNEIFORM SIGN BAR;Lo;0;L;;;;;N;;;;;
+12048;CUNEIFORM SIGN BARA2;Lo;0;L;;;;;N;;;;;
+12049;CUNEIFORM SIGN BI;Lo;0;L;;;;;N;;;;;
+1204A;CUNEIFORM SIGN BI TIMES A;Lo;0;L;;;;;N;;;;;
+1204B;CUNEIFORM SIGN BI TIMES GAR;Lo;0;L;;;;;N;;;;;
+1204C;CUNEIFORM SIGN BI TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1204D;CUNEIFORM SIGN BU;Lo;0;L;;;;;N;;;;;
+1204E;CUNEIFORM SIGN BU OVER BU AB;Lo;0;L;;;;;N;;;;;
+1204F;CUNEIFORM SIGN BU OVER BU UN;Lo;0;L;;;;;N;;;;;
+12050;CUNEIFORM SIGN BU CROSSING BU;Lo;0;L;;;;;N;;;;;
+12051;CUNEIFORM SIGN BULUG;Lo;0;L;;;;;N;;;;;
+12052;CUNEIFORM SIGN BULUG OVER BULUG;Lo;0;L;;;;;N;;;;;
+12053;CUNEIFORM SIGN BUR;Lo;0;L;;;;;N;;;;;
+12054;CUNEIFORM SIGN BUR2;Lo;0;L;;;;;N;;;;;
+12055;CUNEIFORM SIGN DA;Lo;0;L;;;;;N;;;;;
+12056;CUNEIFORM SIGN DAG;Lo;0;L;;;;;N;;;;;
+12057;CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH;Lo;0;L;;;;;N;;;;;
+12058;CUNEIFORM SIGN DAG KISIM5 TIMES AMAR;Lo;0;L;;;;;N;;;;;
+12059;CUNEIFORM SIGN DAG KISIM5 TIMES BALAG;Lo;0;L;;;;;N;;;;;
+1205A;CUNEIFORM SIGN DAG KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
+1205B;CUNEIFORM SIGN DAG KISIM5 TIMES GA;Lo;0;L;;;;;N;;;;;
+1205C;CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH;Lo;0;L;;;;;N;;;;;
+1205D;CUNEIFORM SIGN DAG KISIM5 TIMES GI;Lo;0;L;;;;;N;;;;;
+1205E;CUNEIFORM SIGN DAG KISIM5 TIMES GIR2;Lo;0;L;;;;;N;;;;;
+1205F;CUNEIFORM SIGN DAG KISIM5 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12060;CUNEIFORM SIGN DAG KISIM5 TIMES HA;Lo;0;L;;;;;N;;;;;
+12061;CUNEIFORM SIGN DAG KISIM5 TIMES IR;Lo;0;L;;;;;N;;;;;
+12062;CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU;Lo;0;L;;;;;N;;;;;
+12063;CUNEIFORM SIGN DAG KISIM5 TIMES KAK;Lo;0;L;;;;;N;;;;;
+12064;CUNEIFORM SIGN DAG KISIM5 TIMES LA;Lo;0;L;;;;;N;;;;;
+12065;CUNEIFORM SIGN DAG KISIM5 TIMES LU;Lo;0;L;;;;;N;;;;;
+12066;CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2;Lo;0;L;;;;;N;;;;;
+12067;CUNEIFORM SIGN DAG KISIM5 TIMES LUM;Lo;0;L;;;;;N;;;;;
+12068;CUNEIFORM SIGN DAG KISIM5 TIMES NE;Lo;0;L;;;;;N;;;;;
+12069;CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;;
+1206A;CUNEIFORM SIGN DAG KISIM5 TIMES SI;Lo;0;L;;;;;N;;;;;
+1206B;CUNEIFORM SIGN DAG KISIM5 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1206C;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2;Lo;0;L;;;;;N;;;;;
+1206D;CUNEIFORM SIGN DAG KISIM5 TIMES USH;Lo;0;L;;;;;N;;;;;
+1206E;CUNEIFORM SIGN DAM;Lo;0;L;;;;;N;;;;;
+1206F;CUNEIFORM SIGN DAR;Lo;0;L;;;;;N;;;;;
+12070;CUNEIFORM SIGN DARA3;Lo;0;L;;;;;N;;;;;
+12071;CUNEIFORM SIGN DARA4;Lo;0;L;;;;;N;;;;;
+12072;CUNEIFORM SIGN DI;Lo;0;L;;;;;N;;;;;
+12073;CUNEIFORM SIGN DIB;Lo;0;L;;;;;N;;;;;
+12074;CUNEIFORM SIGN DIM;Lo;0;L;;;;;N;;;;;
+12075;CUNEIFORM SIGN DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
+12076;CUNEIFORM SIGN DIM2;Lo;0;L;;;;;N;;;;;
+12077;CUNEIFORM SIGN DIN;Lo;0;L;;;;;N;;;;;
+12078;CUNEIFORM SIGN DIN KASKAL U GUNU DISH;Lo;0;L;;;;;N;;;;;
+12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;;N;;;;;
+1207A;CUNEIFORM SIGN DU;Lo;0;L;;;;;N;;;;;
+1207B;CUNEIFORM SIGN DU OVER DU;Lo;0;L;;;;;N;;;;;
+1207C;CUNEIFORM SIGN DU GUNU;Lo;0;L;;;;;N;;;;;
+1207D;CUNEIFORM SIGN DU SHESHIG;Lo;0;L;;;;;N;;;;;
+1207E;CUNEIFORM SIGN DUB;Lo;0;L;;;;;N;;;;;
+1207F;CUNEIFORM SIGN DUB TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12080;CUNEIFORM SIGN DUB2;Lo;0;L;;;;;N;;;;;
+12081;CUNEIFORM SIGN DUG;Lo;0;L;;;;;N;;;;;
+12082;CUNEIFORM SIGN DUGUD;Lo;0;L;;;;;N;;;;;
+12083;CUNEIFORM SIGN DUH;Lo;0;L;;;;;N;;;;;
+12084;CUNEIFORM SIGN DUN;Lo;0;L;;;;;N;;;;;
+12085;CUNEIFORM SIGN DUN3;Lo;0;L;;;;;N;;;;;
+12086;CUNEIFORM SIGN DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+12087;CUNEIFORM SIGN DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+12088;CUNEIFORM SIGN DUN4;Lo;0;L;;;;;N;;;;;
+12089;CUNEIFORM SIGN DUR2;Lo;0;L;;;;;N;;;;;
+1208A;CUNEIFORM SIGN E;Lo;0;L;;;;;N;;;;;
+1208B;CUNEIFORM SIGN E TIMES PAP;Lo;0;L;;;;;N;;;;;
+1208C;CUNEIFORM SIGN E OVER E NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+1208D;CUNEIFORM SIGN E2;Lo;0;L;;;;;N;;;;;
+1208E;CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA;Lo;0;L;;;;;N;;;;;
+1208F;CUNEIFORM SIGN E2 TIMES GAR;Lo;0;L;;;;;N;;;;;
+12090;CUNEIFORM SIGN E2 TIMES MI;Lo;0;L;;;;;N;;;;;
+12091;CUNEIFORM SIGN E2 TIMES SAL;Lo;0;L;;;;;N;;;;;
+12092;CUNEIFORM SIGN E2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+12093;CUNEIFORM SIGN E2 TIMES U;Lo;0;L;;;;;N;;;;;
+12094;CUNEIFORM SIGN EDIN;Lo;0;L;;;;;N;;;;;
+12095;CUNEIFORM SIGN EGIR;Lo;0;L;;;;;N;;;;;
+12096;CUNEIFORM SIGN EL;Lo;0;L;;;;;N;;;;;
+12097;CUNEIFORM SIGN EN;Lo;0;L;;;;;N;;;;;
+12098;CUNEIFORM SIGN EN TIMES GAN2;Lo;0;L;;;;;N;;;;;
+12099;CUNEIFORM SIGN EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1209A;CUNEIFORM SIGN EN TIMES ME;Lo;0;L;;;;;N;;;;;
+1209B;CUNEIFORM SIGN EN CROSSING EN;Lo;0;L;;;;;N;;;;;
+1209C;CUNEIFORM SIGN EN OPPOSING EN;Lo;0;L;;;;;N;;;;;
+1209D;CUNEIFORM SIGN EN SQUARED;Lo;0;L;;;;;N;;;;;
+1209E;CUNEIFORM SIGN EREN;Lo;0;L;;;;;N;;;;;
+1209F;CUNEIFORM SIGN ERIN2;Lo;0;L;;;;;N;;;;;
+120A0;CUNEIFORM SIGN ESH2;Lo;0;L;;;;;N;;;;;
+120A1;CUNEIFORM SIGN EZEN;Lo;0;L;;;;;N;;;;;
+120A2;CUNEIFORM SIGN EZEN TIMES A;Lo;0;L;;;;;N;;;;;
+120A3;CUNEIFORM SIGN EZEN TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
+120A4;CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+120A5;CUNEIFORM SIGN EZEN TIMES AN;Lo;0;L;;;;;N;;;;;
+120A6;CUNEIFORM SIGN EZEN TIMES BAD;Lo;0;L;;;;;N;;;;;
+120A7;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+120A8;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+120A9;CUNEIFORM SIGN EZEN TIMES HA;Lo;0;L;;;;;N;;;;;
+120AA;CUNEIFORM SIGN EZEN TIMES HA GUNU;Lo;0;L;;;;;N;;;;;
+120AB;CUNEIFORM SIGN EZEN TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+120AC;CUNEIFORM SIGN EZEN TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+120AD;CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED;Lo;0;L;;;;;N;;;;;
+120AE;CUNEIFORM SIGN EZEN TIMES KU3;Lo;0;L;;;;;N;;;;;
+120AF;CUNEIFORM SIGN EZEN TIMES LA;Lo;0;L;;;;;N;;;;;
+120B0;CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+120B1;CUNEIFORM SIGN EZEN TIMES LI;Lo;0;L;;;;;N;;;;;
+120B2;CUNEIFORM SIGN EZEN TIMES LU;Lo;0;L;;;;;N;;;;;
+120B3;CUNEIFORM SIGN EZEN TIMES U2;Lo;0;L;;;;;N;;;;;
+120B4;CUNEIFORM SIGN EZEN TIMES UD;Lo;0;L;;;;;N;;;;;
+120B5;CUNEIFORM SIGN GA;Lo;0;L;;;;;N;;;;;
+120B6;CUNEIFORM SIGN GA GUNU;Lo;0;L;;;;;N;;;;;
+120B7;CUNEIFORM SIGN GA2;Lo;0;L;;;;;N;;;;;
+120B8;CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
+120B9;CUNEIFORM SIGN GA2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
+120BA;CUNEIFORM SIGN GA2 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
+120BB;CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB;Lo;0;L;;;;;N;;;;;
+120BC;CUNEIFORM SIGN GA2 TIMES AN;Lo;0;L;;;;;N;;;;;
+120BD;CUNEIFORM SIGN GA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
+120BE;CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL;Lo;0;L;;;;;N;;;;;
+120BF;CUNEIFORM SIGN GA2 TIMES BAD;Lo;0;L;;;;;N;;;;;
+120C0;CUNEIFORM SIGN GA2 TIMES BAR PLUS RA;Lo;0;L;;;;;N;;;;;
+120C1;CUNEIFORM SIGN GA2 TIMES BUR;Lo;0;L;;;;;N;;;;;
+120C2;CUNEIFORM SIGN GA2 TIMES BUR PLUS RA;Lo;0;L;;;;;N;;;;;
+120C3;CUNEIFORM SIGN GA2 TIMES DA;Lo;0;L;;;;;N;;;;;
+120C4;CUNEIFORM SIGN GA2 TIMES DI;Lo;0;L;;;;;N;;;;;
+120C5;CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
+120C6;CUNEIFORM SIGN GA2 TIMES DUB;Lo;0;L;;;;;N;;;;;
+120C7;CUNEIFORM SIGN GA2 TIMES EL;Lo;0;L;;;;;N;;;;;
+120C8;CUNEIFORM SIGN GA2 TIMES EL PLUS LA;Lo;0;L;;;;;N;;;;;
+120C9;CUNEIFORM SIGN GA2 TIMES EN;Lo;0;L;;;;;N;;;;;
+120CA;CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120CB;CUNEIFORM SIGN GA2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120CC;CUNEIFORM SIGN GA2 TIMES GAR;Lo;0;L;;;;;N;;;;;
+120CD;CUNEIFORM SIGN GA2 TIMES GI;Lo;0;L;;;;;N;;;;;
+120CE;CUNEIFORM SIGN GA2 TIMES GI4;Lo;0;L;;;;;N;;;;;
+120CF;CUNEIFORM SIGN GA2 TIMES GI4 PLUS A;Lo;0;L;;;;;N;;;;;
+120D0;CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU;Lo;0;L;;;;;N;;;;;
+120D1;CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2;Lo;0;L;;;;;N;;;;;
+120D2;CUNEIFORM SIGN GA2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+120D3;CUNEIFORM SIGN GA2 TIMES HAL PLUS LA;Lo;0;L;;;;;N;;;;;
+120D4;CUNEIFORM SIGN GA2 TIMES HI PLUS LI;Lo;0;L;;;;;N;;;;;
+120D5;CUNEIFORM SIGN GA2 TIMES HUB2;Lo;0;L;;;;;N;;;;;
+120D6;CUNEIFORM SIGN GA2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+120D7;CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH;Lo;0;L;;;;;N;;;;;
+120D8;CUNEIFORM SIGN GA2 TIMES KAK;Lo;0;L;;;;;N;;;;;
+120D9;CUNEIFORM SIGN GA2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+120DA;CUNEIFORM SIGN GA2 TIMES KID;Lo;0;L;;;;;N;;;;;
+120DB;CUNEIFORM SIGN GA2 TIMES KID PLUS LAL;Lo;0;L;;;;;N;;;;;
+120DC;CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN;Lo;0;L;;;;;N;;;;;
+120DD;CUNEIFORM SIGN GA2 TIMES LA;Lo;0;L;;;;;N;;;;;
+120DE;CUNEIFORM SIGN GA2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+120DF;CUNEIFORM SIGN GA2 TIMES MI;Lo;0;L;;;;;N;;;;;
+120E0;CUNEIFORM SIGN GA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+120E1;CUNEIFORM SIGN GA2 TIMES NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+120E2;CUNEIFORM SIGN GA2 TIMES PA;Lo;0;L;;;;;N;;;;;
+120E3;CUNEIFORM SIGN GA2 TIMES SAL;Lo;0;L;;;;;N;;;;;
+120E4;CUNEIFORM SIGN GA2 TIMES SAR;Lo;0;L;;;;;N;;;;;
+120E5;CUNEIFORM SIGN GA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+120E6;CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR;Lo;0;L;;;;;N;;;;;
+120E7;CUNEIFORM SIGN GA2 TIMES SHID;Lo;0;L;;;;;N;;;;;
+120E8;CUNEIFORM SIGN GA2 TIMES SUM;Lo;0;L;;;;;N;;;;;
+120E9;CUNEIFORM SIGN GA2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+120EA;CUNEIFORM SIGN GA2 TIMES U;Lo;0;L;;;;;N;;;;;
+120EB;CUNEIFORM SIGN GA2 TIMES UD;Lo;0;L;;;;;N;;;;;
+120EC;CUNEIFORM SIGN GA2 TIMES UD PLUS DU;Lo;0;L;;;;;N;;;;;
+120ED;CUNEIFORM SIGN GA2 OVER GA2;Lo;0;L;;;;;N;;;;;
+120EE;CUNEIFORM SIGN GABA;Lo;0;L;;;;;N;;;;;
+120EF;CUNEIFORM SIGN GABA CROSSING GABA;Lo;0;L;;;;;N;;;;;
+120F0;CUNEIFORM SIGN GAD;Lo;0;L;;;;;N;;;;;
+120F1;CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+120F2;CUNEIFORM SIGN GAL;Lo;0;L;;;;;N;;;;;
+120F3;CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+120F4;CUNEIFORM SIGN GALAM;Lo;0;L;;;;;N;;;;;
+120F5;CUNEIFORM SIGN GAM;Lo;0;L;;;;;N;;;;;
+120F6;CUNEIFORM SIGN GAN;Lo;0;L;;;;;N;;;;;
+120F7;CUNEIFORM SIGN GAN2;Lo;0;L;;;;;N;;;;;
+120F8;CUNEIFORM SIGN GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120F9;CUNEIFORM SIGN GAN2 OVER GAN2;Lo;0;L;;;;;N;;;;;
+120FA;CUNEIFORM SIGN GAN2 CROSSING GAN2;Lo;0;L;;;;;N;;;;;
+120FB;CUNEIFORM SIGN GAR;Lo;0;L;;;;;N;;;;;
+120FC;CUNEIFORM SIGN GAR3;Lo;0;L;;;;;N;;;;;
+120FD;CUNEIFORM SIGN GASHAN;Lo;0;L;;;;;N;;;;;
+120FE;CUNEIFORM SIGN GESHTIN;Lo;0;L;;;;;N;;;;;
+120FF;CUNEIFORM SIGN GESHTIN TIMES KUR;Lo;0;L;;;;;N;;;;;
+12100;CUNEIFORM SIGN GI;Lo;0;L;;;;;N;;;;;
+12101;CUNEIFORM SIGN GI TIMES E;Lo;0;L;;;;;N;;;;;
+12102;CUNEIFORM SIGN GI TIMES U;Lo;0;L;;;;;N;;;;;
+12103;CUNEIFORM SIGN GI CROSSING GI;Lo;0;L;;;;;N;;;;;
+12104;CUNEIFORM SIGN GI4;Lo;0;L;;;;;N;;;;;
+12105;CUNEIFORM SIGN GI4 OVER GI4;Lo;0;L;;;;;N;;;;;
+12106;CUNEIFORM SIGN GI4 CROSSING GI4;Lo;0;L;;;;;N;;;;;
+12107;CUNEIFORM SIGN GIDIM;Lo;0;L;;;;;N;;;;;
+12108;CUNEIFORM SIGN GIR2;Lo;0;L;;;;;N;;;;;
+12109;CUNEIFORM SIGN GIR2 GUNU;Lo;0;L;;;;;N;;;;;
+1210A;CUNEIFORM SIGN GIR3;Lo;0;L;;;;;N;;;;;
+1210B;CUNEIFORM SIGN GIR3 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
+1210C;CUNEIFORM SIGN GIR3 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1210D;CUNEIFORM SIGN GIR3 TIMES IGI;Lo;0;L;;;;;N;;;;;
+1210E;CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI;Lo;0;L;;;;;N;;;;;
+1210F;CUNEIFORM SIGN GIR3 TIMES PA;Lo;0;L;;;;;N;;;;;
+12110;CUNEIFORM SIGN GISAL;Lo;0;L;;;;;N;;;;;
+12111;CUNEIFORM SIGN GISH;Lo;0;L;;;;;N;;;;;
+12112;CUNEIFORM SIGN GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+12113;CUNEIFORM SIGN GISH TIMES BAD;Lo;0;L;;;;;N;;;;;
+12114;CUNEIFORM SIGN GISH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12115;CUNEIFORM SIGN GISH TENU;Lo;0;L;;;;;N;;;;;
+12116;CUNEIFORM SIGN GU;Lo;0;L;;;;;N;;;;;
+12117;CUNEIFORM SIGN GU CROSSING GU;Lo;0;L;;;;;N;;;;;
+12118;CUNEIFORM SIGN GU2;Lo;0;L;;;;;N;;;;;
+12119;CUNEIFORM SIGN GU2 TIMES KAK;Lo;0;L;;;;;N;;;;;
+1211A;CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1211B;CUNEIFORM SIGN GU2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+1211C;CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2;Lo;0;L;;;;;N;;;;;
+1211D;CUNEIFORM SIGN GU2 GUNU;Lo;0;L;;;;;N;;;;;
+1211E;CUNEIFORM SIGN GUD;Lo;0;L;;;;;N;;;;;
+1211F;CUNEIFORM SIGN GUD TIMES A PLUS KUR;Lo;0;L;;;;;N;;;;;
+12120;CUNEIFORM SIGN GUD TIMES KUR;Lo;0;L;;;;;N;;;;;
+12121;CUNEIFORM SIGN GUD OVER GUD LUGAL;Lo;0;L;;;;;N;;;;;
+12122;CUNEIFORM SIGN GUL;Lo;0;L;;;;;N;;;;;
+12123;CUNEIFORM SIGN GUM;Lo;0;L;;;;;N;;;;;
+12124;CUNEIFORM SIGN GUM TIMES SHE;Lo;0;L;;;;;N;;;;;
+12125;CUNEIFORM SIGN GUR;Lo;0;L;;;;;N;;;;;
+12126;CUNEIFORM SIGN GUR7;Lo;0;L;;;;;N;;;;;
+12127;CUNEIFORM SIGN GURUN;Lo;0;L;;;;;N;;;;;
+12128;CUNEIFORM SIGN GURUSH;Lo;0;L;;;;;N;;;;;
+12129;CUNEIFORM SIGN HA;Lo;0;L;;;;;N;;;;;
+1212A;CUNEIFORM SIGN HA TENU;Lo;0;L;;;;;N;;;;;
+1212B;CUNEIFORM SIGN HA GUNU;Lo;0;L;;;;;N;;;;;
+1212C;CUNEIFORM SIGN HAL;Lo;0;L;;;;;N;;;;;
+1212D;CUNEIFORM SIGN HI;Lo;0;L;;;;;N;;;;;
+1212E;CUNEIFORM SIGN HI TIMES ASH;Lo;0;L;;;;;N;;;;;
+1212F;CUNEIFORM SIGN HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+12130;CUNEIFORM SIGN HI TIMES BAD;Lo;0;L;;;;;N;;;;;
+12131;CUNEIFORM SIGN HI TIMES DISH;Lo;0;L;;;;;N;;;;;
+12132;CUNEIFORM SIGN HI TIMES GAD;Lo;0;L;;;;;N;;;;;
+12133;CUNEIFORM SIGN HI TIMES KIN;Lo;0;L;;;;;N;;;;;
+12134;CUNEIFORM SIGN HI TIMES NUN;Lo;0;L;;;;;N;;;;;
+12135;CUNEIFORM SIGN HI TIMES SHE;Lo;0;L;;;;;N;;;;;
+12136;CUNEIFORM SIGN HI TIMES U;Lo;0;L;;;;;N;;;;;
+12137;CUNEIFORM SIGN HU;Lo;0;L;;;;;N;;;;;
+12138;CUNEIFORM SIGN HUB2;Lo;0;L;;;;;N;;;;;
+12139;CUNEIFORM SIGN HUB2 TIMES AN;Lo;0;L;;;;;N;;;;;
+1213A;CUNEIFORM SIGN HUB2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+1213B;CUNEIFORM SIGN HUB2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1213C;CUNEIFORM SIGN HUB2 TIMES LISH;Lo;0;L;;;;;N;;;;;
+1213D;CUNEIFORM SIGN HUB2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1213E;CUNEIFORM SIGN HUL2;Lo;0;L;;;;;N;;;;;
+1213F;CUNEIFORM SIGN I;Lo;0;L;;;;;N;;;;;
+12140;CUNEIFORM SIGN I A;Lo;0;L;;;;;N;;;;;
+12141;CUNEIFORM SIGN IB;Lo;0;L;;;;;N;;;;;
+12142;CUNEIFORM SIGN IDIM;Lo;0;L;;;;;N;;;;;
+12143;CUNEIFORM SIGN IDIM OVER IDIM BUR;Lo;0;L;;;;;N;;;;;
+12144;CUNEIFORM SIGN IDIM OVER IDIM SQUARED;Lo;0;L;;;;;N;;;;;
+12145;CUNEIFORM SIGN IG;Lo;0;L;;;;;N;;;;;
+12146;CUNEIFORM SIGN IGI;Lo;0;L;;;;;N;;;;;
+12147;CUNEIFORM SIGN IGI DIB;Lo;0;L;;;;;N;;;;;
+12148;CUNEIFORM SIGN IGI RI;Lo;0;L;;;;;N;;;;;
+12149;CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD;Lo;0;L;;;;;N;;;;;
+1214A;CUNEIFORM SIGN IGI GUNU;Lo;0;L;;;;;N;;;;;
+1214B;CUNEIFORM SIGN IL;Lo;0;L;;;;;N;;;;;
+1214C;CUNEIFORM SIGN IL TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1214D;CUNEIFORM SIGN IL2;Lo;0;L;;;;;N;;;;;
+1214E;CUNEIFORM SIGN IM;Lo;0;L;;;;;N;;;;;
+1214F;CUNEIFORM SIGN IM TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12150;CUNEIFORM SIGN IM CROSSING IM;Lo;0;L;;;;;N;;;;;
+12151;CUNEIFORM SIGN IM OPPOSING IM;Lo;0;L;;;;;N;;;;;
+12152;CUNEIFORM SIGN IM SQUARED;Lo;0;L;;;;;N;;;;;
+12153;CUNEIFORM SIGN IMIN;Lo;0;L;;;;;N;;;;;
+12154;CUNEIFORM SIGN IN;Lo;0;L;;;;;N;;;;;
+12155;CUNEIFORM SIGN IR;Lo;0;L;;;;;N;;;;;
+12156;CUNEIFORM SIGN ISH;Lo;0;L;;;;;N;;;;;
+12157;CUNEIFORM SIGN KA;Lo;0;L;;;;;N;;;;;
+12158;CUNEIFORM SIGN KA TIMES A;Lo;0;L;;;;;N;;;;;
+12159;CUNEIFORM SIGN KA TIMES AD;Lo;0;L;;;;;N;;;;;
+1215A;CUNEIFORM SIGN KA TIMES AD PLUS KU3;Lo;0;L;;;;;N;;;;;
+1215B;CUNEIFORM SIGN KA TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1215C;CUNEIFORM SIGN KA TIMES BAD;Lo;0;L;;;;;N;;;;;
+1215D;CUNEIFORM SIGN KA TIMES BALAG;Lo;0;L;;;;;N;;;;;
+1215E;CUNEIFORM SIGN KA TIMES BAR;Lo;0;L;;;;;N;;;;;
+1215F;CUNEIFORM SIGN KA TIMES BI;Lo;0;L;;;;;N;;;;;
+12160;CUNEIFORM SIGN KA TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+12161;CUNEIFORM SIGN KA TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12162;CUNEIFORM SIGN KA TIMES GA;Lo;0;L;;;;;N;;;;;
+12163;CUNEIFORM SIGN KA TIMES GAL;Lo;0;L;;;;;N;;;;;
+12164;CUNEIFORM SIGN KA TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12165;CUNEIFORM SIGN KA TIMES GAR;Lo;0;L;;;;;N;;;;;
+12166;CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A;Lo;0;L;;;;;N;;;;;
+12167;CUNEIFORM SIGN KA TIMES GI;Lo;0;L;;;;;N;;;;;
+12168;CUNEIFORM SIGN KA TIMES GIR2;Lo;0;L;;;;;N;;;;;
+12169;CUNEIFORM SIGN KA TIMES GISH PLUS SAR;Lo;0;L;;;;;N;;;;;
+1216A;CUNEIFORM SIGN KA TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+1216B;CUNEIFORM SIGN KA TIMES GU;Lo;0;L;;;;;N;;;;;
+1216C;CUNEIFORM SIGN KA TIMES GUR7;Lo;0;L;;;;;N;;;;;
+1216D;CUNEIFORM SIGN KA TIMES IGI;Lo;0;L;;;;;N;;;;;
+1216E;CUNEIFORM SIGN KA TIMES IM;Lo;0;L;;;;;N;;;;;
+1216F;CUNEIFORM SIGN KA TIMES KAK;Lo;0;L;;;;;N;;;;;
+12170;CUNEIFORM SIGN KA TIMES KI;Lo;0;L;;;;;N;;;;;
+12171;CUNEIFORM SIGN KA TIMES KID;Lo;0;L;;;;;N;;;;;
+12172;CUNEIFORM SIGN KA TIMES LI;Lo;0;L;;;;;N;;;;;
+12173;CUNEIFORM SIGN KA TIMES LU;Lo;0;L;;;;;N;;;;;
+12174;CUNEIFORM SIGN KA TIMES ME;Lo;0;L;;;;;N;;;;;
+12175;CUNEIFORM SIGN KA TIMES ME PLUS DU;Lo;0;L;;;;;N;;;;;
+12176;CUNEIFORM SIGN KA TIMES ME PLUS GI;Lo;0;L;;;;;N;;;;;
+12177;CUNEIFORM SIGN KA TIMES ME PLUS TE;Lo;0;L;;;;;N;;;;;
+12178;CUNEIFORM SIGN KA TIMES MI;Lo;0;L;;;;;N;;;;;
+12179;CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ;Lo;0;L;;;;;N;;;;;
+1217A;CUNEIFORM SIGN KA TIMES NE;Lo;0;L;;;;;N;;;;;
+1217B;CUNEIFORM SIGN KA TIMES NUN;Lo;0;L;;;;;N;;;;;
+1217C;CUNEIFORM SIGN KA TIMES PI;Lo;0;L;;;;;N;;;;;
+1217D;CUNEIFORM SIGN KA TIMES RU;Lo;0;L;;;;;N;;;;;
+1217E;CUNEIFORM SIGN KA TIMES SA;Lo;0;L;;;;;N;;;;;
+1217F;CUNEIFORM SIGN KA TIMES SAR;Lo;0;L;;;;;N;;;;;
+12180;CUNEIFORM SIGN KA TIMES SHA;Lo;0;L;;;;;N;;;;;
+12181;CUNEIFORM SIGN KA TIMES SHE;Lo;0;L;;;;;N;;;;;
+12182;CUNEIFORM SIGN KA TIMES SHID;Lo;0;L;;;;;N;;;;;
+12183;CUNEIFORM SIGN KA TIMES SHU;Lo;0;L;;;;;N;;;;;
+12184;CUNEIFORM SIGN KA TIMES SIG;Lo;0;L;;;;;N;;;;;
+12185;CUNEIFORM SIGN KA TIMES SUHUR;Lo;0;L;;;;;N;;;;;
+12186;CUNEIFORM SIGN KA TIMES TAR;Lo;0;L;;;;;N;;;;;
+12187;CUNEIFORM SIGN KA TIMES U;Lo;0;L;;;;;N;;;;;
+12188;CUNEIFORM SIGN KA TIMES U2;Lo;0;L;;;;;N;;;;;
+12189;CUNEIFORM SIGN KA TIMES UD;Lo;0;L;;;;;N;;;;;
+1218A;CUNEIFORM SIGN KA TIMES UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
+1218B;CUNEIFORM SIGN KA TIMES USH;Lo;0;L;;;;;N;;;;;
+1218C;CUNEIFORM SIGN KA TIMES ZI;Lo;0;L;;;;;N;;;;;
+1218D;CUNEIFORM SIGN KA2;Lo;0;L;;;;;N;;;;;
+1218E;CUNEIFORM SIGN KA2 CROSSING KA2;Lo;0;L;;;;;N;;;;;
+1218F;CUNEIFORM SIGN KAB;Lo;0;L;;;;;N;;;;;
+12190;CUNEIFORM SIGN KAD2;Lo;0;L;;;;;N;;;;;
+12191;CUNEIFORM SIGN KAD3;Lo;0;L;;;;;N;;;;;
+12192;CUNEIFORM SIGN KAD4;Lo;0;L;;;;;N;;;;;
+12193;CUNEIFORM SIGN KAD5;Lo;0;L;;;;;N;;;;;
+12194;CUNEIFORM SIGN KAD5 OVER KAD5;Lo;0;L;;;;;N;;;;;
+12195;CUNEIFORM SIGN KAK;Lo;0;L;;;;;N;;;;;
+12196;CUNEIFORM SIGN KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12197;CUNEIFORM SIGN KAL;Lo;0;L;;;;;N;;;;;
+12198;CUNEIFORM SIGN KAL TIMES BAD;Lo;0;L;;;;;N;;;;;
+12199;CUNEIFORM SIGN KAL CROSSING KAL;Lo;0;L;;;;;N;;;;;
+1219A;CUNEIFORM SIGN KAM2;Lo;0;L;;;;;N;;;;;
+1219B;CUNEIFORM SIGN KAM4;Lo;0;L;;;;;N;;;;;
+1219C;CUNEIFORM SIGN KASKAL;Lo;0;L;;;;;N;;;;;
+1219D;CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+1219E;CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+1219F;CUNEIFORM SIGN KESH2;Lo;0;L;;;;;N;;;;;
+121A0;CUNEIFORM SIGN KI;Lo;0;L;;;;;N;;;;;
+121A1;CUNEIFORM SIGN KI TIMES BAD;Lo;0;L;;;;;N;;;;;
+121A2;CUNEIFORM SIGN KI TIMES U;Lo;0;L;;;;;N;;;;;
+121A3;CUNEIFORM SIGN KI TIMES UD;Lo;0;L;;;;;N;;;;;
+121A4;CUNEIFORM SIGN KID;Lo;0;L;;;;;N;;;;;
+121A5;CUNEIFORM SIGN KIN;Lo;0;L;;;;;N;;;;;
+121A6;CUNEIFORM SIGN KISAL;Lo;0;L;;;;;N;;;;;
+121A7;CUNEIFORM SIGN KISH;Lo;0;L;;;;;N;;;;;
+121A8;CUNEIFORM SIGN KISIM5;Lo;0;L;;;;;N;;;;;
+121A9;CUNEIFORM SIGN KISIM5 OVER KISIM5;Lo;0;L;;;;;N;;;;;
+121AA;CUNEIFORM SIGN KU;Lo;0;L;;;;;N;;;;;
+121AB;CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+121AC;CUNEIFORM SIGN KU3;Lo;0;L;;;;;N;;;;;
+121AD;CUNEIFORM SIGN KU4;Lo;0;L;;;;;N;;;;;
+121AE;CUNEIFORM SIGN KU4 VARIANT FORM;Lo;0;L;;;;;N;;;;;
+121AF;CUNEIFORM SIGN KU7;Lo;0;L;;;;;N;;;;;
+121B0;CUNEIFORM SIGN KUL;Lo;0;L;;;;;N;;;;;
+121B1;CUNEIFORM SIGN KUL GUNU;Lo;0;L;;;;;N;;;;;
+121B2;CUNEIFORM SIGN KUN;Lo;0;L;;;;;N;;;;;
+121B3;CUNEIFORM SIGN KUR;Lo;0;L;;;;;N;;;;;
+121B4;CUNEIFORM SIGN KUR OPPOSING KUR;Lo;0;L;;;;;N;;;;;
+121B5;CUNEIFORM SIGN KUSHU2;Lo;0;L;;;;;N;;;;;
+121B6;CUNEIFORM SIGN KWU318;Lo;0;L;;;;;N;;;;;
+121B7;CUNEIFORM SIGN LA;Lo;0;L;;;;;N;;;;;
+121B8;CUNEIFORM SIGN LAGAB;Lo;0;L;;;;;N;;;;;
+121B9;CUNEIFORM SIGN LAGAB TIMES A;Lo;0;L;;;;;N;;;;;
+121BA;CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
+121BB;CUNEIFORM SIGN LAGAB TIMES A PLUS GAR;Lo;0;L;;;;;N;;;;;
+121BC;CUNEIFORM SIGN LAGAB TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
+121BD;CUNEIFORM SIGN LAGAB TIMES AL;Lo;0;L;;;;;N;;;;;
+121BE;CUNEIFORM SIGN LAGAB TIMES AN;Lo;0;L;;;;;N;;;;;
+121BF;CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+121C0;CUNEIFORM SIGN LAGAB TIMES BAD;Lo;0;L;;;;;N;;;;;
+121C1;CUNEIFORM SIGN LAGAB TIMES BI;Lo;0;L;;;;;N;;;;;
+121C2;CUNEIFORM SIGN LAGAB TIMES DAR;Lo;0;L;;;;;N;;;;;
+121C3;CUNEIFORM SIGN LAGAB TIMES EN;Lo;0;L;;;;;N;;;;;
+121C4;CUNEIFORM SIGN LAGAB TIMES GA;Lo;0;L;;;;;N;;;;;
+121C5;CUNEIFORM SIGN LAGAB TIMES GAR;Lo;0;L;;;;;N;;;;;
+121C6;CUNEIFORM SIGN LAGAB TIMES GUD;Lo;0;L;;;;;N;;;;;
+121C7;CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD;Lo;0;L;;;;;N;;;;;
+121C8;CUNEIFORM SIGN LAGAB TIMES HA;Lo;0;L;;;;;N;;;;;
+121C9;CUNEIFORM SIGN LAGAB TIMES HAL;Lo;0;L;;;;;N;;;;;
+121CA;CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN;Lo;0;L;;;;;N;;;;;
+121CB;CUNEIFORM SIGN LAGAB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+121CC;CUNEIFORM SIGN LAGAB TIMES IM;Lo;0;L;;;;;N;;;;;
+121CD;CUNEIFORM SIGN LAGAB TIMES IM PLUS HA;Lo;0;L;;;;;N;;;;;
+121CE;CUNEIFORM SIGN LAGAB TIMES IM PLUS LU;Lo;0;L;;;;;N;;;;;
+121CF;CUNEIFORM SIGN LAGAB TIMES KI;Lo;0;L;;;;;N;;;;;
+121D0;CUNEIFORM SIGN LAGAB TIMES KIN;Lo;0;L;;;;;N;;;;;
+121D1;CUNEIFORM SIGN LAGAB TIMES KU3;Lo;0;L;;;;;N;;;;;
+121D2;CUNEIFORM SIGN LAGAB TIMES KUL;Lo;0;L;;;;;N;;;;;
+121D3;CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A;Lo;0;L;;;;;N;;;;;
+121D4;CUNEIFORM SIGN LAGAB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+121D5;CUNEIFORM SIGN LAGAB TIMES LISH;Lo;0;L;;;;;N;;;;;
+121D6;CUNEIFORM SIGN LAGAB TIMES LU;Lo;0;L;;;;;N;;;;;
+121D7;CUNEIFORM SIGN LAGAB TIMES LUL;Lo;0;L;;;;;N;;;;;
+121D8;CUNEIFORM SIGN LAGAB TIMES ME;Lo;0;L;;;;;N;;;;;
+121D9;CUNEIFORM SIGN LAGAB TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+121DA;CUNEIFORM SIGN LAGAB TIMES MUSH;Lo;0;L;;;;;N;;;;;
+121DB;CUNEIFORM SIGN LAGAB TIMES NE;Lo;0;L;;;;;N;;;;;
+121DC;CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
+121DD;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2;Lo;0;L;;;;;N;;;;;
+121DE;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU;Lo;0;L;;;;;N;;;;;
+121DF;CUNEIFORM SIGN LAGAB TIMES SHU2;Lo;0;L;;;;;N;;;;;
+121E0;CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2;Lo;0;L;;;;;N;;;;;
+121E1;CUNEIFORM SIGN LAGAB TIMES SUM;Lo;0;L;;;;;N;;;;;
+121E2;CUNEIFORM SIGN LAGAB TIMES TAG;Lo;0;L;;;;;N;;;;;
+121E3;CUNEIFORM SIGN LAGAB TIMES TAK4;Lo;0;L;;;;;N;;;;;
+121E4;CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA;Lo;0;L;;;;;N;;;;;
+121E5;CUNEIFORM SIGN LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+121E6;CUNEIFORM SIGN LAGAB TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
+121E7;CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+121E8;CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+121E9;CUNEIFORM SIGN LAGAB TIMES UD;Lo;0;L;;;;;N;;;;;
+121EA;CUNEIFORM SIGN LAGAB TIMES USH;Lo;0;L;;;;;N;;;;;
+121EB;CUNEIFORM SIGN LAGAB SQUARED;Lo;0;L;;;;;N;;;;;
+121EC;CUNEIFORM SIGN LAGAR;Lo;0;L;;;;;N;;;;;
+121ED;CUNEIFORM SIGN LAGAR TIMES SHE;Lo;0;L;;;;;N;;;;;
+121EE;CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
+121EF;CUNEIFORM SIGN LAGAR GUNU;Lo;0;L;;;;;N;;;;;
+121F0;CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE;Lo;0;L;;;;;N;;;;;
+121F1;CUNEIFORM SIGN LAHSHU;Lo;0;L;;;;;N;;;;;
+121F2;CUNEIFORM SIGN LAL;Lo;0;L;;;;;N;;;;;
+121F3;CUNEIFORM SIGN LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+121F4;CUNEIFORM SIGN LAM;Lo;0;L;;;;;N;;;;;
+121F5;CUNEIFORM SIGN LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+121F6;CUNEIFORM SIGN LAM TIMES KUR PLUS RU;Lo;0;L;;;;;N;;;;;
+121F7;CUNEIFORM SIGN LI;Lo;0;L;;;;;N;;;;;
+121F8;CUNEIFORM SIGN LIL;Lo;0;L;;;;;N;;;;;
+121F9;CUNEIFORM SIGN LIMMU2;Lo;0;L;;;;;N;;;;;
+121FA;CUNEIFORM SIGN LISH;Lo;0;L;;;;;N;;;;;
+121FB;CUNEIFORM SIGN LU;Lo;0;L;;;;;N;;;;;
+121FC;CUNEIFORM SIGN LU TIMES BAD;Lo;0;L;;;;;N;;;;;
+121FD;CUNEIFORM SIGN LU2;Lo;0;L;;;;;N;;;;;
+121FE;CUNEIFORM SIGN LU2 TIMES AL;Lo;0;L;;;;;N;;;;;
+121FF;CUNEIFORM SIGN LU2 TIMES BAD;Lo;0;L;;;;;N;;;;;
+12200;CUNEIFORM SIGN LU2 TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12201;CUNEIFORM SIGN LU2 TIMES ESH2 TENU;Lo;0;L;;;;;N;;;;;
+12202;CUNEIFORM SIGN LU2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12203;CUNEIFORM SIGN LU2 TIMES HI TIMES BAD;Lo;0;L;;;;;N;;;;;
+12204;CUNEIFORM SIGN LU2 TIMES IM;Lo;0;L;;;;;N;;;;;
+12205;CUNEIFORM SIGN LU2 TIMES KAD2;Lo;0;L;;;;;N;;;;;
+12206;CUNEIFORM SIGN LU2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12207;CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH;Lo;0;L;;;;;N;;;;;
+12208;CUNEIFORM SIGN LU2 TIMES KI;Lo;0;L;;;;;N;;;;;
+12209;CUNEIFORM SIGN LU2 TIMES LA PLUS ASH;Lo;0;L;;;;;N;;;;;
+1220A;CUNEIFORM SIGN LU2 TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+1220B;CUNEIFORM SIGN LU2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+1220C;CUNEIFORM SIGN LU2 TIMES NE;Lo;0;L;;;;;N;;;;;
+1220D;CUNEIFORM SIGN LU2 TIMES NU;Lo;0;L;;;;;N;;;;;
+1220E;CUNEIFORM SIGN LU2 TIMES SI PLUS ASH;Lo;0;L;;;;;N;;;;;
+1220F;CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU;Lo;0;L;;;;;N;;;;;
+12210;CUNEIFORM SIGN LU2 TIMES TUG2;Lo;0;L;;;;;N;;;;;
+12211;CUNEIFORM SIGN LU2 TENU;Lo;0;L;;;;;N;;;;;
+12212;CUNEIFORM SIGN LU2 CROSSING LU2;Lo;0;L;;;;;N;;;;;
+12213;CUNEIFORM SIGN LU2 OPPOSING LU2;Lo;0;L;;;;;N;;;;;
+12214;CUNEIFORM SIGN LU2 SQUARED;Lo;0;L;;;;;N;;;;;
+12215;CUNEIFORM SIGN LU2 SHESHIG;Lo;0;L;;;;;N;;;;;
+12216;CUNEIFORM SIGN LU3;Lo;0;L;;;;;N;;;;;
+12217;CUNEIFORM SIGN LUGAL;Lo;0;L;;;;;N;;;;;
+12218;CUNEIFORM SIGN LUGAL OVER LUGAL;Lo;0;L;;;;;N;;;;;
+12219;CUNEIFORM SIGN LUGAL OPPOSING LUGAL;Lo;0;L;;;;;N;;;;;
+1221A;CUNEIFORM SIGN LUGAL SHESHIG;Lo;0;L;;;;;N;;;;;
+1221B;CUNEIFORM SIGN LUH;Lo;0;L;;;;;N;;;;;
+1221C;CUNEIFORM SIGN LUL;Lo;0;L;;;;;N;;;;;
+1221D;CUNEIFORM SIGN LUM;Lo;0;L;;;;;N;;;;;
+1221E;CUNEIFORM SIGN LUM OVER LUM;Lo;0;L;;;;;N;;;;;
+1221F;CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+12220;CUNEIFORM SIGN MA;Lo;0;L;;;;;N;;;;;
+12221;CUNEIFORM SIGN MA TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12222;CUNEIFORM SIGN MA GUNU;Lo;0;L;;;;;N;;;;;
+12223;CUNEIFORM SIGN MA2;Lo;0;L;;;;;N;;;;;
+12224;CUNEIFORM SIGN MAH;Lo;0;L;;;;;N;;;;;
+12225;CUNEIFORM SIGN MAR;Lo;0;L;;;;;N;;;;;
+12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;;N;;;;;
+12227;CUNEIFORM SIGN MASH2;Lo;0;L;;;;;N;;;;;
+12228;CUNEIFORM SIGN ME;Lo;0;L;;;;;N;;;;;
+12229;CUNEIFORM SIGN MES;Lo;0;L;;;;;N;;;;;
+1222A;CUNEIFORM SIGN MI;Lo;0;L;;;;;N;;;;;
+1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;;N;;;;;
+1222C;CUNEIFORM SIGN MU;Lo;0;L;;;;;N;;;;;
+1222D;CUNEIFORM SIGN MU OVER MU;Lo;0;L;;;;;N;;;;;
+1222E;CUNEIFORM SIGN MUG;Lo;0;L;;;;;N;;;;;
+1222F;CUNEIFORM SIGN MUG GUNU;Lo;0;L;;;;;N;;;;;
+12230;CUNEIFORM SIGN MUNSUB;Lo;0;L;;;;;N;;;;;
+12231;CUNEIFORM SIGN MURGU2;Lo;0;L;;;;;N;;;;;
+12232;CUNEIFORM SIGN MUSH;Lo;0;L;;;;;N;;;;;
+12233;CUNEIFORM SIGN MUSH TIMES A;Lo;0;L;;;;;N;;;;;
+12234;CUNEIFORM SIGN MUSH TIMES KUR;Lo;0;L;;;;;N;;;;;
+12235;CUNEIFORM SIGN MUSH TIMES ZA;Lo;0;L;;;;;N;;;;;
+12236;CUNEIFORM SIGN MUSH OVER MUSH;Lo;0;L;;;;;N;;;;;
+12237;CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
+12238;CUNEIFORM SIGN MUSH CROSSING MUSH;Lo;0;L;;;;;N;;;;;
+12239;CUNEIFORM SIGN MUSH3;Lo;0;L;;;;;N;;;;;
+1223A;CUNEIFORM SIGN MUSH3 TIMES A;Lo;0;L;;;;;N;;;;;
+1223B;CUNEIFORM SIGN MUSH3 TIMES A PLUS DI;Lo;0;L;;;;;N;;;;;
+1223C;CUNEIFORM SIGN MUSH3 TIMES DI;Lo;0;L;;;;;N;;;;;
+1223D;CUNEIFORM SIGN MUSH3 GUNU;Lo;0;L;;;;;N;;;;;
+1223E;CUNEIFORM SIGN NA;Lo;0;L;;;;;N;;;;;
+1223F;CUNEIFORM SIGN NA2;Lo;0;L;;;;;N;;;;;
+12240;CUNEIFORM SIGN NAGA;Lo;0;L;;;;;N;;;;;
+12241;CUNEIFORM SIGN NAGA INVERTED;Lo;0;L;;;;;N;;;;;
+12242;CUNEIFORM SIGN NAGA TIMES SHU TENU;Lo;0;L;;;;;N;;;;;
+12243;CUNEIFORM SIGN NAGA OPPOSING NAGA;Lo;0;L;;;;;N;;;;;
+12244;CUNEIFORM SIGN NAGAR;Lo;0;L;;;;;N;;;;;
+12245;CUNEIFORM SIGN NAM NUTILLU;Lo;0;L;;;;;N;;;;;
+12246;CUNEIFORM SIGN NAM;Lo;0;L;;;;;N;;;;;
+12247;CUNEIFORM SIGN NAM2;Lo;0;L;;;;;N;;;;;
+12248;CUNEIFORM SIGN NE;Lo;0;L;;;;;N;;;;;
+12249;CUNEIFORM SIGN NE TIMES A;Lo;0;L;;;;;N;;;;;
+1224A;CUNEIFORM SIGN NE TIMES UD;Lo;0;L;;;;;N;;;;;
+1224B;CUNEIFORM SIGN NE SHESHIG;Lo;0;L;;;;;N;;;;;
+1224C;CUNEIFORM SIGN NI;Lo;0;L;;;;;N;;;;;
+1224D;CUNEIFORM SIGN NI TIMES E;Lo;0;L;;;;;N;;;;;
+1224E;CUNEIFORM SIGN NI2;Lo;0;L;;;;;N;;;;;
+1224F;CUNEIFORM SIGN NIM;Lo;0;L;;;;;N;;;;;
+12250;CUNEIFORM SIGN NIM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12251;CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12252;CUNEIFORM SIGN NINDA2;Lo;0;L;;;;;N;;;;;
+12253;CUNEIFORM SIGN NINDA2 TIMES AN;Lo;0;L;;;;;N;;;;;
+12254;CUNEIFORM SIGN NINDA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
+12255;CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
+12256;CUNEIFORM SIGN NINDA2 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12257;CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12258;CUNEIFORM SIGN NINDA2 TIMES NE;Lo;0;L;;;;;N;;;;;
+12259;CUNEIFORM SIGN NINDA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+1225A;CUNEIFORM SIGN NINDA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+1225B;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN;Lo;0;L;;;;;N;;;;;
+1225C;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225D;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225E;CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225F;CUNEIFORM SIGN NINDA2 TIMES USH;Lo;0;L;;;;;N;;;;;
+12260;CUNEIFORM SIGN NISAG;Lo;0;L;;;;;N;;;;;
+12261;CUNEIFORM SIGN NU;Lo;0;L;;;;;N;;;;;
+12262;CUNEIFORM SIGN NU11;Lo;0;L;;;;;N;;;;;
+12263;CUNEIFORM SIGN NUN;Lo;0;L;;;;;N;;;;;
+12264;CUNEIFORM SIGN NUN LAGAR TIMES GAR;Lo;0;L;;;;;N;;;;;
+12265;CUNEIFORM SIGN NUN LAGAR TIMES MASH;Lo;0;L;;;;;N;;;;;
+12266;CUNEIFORM SIGN NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
+12267;CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
+12268;CUNEIFORM SIGN NUN LAGAR TIMES USH;Lo;0;L;;;;;N;;;;;
+12269;CUNEIFORM SIGN NUN TENU;Lo;0;L;;;;;N;;;;;
+1226A;CUNEIFORM SIGN NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+1226B;CUNEIFORM SIGN NUN CROSSING NUN;Lo;0;L;;;;;N;;;;;
+1226C;CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR;Lo;0;L;;;;;N;;;;;
+1226D;CUNEIFORM SIGN NUNUZ;Lo;0;L;;;;;N;;;;;
+1226E;CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
+1226F;CUNEIFORM SIGN NUNUZ AB2 TIMES BI;Lo;0;L;;;;;N;;;;;
+12270;CUNEIFORM SIGN NUNUZ AB2 TIMES DUG;Lo;0;L;;;;;N;;;;;
+12271;CUNEIFORM SIGN NUNUZ AB2 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12272;CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12273;CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12274;CUNEIFORM SIGN NUNUZ AB2 TIMES LA;Lo;0;L;;;;;N;;;;;
+12275;CUNEIFORM SIGN NUNUZ AB2 TIMES NE;Lo;0;L;;;;;N;;;;;
+12276;CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3;Lo;0;L;;;;;N;;;;;
+12277;CUNEIFORM SIGN NUNUZ AB2 TIMES U2;Lo;0;L;;;;;N;;;;;
+12278;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
+12279;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U;Lo;0;L;;;;;N;;;;;
+1227A;CUNEIFORM SIGN PA;Lo;0;L;;;;;N;;;;;
+1227B;CUNEIFORM SIGN PAD;Lo;0;L;;;;;N;;;;;
+1227C;CUNEIFORM SIGN PAN;Lo;0;L;;;;;N;;;;;
+1227D;CUNEIFORM SIGN PAP;Lo;0;L;;;;;N;;;;;
+1227E;CUNEIFORM SIGN PESH2;Lo;0;L;;;;;N;;;;;
+1227F;CUNEIFORM SIGN PI;Lo;0;L;;;;;N;;;;;
+12280;CUNEIFORM SIGN PI TIMES A;Lo;0;L;;;;;N;;;;;
+12281;CUNEIFORM SIGN PI TIMES AB;Lo;0;L;;;;;N;;;;;
+12282;CUNEIFORM SIGN PI TIMES BI;Lo;0;L;;;;;N;;;;;
+12283;CUNEIFORM SIGN PI TIMES BU;Lo;0;L;;;;;N;;;;;
+12284;CUNEIFORM SIGN PI TIMES E;Lo;0;L;;;;;N;;;;;
+12285;CUNEIFORM SIGN PI TIMES I;Lo;0;L;;;;;N;;;;;
+12286;CUNEIFORM SIGN PI TIMES IB;Lo;0;L;;;;;N;;;;;
+12287;CUNEIFORM SIGN PI TIMES U;Lo;0;L;;;;;N;;;;;
+12288;CUNEIFORM SIGN PI TIMES U2;Lo;0;L;;;;;N;;;;;
+12289;CUNEIFORM SIGN PI CROSSING PI;Lo;0;L;;;;;N;;;;;
+1228A;CUNEIFORM SIGN PIRIG;Lo;0;L;;;;;N;;;;;
+1228B;CUNEIFORM SIGN PIRIG TIMES KAL;Lo;0;L;;;;;N;;;;;
+1228C;CUNEIFORM SIGN PIRIG TIMES UD;Lo;0;L;;;;;N;;;;;
+1228D;CUNEIFORM SIGN PIRIG TIMES ZA;Lo;0;L;;;;;N;;;;;
+1228E;CUNEIFORM SIGN PIRIG OPPOSING PIRIG;Lo;0;L;;;;;N;;;;;
+1228F;CUNEIFORM SIGN RA;Lo;0;L;;;;;N;;;;;
+12290;CUNEIFORM SIGN RAB;Lo;0;L;;;;;N;;;;;
+12291;CUNEIFORM SIGN RI;Lo;0;L;;;;;N;;;;;
+12292;CUNEIFORM SIGN RU;Lo;0;L;;;;;N;;;;;
+12293;CUNEIFORM SIGN SA;Lo;0;L;;;;;N;;;;;
+12294;CUNEIFORM SIGN SAG NUTILLU;Lo;0;L;;;;;N;;;;;
+12295;CUNEIFORM SIGN SAG;Lo;0;L;;;;;N;;;;;
+12296;CUNEIFORM SIGN SAG TIMES A;Lo;0;L;;;;;N;;;;;
+12297;CUNEIFORM SIGN SAG TIMES DU;Lo;0;L;;;;;N;;;;;
+12298;CUNEIFORM SIGN SAG TIMES DUB;Lo;0;L;;;;;N;;;;;
+12299;CUNEIFORM SIGN SAG TIMES HA;Lo;0;L;;;;;N;;;;;
+1229A;CUNEIFORM SIGN SAG TIMES KAK;Lo;0;L;;;;;N;;;;;
+1229B;CUNEIFORM SIGN SAG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1229C;CUNEIFORM SIGN SAG TIMES LUM;Lo;0;L;;;;;N;;;;;
+1229D;CUNEIFORM SIGN SAG TIMES MI;Lo;0;L;;;;;N;;;;;
+1229E;CUNEIFORM SIGN SAG TIMES NUN;Lo;0;L;;;;;N;;;;;
+1229F;CUNEIFORM SIGN SAG TIMES SAL;Lo;0;L;;;;;N;;;;;
+122A0;CUNEIFORM SIGN SAG TIMES SHID;Lo;0;L;;;;;N;;;;;
+122A1;CUNEIFORM SIGN SAG TIMES TAB;Lo;0;L;;;;;N;;;;;
+122A2;CUNEIFORM SIGN SAG TIMES U2;Lo;0;L;;;;;N;;;;;
+122A3;CUNEIFORM SIGN SAG TIMES UB;Lo;0;L;;;;;N;;;;;
+122A4;CUNEIFORM SIGN SAG TIMES UM;Lo;0;L;;;;;N;;;;;
+122A5;CUNEIFORM SIGN SAG TIMES UR;Lo;0;L;;;;;N;;;;;
+122A6;CUNEIFORM SIGN SAG TIMES USH;Lo;0;L;;;;;N;;;;;
+122A7;CUNEIFORM SIGN SAG OVER SAG;Lo;0;L;;;;;N;;;;;
+122A8;CUNEIFORM SIGN SAG GUNU;Lo;0;L;;;;;N;;;;;
+122A9;CUNEIFORM SIGN SAL;Lo;0;L;;;;;N;;;;;
+122AA;CUNEIFORM SIGN SAL LAGAB TIMES ASH2;Lo;0;L;;;;;N;;;;;
+122AB;CUNEIFORM SIGN SANGA2;Lo;0;L;;;;;N;;;;;
+122AC;CUNEIFORM SIGN SAR;Lo;0;L;;;;;N;;;;;
+122AD;CUNEIFORM SIGN SHA;Lo;0;L;;;;;N;;;;;
+122AE;CUNEIFORM SIGN SHA3;Lo;0;L;;;;;N;;;;;
+122AF;CUNEIFORM SIGN SHA3 TIMES A;Lo;0;L;;;;;N;;;;;
+122B0;CUNEIFORM SIGN SHA3 TIMES BAD;Lo;0;L;;;;;N;;;;;
+122B1;CUNEIFORM SIGN SHA3 TIMES GISH;Lo;0;L;;;;;N;;;;;
+122B2;CUNEIFORM SIGN SHA3 TIMES NE;Lo;0;L;;;;;N;;;;;
+122B3;CUNEIFORM SIGN SHA3 TIMES SHU2;Lo;0;L;;;;;N;;;;;
+122B4;CUNEIFORM SIGN SHA3 TIMES TUR;Lo;0;L;;;;;N;;;;;
+122B5;CUNEIFORM SIGN SHA3 TIMES U;Lo;0;L;;;;;N;;;;;
+122B6;CUNEIFORM SIGN SHA3 TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
+122B7;CUNEIFORM SIGN SHA6;Lo;0;L;;;;;N;;;;;
+122B8;CUNEIFORM SIGN SHAB6;Lo;0;L;;;;;N;;;;;
+122B9;CUNEIFORM SIGN SHAR2;Lo;0;L;;;;;N;;;;;
+122BA;CUNEIFORM SIGN SHE;Lo;0;L;;;;;N;;;;;
+122BB;CUNEIFORM SIGN SHE HU;Lo;0;L;;;;;N;;;;;
+122BC;CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+122BD;CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+122BE;CUNEIFORM SIGN SHEG9;Lo;0;L;;;;;N;;;;;
+122BF;CUNEIFORM SIGN SHEN;Lo;0;L;;;;;N;;;;;
+122C0;CUNEIFORM SIGN SHESH;Lo;0;L;;;;;N;;;;;
+122C1;CUNEIFORM SIGN SHESH2;Lo;0;L;;;;;N;;;;;
+122C2;CUNEIFORM SIGN SHESHLAM;Lo;0;L;;;;;N;;;;;
+122C3;CUNEIFORM SIGN SHID;Lo;0;L;;;;;N;;;;;
+122C4;CUNEIFORM SIGN SHID TIMES A;Lo;0;L;;;;;N;;;;;
+122C5;CUNEIFORM SIGN SHID TIMES IM;Lo;0;L;;;;;N;;;;;
+122C6;CUNEIFORM SIGN SHIM;Lo;0;L;;;;;N;;;;;
+122C7;CUNEIFORM SIGN SHIM TIMES A;Lo;0;L;;;;;N;;;;;
+122C8;CUNEIFORM SIGN SHIM TIMES BAL;Lo;0;L;;;;;N;;;;;
+122C9;CUNEIFORM SIGN SHIM TIMES BULUG;Lo;0;L;;;;;N;;;;;
+122CA;CUNEIFORM SIGN SHIM TIMES DIN;Lo;0;L;;;;;N;;;;;
+122CB;CUNEIFORM SIGN SHIM TIMES GAR;Lo;0;L;;;;;N;;;;;
+122CC;CUNEIFORM SIGN SHIM TIMES IGI;Lo;0;L;;;;;N;;;;;
+122CD;CUNEIFORM SIGN SHIM TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+122CE;CUNEIFORM SIGN SHIM TIMES KUSHU2;Lo;0;L;;;;;N;;;;;
+122CF;CUNEIFORM SIGN SHIM TIMES LUL;Lo;0;L;;;;;N;;;;;
+122D0;CUNEIFORM SIGN SHIM TIMES MUG;Lo;0;L;;;;;N;;;;;
+122D1;CUNEIFORM SIGN SHIM TIMES SAL;Lo;0;L;;;;;N;;;;;
+122D2;CUNEIFORM SIGN SHINIG;Lo;0;L;;;;;N;;;;;
+122D3;CUNEIFORM SIGN SHIR;Lo;0;L;;;;;N;;;;;
+122D4;CUNEIFORM SIGN SHIR TENU;Lo;0;L;;;;;N;;;;;
+122D5;CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR;Lo;0;L;;;;;N;;;;;
+122D6;CUNEIFORM SIGN SHITA;Lo;0;L;;;;;N;;;;;
+122D7;CUNEIFORM SIGN SHU;Lo;0;L;;;;;N;;;;;
+122D8;CUNEIFORM SIGN SHU OVER INVERTED SHU;Lo;0;L;;;;;N;;;;;
+122D9;CUNEIFORM SIGN SHU2;Lo;0;L;;;;;N;;;;;
+122DA;CUNEIFORM SIGN SHUBUR;Lo;0;L;;;;;N;;;;;
+122DB;CUNEIFORM SIGN SI;Lo;0;L;;;;;N;;;;;
+122DC;CUNEIFORM SIGN SI GUNU;Lo;0;L;;;;;N;;;;;
+122DD;CUNEIFORM SIGN SIG;Lo;0;L;;;;;N;;;;;
+122DE;CUNEIFORM SIGN SIG4;Lo;0;L;;;;;N;;;;;
+122DF;CUNEIFORM SIGN SIG4 OVER SIG4 SHU2;Lo;0;L;;;;;N;;;;;
+122E0;CUNEIFORM SIGN SIK2;Lo;0;L;;;;;N;;;;;
+122E1;CUNEIFORM SIGN SILA3;Lo;0;L;;;;;N;;;;;
+122E2;CUNEIFORM SIGN SU;Lo;0;L;;;;;N;;;;;
+122E3;CUNEIFORM SIGN SU OVER SU;Lo;0;L;;;;;N;;;;;
+122E4;CUNEIFORM SIGN SUD;Lo;0;L;;;;;N;;;;;
+122E5;CUNEIFORM SIGN SUD2;Lo;0;L;;;;;N;;;;;
+122E6;CUNEIFORM SIGN SUHUR;Lo;0;L;;;;;N;;;;;
+122E7;CUNEIFORM SIGN SUM;Lo;0;L;;;;;N;;;;;
+122E8;CUNEIFORM SIGN SUMASH;Lo;0;L;;;;;N;;;;;
+122E9;CUNEIFORM SIGN SUR;Lo;0;L;;;;;N;;;;;
+122EA;CUNEIFORM SIGN SUR9;Lo;0;L;;;;;N;;;;;
+122EB;CUNEIFORM SIGN TA;Lo;0;L;;;;;N;;;;;
+122EC;CUNEIFORM SIGN TA ASTERISK;Lo;0;L;;;;;N;;;;;
+122ED;CUNEIFORM SIGN TA TIMES HI;Lo;0;L;;;;;N;;;;;
+122EE;CUNEIFORM SIGN TA TIMES MI;Lo;0;L;;;;;N;;;;;
+122EF;CUNEIFORM SIGN TA GUNU;Lo;0;L;;;;;N;;;;;
+122F0;CUNEIFORM SIGN TAB;Lo;0;L;;;;;N;;;;;
+122F1;CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH;Lo;0;L;;;;;N;;;;;
+122F2;CUNEIFORM SIGN TAB SQUARED;Lo;0;L;;;;;N;;;;;
+122F3;CUNEIFORM SIGN TAG;Lo;0;L;;;;;N;;;;;
+122F4;CUNEIFORM SIGN TAG TIMES BI;Lo;0;L;;;;;N;;;;;
+122F5;CUNEIFORM SIGN TAG TIMES GUD;Lo;0;L;;;;;N;;;;;
+122F6;CUNEIFORM SIGN TAG TIMES SHE;Lo;0;L;;;;;N;;;;;
+122F7;CUNEIFORM SIGN TAG TIMES SHU;Lo;0;L;;;;;N;;;;;
+122F8;CUNEIFORM SIGN TAG TIMES TUG2;Lo;0;L;;;;;N;;;;;
+122F9;CUNEIFORM SIGN TAG TIMES UD;Lo;0;L;;;;;N;;;;;
+122FA;CUNEIFORM SIGN TAK4;Lo;0;L;;;;;N;;;;;
+122FB;CUNEIFORM SIGN TAR;Lo;0;L;;;;;N;;;;;
+122FC;CUNEIFORM SIGN TE;Lo;0;L;;;;;N;;;;;
+122FD;CUNEIFORM SIGN TE GUNU;Lo;0;L;;;;;N;;;;;
+122FE;CUNEIFORM SIGN TI;Lo;0;L;;;;;N;;;;;
+122FF;CUNEIFORM SIGN TI TENU;Lo;0;L;;;;;N;;;;;
+12300;CUNEIFORM SIGN TIL;Lo;0;L;;;;;N;;;;;
+12301;CUNEIFORM SIGN TIR;Lo;0;L;;;;;N;;;;;
+12302;CUNEIFORM SIGN TIR TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12303;CUNEIFORM SIGN TIR OVER TIR;Lo;0;L;;;;;N;;;;;
+12304;CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+12305;CUNEIFORM SIGN TU;Lo;0;L;;;;;N;;;;;
+12306;CUNEIFORM SIGN TUG2;Lo;0;L;;;;;N;;;;;
+12307;CUNEIFORM SIGN TUK;Lo;0;L;;;;;N;;;;;
+12308;CUNEIFORM SIGN TUM;Lo;0;L;;;;;N;;;;;
+12309;CUNEIFORM SIGN TUR;Lo;0;L;;;;;N;;;;;
+1230A;CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA;Lo;0;L;;;;;N;;;;;
+1230B;CUNEIFORM SIGN U;Lo;0;L;;;;;N;;;;;
+1230C;CUNEIFORM SIGN U GUD;Lo;0;L;;;;;N;;;;;
+1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;;N;;;;;
+1230E;CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+1230F;CUNEIFORM SIGN U OVER U SUR OVER SUR;Lo;0;L;;;;;N;;;;;
+12310;CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED;Lo;0;L;;;;;N;;;;;
+12311;CUNEIFORM SIGN U2;Lo;0;L;;;;;N;;;;;
+12312;CUNEIFORM SIGN UB;Lo;0;L;;;;;N;;;;;
+12313;CUNEIFORM SIGN UD;Lo;0;L;;;;;N;;;;;
+12314;CUNEIFORM SIGN UD KUSHU2;Lo;0;L;;;;;N;;;;;
+12315;CUNEIFORM SIGN UD TIMES BAD;Lo;0;L;;;;;N;;;;;
+12316;CUNEIFORM SIGN UD TIMES MI;Lo;0;L;;;;;N;;;;;
+12317;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+12318;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU;Lo;0;L;;;;;N;;;;;
+12319;CUNEIFORM SIGN UD GUNU;Lo;0;L;;;;;N;;;;;
+1231A;CUNEIFORM SIGN UD SHESHIG;Lo;0;L;;;;;N;;;;;
+1231B;CUNEIFORM SIGN UD SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;;
+1231C;CUNEIFORM SIGN UDUG;Lo;0;L;;;;;N;;;;;
+1231D;CUNEIFORM SIGN UM;Lo;0;L;;;;;N;;;;;
+1231E;CUNEIFORM SIGN UM TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+1231F;CUNEIFORM SIGN UM TIMES ME PLUS DA;Lo;0;L;;;;;N;;;;;
+12320;CUNEIFORM SIGN UM TIMES SHA3;Lo;0;L;;;;;N;;;;;
+12321;CUNEIFORM SIGN UM TIMES U;Lo;0;L;;;;;N;;;;;
+12322;CUNEIFORM SIGN UMBIN;Lo;0;L;;;;;N;;;;;
+12323;CUNEIFORM SIGN UMUM;Lo;0;L;;;;;N;;;;;
+12324;CUNEIFORM SIGN UMUM TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+12325;CUNEIFORM SIGN UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
+12326;CUNEIFORM SIGN UN;Lo;0;L;;;;;N;;;;;
+12327;CUNEIFORM SIGN UN GUNU;Lo;0;L;;;;;N;;;;;
+12328;CUNEIFORM SIGN UR;Lo;0;L;;;;;N;;;;;
+12329;CUNEIFORM SIGN UR CROSSING UR;Lo;0;L;;;;;N;;;;;
+1232A;CUNEIFORM SIGN UR SHESHIG;Lo;0;L;;;;;N;;;;;
+1232B;CUNEIFORM SIGN UR2;Lo;0;L;;;;;N;;;;;
+1232C;CUNEIFORM SIGN UR2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
+1232D;CUNEIFORM SIGN UR2 TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
+1232E;CUNEIFORM SIGN UR2 TIMES AL;Lo;0;L;;;;;N;;;;;
+1232F;CUNEIFORM SIGN UR2 TIMES HA;Lo;0;L;;;;;N;;;;;
+12330;CUNEIFORM SIGN UR2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+12331;CUNEIFORM SIGN UR2 TIMES U2;Lo;0;L;;;;;N;;;;;
+12332;CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+12333;CUNEIFORM SIGN UR2 TIMES U2 PLUS BI;Lo;0;L;;;;;N;;;;;
+12334;CUNEIFORM SIGN UR4;Lo;0;L;;;;;N;;;;;
+12335;CUNEIFORM SIGN URI;Lo;0;L;;;;;N;;;;;
+12336;CUNEIFORM SIGN URI3;Lo;0;L;;;;;N;;;;;
+12337;CUNEIFORM SIGN URU;Lo;0;L;;;;;N;;;;;
+12338;CUNEIFORM SIGN URU TIMES A;Lo;0;L;;;;;N;;;;;
+12339;CUNEIFORM SIGN URU TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
+1233A;CUNEIFORM SIGN URU TIMES BAR;Lo;0;L;;;;;N;;;;;
+1233B;CUNEIFORM SIGN URU TIMES DUN;Lo;0;L;;;;;N;;;;;
+1233C;CUNEIFORM SIGN URU TIMES GA;Lo;0;L;;;;;N;;;;;
+1233D;CUNEIFORM SIGN URU TIMES GAL;Lo;0;L;;;;;N;;;;;
+1233E;CUNEIFORM SIGN URU TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1233F;CUNEIFORM SIGN URU TIMES GAR;Lo;0;L;;;;;N;;;;;
+12340;CUNEIFORM SIGN URU TIMES GU;Lo;0;L;;;;;N;;;;;
+12341;CUNEIFORM SIGN URU TIMES HA;Lo;0;L;;;;;N;;;;;
+12342;CUNEIFORM SIGN URU TIMES IGI;Lo;0;L;;;;;N;;;;;
+12343;CUNEIFORM SIGN URU TIMES IM;Lo;0;L;;;;;N;;;;;
+12344;CUNEIFORM SIGN URU TIMES ISH;Lo;0;L;;;;;N;;;;;
+12345;CUNEIFORM SIGN URU TIMES KI;Lo;0;L;;;;;N;;;;;
+12346;CUNEIFORM SIGN URU TIMES LUM;Lo;0;L;;;;;N;;;;;
+12347;CUNEIFORM SIGN URU TIMES MIN;Lo;0;L;;;;;N;;;;;
+12348;CUNEIFORM SIGN URU TIMES PA;Lo;0;L;;;;;N;;;;;
+12349;CUNEIFORM SIGN URU TIMES SHE;Lo;0;L;;;;;N;;;;;
+1234A;CUNEIFORM SIGN URU TIMES SIG4;Lo;0;L;;;;;N;;;;;
+1234B;CUNEIFORM SIGN URU TIMES TU;Lo;0;L;;;;;N;;;;;
+1234C;CUNEIFORM SIGN URU TIMES U PLUS GUD;Lo;0;L;;;;;N;;;;;
+1234D;CUNEIFORM SIGN URU TIMES UD;Lo;0;L;;;;;N;;;;;
+1234E;CUNEIFORM SIGN URU TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1234F;CUNEIFORM SIGN URUDA;Lo;0;L;;;;;N;;;;;
+12350;CUNEIFORM SIGN URUDA TIMES U;Lo;0;L;;;;;N;;;;;
+12351;CUNEIFORM SIGN USH;Lo;0;L;;;;;N;;;;;
+12352;CUNEIFORM SIGN USH TIMES A;Lo;0;L;;;;;N;;;;;
+12353;CUNEIFORM SIGN USH TIMES KU;Lo;0;L;;;;;N;;;;;
+12354;CUNEIFORM SIGN USH TIMES KUR;Lo;0;L;;;;;N;;;;;
+12355;CUNEIFORM SIGN USH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12356;CUNEIFORM SIGN USHX;Lo;0;L;;;;;N;;;;;
+12357;CUNEIFORM SIGN USH2;Lo;0;L;;;;;N;;;;;
+12358;CUNEIFORM SIGN USHUMX;Lo;0;L;;;;;N;;;;;
+12359;CUNEIFORM SIGN UTUKI;Lo;0;L;;;;;N;;;;;
+1235A;CUNEIFORM SIGN UZ3;Lo;0;L;;;;;N;;;;;
+1235B;CUNEIFORM SIGN UZ3 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1235C;CUNEIFORM SIGN UZU;Lo;0;L;;;;;N;;;;;
+1235D;CUNEIFORM SIGN ZA;Lo;0;L;;;;;N;;;;;
+1235E;CUNEIFORM SIGN ZA TENU;Lo;0;L;;;;;N;;;;;
+1235F;CUNEIFORM SIGN ZA SQUARED TIMES KUR;Lo;0;L;;;;;N;;;;;
+12360;CUNEIFORM SIGN ZAG;Lo;0;L;;;;;N;;;;;
+12361;CUNEIFORM SIGN ZAMX;Lo;0;L;;;;;N;;;;;
+12362;CUNEIFORM SIGN ZE2;Lo;0;L;;;;;N;;;;;
+12363;CUNEIFORM SIGN ZI;Lo;0;L;;;;;N;;;;;
+12364;CUNEIFORM SIGN ZI OVER ZI;Lo;0;L;;;;;N;;;;;
+12365;CUNEIFORM SIGN ZI3;Lo;0;L;;;;;N;;;;;
+12366;CUNEIFORM SIGN ZIB;Lo;0;L;;;;;N;;;;;
+12367;CUNEIFORM SIGN ZIB KABA TENU;Lo;0;L;;;;;N;;;;;
+12368;CUNEIFORM SIGN ZIG;Lo;0;L;;;;;N;;;;;
+12369;CUNEIFORM SIGN ZIZ2;Lo;0;L;;;;;N;;;;;
+1236A;CUNEIFORM SIGN ZU;Lo;0;L;;;;;N;;;;;
+1236B;CUNEIFORM SIGN ZU5;Lo;0;L;;;;;N;;;;;
+1236C;CUNEIFORM SIGN ZU5 TIMES A;Lo;0;L;;;;;N;;;;;
+1236D;CUNEIFORM SIGN ZUBUR;Lo;0;L;;;;;N;;;;;
+1236E;CUNEIFORM SIGN ZUM;Lo;0;L;;;;;N;;;;;
+1236F;CUNEIFORM SIGN KAP ELAMITE;Lo;0;L;;;;;N;;;;;
+12370;CUNEIFORM SIGN AB TIMES NUN;Lo;0;L;;;;;N;;;;;
+12371;CUNEIFORM SIGN AB2 TIMES A;Lo;0;L;;;;;N;;;;;
+12372;CUNEIFORM SIGN AMAR TIMES KUG;Lo;0;L;;;;;N;;;;;
+12373;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS MASH;Lo;0;L;;;;;N;;;;;
+12374;CUNEIFORM SIGN DAG3;Lo;0;L;;;;;N;;;;;
+12375;CUNEIFORM SIGN DISH PLUS SHU;Lo;0;L;;;;;N;;;;;
+12376;CUNEIFORM SIGN DUB TIMES SHE;Lo;0;L;;;;;N;;;;;
+12377;CUNEIFORM SIGN EZEN TIMES GUD;Lo;0;L;;;;;N;;;;;
+12378;CUNEIFORM SIGN EZEN TIMES SHE;Lo;0;L;;;;;N;;;;;
+12379;CUNEIFORM SIGN GA2 TIMES AN PLUS KAK PLUS A;Lo;0;L;;;;;N;;;;;
+1237A;CUNEIFORM SIGN GA2 TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1237B;CUNEIFORM SIGN GE22;Lo;0;L;;;;;N;;;;;
+1237C;CUNEIFORM SIGN GIG;Lo;0;L;;;;;N;;;;;
+1237D;CUNEIFORM SIGN HUSH;Lo;0;L;;;;;N;;;;;
+1237E;CUNEIFORM SIGN KA TIMES ANSHE;Lo;0;L;;;;;N;;;;;
+1237F;CUNEIFORM SIGN KA TIMES ASH3;Lo;0;L;;;;;N;;;;;
+12380;CUNEIFORM SIGN KA TIMES GISH;Lo;0;L;;;;;N;;;;;
+12381;CUNEIFORM SIGN KA TIMES GUD;Lo;0;L;;;;;N;;;;;
+12382;CUNEIFORM SIGN KA TIMES HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+12383;CUNEIFORM SIGN KA TIMES LUM;Lo;0;L;;;;;N;;;;;
+12384;CUNEIFORM SIGN KA TIMES PA;Lo;0;L;;;;;N;;;;;
+12385;CUNEIFORM SIGN KA TIMES SHUL;Lo;0;L;;;;;N;;;;;
+12386;CUNEIFORM SIGN KA TIMES TU;Lo;0;L;;;;;N;;;;;
+12387;CUNEIFORM SIGN KA TIMES UR2;Lo;0;L;;;;;N;;;;;
+12388;CUNEIFORM SIGN LAGAB TIMES GI;Lo;0;L;;;;;N;;;;;
+12389;CUNEIFORM SIGN LU2 SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;;
+1238A;CUNEIFORM SIGN LU2 TIMES ESH2 PLUS LAL;Lo;0;L;;;;;N;;;;;
+1238B;CUNEIFORM SIGN LU2 TIMES SHU;Lo;0;L;;;;;N;;;;;
+1238C;CUNEIFORM SIGN MESH;Lo;0;L;;;;;N;;;;;
+1238D;CUNEIFORM SIGN MUSH3 TIMES ZA;Lo;0;L;;;;;N;;;;;
+1238E;CUNEIFORM SIGN NA4;Lo;0;L;;;;;N;;;;;
+1238F;CUNEIFORM SIGN NIN;Lo;0;L;;;;;N;;;;;
+12390;CUNEIFORM SIGN NIN9;Lo;0;L;;;;;N;;;;;
+12391;CUNEIFORM SIGN NINDA2 TIMES BAL;Lo;0;L;;;;;N;;;;;
+12392;CUNEIFORM SIGN NINDA2 TIMES GI;Lo;0;L;;;;;N;;;;;
+12393;CUNEIFORM SIGN NU11 ROTATED NINETY DEGREES;Lo;0;L;;;;;N;;;;;
+12394;CUNEIFORM SIGN PESH2 ASTERISK;Lo;0;L;;;;;N;;;;;
+12395;CUNEIFORM SIGN PIR2;Lo;0;L;;;;;N;;;;;
+12396;CUNEIFORM SIGN SAG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12397;CUNEIFORM SIGN TI2;Lo;0;L;;;;;N;;;;;
+12398;CUNEIFORM SIGN UM TIMES ME;Lo;0;L;;;;;N;;;;;
+12399;CUNEIFORM SIGN U U;Lo;0;L;;;;;N;;;;;
+12400;CUNEIFORM NUMERIC SIGN TWO ASH;Nl;0;L;;;;2;N;;;;;
+12401;CUNEIFORM NUMERIC SIGN THREE ASH;Nl;0;L;;;;3;N;;;;;
+12402;CUNEIFORM NUMERIC SIGN FOUR ASH;Nl;0;L;;;;4;N;;;;;
+12403;CUNEIFORM NUMERIC SIGN FIVE ASH;Nl;0;L;;;;5;N;;;;;
+12404;CUNEIFORM NUMERIC SIGN SIX ASH;Nl;0;L;;;;6;N;;;;;
+12405;CUNEIFORM NUMERIC SIGN SEVEN ASH;Nl;0;L;;;;7;N;;;;;
+12406;CUNEIFORM NUMERIC SIGN EIGHT ASH;Nl;0;L;;;;8;N;;;;;
+12407;CUNEIFORM NUMERIC SIGN NINE ASH;Nl;0;L;;;;9;N;;;;;
+12408;CUNEIFORM NUMERIC SIGN THREE DISH;Nl;0;L;;;;3;N;;;;;
+12409;CUNEIFORM NUMERIC SIGN FOUR DISH;Nl;0;L;;;;4;N;;;;;
+1240A;CUNEIFORM NUMERIC SIGN FIVE DISH;Nl;0;L;;;;5;N;;;;;
+1240B;CUNEIFORM NUMERIC SIGN SIX DISH;Nl;0;L;;;;6;N;;;;;
+1240C;CUNEIFORM NUMERIC SIGN SEVEN DISH;Nl;0;L;;;;7;N;;;;;
+1240D;CUNEIFORM NUMERIC SIGN EIGHT DISH;Nl;0;L;;;;8;N;;;;;
+1240E;CUNEIFORM NUMERIC SIGN NINE DISH;Nl;0;L;;;;9;N;;;;;
+1240F;CUNEIFORM NUMERIC SIGN FOUR U;Nl;0;L;;;;4;N;;;;;
+12410;CUNEIFORM NUMERIC SIGN FIVE U;Nl;0;L;;;;5;N;;;;;
+12411;CUNEIFORM NUMERIC SIGN SIX U;Nl;0;L;;;;6;N;;;;;
+12412;CUNEIFORM NUMERIC SIGN SEVEN U;Nl;0;L;;;;7;N;;;;;
+12413;CUNEIFORM NUMERIC SIGN EIGHT U;Nl;0;L;;;;8;N;;;;;
+12414;CUNEIFORM NUMERIC SIGN NINE U;Nl;0;L;;;;9;N;;;;;
+12415;CUNEIFORM NUMERIC SIGN ONE GESH2;Nl;0;L;;;;1;N;;;;;
+12416;CUNEIFORM NUMERIC SIGN TWO GESH2;Nl;0;L;;;;2;N;;;;;
+12417;CUNEIFORM NUMERIC SIGN THREE GESH2;Nl;0;L;;;;3;N;;;;;
+12418;CUNEIFORM NUMERIC SIGN FOUR GESH2;Nl;0;L;;;;4;N;;;;;
+12419;CUNEIFORM NUMERIC SIGN FIVE GESH2;Nl;0;L;;;;5;N;;;;;
+1241A;CUNEIFORM NUMERIC SIGN SIX GESH2;Nl;0;L;;;;6;N;;;;;
+1241B;CUNEIFORM NUMERIC SIGN SEVEN GESH2;Nl;0;L;;;;7;N;;;;;
+1241C;CUNEIFORM NUMERIC SIGN EIGHT GESH2;Nl;0;L;;;;8;N;;;;;
+1241D;CUNEIFORM NUMERIC SIGN NINE GESH2;Nl;0;L;;;;9;N;;;;;
+1241E;CUNEIFORM NUMERIC SIGN ONE GESHU;Nl;0;L;;;;1;N;;;;;
+1241F;CUNEIFORM NUMERIC SIGN TWO GESHU;Nl;0;L;;;;2;N;;;;;
+12420;CUNEIFORM NUMERIC SIGN THREE GESHU;Nl;0;L;;;;3;N;;;;;
+12421;CUNEIFORM NUMERIC SIGN FOUR GESHU;Nl;0;L;;;;4;N;;;;;
+12422;CUNEIFORM NUMERIC SIGN FIVE GESHU;Nl;0;L;;;;5;N;;;;;
+12423;CUNEIFORM NUMERIC SIGN TWO SHAR2;Nl;0;L;;;;2;N;;;;;
+12424;CUNEIFORM NUMERIC SIGN THREE SHAR2;Nl;0;L;;;;3;N;;;;;
+12425;CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12426;CUNEIFORM NUMERIC SIGN FOUR SHAR2;Nl;0;L;;;;4;N;;;;;
+12427;CUNEIFORM NUMERIC SIGN FIVE SHAR2;Nl;0;L;;;;5;N;;;;;
+12428;CUNEIFORM NUMERIC SIGN SIX SHAR2;Nl;0;L;;;;6;N;;;;;
+12429;CUNEIFORM NUMERIC SIGN SEVEN SHAR2;Nl;0;L;;;;7;N;;;;;
+1242A;CUNEIFORM NUMERIC SIGN EIGHT SHAR2;Nl;0;L;;;;8;N;;;;;
+1242B;CUNEIFORM NUMERIC SIGN NINE SHAR2;Nl;0;L;;;;9;N;;;;;
+1242C;CUNEIFORM NUMERIC SIGN ONE SHARU;Nl;0;L;;;;1;N;;;;;
+1242D;CUNEIFORM NUMERIC SIGN TWO SHARU;Nl;0;L;;;;2;N;;;;;
+1242E;CUNEIFORM NUMERIC SIGN THREE SHARU;Nl;0;L;;;;3;N;;;;;
+1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;;
+12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;;
+12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;216000;N;;;;;
+12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;432000;N;;;;;
+12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;;
+12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;;
+12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;;
+12437;CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12438;CUNEIFORM NUMERIC SIGN FOUR BURU;Nl;0;L;;;;4;N;;;;;
+12439;CUNEIFORM NUMERIC SIGN FIVE BURU;Nl;0;L;;;;5;N;;;;;
+1243A;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16;Nl;0;L;;;;3;N;;;;;
+1243B;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21;Nl;0;L;;;;3;N;;;;;
+1243C;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU;Nl;0;L;;;;4;N;;;;;
+1243D;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4;Nl;0;L;;;;4;N;;;;;
+1243E;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A;Nl;0;L;;;;4;N;;;;;
+1243F;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B;Nl;0;L;;;;4;N;;;;;
+12440;CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9;Nl;0;L;;;;6;N;;;;;
+12441;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3;Nl;0;L;;;;7;N;;;;;
+12442;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A;Nl;0;L;;;;7;N;;;;;
+12443;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B;Nl;0;L;;;;7;N;;;;;
+12444;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU;Nl;0;L;;;;8;N;;;;;
+12445;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3;Nl;0;L;;;;8;N;;;;;
+12446;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU;Nl;0;L;;;;9;N;;;;;
+12447;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3;Nl;0;L;;;;9;N;;;;;
+12448;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4;Nl;0;L;;;;9;N;;;;;
+12449;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A;Nl;0;L;;;;9;N;;;;;
+1244A;CUNEIFORM NUMERIC SIGN TWO ASH TENU;Nl;0;L;;;;2;N;;;;;
+1244B;CUNEIFORM NUMERIC SIGN THREE ASH TENU;Nl;0;L;;;;3;N;;;;;
+1244C;CUNEIFORM NUMERIC SIGN FOUR ASH TENU;Nl;0;L;;;;4;N;;;;;
+1244D;CUNEIFORM NUMERIC SIGN FIVE ASH TENU;Nl;0;L;;;;5;N;;;;;
+1244E;CUNEIFORM NUMERIC SIGN SIX ASH TENU;Nl;0;L;;;;6;N;;;;;
+1244F;CUNEIFORM NUMERIC SIGN ONE BAN2;Nl;0;L;;;;1;N;;;;;
+12450;CUNEIFORM NUMERIC SIGN TWO BAN2;Nl;0;L;;;;2;N;;;;;
+12451;CUNEIFORM NUMERIC SIGN THREE BAN2;Nl;0;L;;;;3;N;;;;;
+12452;CUNEIFORM NUMERIC SIGN FOUR BAN2;Nl;0;L;;;;4;N;;;;;
+12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
+12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
+12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
+12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;2;N;;;;;
+12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;3;N;;;;;
+12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
+12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
+1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;
+1245B;CUNEIFORM NUMERIC SIGN TWO THIRDS DISH;Nl;0;L;;;;2/3;N;;;;;
+1245C;CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH;Nl;0;L;;;;5/6;N;;;;;
+1245D;CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A;Nl;0;L;;;;1/3;N;;;;;
+1245E;CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A;Nl;0;L;;;;2/3;N;;;;;
+1245F;CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH;Nl;0;L;;;;1/8;N;;;;;
+12460;CUNEIFORM NUMERIC SIGN ONE QUARTER ASH;Nl;0;L;;;;1/4;N;;;;;
+12461;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH;Nl;0;L;;;;1/6;N;;;;;
+12462;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER;Nl;0;L;;;;1/4;N;;;;;
+12463;CUNEIFORM NUMERIC SIGN ONE QUARTER GUR;Nl;0;L;;;;1/4;N;;;;;
+12464;CUNEIFORM NUMERIC SIGN ONE HALF GUR;Nl;0;L;;;;1/2;N;;;;;
+12465;CUNEIFORM NUMERIC SIGN ELAMITE ONE THIRD;Nl;0;L;;;;1/3;N;;;;;
+12466;CUNEIFORM NUMERIC SIGN ELAMITE TWO THIRDS;Nl;0;L;;;;2/3;N;;;;;
+12467;CUNEIFORM NUMERIC SIGN ELAMITE FORTY;Nl;0;L;;;;40;N;;;;;
+12468;CUNEIFORM NUMERIC SIGN ELAMITE FIFTY;Nl;0;L;;;;50;N;;;;;
+12469;CUNEIFORM NUMERIC SIGN FOUR U VARIANT FORM;Nl;0;L;;;;4;N;;;;;
+1246A;CUNEIFORM NUMERIC SIGN FIVE U VARIANT FORM;Nl;0;L;;;;5;N;;;;;
+1246B;CUNEIFORM NUMERIC SIGN SIX U VARIANT FORM;Nl;0;L;;;;6;N;;;;;
+1246C;CUNEIFORM NUMERIC SIGN SEVEN U VARIANT FORM;Nl;0;L;;;;7;N;;;;;
+1246D;CUNEIFORM NUMERIC SIGN EIGHT U VARIANT FORM;Nl;0;L;;;;8;N;;;;;
+1246E;CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM;Nl;0;L;;;;9;N;;;;;
+12470;CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
+12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;;
+12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;;
+12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;;
+12474;CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON;Po;0;L;;;;;N;;;;;
+12480;CUNEIFORM SIGN AB TIMES NUN TENU;Lo;0;L;;;;;N;;;;;
+12481;CUNEIFORM SIGN AB TIMES SHU2;Lo;0;L;;;;;N;;;;;
+12482;CUNEIFORM SIGN AD TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12483;CUNEIFORM SIGN BAD TIMES DISH TENU;Lo;0;L;;;;;N;;;;;
+12484;CUNEIFORM SIGN BAHAR2 TIMES AB2;Lo;0;L;;;;;N;;;;;
+12485;CUNEIFORM SIGN BAHAR2 TIMES NI;Lo;0;L;;;;;N;;;;;
+12486;CUNEIFORM SIGN BAHAR2 TIMES ZA;Lo;0;L;;;;;N;;;;;
+12487;CUNEIFORM SIGN BU OVER BU TIMES NA2;Lo;0;L;;;;;N;;;;;
+12488;CUNEIFORM SIGN DA TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12489;CUNEIFORM SIGN DAG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1248A;CUNEIFORM SIGN DIM TIMES IGI;Lo;0;L;;;;;N;;;;;
+1248B;CUNEIFORM SIGN DIM TIMES U U U;Lo;0;L;;;;;N;;;;;
+1248C;CUNEIFORM SIGN DIM2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1248D;CUNEIFORM SIGN DUG TIMES ANSHE;Lo;0;L;;;;;N;;;;;
+1248E;CUNEIFORM SIGN DUG TIMES ASH;Lo;0;L;;;;;N;;;;;
+1248F;CUNEIFORM SIGN DUG TIMES ASH AT LEFT;Lo;0;L;;;;;N;;;;;
+12490;CUNEIFORM SIGN DUG TIMES DIN;Lo;0;L;;;;;N;;;;;
+12491;CUNEIFORM SIGN DUG TIMES DUN;Lo;0;L;;;;;N;;;;;
+12492;CUNEIFORM SIGN DUG TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+12493;CUNEIFORM SIGN DUG TIMES GA;Lo;0;L;;;;;N;;;;;
+12494;CUNEIFORM SIGN DUG TIMES GI;Lo;0;L;;;;;N;;;;;
+12495;CUNEIFORM SIGN DUG TIMES GIR2 GUNU;Lo;0;L;;;;;N;;;;;
+12496;CUNEIFORM SIGN DUG TIMES GISH;Lo;0;L;;;;;N;;;;;
+12497;CUNEIFORM SIGN DUG TIMES HA;Lo;0;L;;;;;N;;;;;
+12498;CUNEIFORM SIGN DUG TIMES HI;Lo;0;L;;;;;N;;;;;
+12499;CUNEIFORM SIGN DUG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1249A;CUNEIFORM SIGN DUG TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1249B;CUNEIFORM SIGN DUG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1249C;CUNEIFORM SIGN DUG TIMES KUSHU2;Lo;0;L;;;;;N;;;;;
+1249D;CUNEIFORM SIGN DUG TIMES KUSHU2 PLUS KASKAL;Lo;0;L;;;;;N;;;;;
+1249E;CUNEIFORM SIGN DUG TIMES LAK-020;Lo;0;L;;;;;N;;;;;
+1249F;CUNEIFORM SIGN DUG TIMES LAM;Lo;0;L;;;;;N;;;;;
+124A0;CUNEIFORM SIGN DUG TIMES LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+124A1;CUNEIFORM SIGN DUG TIMES LUH PLUS GISH;Lo;0;L;;;;;N;;;;;
+124A2;CUNEIFORM SIGN DUG TIMES MASH;Lo;0;L;;;;;N;;;;;
+124A3;CUNEIFORM SIGN DUG TIMES MES;Lo;0;L;;;;;N;;;;;
+124A4;CUNEIFORM SIGN DUG TIMES MI;Lo;0;L;;;;;N;;;;;
+124A5;CUNEIFORM SIGN DUG TIMES NI;Lo;0;L;;;;;N;;;;;
+124A6;CUNEIFORM SIGN DUG TIMES PI;Lo;0;L;;;;;N;;;;;
+124A7;CUNEIFORM SIGN DUG TIMES SHE;Lo;0;L;;;;;N;;;;;
+124A8;CUNEIFORM SIGN DUG TIMES SI GUNU;Lo;0;L;;;;;N;;;;;
+124A9;CUNEIFORM SIGN E2 TIMES KUR;Lo;0;L;;;;;N;;;;;
+124AA;CUNEIFORM SIGN E2 TIMES PAP;Lo;0;L;;;;;N;;;;;
+124AB;CUNEIFORM SIGN ERIN2 X;Lo;0;L;;;;;N;;;;;
+124AC;CUNEIFORM SIGN ESH2 CROSSING ESH2;Lo;0;L;;;;;N;;;;;
+124AD;CUNEIFORM SIGN EZEN SHESHIG TIMES ASH;Lo;0;L;;;;;N;;;;;
+124AE;CUNEIFORM SIGN EZEN SHESHIG TIMES HI;Lo;0;L;;;;;N;;;;;
+124AF;CUNEIFORM SIGN EZEN SHESHIG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+124B0;CUNEIFORM SIGN EZEN SHESHIG TIMES LA;Lo;0;L;;;;;N;;;;;
+124B1;CUNEIFORM SIGN EZEN SHESHIG TIMES LAL;Lo;0;L;;;;;N;;;;;
+124B2;CUNEIFORM SIGN EZEN SHESHIG TIMES ME;Lo;0;L;;;;;N;;;;;
+124B3;CUNEIFORM SIGN EZEN SHESHIG TIMES MES;Lo;0;L;;;;;N;;;;;
+124B4;CUNEIFORM SIGN EZEN SHESHIG TIMES SU;Lo;0;L;;;;;N;;;;;
+124B5;CUNEIFORM SIGN EZEN TIMES SU;Lo;0;L;;;;;N;;;;;
+124B6;CUNEIFORM SIGN GA2 TIMES BAHAR2;Lo;0;L;;;;;N;;;;;
+124B7;CUNEIFORM SIGN GA2 TIMES DIM GUNU;Lo;0;L;;;;;N;;;;;
+124B8;CUNEIFORM SIGN GA2 TIMES DUG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+124B9;CUNEIFORM SIGN GA2 TIMES DUG TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+124BA;CUNEIFORM SIGN GA2 TIMES EREN;Lo;0;L;;;;;N;;;;;
+124BB;CUNEIFORM SIGN GA2 TIMES GA;Lo;0;L;;;;;N;;;;;
+124BC;CUNEIFORM SIGN GA2 TIMES GAR PLUS DI;Lo;0;L;;;;;N;;;;;
+124BD;CUNEIFORM SIGN GA2 TIMES GAR PLUS NE;Lo;0;L;;;;;N;;;;;
+124BE;CUNEIFORM SIGN GA2 TIMES HA PLUS A;Lo;0;L;;;;;N;;;;;
+124BF;CUNEIFORM SIGN GA2 TIMES KUSHU2 PLUS KASKAL;Lo;0;L;;;;;N;;;;;
+124C0;CUNEIFORM SIGN GA2 TIMES LAM;Lo;0;L;;;;;N;;;;;
+124C1;CUNEIFORM SIGN GA2 TIMES LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+124C2;CUNEIFORM SIGN GA2 TIMES LUH;Lo;0;L;;;;;N;;;;;
+124C3;CUNEIFORM SIGN GA2 TIMES MUSH;Lo;0;L;;;;;N;;;;;
+124C4;CUNEIFORM SIGN GA2 TIMES NE;Lo;0;L;;;;;N;;;;;
+124C5;CUNEIFORM SIGN GA2 TIMES NE PLUS E2;Lo;0;L;;;;;N;;;;;
+124C6;CUNEIFORM SIGN GA2 TIMES NE PLUS GI;Lo;0;L;;;;;N;;;;;
+124C7;CUNEIFORM SIGN GA2 TIMES SHIM;Lo;0;L;;;;;N;;;;;
+124C8;CUNEIFORM SIGN GA2 TIMES ZIZ2;Lo;0;L;;;;;N;;;;;
+124C9;CUNEIFORM SIGN GABA ROTATED NINETY DEGREES;Lo;0;L;;;;;N;;;;;
+124CA;CUNEIFORM SIGN GESHTIN TIMES U;Lo;0;L;;;;;N;;;;;
+124CB;CUNEIFORM SIGN GISH TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+124CC;CUNEIFORM SIGN GU2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+124CD;CUNEIFORM SIGN GUD PLUS GISH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+124CE;CUNEIFORM SIGN HA TENU GUNU;Lo;0;L;;;;;N;;;;;
+124CF;CUNEIFORM SIGN HI TIMES ASH OVER HI TIMES ASH;Lo;0;L;;;;;N;;;;;
+124D0;CUNEIFORM SIGN KA TIMES BU;Lo;0;L;;;;;N;;;;;
+124D1;CUNEIFORM SIGN KA TIMES KA;Lo;0;L;;;;;N;;;;;
+124D2;CUNEIFORM SIGN KA TIMES U U U;Lo;0;L;;;;;N;;;;;
+124D3;CUNEIFORM SIGN KA TIMES UR;Lo;0;L;;;;;N;;;;;
+124D4;CUNEIFORM SIGN LAGAB TIMES ZU OVER ZU;Lo;0;L;;;;;N;;;;;
+124D5;CUNEIFORM SIGN LAK-003;Lo;0;L;;;;;N;;;;;
+124D6;CUNEIFORM SIGN LAK-021;Lo;0;L;;;;;N;;;;;
+124D7;CUNEIFORM SIGN LAK-025;Lo;0;L;;;;;N;;;;;
+124D8;CUNEIFORM SIGN LAK-030;Lo;0;L;;;;;N;;;;;
+124D9;CUNEIFORM SIGN LAK-050;Lo;0;L;;;;;N;;;;;
+124DA;CUNEIFORM SIGN LAK-051;Lo;0;L;;;;;N;;;;;
+124DB;CUNEIFORM SIGN LAK-062;Lo;0;L;;;;;N;;;;;
+124DC;CUNEIFORM SIGN LAK-079 OVER LAK-079 GUNU;Lo;0;L;;;;;N;;;;;
+124DD;CUNEIFORM SIGN LAK-080;Lo;0;L;;;;;N;;;;;
+124DE;CUNEIFORM SIGN LAK-081 OVER LAK-081;Lo;0;L;;;;;N;;;;;
+124DF;CUNEIFORM SIGN LAK-092;Lo;0;L;;;;;N;;;;;
+124E0;CUNEIFORM SIGN LAK-130;Lo;0;L;;;;;N;;;;;
+124E1;CUNEIFORM SIGN LAK-142;Lo;0;L;;;;;N;;;;;
+124E2;CUNEIFORM SIGN LAK-210;Lo;0;L;;;;;N;;;;;
+124E3;CUNEIFORM SIGN LAK-219;Lo;0;L;;;;;N;;;;;
+124E4;CUNEIFORM SIGN LAK-220;Lo;0;L;;;;;N;;;;;
+124E5;CUNEIFORM SIGN LAK-225;Lo;0;L;;;;;N;;;;;
+124E6;CUNEIFORM SIGN LAK-228;Lo;0;L;;;;;N;;;;;
+124E7;CUNEIFORM SIGN LAK-238;Lo;0;L;;;;;N;;;;;
+124E8;CUNEIFORM SIGN LAK-265;Lo;0;L;;;;;N;;;;;
+124E9;CUNEIFORM SIGN LAK-266;Lo;0;L;;;;;N;;;;;
+124EA;CUNEIFORM SIGN LAK-343;Lo;0;L;;;;;N;;;;;
+124EB;CUNEIFORM SIGN LAK-347;Lo;0;L;;;;;N;;;;;
+124EC;CUNEIFORM SIGN LAK-348;Lo;0;L;;;;;N;;;;;
+124ED;CUNEIFORM SIGN LAK-383;Lo;0;L;;;;;N;;;;;
+124EE;CUNEIFORM SIGN LAK-384;Lo;0;L;;;;;N;;;;;
+124EF;CUNEIFORM SIGN LAK-390;Lo;0;L;;;;;N;;;;;
+124F0;CUNEIFORM SIGN LAK-441;Lo;0;L;;;;;N;;;;;
+124F1;CUNEIFORM SIGN LAK-449;Lo;0;L;;;;;N;;;;;
+124F2;CUNEIFORM SIGN LAK-449 TIMES GU;Lo;0;L;;;;;N;;;;;
+124F3;CUNEIFORM SIGN LAK-449 TIMES IGI;Lo;0;L;;;;;N;;;;;
+124F4;CUNEIFORM SIGN LAK-449 TIMES PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+124F5;CUNEIFORM SIGN LAK-449 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+124F6;CUNEIFORM SIGN LAK-449 TIMES U2 PLUS BA;Lo;0;L;;;;;N;;;;;
+124F7;CUNEIFORM SIGN LAK-450;Lo;0;L;;;;;N;;;;;
+124F8;CUNEIFORM SIGN LAK-457;Lo;0;L;;;;;N;;;;;
+124F9;CUNEIFORM SIGN LAK-470;Lo;0;L;;;;;N;;;;;
+124FA;CUNEIFORM SIGN LAK-483;Lo;0;L;;;;;N;;;;;
+124FB;CUNEIFORM SIGN LAK-490;Lo;0;L;;;;;N;;;;;
+124FC;CUNEIFORM SIGN LAK-492;Lo;0;L;;;;;N;;;;;
+124FD;CUNEIFORM SIGN LAK-493;Lo;0;L;;;;;N;;;;;
+124FE;CUNEIFORM SIGN LAK-495;Lo;0;L;;;;;N;;;;;
+124FF;CUNEIFORM SIGN LAK-550;Lo;0;L;;;;;N;;;;;
+12500;CUNEIFORM SIGN LAK-608;Lo;0;L;;;;;N;;;;;
+12501;CUNEIFORM SIGN LAK-617;Lo;0;L;;;;;N;;;;;
+12502;CUNEIFORM SIGN LAK-617 TIMES ASH;Lo;0;L;;;;;N;;;;;
+12503;CUNEIFORM SIGN LAK-617 TIMES BAD;Lo;0;L;;;;;N;;;;;
+12504;CUNEIFORM SIGN LAK-617 TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+12505;CUNEIFORM SIGN LAK-617 TIMES KU3;Lo;0;L;;;;;N;;;;;
+12506;CUNEIFORM SIGN LAK-617 TIMES LA;Lo;0;L;;;;;N;;;;;
+12507;CUNEIFORM SIGN LAK-617 TIMES TAR;Lo;0;L;;;;;N;;;;;
+12508;CUNEIFORM SIGN LAK-617 TIMES TE;Lo;0;L;;;;;N;;;;;
+12509;CUNEIFORM SIGN LAK-617 TIMES U2;Lo;0;L;;;;;N;;;;;
+1250A;CUNEIFORM SIGN LAK-617 TIMES UD;Lo;0;L;;;;;N;;;;;
+1250B;CUNEIFORM SIGN LAK-617 TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1250C;CUNEIFORM SIGN LAK-636;Lo;0;L;;;;;N;;;;;
+1250D;CUNEIFORM SIGN LAK-648;Lo;0;L;;;;;N;;;;;
+1250E;CUNEIFORM SIGN LAK-648 TIMES DUB;Lo;0;L;;;;;N;;;;;
+1250F;CUNEIFORM SIGN LAK-648 TIMES GA;Lo;0;L;;;;;N;;;;;
+12510;CUNEIFORM SIGN LAK-648 TIMES IGI;Lo;0;L;;;;;N;;;;;
+12511;CUNEIFORM SIGN LAK-648 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12512;CUNEIFORM SIGN LAK-648 TIMES NI;Lo;0;L;;;;;N;;;;;
+12513;CUNEIFORM SIGN LAK-648 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+12514;CUNEIFORM SIGN LAK-648 TIMES SHESH PLUS KI;Lo;0;L;;;;;N;;;;;
+12515;CUNEIFORM SIGN LAK-648 TIMES UD;Lo;0;L;;;;;N;;;;;
+12516;CUNEIFORM SIGN LAK-648 TIMES URUDA;Lo;0;L;;;;;N;;;;;
+12517;CUNEIFORM SIGN LAK-724;Lo;0;L;;;;;N;;;;;
+12518;CUNEIFORM SIGN LAK-749;Lo;0;L;;;;;N;;;;;
+12519;CUNEIFORM SIGN LU2 GUNU TIMES ASH;Lo;0;L;;;;;N;;;;;
+1251A;CUNEIFORM SIGN LU2 TIMES DISH;Lo;0;L;;;;;N;;;;;
+1251B;CUNEIFORM SIGN LU2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+1251C;CUNEIFORM SIGN LU2 TIMES PAP;Lo;0;L;;;;;N;;;;;
+1251D;CUNEIFORM SIGN LU2 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+1251E;CUNEIFORM SIGN LU2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1251F;CUNEIFORM SIGN MI PLUS ZA7;Lo;0;L;;;;;N;;;;;
+12520;CUNEIFORM SIGN MUSH OVER MUSH TIMES GA;Lo;0;L;;;;;N;;;;;
+12521;CUNEIFORM SIGN MUSH OVER MUSH TIMES KAK;Lo;0;L;;;;;N;;;;;
+12522;CUNEIFORM SIGN NINDA2 TIMES DIM GUNU;Lo;0;L;;;;;N;;;;;
+12523;CUNEIFORM SIGN NINDA2 TIMES GISH;Lo;0;L;;;;;N;;;;;
+12524;CUNEIFORM SIGN NINDA2 TIMES GUL;Lo;0;L;;;;;N;;;;;
+12525;CUNEIFORM SIGN NINDA2 TIMES HI;Lo;0;L;;;;;N;;;;;
+12526;CUNEIFORM SIGN NINDA2 TIMES KESH2;Lo;0;L;;;;;N;;;;;
+12527;CUNEIFORM SIGN NINDA2 TIMES LAK-050;Lo;0;L;;;;;N;;;;;
+12528;CUNEIFORM SIGN NINDA2 TIMES MASH;Lo;0;L;;;;;N;;;;;
+12529;CUNEIFORM SIGN NINDA2 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;;
+1252A;CUNEIFORM SIGN NINDA2 TIMES U;Lo;0;L;;;;;N;;;;;
+1252B;CUNEIFORM SIGN NINDA2 TIMES U PLUS U;Lo;0;L;;;;;N;;;;;
+1252C;CUNEIFORM SIGN NINDA2 TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1252D;CUNEIFORM SIGN SAG GUNU TIMES HA;Lo;0;L;;;;;N;;;;;
+1252E;CUNEIFORM SIGN SAG TIMES EN;Lo;0;L;;;;;N;;;;;
+1252F;CUNEIFORM SIGN SAG TIMES SHE AT LEFT;Lo;0;L;;;;;N;;;;;
+12530;CUNEIFORM SIGN SAG TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12531;CUNEIFORM SIGN SHA6 TENU;Lo;0;L;;;;;N;;;;;
+12532;CUNEIFORM SIGN SHE OVER SHE;Lo;0;L;;;;;N;;;;;
+12533;CUNEIFORM SIGN SHE PLUS HUB2;Lo;0;L;;;;;N;;;;;
+12534;CUNEIFORM SIGN SHE PLUS NAM2;Lo;0;L;;;;;N;;;;;
+12535;CUNEIFORM SIGN SHE PLUS SAR;Lo;0;L;;;;;N;;;;;
+12536;CUNEIFORM SIGN SHU2 PLUS DUG TIMES NI;Lo;0;L;;;;;N;;;;;
+12537;CUNEIFORM SIGN SHU2 PLUS E2 TIMES AN;Lo;0;L;;;;;N;;;;;
+12538;CUNEIFORM SIGN SI TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12539;CUNEIFORM SIGN TAK4 PLUS SAG;Lo;0;L;;;;;N;;;;;
+1253A;CUNEIFORM SIGN TUM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1253B;CUNEIFORM SIGN TUM TIMES THREE DISH;Lo;0;L;;;;;N;;;;;
+1253C;CUNEIFORM SIGN UR2 INVERTED;Lo;0;L;;;;;N;;;;;
+1253D;CUNEIFORM SIGN UR2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1253E;CUNEIFORM SIGN URU TIMES DARA3;Lo;0;L;;;;;N;;;;;
+1253F;CUNEIFORM SIGN URU TIMES LAK-668;Lo;0;L;;;;;N;;;;;
+12540;CUNEIFORM SIGN URU TIMES LU3;Lo;0;L;;;;;N;;;;;
+12541;CUNEIFORM SIGN ZA7;Lo;0;L;;;;;N;;;;;
+12542;CUNEIFORM SIGN ZU OVER ZU PLUS SAR;Lo;0;L;;;;;N;;;;;
+12543;CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU;Lo;0;L;;;;;N;;;;;
+13000;EGYPTIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;;
+13001;EGYPTIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;;
+13002;EGYPTIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;;
+13003;EGYPTIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;;
+13004;EGYPTIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;;
+13005;EGYPTIAN HIEROGLYPH A005A;Lo;0;L;;;;;N;;;;;
+13006;EGYPTIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;;
+13007;EGYPTIAN HIEROGLYPH A006A;Lo;0;L;;;;;N;;;;;
+13008;EGYPTIAN HIEROGLYPH A006B;Lo;0;L;;;;;N;;;;;
+13009;EGYPTIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;;
+1300A;EGYPTIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;;
+1300B;EGYPTIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;;
+1300C;EGYPTIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;;
+1300D;EGYPTIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;;
+1300E;EGYPTIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;;
+1300F;EGYPTIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;;
+13010;EGYPTIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;;
+13011;EGYPTIAN HIEROGLYPH A014A;Lo;0;L;;;;;N;;;;;
+13012;EGYPTIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;;
+13013;EGYPTIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;;
+13014;EGYPTIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;;
+13015;EGYPTIAN HIEROGLYPH A017A;Lo;0;L;;;;;N;;;;;
+13016;EGYPTIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;;
+13017;EGYPTIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;;
+13018;EGYPTIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;;
+13019;EGYPTIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;;
+1301A;EGYPTIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;;
+1301B;EGYPTIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;;
+1301C;EGYPTIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;;
+1301D;EGYPTIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;;
+1301E;EGYPTIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;;
+1301F;EGYPTIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;;
+13020;EGYPTIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;;
+13021;EGYPTIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;;
+13022;EGYPTIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;;
+13023;EGYPTIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;;
+13024;EGYPTIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;;
+13025;EGYPTIAN HIEROGLYPH A032A;Lo;0;L;;;;;N;;;;;
+13026;EGYPTIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;;
+13027;EGYPTIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;;
+13028;EGYPTIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;;
+13029;EGYPTIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;;
+1302A;EGYPTIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;;
+1302B;EGYPTIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;;
+1302C;EGYPTIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;;
+1302D;EGYPTIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;;
+1302E;EGYPTIAN HIEROGLYPH A040A;Lo;0;L;;;;;N;;;;;
+1302F;EGYPTIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;;
+13030;EGYPTIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;;
+13031;EGYPTIAN HIEROGLYPH A042A;Lo;0;L;;;;;N;;;;;
+13032;EGYPTIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;;
+13033;EGYPTIAN HIEROGLYPH A043A;Lo;0;L;;;;;N;;;;;
+13034;EGYPTIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;;
+13035;EGYPTIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;;
+13036;EGYPTIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;;
+13037;EGYPTIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;;
+13038;EGYPTIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;;
+13039;EGYPTIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;;
+1303A;EGYPTIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;;
+1303B;EGYPTIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;;
+1303C;EGYPTIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;;
+1303D;EGYPTIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;;
+1303E;EGYPTIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;;
+1303F;EGYPTIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;;
+13040;EGYPTIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;;
+13041;EGYPTIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;;
+13042;EGYPTIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;;
+13043;EGYPTIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;;
+13044;EGYPTIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;;
+13045;EGYPTIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;;
+13046;EGYPTIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;;
+13047;EGYPTIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;;
+13048;EGYPTIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;;
+13049;EGYPTIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;;
+1304A;EGYPTIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;;
+1304B;EGYPTIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;;
+1304C;EGYPTIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;;
+1304D;EGYPTIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;;
+1304E;EGYPTIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;;
+1304F;EGYPTIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;;
+13050;EGYPTIAN HIEROGLYPH B001;Lo;0;L;;;;;N;;;;;
+13051;EGYPTIAN HIEROGLYPH B002;Lo;0;L;;;;;N;;;;;
+13052;EGYPTIAN HIEROGLYPH B003;Lo;0;L;;;;;N;;;;;
+13053;EGYPTIAN HIEROGLYPH B004;Lo;0;L;;;;;N;;;;;
+13054;EGYPTIAN HIEROGLYPH B005;Lo;0;L;;;;;N;;;;;
+13055;EGYPTIAN HIEROGLYPH B005A;Lo;0;L;;;;;N;;;;;
+13056;EGYPTIAN HIEROGLYPH B006;Lo;0;L;;;;;N;;;;;
+13057;EGYPTIAN HIEROGLYPH B007;Lo;0;L;;;;;N;;;;;
+13058;EGYPTIAN HIEROGLYPH B008;Lo;0;L;;;;;N;;;;;
+13059;EGYPTIAN HIEROGLYPH B009;Lo;0;L;;;;;N;;;;;
+1305A;EGYPTIAN HIEROGLYPH C001;Lo;0;L;;;;;N;;;;;
+1305B;EGYPTIAN HIEROGLYPH C002;Lo;0;L;;;;;N;;;;;
+1305C;EGYPTIAN HIEROGLYPH C002A;Lo;0;L;;;;;N;;;;;
+1305D;EGYPTIAN HIEROGLYPH C002B;Lo;0;L;;;;;N;;;;;
+1305E;EGYPTIAN HIEROGLYPH C002C;Lo;0;L;;;;;N;;;;;
+1305F;EGYPTIAN HIEROGLYPH C003;Lo;0;L;;;;;N;;;;;
+13060;EGYPTIAN HIEROGLYPH C004;Lo;0;L;;;;;N;;;;;
+13061;EGYPTIAN HIEROGLYPH C005;Lo;0;L;;;;;N;;;;;
+13062;EGYPTIAN HIEROGLYPH C006;Lo;0;L;;;;;N;;;;;
+13063;EGYPTIAN HIEROGLYPH C007;Lo;0;L;;;;;N;;;;;
+13064;EGYPTIAN HIEROGLYPH C008;Lo;0;L;;;;;N;;;;;
+13065;EGYPTIAN HIEROGLYPH C009;Lo;0;L;;;;;N;;;;;
+13066;EGYPTIAN HIEROGLYPH C010;Lo;0;L;;;;;N;;;;;
+13067;EGYPTIAN HIEROGLYPH C010A;Lo;0;L;;;;;N;;;;;
+13068;EGYPTIAN HIEROGLYPH C011;Lo;0;L;;;;;N;;;;;
+13069;EGYPTIAN HIEROGLYPH C012;Lo;0;L;;;;;N;;;;;
+1306A;EGYPTIAN HIEROGLYPH C013;Lo;0;L;;;;;N;;;;;
+1306B;EGYPTIAN HIEROGLYPH C014;Lo;0;L;;;;;N;;;;;
+1306C;EGYPTIAN HIEROGLYPH C015;Lo;0;L;;;;;N;;;;;
+1306D;EGYPTIAN HIEROGLYPH C016;Lo;0;L;;;;;N;;;;;
+1306E;EGYPTIAN HIEROGLYPH C017;Lo;0;L;;;;;N;;;;;
+1306F;EGYPTIAN HIEROGLYPH C018;Lo;0;L;;;;;N;;;;;
+13070;EGYPTIAN HIEROGLYPH C019;Lo;0;L;;;;;N;;;;;
+13071;EGYPTIAN HIEROGLYPH C020;Lo;0;L;;;;;N;;;;;
+13072;EGYPTIAN HIEROGLYPH C021;Lo;0;L;;;;;N;;;;;
+13073;EGYPTIAN HIEROGLYPH C022;Lo;0;L;;;;;N;;;;;
+13074;EGYPTIAN HIEROGLYPH C023;Lo;0;L;;;;;N;;;;;
+13075;EGYPTIAN HIEROGLYPH C024;Lo;0;L;;;;;N;;;;;
+13076;EGYPTIAN HIEROGLYPH D001;Lo;0;L;;;;;N;;;;;
+13077;EGYPTIAN HIEROGLYPH D002;Lo;0;L;;;;;N;;;;;
+13078;EGYPTIAN HIEROGLYPH D003;Lo;0;L;;;;;N;;;;;
+13079;EGYPTIAN HIEROGLYPH D004;Lo;0;L;;;;;N;;;;;
+1307A;EGYPTIAN HIEROGLYPH D005;Lo;0;L;;;;;N;;;;;
+1307B;EGYPTIAN HIEROGLYPH D006;Lo;0;L;;;;;N;;;;;
+1307C;EGYPTIAN HIEROGLYPH D007;Lo;0;L;;;;;N;;;;;
+1307D;EGYPTIAN HIEROGLYPH D008;Lo;0;L;;;;;N;;;;;
+1307E;EGYPTIAN HIEROGLYPH D008A;Lo;0;L;;;;;N;;;;;
+1307F;EGYPTIAN HIEROGLYPH D009;Lo;0;L;;;;;N;;;;;
+13080;EGYPTIAN HIEROGLYPH D010;Lo;0;L;;;;;N;;;;;
+13081;EGYPTIAN HIEROGLYPH D011;Lo;0;L;;;;;N;;;;;
+13082;EGYPTIAN HIEROGLYPH D012;Lo;0;L;;;;;N;;;;;
+13083;EGYPTIAN HIEROGLYPH D013;Lo;0;L;;;;;N;;;;;
+13084;EGYPTIAN HIEROGLYPH D014;Lo;0;L;;;;;N;;;;;
+13085;EGYPTIAN HIEROGLYPH D015;Lo;0;L;;;;;N;;;;;
+13086;EGYPTIAN HIEROGLYPH D016;Lo;0;L;;;;;N;;;;;
+13087;EGYPTIAN HIEROGLYPH D017;Lo;0;L;;;;;N;;;;;
+13088;EGYPTIAN HIEROGLYPH D018;Lo;0;L;;;;;N;;;;;
+13089;EGYPTIAN HIEROGLYPH D019;Lo;0;L;;;;;N;;;;;
+1308A;EGYPTIAN HIEROGLYPH D020;Lo;0;L;;;;;N;;;;;
+1308B;EGYPTIAN HIEROGLYPH D021;Lo;0;L;;;;;N;;;;;
+1308C;EGYPTIAN HIEROGLYPH D022;Lo;0;L;;;;;N;;;;;
+1308D;EGYPTIAN HIEROGLYPH D023;Lo;0;L;;;;;N;;;;;
+1308E;EGYPTIAN HIEROGLYPH D024;Lo;0;L;;;;;N;;;;;
+1308F;EGYPTIAN HIEROGLYPH D025;Lo;0;L;;;;;N;;;;;
+13090;EGYPTIAN HIEROGLYPH D026;Lo;0;L;;;;;N;;;;;
+13091;EGYPTIAN HIEROGLYPH D027;Lo;0;L;;;;;N;;;;;
+13092;EGYPTIAN HIEROGLYPH D027A;Lo;0;L;;;;;N;;;;;
+13093;EGYPTIAN HIEROGLYPH D028;Lo;0;L;;;;;N;;;;;
+13094;EGYPTIAN HIEROGLYPH D029;Lo;0;L;;;;;N;;;;;
+13095;EGYPTIAN HIEROGLYPH D030;Lo;0;L;;;;;N;;;;;
+13096;EGYPTIAN HIEROGLYPH D031;Lo;0;L;;;;;N;;;;;
+13097;EGYPTIAN HIEROGLYPH D031A;Lo;0;L;;;;;N;;;;;
+13098;EGYPTIAN HIEROGLYPH D032;Lo;0;L;;;;;N;;;;;
+13099;EGYPTIAN HIEROGLYPH D033;Lo;0;L;;;;;N;;;;;
+1309A;EGYPTIAN HIEROGLYPH D034;Lo;0;L;;;;;N;;;;;
+1309B;EGYPTIAN HIEROGLYPH D034A;Lo;0;L;;;;;N;;;;;
+1309C;EGYPTIAN HIEROGLYPH D035;Lo;0;L;;;;;N;;;;;
+1309D;EGYPTIAN HIEROGLYPH D036;Lo;0;L;;;;;N;;;;;
+1309E;EGYPTIAN HIEROGLYPH D037;Lo;0;L;;;;;N;;;;;
+1309F;EGYPTIAN HIEROGLYPH D038;Lo;0;L;;;;;N;;;;;
+130A0;EGYPTIAN HIEROGLYPH D039;Lo;0;L;;;;;N;;;;;
+130A1;EGYPTIAN HIEROGLYPH D040;Lo;0;L;;;;;N;;;;;
+130A2;EGYPTIAN HIEROGLYPH D041;Lo;0;L;;;;;N;;;;;
+130A3;EGYPTIAN HIEROGLYPH D042;Lo;0;L;;;;;N;;;;;
+130A4;EGYPTIAN HIEROGLYPH D043;Lo;0;L;;;;;N;;;;;
+130A5;EGYPTIAN HIEROGLYPH D044;Lo;0;L;;;;;N;;;;;
+130A6;EGYPTIAN HIEROGLYPH D045;Lo;0;L;;;;;N;;;;;
+130A7;EGYPTIAN HIEROGLYPH D046;Lo;0;L;;;;;N;;;;;
+130A8;EGYPTIAN HIEROGLYPH D046A;Lo;0;L;;;;;N;;;;;
+130A9;EGYPTIAN HIEROGLYPH D047;Lo;0;L;;;;;N;;;;;
+130AA;EGYPTIAN HIEROGLYPH D048;Lo;0;L;;;;;N;;;;;
+130AB;EGYPTIAN HIEROGLYPH D048A;Lo;0;L;;;;;N;;;;;
+130AC;EGYPTIAN HIEROGLYPH D049;Lo;0;L;;;;;N;;;;;
+130AD;EGYPTIAN HIEROGLYPH D050;Lo;0;L;;;;;N;;;;;
+130AE;EGYPTIAN HIEROGLYPH D050A;Lo;0;L;;;;;N;;;;;
+130AF;EGYPTIAN HIEROGLYPH D050B;Lo;0;L;;;;;N;;;;;
+130B0;EGYPTIAN HIEROGLYPH D050C;Lo;0;L;;;;;N;;;;;
+130B1;EGYPTIAN HIEROGLYPH D050D;Lo;0;L;;;;;N;;;;;
+130B2;EGYPTIAN HIEROGLYPH D050E;Lo;0;L;;;;;N;;;;;
+130B3;EGYPTIAN HIEROGLYPH D050F;Lo;0;L;;;;;N;;;;;
+130B4;EGYPTIAN HIEROGLYPH D050G;Lo;0;L;;;;;N;;;;;
+130B5;EGYPTIAN HIEROGLYPH D050H;Lo;0;L;;;;;N;;;;;
+130B6;EGYPTIAN HIEROGLYPH D050I;Lo;0;L;;;;;N;;;;;
+130B7;EGYPTIAN HIEROGLYPH D051;Lo;0;L;;;;;N;;;;;
+130B8;EGYPTIAN HIEROGLYPH D052;Lo;0;L;;;;;N;;;;;
+130B9;EGYPTIAN HIEROGLYPH D052A;Lo;0;L;;;;;N;;;;;
+130BA;EGYPTIAN HIEROGLYPH D053;Lo;0;L;;;;;N;;;;;
+130BB;EGYPTIAN HIEROGLYPH D054;Lo;0;L;;;;;N;;;;;
+130BC;EGYPTIAN HIEROGLYPH D054A;Lo;0;L;;;;;N;;;;;
+130BD;EGYPTIAN HIEROGLYPH D055;Lo;0;L;;;;;N;;;;;
+130BE;EGYPTIAN HIEROGLYPH D056;Lo;0;L;;;;;N;;;;;
+130BF;EGYPTIAN HIEROGLYPH D057;Lo;0;L;;;;;N;;;;;
+130C0;EGYPTIAN HIEROGLYPH D058;Lo;0;L;;;;;N;;;;;
+130C1;EGYPTIAN HIEROGLYPH D059;Lo;0;L;;;;;N;;;;;
+130C2;EGYPTIAN HIEROGLYPH D060;Lo;0;L;;;;;N;;;;;
+130C3;EGYPTIAN HIEROGLYPH D061;Lo;0;L;;;;;N;;;;;
+130C4;EGYPTIAN HIEROGLYPH D062;Lo;0;L;;;;;N;;;;;
+130C5;EGYPTIAN HIEROGLYPH D063;Lo;0;L;;;;;N;;;;;
+130C6;EGYPTIAN HIEROGLYPH D064;Lo;0;L;;;;;N;;;;;
+130C7;EGYPTIAN HIEROGLYPH D065;Lo;0;L;;;;;N;;;;;
+130C8;EGYPTIAN HIEROGLYPH D066;Lo;0;L;;;;;N;;;;;
+130C9;EGYPTIAN HIEROGLYPH D067;Lo;0;L;;;;;N;;;;;
+130CA;EGYPTIAN HIEROGLYPH D067A;Lo;0;L;;;;;N;;;;;
+130CB;EGYPTIAN HIEROGLYPH D067B;Lo;0;L;;;;;N;;;;;
+130CC;EGYPTIAN HIEROGLYPH D067C;Lo;0;L;;;;;N;;;;;
+130CD;EGYPTIAN HIEROGLYPH D067D;Lo;0;L;;;;;N;;;;;
+130CE;EGYPTIAN HIEROGLYPH D067E;Lo;0;L;;;;;N;;;;;
+130CF;EGYPTIAN HIEROGLYPH D067F;Lo;0;L;;;;;N;;;;;
+130D0;EGYPTIAN HIEROGLYPH D067G;Lo;0;L;;;;;N;;;;;
+130D1;EGYPTIAN HIEROGLYPH D067H;Lo;0;L;;;;;N;;;;;
+130D2;EGYPTIAN HIEROGLYPH E001;Lo;0;L;;;;;N;;;;;
+130D3;EGYPTIAN HIEROGLYPH E002;Lo;0;L;;;;;N;;;;;
+130D4;EGYPTIAN HIEROGLYPH E003;Lo;0;L;;;;;N;;;;;
+130D5;EGYPTIAN HIEROGLYPH E004;Lo;0;L;;;;;N;;;;;
+130D6;EGYPTIAN HIEROGLYPH E005;Lo;0;L;;;;;N;;;;;
+130D7;EGYPTIAN HIEROGLYPH E006;Lo;0;L;;;;;N;;;;;
+130D8;EGYPTIAN HIEROGLYPH E007;Lo;0;L;;;;;N;;;;;
+130D9;EGYPTIAN HIEROGLYPH E008;Lo;0;L;;;;;N;;;;;
+130DA;EGYPTIAN HIEROGLYPH E008A;Lo;0;L;;;;;N;;;;;
+130DB;EGYPTIAN HIEROGLYPH E009;Lo;0;L;;;;;N;;;;;
+130DC;EGYPTIAN HIEROGLYPH E009A;Lo;0;L;;;;;N;;;;;
+130DD;EGYPTIAN HIEROGLYPH E010;Lo;0;L;;;;;N;;;;;
+130DE;EGYPTIAN HIEROGLYPH E011;Lo;0;L;;;;;N;;;;;
+130DF;EGYPTIAN HIEROGLYPH E012;Lo;0;L;;;;;N;;;;;
+130E0;EGYPTIAN HIEROGLYPH E013;Lo;0;L;;;;;N;;;;;
+130E1;EGYPTIAN HIEROGLYPH E014;Lo;0;L;;;;;N;;;;;
+130E2;EGYPTIAN HIEROGLYPH E015;Lo;0;L;;;;;N;;;;;
+130E3;EGYPTIAN HIEROGLYPH E016;Lo;0;L;;;;;N;;;;;
+130E4;EGYPTIAN HIEROGLYPH E016A;Lo;0;L;;;;;N;;;;;
+130E5;EGYPTIAN HIEROGLYPH E017;Lo;0;L;;;;;N;;;;;
+130E6;EGYPTIAN HIEROGLYPH E017A;Lo;0;L;;;;;N;;;;;
+130E7;EGYPTIAN HIEROGLYPH E018;Lo;0;L;;;;;N;;;;;
+130E8;EGYPTIAN HIEROGLYPH E019;Lo;0;L;;;;;N;;;;;
+130E9;EGYPTIAN HIEROGLYPH E020;Lo;0;L;;;;;N;;;;;
+130EA;EGYPTIAN HIEROGLYPH E020A;Lo;0;L;;;;;N;;;;;
+130EB;EGYPTIAN HIEROGLYPH E021;Lo;0;L;;;;;N;;;;;
+130EC;EGYPTIAN HIEROGLYPH E022;Lo;0;L;;;;;N;;;;;
+130ED;EGYPTIAN HIEROGLYPH E023;Lo;0;L;;;;;N;;;;;
+130EE;EGYPTIAN HIEROGLYPH E024;Lo;0;L;;;;;N;;;;;
+130EF;EGYPTIAN HIEROGLYPH E025;Lo;0;L;;;;;N;;;;;
+130F0;EGYPTIAN HIEROGLYPH E026;Lo;0;L;;;;;N;;;;;
+130F1;EGYPTIAN HIEROGLYPH E027;Lo;0;L;;;;;N;;;;;
+130F2;EGYPTIAN HIEROGLYPH E028;Lo;0;L;;;;;N;;;;;
+130F3;EGYPTIAN HIEROGLYPH E028A;Lo;0;L;;;;;N;;;;;
+130F4;EGYPTIAN HIEROGLYPH E029;Lo;0;L;;;;;N;;;;;
+130F5;EGYPTIAN HIEROGLYPH E030;Lo;0;L;;;;;N;;;;;
+130F6;EGYPTIAN HIEROGLYPH E031;Lo;0;L;;;;;N;;;;;
+130F7;EGYPTIAN HIEROGLYPH E032;Lo;0;L;;;;;N;;;;;
+130F8;EGYPTIAN HIEROGLYPH E033;Lo;0;L;;;;;N;;;;;
+130F9;EGYPTIAN HIEROGLYPH E034;Lo;0;L;;;;;N;;;;;
+130FA;EGYPTIAN HIEROGLYPH E034A;Lo;0;L;;;;;N;;;;;
+130FB;EGYPTIAN HIEROGLYPH E036;Lo;0;L;;;;;N;;;;;
+130FC;EGYPTIAN HIEROGLYPH E037;Lo;0;L;;;;;N;;;;;
+130FD;EGYPTIAN HIEROGLYPH E038;Lo;0;L;;;;;N;;;;;
+130FE;EGYPTIAN HIEROGLYPH F001;Lo;0;L;;;;;N;;;;;
+130FF;EGYPTIAN HIEROGLYPH F001A;Lo;0;L;;;;;N;;;;;
+13100;EGYPTIAN HIEROGLYPH F002;Lo;0;L;;;;;N;;;;;
+13101;EGYPTIAN HIEROGLYPH F003;Lo;0;L;;;;;N;;;;;
+13102;EGYPTIAN HIEROGLYPH F004;Lo;0;L;;;;;N;;;;;
+13103;EGYPTIAN HIEROGLYPH F005;Lo;0;L;;;;;N;;;;;
+13104;EGYPTIAN HIEROGLYPH F006;Lo;0;L;;;;;N;;;;;
+13105;EGYPTIAN HIEROGLYPH F007;Lo;0;L;;;;;N;;;;;
+13106;EGYPTIAN HIEROGLYPH F008;Lo;0;L;;;;;N;;;;;
+13107;EGYPTIAN HIEROGLYPH F009;Lo;0;L;;;;;N;;;;;
+13108;EGYPTIAN HIEROGLYPH F010;Lo;0;L;;;;;N;;;;;
+13109;EGYPTIAN HIEROGLYPH F011;Lo;0;L;;;;;N;;;;;
+1310A;EGYPTIAN HIEROGLYPH F012;Lo;0;L;;;;;N;;;;;
+1310B;EGYPTIAN HIEROGLYPH F013;Lo;0;L;;;;;N;;;;;
+1310C;EGYPTIAN HIEROGLYPH F013A;Lo;0;L;;;;;N;;;;;
+1310D;EGYPTIAN HIEROGLYPH F014;Lo;0;L;;;;;N;;;;;
+1310E;EGYPTIAN HIEROGLYPH F015;Lo;0;L;;;;;N;;;;;
+1310F;EGYPTIAN HIEROGLYPH F016;Lo;0;L;;;;;N;;;;;
+13110;EGYPTIAN HIEROGLYPH F017;Lo;0;L;;;;;N;;;;;
+13111;EGYPTIAN HIEROGLYPH F018;Lo;0;L;;;;;N;;;;;
+13112;EGYPTIAN HIEROGLYPH F019;Lo;0;L;;;;;N;;;;;
+13113;EGYPTIAN HIEROGLYPH F020;Lo;0;L;;;;;N;;;;;
+13114;EGYPTIAN HIEROGLYPH F021;Lo;0;L;;;;;N;;;;;
+13115;EGYPTIAN HIEROGLYPH F021A;Lo;0;L;;;;;N;;;;;
+13116;EGYPTIAN HIEROGLYPH F022;Lo;0;L;;;;;N;;;;;
+13117;EGYPTIAN HIEROGLYPH F023;Lo;0;L;;;;;N;;;;;
+13118;EGYPTIAN HIEROGLYPH F024;Lo;0;L;;;;;N;;;;;
+13119;EGYPTIAN HIEROGLYPH F025;Lo;0;L;;;;;N;;;;;
+1311A;EGYPTIAN HIEROGLYPH F026;Lo;0;L;;;;;N;;;;;
+1311B;EGYPTIAN HIEROGLYPH F027;Lo;0;L;;;;;N;;;;;
+1311C;EGYPTIAN HIEROGLYPH F028;Lo;0;L;;;;;N;;;;;
+1311D;EGYPTIAN HIEROGLYPH F029;Lo;0;L;;;;;N;;;;;
+1311E;EGYPTIAN HIEROGLYPH F030;Lo;0;L;;;;;N;;;;;
+1311F;EGYPTIAN HIEROGLYPH F031;Lo;0;L;;;;;N;;;;;
+13120;EGYPTIAN HIEROGLYPH F031A;Lo;0;L;;;;;N;;;;;
+13121;EGYPTIAN HIEROGLYPH F032;Lo;0;L;;;;;N;;;;;
+13122;EGYPTIAN HIEROGLYPH F033;Lo;0;L;;;;;N;;;;;
+13123;EGYPTIAN HIEROGLYPH F034;Lo;0;L;;;;;N;;;;;
+13124;EGYPTIAN HIEROGLYPH F035;Lo;0;L;;;;;N;;;;;
+13125;EGYPTIAN HIEROGLYPH F036;Lo;0;L;;;;;N;;;;;
+13126;EGYPTIAN HIEROGLYPH F037;Lo;0;L;;;;;N;;;;;
+13127;EGYPTIAN HIEROGLYPH F037A;Lo;0;L;;;;;N;;;;;
+13128;EGYPTIAN HIEROGLYPH F038;Lo;0;L;;;;;N;;;;;
+13129;EGYPTIAN HIEROGLYPH F038A;Lo;0;L;;;;;N;;;;;
+1312A;EGYPTIAN HIEROGLYPH F039;Lo;0;L;;;;;N;;;;;
+1312B;EGYPTIAN HIEROGLYPH F040;Lo;0;L;;;;;N;;;;;
+1312C;EGYPTIAN HIEROGLYPH F041;Lo;0;L;;;;;N;;;;;
+1312D;EGYPTIAN HIEROGLYPH F042;Lo;0;L;;;;;N;;;;;
+1312E;EGYPTIAN HIEROGLYPH F043;Lo;0;L;;;;;N;;;;;
+1312F;EGYPTIAN HIEROGLYPH F044;Lo;0;L;;;;;N;;;;;
+13130;EGYPTIAN HIEROGLYPH F045;Lo;0;L;;;;;N;;;;;
+13131;EGYPTIAN HIEROGLYPH F045A;Lo;0;L;;;;;N;;;;;
+13132;EGYPTIAN HIEROGLYPH F046;Lo;0;L;;;;;N;;;;;
+13133;EGYPTIAN HIEROGLYPH F046A;Lo;0;L;;;;;N;;;;;
+13134;EGYPTIAN HIEROGLYPH F047;Lo;0;L;;;;;N;;;;;
+13135;EGYPTIAN HIEROGLYPH F047A;Lo;0;L;;;;;N;;;;;
+13136;EGYPTIAN HIEROGLYPH F048;Lo;0;L;;;;;N;;;;;
+13137;EGYPTIAN HIEROGLYPH F049;Lo;0;L;;;;;N;;;;;
+13138;EGYPTIAN HIEROGLYPH F050;Lo;0;L;;;;;N;;;;;
+13139;EGYPTIAN HIEROGLYPH F051;Lo;0;L;;;;;N;;;;;
+1313A;EGYPTIAN HIEROGLYPH F051A;Lo;0;L;;;;;N;;;;;
+1313B;EGYPTIAN HIEROGLYPH F051B;Lo;0;L;;;;;N;;;;;
+1313C;EGYPTIAN HIEROGLYPH F051C;Lo;0;L;;;;;N;;;;;
+1313D;EGYPTIAN HIEROGLYPH F052;Lo;0;L;;;;;N;;;;;
+1313E;EGYPTIAN HIEROGLYPH F053;Lo;0;L;;;;;N;;;;;
+1313F;EGYPTIAN HIEROGLYPH G001;Lo;0;L;;;;;N;;;;;
+13140;EGYPTIAN HIEROGLYPH G002;Lo;0;L;;;;;N;;;;;
+13141;EGYPTIAN HIEROGLYPH G003;Lo;0;L;;;;;N;;;;;
+13142;EGYPTIAN HIEROGLYPH G004;Lo;0;L;;;;;N;;;;;
+13143;EGYPTIAN HIEROGLYPH G005;Lo;0;L;;;;;N;;;;;
+13144;EGYPTIAN HIEROGLYPH G006;Lo;0;L;;;;;N;;;;;
+13145;EGYPTIAN HIEROGLYPH G006A;Lo;0;L;;;;;N;;;;;
+13146;EGYPTIAN HIEROGLYPH G007;Lo;0;L;;;;;N;;;;;
+13147;EGYPTIAN HIEROGLYPH G007A;Lo;0;L;;;;;N;;;;;
+13148;EGYPTIAN HIEROGLYPH G007B;Lo;0;L;;;;;N;;;;;
+13149;EGYPTIAN HIEROGLYPH G008;Lo;0;L;;;;;N;;;;;
+1314A;EGYPTIAN HIEROGLYPH G009;Lo;0;L;;;;;N;;;;;
+1314B;EGYPTIAN HIEROGLYPH G010;Lo;0;L;;;;;N;;;;;
+1314C;EGYPTIAN HIEROGLYPH G011;Lo;0;L;;;;;N;;;;;
+1314D;EGYPTIAN HIEROGLYPH G011A;Lo;0;L;;;;;N;;;;;
+1314E;EGYPTIAN HIEROGLYPH G012;Lo;0;L;;;;;N;;;;;
+1314F;EGYPTIAN HIEROGLYPH G013;Lo;0;L;;;;;N;;;;;
+13150;EGYPTIAN HIEROGLYPH G014;Lo;0;L;;;;;N;;;;;
+13151;EGYPTIAN HIEROGLYPH G015;Lo;0;L;;;;;N;;;;;
+13152;EGYPTIAN HIEROGLYPH G016;Lo;0;L;;;;;N;;;;;
+13153;EGYPTIAN HIEROGLYPH G017;Lo;0;L;;;;;N;;;;;
+13154;EGYPTIAN HIEROGLYPH G018;Lo;0;L;;;;;N;;;;;
+13155;EGYPTIAN HIEROGLYPH G019;Lo;0;L;;;;;N;;;;;
+13156;EGYPTIAN HIEROGLYPH G020;Lo;0;L;;;;;N;;;;;
+13157;EGYPTIAN HIEROGLYPH G020A;Lo;0;L;;;;;N;;;;;
+13158;EGYPTIAN HIEROGLYPH G021;Lo;0;L;;;;;N;;;;;
+13159;EGYPTIAN HIEROGLYPH G022;Lo;0;L;;;;;N;;;;;
+1315A;EGYPTIAN HIEROGLYPH G023;Lo;0;L;;;;;N;;;;;
+1315B;EGYPTIAN HIEROGLYPH G024;Lo;0;L;;;;;N;;;;;
+1315C;EGYPTIAN HIEROGLYPH G025;Lo;0;L;;;;;N;;;;;
+1315D;EGYPTIAN HIEROGLYPH G026;Lo;0;L;;;;;N;;;;;
+1315E;EGYPTIAN HIEROGLYPH G026A;Lo;0;L;;;;;N;;;;;
+1315F;EGYPTIAN HIEROGLYPH G027;Lo;0;L;;;;;N;;;;;
+13160;EGYPTIAN HIEROGLYPH G028;Lo;0;L;;;;;N;;;;;
+13161;EGYPTIAN HIEROGLYPH G029;Lo;0;L;;;;;N;;;;;
+13162;EGYPTIAN HIEROGLYPH G030;Lo;0;L;;;;;N;;;;;
+13163;EGYPTIAN HIEROGLYPH G031;Lo;0;L;;;;;N;;;;;
+13164;EGYPTIAN HIEROGLYPH G032;Lo;0;L;;;;;N;;;;;
+13165;EGYPTIAN HIEROGLYPH G033;Lo;0;L;;;;;N;;;;;
+13166;EGYPTIAN HIEROGLYPH G034;Lo;0;L;;;;;N;;;;;
+13167;EGYPTIAN HIEROGLYPH G035;Lo;0;L;;;;;N;;;;;
+13168;EGYPTIAN HIEROGLYPH G036;Lo;0;L;;;;;N;;;;;
+13169;EGYPTIAN HIEROGLYPH G036A;Lo;0;L;;;;;N;;;;;
+1316A;EGYPTIAN HIEROGLYPH G037;Lo;0;L;;;;;N;;;;;
+1316B;EGYPTIAN HIEROGLYPH G037A;Lo;0;L;;;;;N;;;;;
+1316C;EGYPTIAN HIEROGLYPH G038;Lo;0;L;;;;;N;;;;;
+1316D;EGYPTIAN HIEROGLYPH G039;Lo;0;L;;;;;N;;;;;
+1316E;EGYPTIAN HIEROGLYPH G040;Lo;0;L;;;;;N;;;;;
+1316F;EGYPTIAN HIEROGLYPH G041;Lo;0;L;;;;;N;;;;;
+13170;EGYPTIAN HIEROGLYPH G042;Lo;0;L;;;;;N;;;;;
+13171;EGYPTIAN HIEROGLYPH G043;Lo;0;L;;;;;N;;;;;
+13172;EGYPTIAN HIEROGLYPH G043A;Lo;0;L;;;;;N;;;;;
+13173;EGYPTIAN HIEROGLYPH G044;Lo;0;L;;;;;N;;;;;
+13174;EGYPTIAN HIEROGLYPH G045;Lo;0;L;;;;;N;;;;;
+13175;EGYPTIAN HIEROGLYPH G045A;Lo;0;L;;;;;N;;;;;
+13176;EGYPTIAN HIEROGLYPH G046;Lo;0;L;;;;;N;;;;;
+13177;EGYPTIAN HIEROGLYPH G047;Lo;0;L;;;;;N;;;;;
+13178;EGYPTIAN HIEROGLYPH G048;Lo;0;L;;;;;N;;;;;
+13179;EGYPTIAN HIEROGLYPH G049;Lo;0;L;;;;;N;;;;;
+1317A;EGYPTIAN HIEROGLYPH G050;Lo;0;L;;;;;N;;;;;
+1317B;EGYPTIAN HIEROGLYPH G051;Lo;0;L;;;;;N;;;;;
+1317C;EGYPTIAN HIEROGLYPH G052;Lo;0;L;;;;;N;;;;;
+1317D;EGYPTIAN HIEROGLYPH G053;Lo;0;L;;;;;N;;;;;
+1317E;EGYPTIAN HIEROGLYPH G054;Lo;0;L;;;;;N;;;;;
+1317F;EGYPTIAN HIEROGLYPH H001;Lo;0;L;;;;;N;;;;;
+13180;EGYPTIAN HIEROGLYPH H002;Lo;0;L;;;;;N;;;;;
+13181;EGYPTIAN HIEROGLYPH H003;Lo;0;L;;;;;N;;;;;
+13182;EGYPTIAN HIEROGLYPH H004;Lo;0;L;;;;;N;;;;;
+13183;EGYPTIAN HIEROGLYPH H005;Lo;0;L;;;;;N;;;;;
+13184;EGYPTIAN HIEROGLYPH H006;Lo;0;L;;;;;N;;;;;
+13185;EGYPTIAN HIEROGLYPH H006A;Lo;0;L;;;;;N;;;;;
+13186;EGYPTIAN HIEROGLYPH H007;Lo;0;L;;;;;N;;;;;
+13187;EGYPTIAN HIEROGLYPH H008;Lo;0;L;;;;;N;;;;;
+13188;EGYPTIAN HIEROGLYPH I001;Lo;0;L;;;;;N;;;;;
+13189;EGYPTIAN HIEROGLYPH I002;Lo;0;L;;;;;N;;;;;
+1318A;EGYPTIAN HIEROGLYPH I003;Lo;0;L;;;;;N;;;;;
+1318B;EGYPTIAN HIEROGLYPH I004;Lo;0;L;;;;;N;;;;;
+1318C;EGYPTIAN HIEROGLYPH I005;Lo;0;L;;;;;N;;;;;
+1318D;EGYPTIAN HIEROGLYPH I005A;Lo;0;L;;;;;N;;;;;
+1318E;EGYPTIAN HIEROGLYPH I006;Lo;0;L;;;;;N;;;;;
+1318F;EGYPTIAN HIEROGLYPH I007;Lo;0;L;;;;;N;;;;;
+13190;EGYPTIAN HIEROGLYPH I008;Lo;0;L;;;;;N;;;;;
+13191;EGYPTIAN HIEROGLYPH I009;Lo;0;L;;;;;N;;;;;
+13192;EGYPTIAN HIEROGLYPH I009A;Lo;0;L;;;;;N;;;;;
+13193;EGYPTIAN HIEROGLYPH I010;Lo;0;L;;;;;N;;;;;
+13194;EGYPTIAN HIEROGLYPH I010A;Lo;0;L;;;;;N;;;;;
+13195;EGYPTIAN HIEROGLYPH I011;Lo;0;L;;;;;N;;;;;
+13196;EGYPTIAN HIEROGLYPH I011A;Lo;0;L;;;;;N;;;;;
+13197;EGYPTIAN HIEROGLYPH I012;Lo;0;L;;;;;N;;;;;
+13198;EGYPTIAN HIEROGLYPH I013;Lo;0;L;;;;;N;;;;;
+13199;EGYPTIAN HIEROGLYPH I014;Lo;0;L;;;;;N;;;;;
+1319A;EGYPTIAN HIEROGLYPH I015;Lo;0;L;;;;;N;;;;;
+1319B;EGYPTIAN HIEROGLYPH K001;Lo;0;L;;;;;N;;;;;
+1319C;EGYPTIAN HIEROGLYPH K002;Lo;0;L;;;;;N;;;;;
+1319D;EGYPTIAN HIEROGLYPH K003;Lo;0;L;;;;;N;;;;;
+1319E;EGYPTIAN HIEROGLYPH K004;Lo;0;L;;;;;N;;;;;
+1319F;EGYPTIAN HIEROGLYPH K005;Lo;0;L;;;;;N;;;;;
+131A0;EGYPTIAN HIEROGLYPH K006;Lo;0;L;;;;;N;;;;;
+131A1;EGYPTIAN HIEROGLYPH K007;Lo;0;L;;;;;N;;;;;
+131A2;EGYPTIAN HIEROGLYPH K008;Lo;0;L;;;;;N;;;;;
+131A3;EGYPTIAN HIEROGLYPH L001;Lo;0;L;;;;;N;;;;;
+131A4;EGYPTIAN HIEROGLYPH L002;Lo;0;L;;;;;N;;;;;
+131A5;EGYPTIAN HIEROGLYPH L002A;Lo;0;L;;;;;N;;;;;
+131A6;EGYPTIAN HIEROGLYPH L003;Lo;0;L;;;;;N;;;;;
+131A7;EGYPTIAN HIEROGLYPH L004;Lo;0;L;;;;;N;;;;;
+131A8;EGYPTIAN HIEROGLYPH L005;Lo;0;L;;;;;N;;;;;
+131A9;EGYPTIAN HIEROGLYPH L006;Lo;0;L;;;;;N;;;;;
+131AA;EGYPTIAN HIEROGLYPH L006A;Lo;0;L;;;;;N;;;;;
+131AB;EGYPTIAN HIEROGLYPH L007;Lo;0;L;;;;;N;;;;;
+131AC;EGYPTIAN HIEROGLYPH L008;Lo;0;L;;;;;N;;;;;
+131AD;EGYPTIAN HIEROGLYPH M001;Lo;0;L;;;;;N;;;;;
+131AE;EGYPTIAN HIEROGLYPH M001A;Lo;0;L;;;;;N;;;;;
+131AF;EGYPTIAN HIEROGLYPH M001B;Lo;0;L;;;;;N;;;;;
+131B0;EGYPTIAN HIEROGLYPH M002;Lo;0;L;;;;;N;;;;;
+131B1;EGYPTIAN HIEROGLYPH M003;Lo;0;L;;;;;N;;;;;
+131B2;EGYPTIAN HIEROGLYPH M003A;Lo;0;L;;;;;N;;;;;
+131B3;EGYPTIAN HIEROGLYPH M004;Lo;0;L;;;;;N;;;;;
+131B4;EGYPTIAN HIEROGLYPH M005;Lo;0;L;;;;;N;;;;;
+131B5;EGYPTIAN HIEROGLYPH M006;Lo;0;L;;;;;N;;;;;
+131B6;EGYPTIAN HIEROGLYPH M007;Lo;0;L;;;;;N;;;;;
+131B7;EGYPTIAN HIEROGLYPH M008;Lo;0;L;;;;;N;;;;;
+131B8;EGYPTIAN HIEROGLYPH M009;Lo;0;L;;;;;N;;;;;
+131B9;EGYPTIAN HIEROGLYPH M010;Lo;0;L;;;;;N;;;;;
+131BA;EGYPTIAN HIEROGLYPH M010A;Lo;0;L;;;;;N;;;;;
+131BB;EGYPTIAN HIEROGLYPH M011;Lo;0;L;;;;;N;;;;;
+131BC;EGYPTIAN HIEROGLYPH M012;Lo;0;L;;;;;N;;;;;
+131BD;EGYPTIAN HIEROGLYPH M012A;Lo;0;L;;;;;N;;;;;
+131BE;EGYPTIAN HIEROGLYPH M012B;Lo;0;L;;;;;N;;;;;
+131BF;EGYPTIAN HIEROGLYPH M012C;Lo;0;L;;;;;N;;;;;
+131C0;EGYPTIAN HIEROGLYPH M012D;Lo;0;L;;;;;N;;;;;
+131C1;EGYPTIAN HIEROGLYPH M012E;Lo;0;L;;;;;N;;;;;
+131C2;EGYPTIAN HIEROGLYPH M012F;Lo;0;L;;;;;N;;;;;
+131C3;EGYPTIAN HIEROGLYPH M012G;Lo;0;L;;;;;N;;;;;
+131C4;EGYPTIAN HIEROGLYPH M012H;Lo;0;L;;;;;N;;;;;
+131C5;EGYPTIAN HIEROGLYPH M013;Lo;0;L;;;;;N;;;;;
+131C6;EGYPTIAN HIEROGLYPH M014;Lo;0;L;;;;;N;;;;;
+131C7;EGYPTIAN HIEROGLYPH M015;Lo;0;L;;;;;N;;;;;
+131C8;EGYPTIAN HIEROGLYPH M015A;Lo;0;L;;;;;N;;;;;
+131C9;EGYPTIAN HIEROGLYPH M016;Lo;0;L;;;;;N;;;;;
+131CA;EGYPTIAN HIEROGLYPH M016A;Lo;0;L;;;;;N;;;;;
+131CB;EGYPTIAN HIEROGLYPH M017;Lo;0;L;;;;;N;;;;;
+131CC;EGYPTIAN HIEROGLYPH M017A;Lo;0;L;;;;;N;;;;;
+131CD;EGYPTIAN HIEROGLYPH M018;Lo;0;L;;;;;N;;;;;
+131CE;EGYPTIAN HIEROGLYPH M019;Lo;0;L;;;;;N;;;;;
+131CF;EGYPTIAN HIEROGLYPH M020;Lo;0;L;;;;;N;;;;;
+131D0;EGYPTIAN HIEROGLYPH M021;Lo;0;L;;;;;N;;;;;
+131D1;EGYPTIAN HIEROGLYPH M022;Lo;0;L;;;;;N;;;;;
+131D2;EGYPTIAN HIEROGLYPH M022A;Lo;0;L;;;;;N;;;;;
+131D3;EGYPTIAN HIEROGLYPH M023;Lo;0;L;;;;;N;;;;;
+131D4;EGYPTIAN HIEROGLYPH M024;Lo;0;L;;;;;N;;;;;
+131D5;EGYPTIAN HIEROGLYPH M024A;Lo;0;L;;;;;N;;;;;
+131D6;EGYPTIAN HIEROGLYPH M025;Lo;0;L;;;;;N;;;;;
+131D7;EGYPTIAN HIEROGLYPH M026;Lo;0;L;;;;;N;;;;;
+131D8;EGYPTIAN HIEROGLYPH M027;Lo;0;L;;;;;N;;;;;
+131D9;EGYPTIAN HIEROGLYPH M028;Lo;0;L;;;;;N;;;;;
+131DA;EGYPTIAN HIEROGLYPH M028A;Lo;0;L;;;;;N;;;;;
+131DB;EGYPTIAN HIEROGLYPH M029;Lo;0;L;;;;;N;;;;;
+131DC;EGYPTIAN HIEROGLYPH M030;Lo;0;L;;;;;N;;;;;
+131DD;EGYPTIAN HIEROGLYPH M031;Lo;0;L;;;;;N;;;;;
+131DE;EGYPTIAN HIEROGLYPH M031A;Lo;0;L;;;;;N;;;;;
+131DF;EGYPTIAN HIEROGLYPH M032;Lo;0;L;;;;;N;;;;;
+131E0;EGYPTIAN HIEROGLYPH M033;Lo;0;L;;;;;N;;;;;
+131E1;EGYPTIAN HIEROGLYPH M033A;Lo;0;L;;;;;N;;;;;
+131E2;EGYPTIAN HIEROGLYPH M033B;Lo;0;L;;;;;N;;;;;
+131E3;EGYPTIAN HIEROGLYPH M034;Lo;0;L;;;;;N;;;;;
+131E4;EGYPTIAN HIEROGLYPH M035;Lo;0;L;;;;;N;;;;;
+131E5;EGYPTIAN HIEROGLYPH M036;Lo;0;L;;;;;N;;;;;
+131E6;EGYPTIAN HIEROGLYPH M037;Lo;0;L;;;;;N;;;;;
+131E7;EGYPTIAN HIEROGLYPH M038;Lo;0;L;;;;;N;;;;;
+131E8;EGYPTIAN HIEROGLYPH M039;Lo;0;L;;;;;N;;;;;
+131E9;EGYPTIAN HIEROGLYPH M040;Lo;0;L;;;;;N;;;;;
+131EA;EGYPTIAN HIEROGLYPH M040A;Lo;0;L;;;;;N;;;;;
+131EB;EGYPTIAN HIEROGLYPH M041;Lo;0;L;;;;;N;;;;;
+131EC;EGYPTIAN HIEROGLYPH M042;Lo;0;L;;;;;N;;;;;
+131ED;EGYPTIAN HIEROGLYPH M043;Lo;0;L;;;;;N;;;;;
+131EE;EGYPTIAN HIEROGLYPH M044;Lo;0;L;;;;;N;;;;;
+131EF;EGYPTIAN HIEROGLYPH N001;Lo;0;L;;;;;N;;;;;
+131F0;EGYPTIAN HIEROGLYPH N002;Lo;0;L;;;;;N;;;;;
+131F1;EGYPTIAN HIEROGLYPH N003;Lo;0;L;;;;;N;;;;;
+131F2;EGYPTIAN HIEROGLYPH N004;Lo;0;L;;;;;N;;;;;
+131F3;EGYPTIAN HIEROGLYPH N005;Lo;0;L;;;;;N;;;;;
+131F4;EGYPTIAN HIEROGLYPH N006;Lo;0;L;;;;;N;;;;;
+131F5;EGYPTIAN HIEROGLYPH N007;Lo;0;L;;;;;N;;;;;
+131F6;EGYPTIAN HIEROGLYPH N008;Lo;0;L;;;;;N;;;;;
+131F7;EGYPTIAN HIEROGLYPH N009;Lo;0;L;;;;;N;;;;;
+131F8;EGYPTIAN HIEROGLYPH N010;Lo;0;L;;;;;N;;;;;
+131F9;EGYPTIAN HIEROGLYPH N011;Lo;0;L;;;;;N;;;;;
+131FA;EGYPTIAN HIEROGLYPH N012;Lo;0;L;;;;;N;;;;;
+131FB;EGYPTIAN HIEROGLYPH N013;Lo;0;L;;;;;N;;;;;
+131FC;EGYPTIAN HIEROGLYPH N014;Lo;0;L;;;;;N;;;;;
+131FD;EGYPTIAN HIEROGLYPH N015;Lo;0;L;;;;;N;;;;;
+131FE;EGYPTIAN HIEROGLYPH N016;Lo;0;L;;;;;N;;;;;
+131FF;EGYPTIAN HIEROGLYPH N017;Lo;0;L;;;;;N;;;;;
+13200;EGYPTIAN HIEROGLYPH N018;Lo;0;L;;;;;N;;;;;
+13201;EGYPTIAN HIEROGLYPH N018A;Lo;0;L;;;;;N;;;;;
+13202;EGYPTIAN HIEROGLYPH N018B;Lo;0;L;;;;;N;;;;;
+13203;EGYPTIAN HIEROGLYPH N019;Lo;0;L;;;;;N;;;;;
+13204;EGYPTIAN HIEROGLYPH N020;Lo;0;L;;;;;N;;;;;
+13205;EGYPTIAN HIEROGLYPH N021;Lo;0;L;;;;;N;;;;;
+13206;EGYPTIAN HIEROGLYPH N022;Lo;0;L;;;;;N;;;;;
+13207;EGYPTIAN HIEROGLYPH N023;Lo;0;L;;;;;N;;;;;
+13208;EGYPTIAN HIEROGLYPH N024;Lo;0;L;;;;;N;;;;;
+13209;EGYPTIAN HIEROGLYPH N025;Lo;0;L;;;;;N;;;;;
+1320A;EGYPTIAN HIEROGLYPH N025A;Lo;0;L;;;;;N;;;;;
+1320B;EGYPTIAN HIEROGLYPH N026;Lo;0;L;;;;;N;;;;;
+1320C;EGYPTIAN HIEROGLYPH N027;Lo;0;L;;;;;N;;;;;
+1320D;EGYPTIAN HIEROGLYPH N028;Lo;0;L;;;;;N;;;;;
+1320E;EGYPTIAN HIEROGLYPH N029;Lo;0;L;;;;;N;;;;;
+1320F;EGYPTIAN HIEROGLYPH N030;Lo;0;L;;;;;N;;;;;
+13210;EGYPTIAN HIEROGLYPH N031;Lo;0;L;;;;;N;;;;;
+13211;EGYPTIAN HIEROGLYPH N032;Lo;0;L;;;;;N;;;;;
+13212;EGYPTIAN HIEROGLYPH N033;Lo;0;L;;;;;N;;;;;
+13213;EGYPTIAN HIEROGLYPH N033A;Lo;0;L;;;;;N;;;;;
+13214;EGYPTIAN HIEROGLYPH N034;Lo;0;L;;;;;N;;;;;
+13215;EGYPTIAN HIEROGLYPH N034A;Lo;0;L;;;;;N;;;;;
+13216;EGYPTIAN HIEROGLYPH N035;Lo;0;L;;;;;N;;;;;
+13217;EGYPTIAN HIEROGLYPH N035A;Lo;0;L;;;;;N;;;;;
+13218;EGYPTIAN HIEROGLYPH N036;Lo;0;L;;;;;N;;;;;
+13219;EGYPTIAN HIEROGLYPH N037;Lo;0;L;;;;;N;;;;;
+1321A;EGYPTIAN HIEROGLYPH N037A;Lo;0;L;;;;;N;;;;;
+1321B;EGYPTIAN HIEROGLYPH N038;Lo;0;L;;;;;N;;;;;
+1321C;EGYPTIAN HIEROGLYPH N039;Lo;0;L;;;;;N;;;;;
+1321D;EGYPTIAN HIEROGLYPH N040;Lo;0;L;;;;;N;;;;;
+1321E;EGYPTIAN HIEROGLYPH N041;Lo;0;L;;;;;N;;;;;
+1321F;EGYPTIAN HIEROGLYPH N042;Lo;0;L;;;;;N;;;;;
+13220;EGYPTIAN HIEROGLYPH NL001;Lo;0;L;;;;;N;;;;;
+13221;EGYPTIAN HIEROGLYPH NL002;Lo;0;L;;;;;N;;;;;
+13222;EGYPTIAN HIEROGLYPH NL003;Lo;0;L;;;;;N;;;;;
+13223;EGYPTIAN HIEROGLYPH NL004;Lo;0;L;;;;;N;;;;;
+13224;EGYPTIAN HIEROGLYPH NL005;Lo;0;L;;;;;N;;;;;
+13225;EGYPTIAN HIEROGLYPH NL005A;Lo;0;L;;;;;N;;;;;
+13226;EGYPTIAN HIEROGLYPH NL006;Lo;0;L;;;;;N;;;;;
+13227;EGYPTIAN HIEROGLYPH NL007;Lo;0;L;;;;;N;;;;;
+13228;EGYPTIAN HIEROGLYPH NL008;Lo;0;L;;;;;N;;;;;
+13229;EGYPTIAN HIEROGLYPH NL009;Lo;0;L;;;;;N;;;;;
+1322A;EGYPTIAN HIEROGLYPH NL010;Lo;0;L;;;;;N;;;;;
+1322B;EGYPTIAN HIEROGLYPH NL011;Lo;0;L;;;;;N;;;;;
+1322C;EGYPTIAN HIEROGLYPH NL012;Lo;0;L;;;;;N;;;;;
+1322D;EGYPTIAN HIEROGLYPH NL013;Lo;0;L;;;;;N;;;;;
+1322E;EGYPTIAN HIEROGLYPH NL014;Lo;0;L;;;;;N;;;;;
+1322F;EGYPTIAN HIEROGLYPH NL015;Lo;0;L;;;;;N;;;;;
+13230;EGYPTIAN HIEROGLYPH NL016;Lo;0;L;;;;;N;;;;;
+13231;EGYPTIAN HIEROGLYPH NL017;Lo;0;L;;;;;N;;;;;
+13232;EGYPTIAN HIEROGLYPH NL017A;Lo;0;L;;;;;N;;;;;
+13233;EGYPTIAN HIEROGLYPH NL018;Lo;0;L;;;;;N;;;;;
+13234;EGYPTIAN HIEROGLYPH NL019;Lo;0;L;;;;;N;;;;;
+13235;EGYPTIAN HIEROGLYPH NL020;Lo;0;L;;;;;N;;;;;
+13236;EGYPTIAN HIEROGLYPH NU001;Lo;0;L;;;;;N;;;;;
+13237;EGYPTIAN HIEROGLYPH NU002;Lo;0;L;;;;;N;;;;;
+13238;EGYPTIAN HIEROGLYPH NU003;Lo;0;L;;;;;N;;;;;
+13239;EGYPTIAN HIEROGLYPH NU004;Lo;0;L;;;;;N;;;;;
+1323A;EGYPTIAN HIEROGLYPH NU005;Lo;0;L;;;;;N;;;;;
+1323B;EGYPTIAN HIEROGLYPH NU006;Lo;0;L;;;;;N;;;;;
+1323C;EGYPTIAN HIEROGLYPH NU007;Lo;0;L;;;;;N;;;;;
+1323D;EGYPTIAN HIEROGLYPH NU008;Lo;0;L;;;;;N;;;;;
+1323E;EGYPTIAN HIEROGLYPH NU009;Lo;0;L;;;;;N;;;;;
+1323F;EGYPTIAN HIEROGLYPH NU010;Lo;0;L;;;;;N;;;;;
+13240;EGYPTIAN HIEROGLYPH NU010A;Lo;0;L;;;;;N;;;;;
+13241;EGYPTIAN HIEROGLYPH NU011;Lo;0;L;;;;;N;;;;;
+13242;EGYPTIAN HIEROGLYPH NU011A;Lo;0;L;;;;;N;;;;;
+13243;EGYPTIAN HIEROGLYPH NU012;Lo;0;L;;;;;N;;;;;
+13244;EGYPTIAN HIEROGLYPH NU013;Lo;0;L;;;;;N;;;;;
+13245;EGYPTIAN HIEROGLYPH NU014;Lo;0;L;;;;;N;;;;;
+13246;EGYPTIAN HIEROGLYPH NU015;Lo;0;L;;;;;N;;;;;
+13247;EGYPTIAN HIEROGLYPH NU016;Lo;0;L;;;;;N;;;;;
+13248;EGYPTIAN HIEROGLYPH NU017;Lo;0;L;;;;;N;;;;;
+13249;EGYPTIAN HIEROGLYPH NU018;Lo;0;L;;;;;N;;;;;
+1324A;EGYPTIAN HIEROGLYPH NU018A;Lo;0;L;;;;;N;;;;;
+1324B;EGYPTIAN HIEROGLYPH NU019;Lo;0;L;;;;;N;;;;;
+1324C;EGYPTIAN HIEROGLYPH NU020;Lo;0;L;;;;;N;;;;;
+1324D;EGYPTIAN HIEROGLYPH NU021;Lo;0;L;;;;;N;;;;;
+1324E;EGYPTIAN HIEROGLYPH NU022;Lo;0;L;;;;;N;;;;;
+1324F;EGYPTIAN HIEROGLYPH NU022A;Lo;0;L;;;;;N;;;;;
+13250;EGYPTIAN HIEROGLYPH O001;Lo;0;L;;;;;N;;;;;
+13251;EGYPTIAN HIEROGLYPH O001A;Lo;0;L;;;;;N;;;;;
+13252;EGYPTIAN HIEROGLYPH O002;Lo;0;L;;;;;N;;;;;
+13253;EGYPTIAN HIEROGLYPH O003;Lo;0;L;;;;;N;;;;;
+13254;EGYPTIAN HIEROGLYPH O004;Lo;0;L;;;;;N;;;;;
+13255;EGYPTIAN HIEROGLYPH O005;Lo;0;L;;;;;N;;;;;
+13256;EGYPTIAN HIEROGLYPH O005A;Lo;0;L;;;;;N;;;;;
+13257;EGYPTIAN HIEROGLYPH O006;Lo;0;L;;;;;N;;;;;
+13258;EGYPTIAN HIEROGLYPH O006A;Lo;0;L;;;;;N;;;;;
+13259;EGYPTIAN HIEROGLYPH O006B;Lo;0;L;;;;;N;;;;;
+1325A;EGYPTIAN HIEROGLYPH O006C;Lo;0;L;;;;;N;;;;;
+1325B;EGYPTIAN HIEROGLYPH O006D;Lo;0;L;;;;;N;;;;;
+1325C;EGYPTIAN HIEROGLYPH O006E;Lo;0;L;;;;;N;;;;;
+1325D;EGYPTIAN HIEROGLYPH O006F;Lo;0;L;;;;;N;;;;;
+1325E;EGYPTIAN HIEROGLYPH O007;Lo;0;L;;;;;N;;;;;
+1325F;EGYPTIAN HIEROGLYPH O008;Lo;0;L;;;;;N;;;;;
+13260;EGYPTIAN HIEROGLYPH O009;Lo;0;L;;;;;N;;;;;
+13261;EGYPTIAN HIEROGLYPH O010;Lo;0;L;;;;;N;;;;;
+13262;EGYPTIAN HIEROGLYPH O010A;Lo;0;L;;;;;N;;;;;
+13263;EGYPTIAN HIEROGLYPH O010B;Lo;0;L;;;;;N;;;;;
+13264;EGYPTIAN HIEROGLYPH O010C;Lo;0;L;;;;;N;;;;;
+13265;EGYPTIAN HIEROGLYPH O011;Lo;0;L;;;;;N;;;;;
+13266;EGYPTIAN HIEROGLYPH O012;Lo;0;L;;;;;N;;;;;
+13267;EGYPTIAN HIEROGLYPH O013;Lo;0;L;;;;;N;;;;;
+13268;EGYPTIAN HIEROGLYPH O014;Lo;0;L;;;;;N;;;;;
+13269;EGYPTIAN HIEROGLYPH O015;Lo;0;L;;;;;N;;;;;
+1326A;EGYPTIAN HIEROGLYPH O016;Lo;0;L;;;;;N;;;;;
+1326B;EGYPTIAN HIEROGLYPH O017;Lo;0;L;;;;;N;;;;;
+1326C;EGYPTIAN HIEROGLYPH O018;Lo;0;L;;;;;N;;;;;
+1326D;EGYPTIAN HIEROGLYPH O019;Lo;0;L;;;;;N;;;;;
+1326E;EGYPTIAN HIEROGLYPH O019A;Lo;0;L;;;;;N;;;;;
+1326F;EGYPTIAN HIEROGLYPH O020;Lo;0;L;;;;;N;;;;;
+13270;EGYPTIAN HIEROGLYPH O020A;Lo;0;L;;;;;N;;;;;
+13271;EGYPTIAN HIEROGLYPH O021;Lo;0;L;;;;;N;;;;;
+13272;EGYPTIAN HIEROGLYPH O022;Lo;0;L;;;;;N;;;;;
+13273;EGYPTIAN HIEROGLYPH O023;Lo;0;L;;;;;N;;;;;
+13274;EGYPTIAN HIEROGLYPH O024;Lo;0;L;;;;;N;;;;;
+13275;EGYPTIAN HIEROGLYPH O024A;Lo;0;L;;;;;N;;;;;
+13276;EGYPTIAN HIEROGLYPH O025;Lo;0;L;;;;;N;;;;;
+13277;EGYPTIAN HIEROGLYPH O025A;Lo;0;L;;;;;N;;;;;
+13278;EGYPTIAN HIEROGLYPH O026;Lo;0;L;;;;;N;;;;;
+13279;EGYPTIAN HIEROGLYPH O027;Lo;0;L;;;;;N;;;;;
+1327A;EGYPTIAN HIEROGLYPH O028;Lo;0;L;;;;;N;;;;;
+1327B;EGYPTIAN HIEROGLYPH O029;Lo;0;L;;;;;N;;;;;
+1327C;EGYPTIAN HIEROGLYPH O029A;Lo;0;L;;;;;N;;;;;
+1327D;EGYPTIAN HIEROGLYPH O030;Lo;0;L;;;;;N;;;;;
+1327E;EGYPTIAN HIEROGLYPH O030A;Lo;0;L;;;;;N;;;;;
+1327F;EGYPTIAN HIEROGLYPH O031;Lo;0;L;;;;;N;;;;;
+13280;EGYPTIAN HIEROGLYPH O032;Lo;0;L;;;;;N;;;;;
+13281;EGYPTIAN HIEROGLYPH O033;Lo;0;L;;;;;N;;;;;
+13282;EGYPTIAN HIEROGLYPH O033A;Lo;0;L;;;;;N;;;;;
+13283;EGYPTIAN HIEROGLYPH O034;Lo;0;L;;;;;N;;;;;
+13284;EGYPTIAN HIEROGLYPH O035;Lo;0;L;;;;;N;;;;;
+13285;EGYPTIAN HIEROGLYPH O036;Lo;0;L;;;;;N;;;;;
+13286;EGYPTIAN HIEROGLYPH O036A;Lo;0;L;;;;;N;;;;;
+13287;EGYPTIAN HIEROGLYPH O036B;Lo;0;L;;;;;N;;;;;
+13288;EGYPTIAN HIEROGLYPH O036C;Lo;0;L;;;;;N;;;;;
+13289;EGYPTIAN HIEROGLYPH O036D;Lo;0;L;;;;;N;;;;;
+1328A;EGYPTIAN HIEROGLYPH O037;Lo;0;L;;;;;N;;;;;
+1328B;EGYPTIAN HIEROGLYPH O038;Lo;0;L;;;;;N;;;;;
+1328C;EGYPTIAN HIEROGLYPH O039;Lo;0;L;;;;;N;;;;;
+1328D;EGYPTIAN HIEROGLYPH O040;Lo;0;L;;;;;N;;;;;
+1328E;EGYPTIAN HIEROGLYPH O041;Lo;0;L;;;;;N;;;;;
+1328F;EGYPTIAN HIEROGLYPH O042;Lo;0;L;;;;;N;;;;;
+13290;EGYPTIAN HIEROGLYPH O043;Lo;0;L;;;;;N;;;;;
+13291;EGYPTIAN HIEROGLYPH O044;Lo;0;L;;;;;N;;;;;
+13292;EGYPTIAN HIEROGLYPH O045;Lo;0;L;;;;;N;;;;;
+13293;EGYPTIAN HIEROGLYPH O046;Lo;0;L;;;;;N;;;;;
+13294;EGYPTIAN HIEROGLYPH O047;Lo;0;L;;;;;N;;;;;
+13295;EGYPTIAN HIEROGLYPH O048;Lo;0;L;;;;;N;;;;;
+13296;EGYPTIAN HIEROGLYPH O049;Lo;0;L;;;;;N;;;;;
+13297;EGYPTIAN HIEROGLYPH O050;Lo;0;L;;;;;N;;;;;
+13298;EGYPTIAN HIEROGLYPH O050A;Lo;0;L;;;;;N;;;;;
+13299;EGYPTIAN HIEROGLYPH O050B;Lo;0;L;;;;;N;;;;;
+1329A;EGYPTIAN HIEROGLYPH O051;Lo;0;L;;;;;N;;;;;
+1329B;EGYPTIAN HIEROGLYPH P001;Lo;0;L;;;;;N;;;;;
+1329C;EGYPTIAN HIEROGLYPH P001A;Lo;0;L;;;;;N;;;;;
+1329D;EGYPTIAN HIEROGLYPH P002;Lo;0;L;;;;;N;;;;;
+1329E;EGYPTIAN HIEROGLYPH P003;Lo;0;L;;;;;N;;;;;
+1329F;EGYPTIAN HIEROGLYPH P003A;Lo;0;L;;;;;N;;;;;
+132A0;EGYPTIAN HIEROGLYPH P004;Lo;0;L;;;;;N;;;;;
+132A1;EGYPTIAN HIEROGLYPH P005;Lo;0;L;;;;;N;;;;;
+132A2;EGYPTIAN HIEROGLYPH P006;Lo;0;L;;;;;N;;;;;
+132A3;EGYPTIAN HIEROGLYPH P007;Lo;0;L;;;;;N;;;;;
+132A4;EGYPTIAN HIEROGLYPH P008;Lo;0;L;;;;;N;;;;;
+132A5;EGYPTIAN HIEROGLYPH P009;Lo;0;L;;;;;N;;;;;
+132A6;EGYPTIAN HIEROGLYPH P010;Lo;0;L;;;;;N;;;;;
+132A7;EGYPTIAN HIEROGLYPH P011;Lo;0;L;;;;;N;;;;;
+132A8;EGYPTIAN HIEROGLYPH Q001;Lo;0;L;;;;;N;;;;;
+132A9;EGYPTIAN HIEROGLYPH Q002;Lo;0;L;;;;;N;;;;;
+132AA;EGYPTIAN HIEROGLYPH Q003;Lo;0;L;;;;;N;;;;;
+132AB;EGYPTIAN HIEROGLYPH Q004;Lo;0;L;;;;;N;;;;;
+132AC;EGYPTIAN HIEROGLYPH Q005;Lo;0;L;;;;;N;;;;;
+132AD;EGYPTIAN HIEROGLYPH Q006;Lo;0;L;;;;;N;;;;;
+132AE;EGYPTIAN HIEROGLYPH Q007;Lo;0;L;;;;;N;;;;;
+132AF;EGYPTIAN HIEROGLYPH R001;Lo;0;L;;;;;N;;;;;
+132B0;EGYPTIAN HIEROGLYPH R002;Lo;0;L;;;;;N;;;;;
+132B1;EGYPTIAN HIEROGLYPH R002A;Lo;0;L;;;;;N;;;;;
+132B2;EGYPTIAN HIEROGLYPH R003;Lo;0;L;;;;;N;;;;;
+132B3;EGYPTIAN HIEROGLYPH R003A;Lo;0;L;;;;;N;;;;;
+132B4;EGYPTIAN HIEROGLYPH R003B;Lo;0;L;;;;;N;;;;;
+132B5;EGYPTIAN HIEROGLYPH R004;Lo;0;L;;;;;N;;;;;
+132B6;EGYPTIAN HIEROGLYPH R005;Lo;0;L;;;;;N;;;;;
+132B7;EGYPTIAN HIEROGLYPH R006;Lo;0;L;;;;;N;;;;;
+132B8;EGYPTIAN HIEROGLYPH R007;Lo;0;L;;;;;N;;;;;
+132B9;EGYPTIAN HIEROGLYPH R008;Lo;0;L;;;;;N;;;;;
+132BA;EGYPTIAN HIEROGLYPH R009;Lo;0;L;;;;;N;;;;;
+132BB;EGYPTIAN HIEROGLYPH R010;Lo;0;L;;;;;N;;;;;
+132BC;EGYPTIAN HIEROGLYPH R010A;Lo;0;L;;;;;N;;;;;
+132BD;EGYPTIAN HIEROGLYPH R011;Lo;0;L;;;;;N;;;;;
+132BE;EGYPTIAN HIEROGLYPH R012;Lo;0;L;;;;;N;;;;;
+132BF;EGYPTIAN HIEROGLYPH R013;Lo;0;L;;;;;N;;;;;
+132C0;EGYPTIAN HIEROGLYPH R014;Lo;0;L;;;;;N;;;;;
+132C1;EGYPTIAN HIEROGLYPH R015;Lo;0;L;;;;;N;;;;;
+132C2;EGYPTIAN HIEROGLYPH R016;Lo;0;L;;;;;N;;;;;
+132C3;EGYPTIAN HIEROGLYPH R016A;Lo;0;L;;;;;N;;;;;
+132C4;EGYPTIAN HIEROGLYPH R017;Lo;0;L;;;;;N;;;;;
+132C5;EGYPTIAN HIEROGLYPH R018;Lo;0;L;;;;;N;;;;;
+132C6;EGYPTIAN HIEROGLYPH R019;Lo;0;L;;;;;N;;;;;
+132C7;EGYPTIAN HIEROGLYPH R020;Lo;0;L;;;;;N;;;;;
+132C8;EGYPTIAN HIEROGLYPH R021;Lo;0;L;;;;;N;;;;;
+132C9;EGYPTIAN HIEROGLYPH R022;Lo;0;L;;;;;N;;;;;
+132CA;EGYPTIAN HIEROGLYPH R023;Lo;0;L;;;;;N;;;;;
+132CB;EGYPTIAN HIEROGLYPH R024;Lo;0;L;;;;;N;;;;;
+132CC;EGYPTIAN HIEROGLYPH R025;Lo;0;L;;;;;N;;;;;
+132CD;EGYPTIAN HIEROGLYPH R026;Lo;0;L;;;;;N;;;;;
+132CE;EGYPTIAN HIEROGLYPH R027;Lo;0;L;;;;;N;;;;;
+132CF;EGYPTIAN HIEROGLYPH R028;Lo;0;L;;;;;N;;;;;
+132D0;EGYPTIAN HIEROGLYPH R029;Lo;0;L;;;;;N;;;;;
+132D1;EGYPTIAN HIEROGLYPH S001;Lo;0;L;;;;;N;;;;;
+132D2;EGYPTIAN HIEROGLYPH S002;Lo;0;L;;;;;N;;;;;
+132D3;EGYPTIAN HIEROGLYPH S002A;Lo;0;L;;;;;N;;;;;
+132D4;EGYPTIAN HIEROGLYPH S003;Lo;0;L;;;;;N;;;;;
+132D5;EGYPTIAN HIEROGLYPH S004;Lo;0;L;;;;;N;;;;;
+132D6;EGYPTIAN HIEROGLYPH S005;Lo;0;L;;;;;N;;;;;
+132D7;EGYPTIAN HIEROGLYPH S006;Lo;0;L;;;;;N;;;;;
+132D8;EGYPTIAN HIEROGLYPH S006A;Lo;0;L;;;;;N;;;;;
+132D9;EGYPTIAN HIEROGLYPH S007;Lo;0;L;;;;;N;;;;;
+132DA;EGYPTIAN HIEROGLYPH S008;Lo;0;L;;;;;N;;;;;
+132DB;EGYPTIAN HIEROGLYPH S009;Lo;0;L;;;;;N;;;;;
+132DC;EGYPTIAN HIEROGLYPH S010;Lo;0;L;;;;;N;;;;;
+132DD;EGYPTIAN HIEROGLYPH S011;Lo;0;L;;;;;N;;;;;
+132DE;EGYPTIAN HIEROGLYPH S012;Lo;0;L;;;;;N;;;;;
+132DF;EGYPTIAN HIEROGLYPH S013;Lo;0;L;;;;;N;;;;;
+132E0;EGYPTIAN HIEROGLYPH S014;Lo;0;L;;;;;N;;;;;
+132E1;EGYPTIAN HIEROGLYPH S014A;Lo;0;L;;;;;N;;;;;
+132E2;EGYPTIAN HIEROGLYPH S014B;Lo;0;L;;;;;N;;;;;
+132E3;EGYPTIAN HIEROGLYPH S015;Lo;0;L;;;;;N;;;;;
+132E4;EGYPTIAN HIEROGLYPH S016;Lo;0;L;;;;;N;;;;;
+132E5;EGYPTIAN HIEROGLYPH S017;Lo;0;L;;;;;N;;;;;
+132E6;EGYPTIAN HIEROGLYPH S017A;Lo;0;L;;;;;N;;;;;
+132E7;EGYPTIAN HIEROGLYPH S018;Lo;0;L;;;;;N;;;;;
+132E8;EGYPTIAN HIEROGLYPH S019;Lo;0;L;;;;;N;;;;;
+132E9;EGYPTIAN HIEROGLYPH S020;Lo;0;L;;;;;N;;;;;
+132EA;EGYPTIAN HIEROGLYPH S021;Lo;0;L;;;;;N;;;;;
+132EB;EGYPTIAN HIEROGLYPH S022;Lo;0;L;;;;;N;;;;;
+132EC;EGYPTIAN HIEROGLYPH S023;Lo;0;L;;;;;N;;;;;
+132ED;EGYPTIAN HIEROGLYPH S024;Lo;0;L;;;;;N;;;;;
+132EE;EGYPTIAN HIEROGLYPH S025;Lo;0;L;;;;;N;;;;;
+132EF;EGYPTIAN HIEROGLYPH S026;Lo;0;L;;;;;N;;;;;
+132F0;EGYPTIAN HIEROGLYPH S026A;Lo;0;L;;;;;N;;;;;
+132F1;EGYPTIAN HIEROGLYPH S026B;Lo;0;L;;;;;N;;;;;
+132F2;EGYPTIAN HIEROGLYPH S027;Lo;0;L;;;;;N;;;;;
+132F3;EGYPTIAN HIEROGLYPH S028;Lo;0;L;;;;;N;;;;;
+132F4;EGYPTIAN HIEROGLYPH S029;Lo;0;L;;;;;N;;;;;
+132F5;EGYPTIAN HIEROGLYPH S030;Lo;0;L;;;;;N;;;;;
+132F6;EGYPTIAN HIEROGLYPH S031;Lo;0;L;;;;;N;;;;;
+132F7;EGYPTIAN HIEROGLYPH S032;Lo;0;L;;;;;N;;;;;
+132F8;EGYPTIAN HIEROGLYPH S033;Lo;0;L;;;;;N;;;;;
+132F9;EGYPTIAN HIEROGLYPH S034;Lo;0;L;;;;;N;;;;;
+132FA;EGYPTIAN HIEROGLYPH S035;Lo;0;L;;;;;N;;;;;
+132FB;EGYPTIAN HIEROGLYPH S035A;Lo;0;L;;;;;N;;;;;
+132FC;EGYPTIAN HIEROGLYPH S036;Lo;0;L;;;;;N;;;;;
+132FD;EGYPTIAN HIEROGLYPH S037;Lo;0;L;;;;;N;;;;;
+132FE;EGYPTIAN HIEROGLYPH S038;Lo;0;L;;;;;N;;;;;
+132FF;EGYPTIAN HIEROGLYPH S039;Lo;0;L;;;;;N;;;;;
+13300;EGYPTIAN HIEROGLYPH S040;Lo;0;L;;;;;N;;;;;
+13301;EGYPTIAN HIEROGLYPH S041;Lo;0;L;;;;;N;;;;;
+13302;EGYPTIAN HIEROGLYPH S042;Lo;0;L;;;;;N;;;;;
+13303;EGYPTIAN HIEROGLYPH S043;Lo;0;L;;;;;N;;;;;
+13304;EGYPTIAN HIEROGLYPH S044;Lo;0;L;;;;;N;;;;;
+13305;EGYPTIAN HIEROGLYPH S045;Lo;0;L;;;;;N;;;;;
+13306;EGYPTIAN HIEROGLYPH S046;Lo;0;L;;;;;N;;;;;
+13307;EGYPTIAN HIEROGLYPH T001;Lo;0;L;;;;;N;;;;;
+13308;EGYPTIAN HIEROGLYPH T002;Lo;0;L;;;;;N;;;;;
+13309;EGYPTIAN HIEROGLYPH T003;Lo;0;L;;;;;N;;;;;
+1330A;EGYPTIAN HIEROGLYPH T003A;Lo;0;L;;;;;N;;;;;
+1330B;EGYPTIAN HIEROGLYPH T004;Lo;0;L;;;;;N;;;;;
+1330C;EGYPTIAN HIEROGLYPH T005;Lo;0;L;;;;;N;;;;;
+1330D;EGYPTIAN HIEROGLYPH T006;Lo;0;L;;;;;N;;;;;
+1330E;EGYPTIAN HIEROGLYPH T007;Lo;0;L;;;;;N;;;;;
+1330F;EGYPTIAN HIEROGLYPH T007A;Lo;0;L;;;;;N;;;;;
+13310;EGYPTIAN HIEROGLYPH T008;Lo;0;L;;;;;N;;;;;
+13311;EGYPTIAN HIEROGLYPH T008A;Lo;0;L;;;;;N;;;;;
+13312;EGYPTIAN HIEROGLYPH T009;Lo;0;L;;;;;N;;;;;
+13313;EGYPTIAN HIEROGLYPH T009A;Lo;0;L;;;;;N;;;;;
+13314;EGYPTIAN HIEROGLYPH T010;Lo;0;L;;;;;N;;;;;
+13315;EGYPTIAN HIEROGLYPH T011;Lo;0;L;;;;;N;;;;;
+13316;EGYPTIAN HIEROGLYPH T011A;Lo;0;L;;;;;N;;;;;
+13317;EGYPTIAN HIEROGLYPH T012;Lo;0;L;;;;;N;;;;;
+13318;EGYPTIAN HIEROGLYPH T013;Lo;0;L;;;;;N;;;;;
+13319;EGYPTIAN HIEROGLYPH T014;Lo;0;L;;;;;N;;;;;
+1331A;EGYPTIAN HIEROGLYPH T015;Lo;0;L;;;;;N;;;;;
+1331B;EGYPTIAN HIEROGLYPH T016;Lo;0;L;;;;;N;;;;;
+1331C;EGYPTIAN HIEROGLYPH T016A;Lo;0;L;;;;;N;;;;;
+1331D;EGYPTIAN HIEROGLYPH T017;Lo;0;L;;;;;N;;;;;
+1331E;EGYPTIAN HIEROGLYPH T018;Lo;0;L;;;;;N;;;;;
+1331F;EGYPTIAN HIEROGLYPH T019;Lo;0;L;;;;;N;;;;;
+13320;EGYPTIAN HIEROGLYPH T020;Lo;0;L;;;;;N;;;;;
+13321;EGYPTIAN HIEROGLYPH T021;Lo;0;L;;;;;N;;;;;
+13322;EGYPTIAN HIEROGLYPH T022;Lo;0;L;;;;;N;;;;;
+13323;EGYPTIAN HIEROGLYPH T023;Lo;0;L;;;;;N;;;;;
+13324;EGYPTIAN HIEROGLYPH T024;Lo;0;L;;;;;N;;;;;
+13325;EGYPTIAN HIEROGLYPH T025;Lo;0;L;;;;;N;;;;;
+13326;EGYPTIAN HIEROGLYPH T026;Lo;0;L;;;;;N;;;;;
+13327;EGYPTIAN HIEROGLYPH T027;Lo;0;L;;;;;N;;;;;
+13328;EGYPTIAN HIEROGLYPH T028;Lo;0;L;;;;;N;;;;;
+13329;EGYPTIAN HIEROGLYPH T029;Lo;0;L;;;;;N;;;;;
+1332A;EGYPTIAN HIEROGLYPH T030;Lo;0;L;;;;;N;;;;;
+1332B;EGYPTIAN HIEROGLYPH T031;Lo;0;L;;;;;N;;;;;
+1332C;EGYPTIAN HIEROGLYPH T032;Lo;0;L;;;;;N;;;;;
+1332D;EGYPTIAN HIEROGLYPH T032A;Lo;0;L;;;;;N;;;;;
+1332E;EGYPTIAN HIEROGLYPH T033;Lo;0;L;;;;;N;;;;;
+1332F;EGYPTIAN HIEROGLYPH T033A;Lo;0;L;;;;;N;;;;;
+13330;EGYPTIAN HIEROGLYPH T034;Lo;0;L;;;;;N;;;;;
+13331;EGYPTIAN HIEROGLYPH T035;Lo;0;L;;;;;N;;;;;
+13332;EGYPTIAN HIEROGLYPH T036;Lo;0;L;;;;;N;;;;;
+13333;EGYPTIAN HIEROGLYPH U001;Lo;0;L;;;;;N;;;;;
+13334;EGYPTIAN HIEROGLYPH U002;Lo;0;L;;;;;N;;;;;
+13335;EGYPTIAN HIEROGLYPH U003;Lo;0;L;;;;;N;;;;;
+13336;EGYPTIAN HIEROGLYPH U004;Lo;0;L;;;;;N;;;;;
+13337;EGYPTIAN HIEROGLYPH U005;Lo;0;L;;;;;N;;;;;
+13338;EGYPTIAN HIEROGLYPH U006;Lo;0;L;;;;;N;;;;;
+13339;EGYPTIAN HIEROGLYPH U006A;Lo;0;L;;;;;N;;;;;
+1333A;EGYPTIAN HIEROGLYPH U006B;Lo;0;L;;;;;N;;;;;
+1333B;EGYPTIAN HIEROGLYPH U007;Lo;0;L;;;;;N;;;;;
+1333C;EGYPTIAN HIEROGLYPH U008;Lo;0;L;;;;;N;;;;;
+1333D;EGYPTIAN HIEROGLYPH U009;Lo;0;L;;;;;N;;;;;
+1333E;EGYPTIAN HIEROGLYPH U010;Lo;0;L;;;;;N;;;;;
+1333F;EGYPTIAN HIEROGLYPH U011;Lo;0;L;;;;;N;;;;;
+13340;EGYPTIAN HIEROGLYPH U012;Lo;0;L;;;;;N;;;;;
+13341;EGYPTIAN HIEROGLYPH U013;Lo;0;L;;;;;N;;;;;
+13342;EGYPTIAN HIEROGLYPH U014;Lo;0;L;;;;;N;;;;;
+13343;EGYPTIAN HIEROGLYPH U015;Lo;0;L;;;;;N;;;;;
+13344;EGYPTIAN HIEROGLYPH U016;Lo;0;L;;;;;N;;;;;
+13345;EGYPTIAN HIEROGLYPH U017;Lo;0;L;;;;;N;;;;;
+13346;EGYPTIAN HIEROGLYPH U018;Lo;0;L;;;;;N;;;;;
+13347;EGYPTIAN HIEROGLYPH U019;Lo;0;L;;;;;N;;;;;
+13348;EGYPTIAN HIEROGLYPH U020;Lo;0;L;;;;;N;;;;;
+13349;EGYPTIAN HIEROGLYPH U021;Lo;0;L;;;;;N;;;;;
+1334A;EGYPTIAN HIEROGLYPH U022;Lo;0;L;;;;;N;;;;;
+1334B;EGYPTIAN HIEROGLYPH U023;Lo;0;L;;;;;N;;;;;
+1334C;EGYPTIAN HIEROGLYPH U023A;Lo;0;L;;;;;N;;;;;
+1334D;EGYPTIAN HIEROGLYPH U024;Lo;0;L;;;;;N;;;;;
+1334E;EGYPTIAN HIEROGLYPH U025;Lo;0;L;;;;;N;;;;;
+1334F;EGYPTIAN HIEROGLYPH U026;Lo;0;L;;;;;N;;;;;
+13350;EGYPTIAN HIEROGLYPH U027;Lo;0;L;;;;;N;;;;;
+13351;EGYPTIAN HIEROGLYPH U028;Lo;0;L;;;;;N;;;;;
+13352;EGYPTIAN HIEROGLYPH U029;Lo;0;L;;;;;N;;;;;
+13353;EGYPTIAN HIEROGLYPH U029A;Lo;0;L;;;;;N;;;;;
+13354;EGYPTIAN HIEROGLYPH U030;Lo;0;L;;;;;N;;;;;
+13355;EGYPTIAN HIEROGLYPH U031;Lo;0;L;;;;;N;;;;;
+13356;EGYPTIAN HIEROGLYPH U032;Lo;0;L;;;;;N;;;;;
+13357;EGYPTIAN HIEROGLYPH U032A;Lo;0;L;;;;;N;;;;;
+13358;EGYPTIAN HIEROGLYPH U033;Lo;0;L;;;;;N;;;;;
+13359;EGYPTIAN HIEROGLYPH U034;Lo;0;L;;;;;N;;;;;
+1335A;EGYPTIAN HIEROGLYPH U035;Lo;0;L;;;;;N;;;;;
+1335B;EGYPTIAN HIEROGLYPH U036;Lo;0;L;;;;;N;;;;;
+1335C;EGYPTIAN HIEROGLYPH U037;Lo;0;L;;;;;N;;;;;
+1335D;EGYPTIAN HIEROGLYPH U038;Lo;0;L;;;;;N;;;;;
+1335E;EGYPTIAN HIEROGLYPH U039;Lo;0;L;;;;;N;;;;;
+1335F;EGYPTIAN HIEROGLYPH U040;Lo;0;L;;;;;N;;;;;
+13360;EGYPTIAN HIEROGLYPH U041;Lo;0;L;;;;;N;;;;;
+13361;EGYPTIAN HIEROGLYPH U042;Lo;0;L;;;;;N;;;;;
+13362;EGYPTIAN HIEROGLYPH V001;Lo;0;L;;;;;N;;;;;
+13363;EGYPTIAN HIEROGLYPH V001A;Lo;0;L;;;;;N;;;;;
+13364;EGYPTIAN HIEROGLYPH V001B;Lo;0;L;;;;;N;;;;;
+13365;EGYPTIAN HIEROGLYPH V001C;Lo;0;L;;;;;N;;;;;
+13366;EGYPTIAN HIEROGLYPH V001D;Lo;0;L;;;;;N;;;;;
+13367;EGYPTIAN HIEROGLYPH V001E;Lo;0;L;;;;;N;;;;;
+13368;EGYPTIAN HIEROGLYPH V001F;Lo;0;L;;;;;N;;;;;
+13369;EGYPTIAN HIEROGLYPH V001G;Lo;0;L;;;;;N;;;;;
+1336A;EGYPTIAN HIEROGLYPH V001H;Lo;0;L;;;;;N;;;;;
+1336B;EGYPTIAN HIEROGLYPH V001I;Lo;0;L;;;;;N;;;;;
+1336C;EGYPTIAN HIEROGLYPH V002;Lo;0;L;;;;;N;;;;;
+1336D;EGYPTIAN HIEROGLYPH V002A;Lo;0;L;;;;;N;;;;;
+1336E;EGYPTIAN HIEROGLYPH V003;Lo;0;L;;;;;N;;;;;
+1336F;EGYPTIAN HIEROGLYPH V004;Lo;0;L;;;;;N;;;;;
+13370;EGYPTIAN HIEROGLYPH V005;Lo;0;L;;;;;N;;;;;
+13371;EGYPTIAN HIEROGLYPH V006;Lo;0;L;;;;;N;;;;;
+13372;EGYPTIAN HIEROGLYPH V007;Lo;0;L;;;;;N;;;;;
+13373;EGYPTIAN HIEROGLYPH V007A;Lo;0;L;;;;;N;;;;;
+13374;EGYPTIAN HIEROGLYPH V007B;Lo;0;L;;;;;N;;;;;
+13375;EGYPTIAN HIEROGLYPH V008;Lo;0;L;;;;;N;;;;;
+13376;EGYPTIAN HIEROGLYPH V009;Lo;0;L;;;;;N;;;;;
+13377;EGYPTIAN HIEROGLYPH V010;Lo;0;L;;;;;N;;;;;
+13378;EGYPTIAN HIEROGLYPH V011;Lo;0;L;;;;;N;;;;;
+13379;EGYPTIAN HIEROGLYPH V011A;Lo;0;L;;;;;N;;;;;
+1337A;EGYPTIAN HIEROGLYPH V011B;Lo;0;L;;;;;N;;;;;
+1337B;EGYPTIAN HIEROGLYPH V011C;Lo;0;L;;;;;N;;;;;
+1337C;EGYPTIAN HIEROGLYPH V012;Lo;0;L;;;;;N;;;;;
+1337D;EGYPTIAN HIEROGLYPH V012A;Lo;0;L;;;;;N;;;;;
+1337E;EGYPTIAN HIEROGLYPH V012B;Lo;0;L;;;;;N;;;;;
+1337F;EGYPTIAN HIEROGLYPH V013;Lo;0;L;;;;;N;;;;;
+13380;EGYPTIAN HIEROGLYPH V014;Lo;0;L;;;;;N;;;;;
+13381;EGYPTIAN HIEROGLYPH V015;Lo;0;L;;;;;N;;;;;
+13382;EGYPTIAN HIEROGLYPH V016;Lo;0;L;;;;;N;;;;;
+13383;EGYPTIAN HIEROGLYPH V017;Lo;0;L;;;;;N;;;;;
+13384;EGYPTIAN HIEROGLYPH V018;Lo;0;L;;;;;N;;;;;
+13385;EGYPTIAN HIEROGLYPH V019;Lo;0;L;;;;;N;;;;;
+13386;EGYPTIAN HIEROGLYPH V020;Lo;0;L;;;;;N;;;;;
+13387;EGYPTIAN HIEROGLYPH V020A;Lo;0;L;;;;;N;;;;;
+13388;EGYPTIAN HIEROGLYPH V020B;Lo;0;L;;;;;N;;;;;
+13389;EGYPTIAN HIEROGLYPH V020C;Lo;0;L;;;;;N;;;;;
+1338A;EGYPTIAN HIEROGLYPH V020D;Lo;0;L;;;;;N;;;;;
+1338B;EGYPTIAN HIEROGLYPH V020E;Lo;0;L;;;;;N;;;;;
+1338C;EGYPTIAN HIEROGLYPH V020F;Lo;0;L;;;;;N;;;;;
+1338D;EGYPTIAN HIEROGLYPH V020G;Lo;0;L;;;;;N;;;;;
+1338E;EGYPTIAN HIEROGLYPH V020H;Lo;0;L;;;;;N;;;;;
+1338F;EGYPTIAN HIEROGLYPH V020I;Lo;0;L;;;;;N;;;;;
+13390;EGYPTIAN HIEROGLYPH V020J;Lo;0;L;;;;;N;;;;;
+13391;EGYPTIAN HIEROGLYPH V020K;Lo;0;L;;;;;N;;;;;
+13392;EGYPTIAN HIEROGLYPH V020L;Lo;0;L;;;;;N;;;;;
+13393;EGYPTIAN HIEROGLYPH V021;Lo;0;L;;;;;N;;;;;
+13394;EGYPTIAN HIEROGLYPH V022;Lo;0;L;;;;;N;;;;;
+13395;EGYPTIAN HIEROGLYPH V023;Lo;0;L;;;;;N;;;;;
+13396;EGYPTIAN HIEROGLYPH V023A;Lo;0;L;;;;;N;;;;;
+13397;EGYPTIAN HIEROGLYPH V024;Lo;0;L;;;;;N;;;;;
+13398;EGYPTIAN HIEROGLYPH V025;Lo;0;L;;;;;N;;;;;
+13399;EGYPTIAN HIEROGLYPH V026;Lo;0;L;;;;;N;;;;;
+1339A;EGYPTIAN HIEROGLYPH V027;Lo;0;L;;;;;N;;;;;
+1339B;EGYPTIAN HIEROGLYPH V028;Lo;0;L;;;;;N;;;;;
+1339C;EGYPTIAN HIEROGLYPH V028A;Lo;0;L;;;;;N;;;;;
+1339D;EGYPTIAN HIEROGLYPH V029;Lo;0;L;;;;;N;;;;;
+1339E;EGYPTIAN HIEROGLYPH V029A;Lo;0;L;;;;;N;;;;;
+1339F;EGYPTIAN HIEROGLYPH V030;Lo;0;L;;;;;N;;;;;
+133A0;EGYPTIAN HIEROGLYPH V030A;Lo;0;L;;;;;N;;;;;
+133A1;EGYPTIAN HIEROGLYPH V031;Lo;0;L;;;;;N;;;;;
+133A2;EGYPTIAN HIEROGLYPH V031A;Lo;0;L;;;;;N;;;;;
+133A3;EGYPTIAN HIEROGLYPH V032;Lo;0;L;;;;;N;;;;;
+133A4;EGYPTIAN HIEROGLYPH V033;Lo;0;L;;;;;N;;;;;
+133A5;EGYPTIAN HIEROGLYPH V033A;Lo;0;L;;;;;N;;;;;
+133A6;EGYPTIAN HIEROGLYPH V034;Lo;0;L;;;;;N;;;;;
+133A7;EGYPTIAN HIEROGLYPH V035;Lo;0;L;;;;;N;;;;;
+133A8;EGYPTIAN HIEROGLYPH V036;Lo;0;L;;;;;N;;;;;
+133A9;EGYPTIAN HIEROGLYPH V037;Lo;0;L;;;;;N;;;;;
+133AA;EGYPTIAN HIEROGLYPH V037A;Lo;0;L;;;;;N;;;;;
+133AB;EGYPTIAN HIEROGLYPH V038;Lo;0;L;;;;;N;;;;;
+133AC;EGYPTIAN HIEROGLYPH V039;Lo;0;L;;;;;N;;;;;
+133AD;EGYPTIAN HIEROGLYPH V040;Lo;0;L;;;;;N;;;;;
+133AE;EGYPTIAN HIEROGLYPH V040A;Lo;0;L;;;;;N;;;;;
+133AF;EGYPTIAN HIEROGLYPH W001;Lo;0;L;;;;;N;;;;;
+133B0;EGYPTIAN HIEROGLYPH W002;Lo;0;L;;;;;N;;;;;
+133B1;EGYPTIAN HIEROGLYPH W003;Lo;0;L;;;;;N;;;;;
+133B2;EGYPTIAN HIEROGLYPH W003A;Lo;0;L;;;;;N;;;;;
+133B3;EGYPTIAN HIEROGLYPH W004;Lo;0;L;;;;;N;;;;;
+133B4;EGYPTIAN HIEROGLYPH W005;Lo;0;L;;;;;N;;;;;
+133B5;EGYPTIAN HIEROGLYPH W006;Lo;0;L;;;;;N;;;;;
+133B6;EGYPTIAN HIEROGLYPH W007;Lo;0;L;;;;;N;;;;;
+133B7;EGYPTIAN HIEROGLYPH W008;Lo;0;L;;;;;N;;;;;
+133B8;EGYPTIAN HIEROGLYPH W009;Lo;0;L;;;;;N;;;;;
+133B9;EGYPTIAN HIEROGLYPH W009A;Lo;0;L;;;;;N;;;;;
+133BA;EGYPTIAN HIEROGLYPH W010;Lo;0;L;;;;;N;;;;;
+133BB;EGYPTIAN HIEROGLYPH W010A;Lo;0;L;;;;;N;;;;;
+133BC;EGYPTIAN HIEROGLYPH W011;Lo;0;L;;;;;N;;;;;
+133BD;EGYPTIAN HIEROGLYPH W012;Lo;0;L;;;;;N;;;;;
+133BE;EGYPTIAN HIEROGLYPH W013;Lo;0;L;;;;;N;;;;;
+133BF;EGYPTIAN HIEROGLYPH W014;Lo;0;L;;;;;N;;;;;
+133C0;EGYPTIAN HIEROGLYPH W014A;Lo;0;L;;;;;N;;;;;
+133C1;EGYPTIAN HIEROGLYPH W015;Lo;0;L;;;;;N;;;;;
+133C2;EGYPTIAN HIEROGLYPH W016;Lo;0;L;;;;;N;;;;;
+133C3;EGYPTIAN HIEROGLYPH W017;Lo;0;L;;;;;N;;;;;
+133C4;EGYPTIAN HIEROGLYPH W017A;Lo;0;L;;;;;N;;;;;
+133C5;EGYPTIAN HIEROGLYPH W018;Lo;0;L;;;;;N;;;;;
+133C6;EGYPTIAN HIEROGLYPH W018A;Lo;0;L;;;;;N;;;;;
+133C7;EGYPTIAN HIEROGLYPH W019;Lo;0;L;;;;;N;;;;;
+133C8;EGYPTIAN HIEROGLYPH W020;Lo;0;L;;;;;N;;;;;
+133C9;EGYPTIAN HIEROGLYPH W021;Lo;0;L;;;;;N;;;;;
+133CA;EGYPTIAN HIEROGLYPH W022;Lo;0;L;;;;;N;;;;;
+133CB;EGYPTIAN HIEROGLYPH W023;Lo;0;L;;;;;N;;;;;
+133CC;EGYPTIAN HIEROGLYPH W024;Lo;0;L;;;;;N;;;;;
+133CD;EGYPTIAN HIEROGLYPH W024A;Lo;0;L;;;;;N;;;;;
+133CE;EGYPTIAN HIEROGLYPH W025;Lo;0;L;;;;;N;;;;;
+133CF;EGYPTIAN HIEROGLYPH X001;Lo;0;L;;;;;N;;;;;
+133D0;EGYPTIAN HIEROGLYPH X002;Lo;0;L;;;;;N;;;;;
+133D1;EGYPTIAN HIEROGLYPH X003;Lo;0;L;;;;;N;;;;;
+133D2;EGYPTIAN HIEROGLYPH X004;Lo;0;L;;;;;N;;;;;
+133D3;EGYPTIAN HIEROGLYPH X004A;Lo;0;L;;;;;N;;;;;
+133D4;EGYPTIAN HIEROGLYPH X004B;Lo;0;L;;;;;N;;;;;
+133D5;EGYPTIAN HIEROGLYPH X005;Lo;0;L;;;;;N;;;;;
+133D6;EGYPTIAN HIEROGLYPH X006;Lo;0;L;;;;;N;;;;;
+133D7;EGYPTIAN HIEROGLYPH X006A;Lo;0;L;;;;;N;;;;;
+133D8;EGYPTIAN HIEROGLYPH X007;Lo;0;L;;;;;N;;;;;
+133D9;EGYPTIAN HIEROGLYPH X008;Lo;0;L;;;;;N;;;;;
+133DA;EGYPTIAN HIEROGLYPH X008A;Lo;0;L;;;;;N;;;;;
+133DB;EGYPTIAN HIEROGLYPH Y001;Lo;0;L;;;;;N;;;;;
+133DC;EGYPTIAN HIEROGLYPH Y001A;Lo;0;L;;;;;N;;;;;
+133DD;EGYPTIAN HIEROGLYPH Y002;Lo;0;L;;;;;N;;;;;
+133DE;EGYPTIAN HIEROGLYPH Y003;Lo;0;L;;;;;N;;;;;
+133DF;EGYPTIAN HIEROGLYPH Y004;Lo;0;L;;;;;N;;;;;
+133E0;EGYPTIAN HIEROGLYPH Y005;Lo;0;L;;;;;N;;;;;
+133E1;EGYPTIAN HIEROGLYPH Y006;Lo;0;L;;;;;N;;;;;
+133E2;EGYPTIAN HIEROGLYPH Y007;Lo;0;L;;;;;N;;;;;
+133E3;EGYPTIAN HIEROGLYPH Y008;Lo;0;L;;;;;N;;;;;
+133E4;EGYPTIAN HIEROGLYPH Z001;Lo;0;L;;;;;N;;;;;
+133E5;EGYPTIAN HIEROGLYPH Z002;Lo;0;L;;;;;N;;;;;
+133E6;EGYPTIAN HIEROGLYPH Z002A;Lo;0;L;;;;;N;;;;;
+133E7;EGYPTIAN HIEROGLYPH Z002B;Lo;0;L;;;;;N;;;;;
+133E8;EGYPTIAN HIEROGLYPH Z002C;Lo;0;L;;;;;N;;;;;
+133E9;EGYPTIAN HIEROGLYPH Z002D;Lo;0;L;;;;;N;;;;;
+133EA;EGYPTIAN HIEROGLYPH Z003;Lo;0;L;;;;;N;;;;;
+133EB;EGYPTIAN HIEROGLYPH Z003A;Lo;0;L;;;;;N;;;;;
+133EC;EGYPTIAN HIEROGLYPH Z003B;Lo;0;L;;;;;N;;;;;
+133ED;EGYPTIAN HIEROGLYPH Z004;Lo;0;L;;;;;N;;;;;
+133EE;EGYPTIAN HIEROGLYPH Z004A;Lo;0;L;;;;;N;;;;;
+133EF;EGYPTIAN HIEROGLYPH Z005;Lo;0;L;;;;;N;;;;;
+133F0;EGYPTIAN HIEROGLYPH Z005A;Lo;0;L;;;;;N;;;;;
+133F1;EGYPTIAN HIEROGLYPH Z006;Lo;0;L;;;;;N;;;;;
+133F2;EGYPTIAN HIEROGLYPH Z007;Lo;0;L;;;;;N;;;;;
+133F3;EGYPTIAN HIEROGLYPH Z008;Lo;0;L;;;;;N;;;;;
+133F4;EGYPTIAN HIEROGLYPH Z009;Lo;0;L;;;;;N;;;;;
+133F5;EGYPTIAN HIEROGLYPH Z010;Lo;0;L;;;;;N;;;;;
+133F6;EGYPTIAN HIEROGLYPH Z011;Lo;0;L;;;;;N;;;;;
+133F7;EGYPTIAN HIEROGLYPH Z012;Lo;0;L;;;;;N;;;;;
+133F8;EGYPTIAN HIEROGLYPH Z013;Lo;0;L;;;;;N;;;;;
+133F9;EGYPTIAN HIEROGLYPH Z014;Lo;0;L;;;;;N;;;;;
+133FA;EGYPTIAN HIEROGLYPH Z015;Lo;0;L;;;;;N;;;;;
+133FB;EGYPTIAN HIEROGLYPH Z015A;Lo;0;L;;;;;N;;;;;
+133FC;EGYPTIAN HIEROGLYPH Z015B;Lo;0;L;;;;;N;;;;;
+133FD;EGYPTIAN HIEROGLYPH Z015C;Lo;0;L;;;;;N;;;;;
+133FE;EGYPTIAN HIEROGLYPH Z015D;Lo;0;L;;;;;N;;;;;
+133FF;EGYPTIAN HIEROGLYPH Z015E;Lo;0;L;;;;;N;;;;;
+13400;EGYPTIAN HIEROGLYPH Z015F;Lo;0;L;;;;;N;;;;;
+13401;EGYPTIAN HIEROGLYPH Z015G;Lo;0;L;;;;;N;;;;;
+13402;EGYPTIAN HIEROGLYPH Z015H;Lo;0;L;;;;;N;;;;;
+13403;EGYPTIAN HIEROGLYPH Z015I;Lo;0;L;;;;;N;;;;;
+13404;EGYPTIAN HIEROGLYPH Z016;Lo;0;L;;;;;N;;;;;
+13405;EGYPTIAN HIEROGLYPH Z016A;Lo;0;L;;;;;N;;;;;
+13406;EGYPTIAN HIEROGLYPH Z016B;Lo;0;L;;;;;N;;;;;
+13407;EGYPTIAN HIEROGLYPH Z016C;Lo;0;L;;;;;N;;;;;
+13408;EGYPTIAN HIEROGLYPH Z016D;Lo;0;L;;;;;N;;;;;
+13409;EGYPTIAN HIEROGLYPH Z016E;Lo;0;L;;;;;N;;;;;
+1340A;EGYPTIAN HIEROGLYPH Z016F;Lo;0;L;;;;;N;;;;;
+1340B;EGYPTIAN HIEROGLYPH Z016G;Lo;0;L;;;;;N;;;;;
+1340C;EGYPTIAN HIEROGLYPH Z016H;Lo;0;L;;;;;N;;;;;
+1340D;EGYPTIAN HIEROGLYPH AA001;Lo;0;L;;;;;N;;;;;
+1340E;EGYPTIAN HIEROGLYPH AA002;Lo;0;L;;;;;N;;;;;
+1340F;EGYPTIAN HIEROGLYPH AA003;Lo;0;L;;;;;N;;;;;
+13410;EGYPTIAN HIEROGLYPH AA004;Lo;0;L;;;;;N;;;;;
+13411;EGYPTIAN HIEROGLYPH AA005;Lo;0;L;;;;;N;;;;;
+13412;EGYPTIAN HIEROGLYPH AA006;Lo;0;L;;;;;N;;;;;
+13413;EGYPTIAN HIEROGLYPH AA007;Lo;0;L;;;;;N;;;;;
+13414;EGYPTIAN HIEROGLYPH AA007A;Lo;0;L;;;;;N;;;;;
+13415;EGYPTIAN HIEROGLYPH AA007B;Lo;0;L;;;;;N;;;;;
+13416;EGYPTIAN HIEROGLYPH AA008;Lo;0;L;;;;;N;;;;;
+13417;EGYPTIAN HIEROGLYPH AA009;Lo;0;L;;;;;N;;;;;
+13418;EGYPTIAN HIEROGLYPH AA010;Lo;0;L;;;;;N;;;;;
+13419;EGYPTIAN HIEROGLYPH AA011;Lo;0;L;;;;;N;;;;;
+1341A;EGYPTIAN HIEROGLYPH AA012;Lo;0;L;;;;;N;;;;;
+1341B;EGYPTIAN HIEROGLYPH AA013;Lo;0;L;;;;;N;;;;;
+1341C;EGYPTIAN HIEROGLYPH AA014;Lo;0;L;;;;;N;;;;;
+1341D;EGYPTIAN HIEROGLYPH AA015;Lo;0;L;;;;;N;;;;;
+1341E;EGYPTIAN HIEROGLYPH AA016;Lo;0;L;;;;;N;;;;;
+1341F;EGYPTIAN HIEROGLYPH AA017;Lo;0;L;;;;;N;;;;;
+13420;EGYPTIAN HIEROGLYPH AA018;Lo;0;L;;;;;N;;;;;
+13421;EGYPTIAN HIEROGLYPH AA019;Lo;0;L;;;;;N;;;;;
+13422;EGYPTIAN HIEROGLYPH AA020;Lo;0;L;;;;;N;;;;;
+13423;EGYPTIAN HIEROGLYPH AA021;Lo;0;L;;;;;N;;;;;
+13424;EGYPTIAN HIEROGLYPH AA022;Lo;0;L;;;;;N;;;;;
+13425;EGYPTIAN HIEROGLYPH AA023;Lo;0;L;;;;;N;;;;;
+13426;EGYPTIAN HIEROGLYPH AA024;Lo;0;L;;;;;N;;;;;
+13427;EGYPTIAN HIEROGLYPH AA025;Lo;0;L;;;;;N;;;;;
+13428;EGYPTIAN HIEROGLYPH AA026;Lo;0;L;;;;;N;;;;;
+13429;EGYPTIAN HIEROGLYPH AA027;Lo;0;L;;;;;N;;;;;
+1342A;EGYPTIAN HIEROGLYPH AA028;Lo;0;L;;;;;N;;;;;
+1342B;EGYPTIAN HIEROGLYPH AA029;Lo;0;L;;;;;N;;;;;
+1342C;EGYPTIAN HIEROGLYPH AA030;Lo;0;L;;;;;N;;;;;
+1342D;EGYPTIAN HIEROGLYPH AA031;Lo;0;L;;;;;N;;;;;
+1342E;EGYPTIAN HIEROGLYPH AA032;Lo;0;L;;;;;N;;;;;
+13430;EGYPTIAN HIEROGLYPH VERTICAL JOINER;Cf;0;L;;;;;N;;;;;
+13431;EGYPTIAN HIEROGLYPH HORIZONTAL JOINER;Cf;0;L;;;;;N;;;;;
+13432;EGYPTIAN HIEROGLYPH INSERT AT TOP START;Cf;0;L;;;;;N;;;;;
+13433;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM START;Cf;0;L;;;;;N;;;;;
+13434;EGYPTIAN HIEROGLYPH INSERT AT TOP END;Cf;0;L;;;;;N;;;;;
+13435;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM END;Cf;0;L;;;;;N;;;;;
+13436;EGYPTIAN HIEROGLYPH OVERLAY MIDDLE;Cf;0;L;;;;;N;;;;;
+13437;EGYPTIAN HIEROGLYPH BEGIN SEGMENT;Cf;0;L;;;;;N;;;;;
+13438;EGYPTIAN HIEROGLYPH END SEGMENT;Cf;0;L;;;;;N;;;;;
+14400;ANATOLIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;;
+14401;ANATOLIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;;
+14402;ANATOLIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;;
+14403;ANATOLIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;;
+14404;ANATOLIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;;
+14405;ANATOLIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;;
+14406;ANATOLIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;;
+14407;ANATOLIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;;
+14408;ANATOLIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;;
+14409;ANATOLIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;;
+1440A;ANATOLIAN HIEROGLYPH A010A;Lo;0;L;;;;;N;;;;;
+1440B;ANATOLIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;;
+1440C;ANATOLIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;;
+1440D;ANATOLIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;;
+1440E;ANATOLIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;;
+1440F;ANATOLIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;;
+14410;ANATOLIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;;
+14411;ANATOLIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;;
+14412;ANATOLIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;;
+14413;ANATOLIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;;
+14414;ANATOLIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;;
+14415;ANATOLIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;;
+14416;ANATOLIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;;
+14417;ANATOLIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;;
+14418;ANATOLIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;;
+14419;ANATOLIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;;
+1441A;ANATOLIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;;
+1441B;ANATOLIAN HIEROGLYPH A026A;Lo;0;L;;;;;N;;;;;
+1441C;ANATOLIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;;
+1441D;ANATOLIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;;
+1441E;ANATOLIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;;
+1441F;ANATOLIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;;
+14420;ANATOLIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;;
+14421;ANATOLIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;;
+14422;ANATOLIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;;
+14423;ANATOLIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;;
+14424;ANATOLIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;;
+14425;ANATOLIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;;
+14426;ANATOLIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;;
+14427;ANATOLIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;;
+14428;ANATOLIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;;
+14429;ANATOLIAN HIEROGLYPH A039A;Lo;0;L;;;;;N;;;;;
+1442A;ANATOLIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;;
+1442B;ANATOLIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;;
+1442C;ANATOLIAN HIEROGLYPH A041A;Lo;0;L;;;;;N;;;;;
+1442D;ANATOLIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;;
+1442E;ANATOLIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;;
+1442F;ANATOLIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;;
+14430;ANATOLIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;;
+14431;ANATOLIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;;
+14432;ANATOLIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;;
+14433;ANATOLIAN HIEROGLYPH A046A;Lo;0;L;;;;;N;;;;;
+14434;ANATOLIAN HIEROGLYPH A046B;Lo;0;L;;;;;N;;;;;
+14435;ANATOLIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;;
+14436;ANATOLIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;;
+14437;ANATOLIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;;
+14438;ANATOLIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;;
+14439;ANATOLIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;;
+1443A;ANATOLIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;;
+1443B;ANATOLIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;;
+1443C;ANATOLIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;;
+1443D;ANATOLIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;;
+1443E;ANATOLIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;;
+1443F;ANATOLIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;;
+14440;ANATOLIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;;
+14441;ANATOLIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;;
+14442;ANATOLIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;;
+14443;ANATOLIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;;
+14444;ANATOLIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;;
+14445;ANATOLIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;;
+14446;ANATOLIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;;
+14447;ANATOLIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;;
+14448;ANATOLIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;;
+14449;ANATOLIAN HIEROGLYPH A066A;Lo;0;L;;;;;N;;;;;
+1444A;ANATOLIAN HIEROGLYPH A066B;Lo;0;L;;;;;N;;;;;
+1444B;ANATOLIAN HIEROGLYPH A066C;Lo;0;L;;;;;N;;;;;
+1444C;ANATOLIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;;
+1444D;ANATOLIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;;
+1444E;ANATOLIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;;
+1444F;ANATOLIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;;
+14450;ANATOLIAN HIEROGLYPH A071;Lo;0;L;;;;;N;;;;;
+14451;ANATOLIAN HIEROGLYPH A072;Lo;0;L;;;;;N;;;;;
+14452;ANATOLIAN HIEROGLYPH A073;Lo;0;L;;;;;N;;;;;
+14453;ANATOLIAN HIEROGLYPH A074;Lo;0;L;;;;;N;;;;;
+14454;ANATOLIAN HIEROGLYPH A075;Lo;0;L;;;;;N;;;;;
+14455;ANATOLIAN HIEROGLYPH A076;Lo;0;L;;;;;N;;;;;
+14456;ANATOLIAN HIEROGLYPH A077;Lo;0;L;;;;;N;;;;;
+14457;ANATOLIAN HIEROGLYPH A078;Lo;0;L;;;;;N;;;;;
+14458;ANATOLIAN HIEROGLYPH A079;Lo;0;L;;;;;N;;;;;
+14459;ANATOLIAN HIEROGLYPH A080;Lo;0;L;;;;;N;;;;;
+1445A;ANATOLIAN HIEROGLYPH A081;Lo;0;L;;;;;N;;;;;
+1445B;ANATOLIAN HIEROGLYPH A082;Lo;0;L;;;;;N;;;;;
+1445C;ANATOLIAN HIEROGLYPH A083;Lo;0;L;;;;;N;;;;;
+1445D;ANATOLIAN HIEROGLYPH A084;Lo;0;L;;;;;N;;;;;
+1445E;ANATOLIAN HIEROGLYPH A085;Lo;0;L;;;;;N;;;;;
+1445F;ANATOLIAN HIEROGLYPH A086;Lo;0;L;;;;;N;;;;;
+14460;ANATOLIAN HIEROGLYPH A087;Lo;0;L;;;;;N;;;;;
+14461;ANATOLIAN HIEROGLYPH A088;Lo;0;L;;;;;N;;;;;
+14462;ANATOLIAN HIEROGLYPH A089;Lo;0;L;;;;;N;;;;;
+14463;ANATOLIAN HIEROGLYPH A090;Lo;0;L;;;;;N;;;;;
+14464;ANATOLIAN HIEROGLYPH A091;Lo;0;L;;;;;N;;;;;
+14465;ANATOLIAN HIEROGLYPH A092;Lo;0;L;;;;;N;;;;;
+14466;ANATOLIAN HIEROGLYPH A093;Lo;0;L;;;;;N;;;;;
+14467;ANATOLIAN HIEROGLYPH A094;Lo;0;L;;;;;N;;;;;
+14468;ANATOLIAN HIEROGLYPH A095;Lo;0;L;;;;;N;;;;;
+14469;ANATOLIAN HIEROGLYPH A096;Lo;0;L;;;;;N;;;;;
+1446A;ANATOLIAN HIEROGLYPH A097;Lo;0;L;;;;;N;;;;;
+1446B;ANATOLIAN HIEROGLYPH A097A;Lo;0;L;;;;;N;;;;;
+1446C;ANATOLIAN HIEROGLYPH A098;Lo;0;L;;;;;N;;;;;
+1446D;ANATOLIAN HIEROGLYPH A098A;Lo;0;L;;;;;N;;;;;
+1446E;ANATOLIAN HIEROGLYPH A099;Lo;0;L;;;;;N;;;;;
+1446F;ANATOLIAN HIEROGLYPH A100;Lo;0;L;;;;;N;;;;;
+14470;ANATOLIAN HIEROGLYPH A100A;Lo;0;L;;;;;N;;;;;
+14471;ANATOLIAN HIEROGLYPH A101;Lo;0;L;;;;;N;;;;;
+14472;ANATOLIAN HIEROGLYPH A101A;Lo;0;L;;;;;N;;;;;
+14473;ANATOLIAN HIEROGLYPH A102;Lo;0;L;;;;;N;;;;;
+14474;ANATOLIAN HIEROGLYPH A102A;Lo;0;L;;;;;N;;;;;
+14475;ANATOLIAN HIEROGLYPH A103;Lo;0;L;;;;;N;;;;;
+14476;ANATOLIAN HIEROGLYPH A104;Lo;0;L;;;;;N;;;;;
+14477;ANATOLIAN HIEROGLYPH A104A;Lo;0;L;;;;;N;;;;;
+14478;ANATOLIAN HIEROGLYPH A104B;Lo;0;L;;;;;N;;;;;
+14479;ANATOLIAN HIEROGLYPH A104C;Lo;0;L;;;;;N;;;;;
+1447A;ANATOLIAN HIEROGLYPH A105;Lo;0;L;;;;;N;;;;;
+1447B;ANATOLIAN HIEROGLYPH A105A;Lo;0;L;;;;;N;;;;;
+1447C;ANATOLIAN HIEROGLYPH A105B;Lo;0;L;;;;;N;;;;;
+1447D;ANATOLIAN HIEROGLYPH A106;Lo;0;L;;;;;N;;;;;
+1447E;ANATOLIAN HIEROGLYPH A107;Lo;0;L;;;;;N;;;;;
+1447F;ANATOLIAN HIEROGLYPH A107A;Lo;0;L;;;;;N;;;;;
+14480;ANATOLIAN HIEROGLYPH A107B;Lo;0;L;;;;;N;;;;;
+14481;ANATOLIAN HIEROGLYPH A107C;Lo;0;L;;;;;N;;;;;
+14482;ANATOLIAN HIEROGLYPH A108;Lo;0;L;;;;;N;;;;;
+14483;ANATOLIAN HIEROGLYPH A109;Lo;0;L;;;;;N;;;;;
+14484;ANATOLIAN HIEROGLYPH A110;Lo;0;L;;;;;N;;;;;
+14485;ANATOLIAN HIEROGLYPH A110A;Lo;0;L;;;;;N;;;;;
+14486;ANATOLIAN HIEROGLYPH A110B;Lo;0;L;;;;;N;;;;;
+14487;ANATOLIAN HIEROGLYPH A111;Lo;0;L;;;;;N;;;;;
+14488;ANATOLIAN HIEROGLYPH A112;Lo;0;L;;;;;N;;;;;
+14489;ANATOLIAN HIEROGLYPH A113;Lo;0;L;;;;;N;;;;;
+1448A;ANATOLIAN HIEROGLYPH A114;Lo;0;L;;;;;N;;;;;
+1448B;ANATOLIAN HIEROGLYPH A115;Lo;0;L;;;;;N;;;;;
+1448C;ANATOLIAN HIEROGLYPH A115A;Lo;0;L;;;;;N;;;;;
+1448D;ANATOLIAN HIEROGLYPH A116;Lo;0;L;;;;;N;;;;;
+1448E;ANATOLIAN HIEROGLYPH A117;Lo;0;L;;;;;N;;;;;
+1448F;ANATOLIAN HIEROGLYPH A118;Lo;0;L;;;;;N;;;;;
+14490;ANATOLIAN HIEROGLYPH A119;Lo;0;L;;;;;N;;;;;
+14491;ANATOLIAN HIEROGLYPH A120;Lo;0;L;;;;;N;;;;;
+14492;ANATOLIAN HIEROGLYPH A121;Lo;0;L;;;;;N;;;;;
+14493;ANATOLIAN HIEROGLYPH A122;Lo;0;L;;;;;N;;;;;
+14494;ANATOLIAN HIEROGLYPH A123;Lo;0;L;;;;;N;;;;;
+14495;ANATOLIAN HIEROGLYPH A124;Lo;0;L;;;;;N;;;;;
+14496;ANATOLIAN HIEROGLYPH A125;Lo;0;L;;;;;N;;;;;
+14497;ANATOLIAN HIEROGLYPH A125A;Lo;0;L;;;;;N;;;;;
+14498;ANATOLIAN HIEROGLYPH A126;Lo;0;L;;;;;N;;;;;
+14499;ANATOLIAN HIEROGLYPH A127;Lo;0;L;;;;;N;;;;;
+1449A;ANATOLIAN HIEROGLYPH A128;Lo;0;L;;;;;N;;;;;
+1449B;ANATOLIAN HIEROGLYPH A129;Lo;0;L;;;;;N;;;;;
+1449C;ANATOLIAN HIEROGLYPH A130;Lo;0;L;;;;;N;;;;;
+1449D;ANATOLIAN HIEROGLYPH A131;Lo;0;L;;;;;N;;;;;
+1449E;ANATOLIAN HIEROGLYPH A132;Lo;0;L;;;;;N;;;;;
+1449F;ANATOLIAN HIEROGLYPH A133;Lo;0;L;;;;;N;;;;;
+144A0;ANATOLIAN HIEROGLYPH A134;Lo;0;L;;;;;N;;;;;
+144A1;ANATOLIAN HIEROGLYPH A135;Lo;0;L;;;;;N;;;;;
+144A2;ANATOLIAN HIEROGLYPH A135A;Lo;0;L;;;;;N;;;;;
+144A3;ANATOLIAN HIEROGLYPH A136;Lo;0;L;;;;;N;;;;;
+144A4;ANATOLIAN HIEROGLYPH A137;Lo;0;L;;;;;N;;;;;
+144A5;ANATOLIAN HIEROGLYPH A138;Lo;0;L;;;;;N;;;;;
+144A6;ANATOLIAN HIEROGLYPH A139;Lo;0;L;;;;;N;;;;;
+144A7;ANATOLIAN HIEROGLYPH A140;Lo;0;L;;;;;N;;;;;
+144A8;ANATOLIAN HIEROGLYPH A141;Lo;0;L;;;;;N;;;;;
+144A9;ANATOLIAN HIEROGLYPH A142;Lo;0;L;;;;;N;;;;;
+144AA;ANATOLIAN HIEROGLYPH A143;Lo;0;L;;;;;N;;;;;
+144AB;ANATOLIAN HIEROGLYPH A144;Lo;0;L;;;;;N;;;;;
+144AC;ANATOLIAN HIEROGLYPH A145;Lo;0;L;;;;;N;;;;;
+144AD;ANATOLIAN HIEROGLYPH A146;Lo;0;L;;;;;N;;;;;
+144AE;ANATOLIAN HIEROGLYPH A147;Lo;0;L;;;;;N;;;;;
+144AF;ANATOLIAN HIEROGLYPH A148;Lo;0;L;;;;;N;;;;;
+144B0;ANATOLIAN HIEROGLYPH A149;Lo;0;L;;;;;N;;;;;
+144B1;ANATOLIAN HIEROGLYPH A150;Lo;0;L;;;;;N;;;;;
+144B2;ANATOLIAN HIEROGLYPH A151;Lo;0;L;;;;;N;;;;;
+144B3;ANATOLIAN HIEROGLYPH A152;Lo;0;L;;;;;N;;;;;
+144B4;ANATOLIAN HIEROGLYPH A153;Lo;0;L;;;;;N;;;;;
+144B5;ANATOLIAN HIEROGLYPH A154;Lo;0;L;;;;;N;;;;;
+144B6;ANATOLIAN HIEROGLYPH A155;Lo;0;L;;;;;N;;;;;
+144B7;ANATOLIAN HIEROGLYPH A156;Lo;0;L;;;;;N;;;;;
+144B8;ANATOLIAN HIEROGLYPH A157;Lo;0;L;;;;;N;;;;;
+144B9;ANATOLIAN HIEROGLYPH A158;Lo;0;L;;;;;N;;;;;
+144BA;ANATOLIAN HIEROGLYPH A159;Lo;0;L;;;;;N;;;;;
+144BB;ANATOLIAN HIEROGLYPH A160;Lo;0;L;;;;;N;;;;;
+144BC;ANATOLIAN HIEROGLYPH A161;Lo;0;L;;;;;N;;;;;
+144BD;ANATOLIAN HIEROGLYPH A162;Lo;0;L;;;;;N;;;;;
+144BE;ANATOLIAN HIEROGLYPH A163;Lo;0;L;;;;;N;;;;;
+144BF;ANATOLIAN HIEROGLYPH A164;Lo;0;L;;;;;N;;;;;
+144C0;ANATOLIAN HIEROGLYPH A165;Lo;0;L;;;;;N;;;;;
+144C1;ANATOLIAN HIEROGLYPH A166;Lo;0;L;;;;;N;;;;;
+144C2;ANATOLIAN HIEROGLYPH A167;Lo;0;L;;;;;N;;;;;
+144C3;ANATOLIAN HIEROGLYPH A168;Lo;0;L;;;;;N;;;;;
+144C4;ANATOLIAN HIEROGLYPH A169;Lo;0;L;;;;;N;;;;;
+144C5;ANATOLIAN HIEROGLYPH A170;Lo;0;L;;;;;N;;;;;
+144C6;ANATOLIAN HIEROGLYPH A171;Lo;0;L;;;;;N;;;;;
+144C7;ANATOLIAN HIEROGLYPH A172;Lo;0;L;;;;;N;;;;;
+144C8;ANATOLIAN HIEROGLYPH A173;Lo;0;L;;;;;N;;;;;
+144C9;ANATOLIAN HIEROGLYPH A174;Lo;0;L;;;;;N;;;;;
+144CA;ANATOLIAN HIEROGLYPH A175;Lo;0;L;;;;;N;;;;;
+144CB;ANATOLIAN HIEROGLYPH A176;Lo;0;L;;;;;N;;;;;
+144CC;ANATOLIAN HIEROGLYPH A177;Lo;0;L;;;;;N;;;;;
+144CD;ANATOLIAN HIEROGLYPH A178;Lo;0;L;;;;;N;;;;;
+144CE;ANATOLIAN HIEROGLYPH A179;Lo;0;L;;;;;N;;;;;
+144CF;ANATOLIAN HIEROGLYPH A180;Lo;0;L;;;;;N;;;;;
+144D0;ANATOLIAN HIEROGLYPH A181;Lo;0;L;;;;;N;;;;;
+144D1;ANATOLIAN HIEROGLYPH A182;Lo;0;L;;;;;N;;;;;
+144D2;ANATOLIAN HIEROGLYPH A183;Lo;0;L;;;;;N;;;;;
+144D3;ANATOLIAN HIEROGLYPH A184;Lo;0;L;;;;;N;;;;;
+144D4;ANATOLIAN HIEROGLYPH A185;Lo;0;L;;;;;N;;;;;
+144D5;ANATOLIAN HIEROGLYPH A186;Lo;0;L;;;;;N;;;;;
+144D6;ANATOLIAN HIEROGLYPH A187;Lo;0;L;;;;;N;;;;;
+144D7;ANATOLIAN HIEROGLYPH A188;Lo;0;L;;;;;N;;;;;
+144D8;ANATOLIAN HIEROGLYPH A189;Lo;0;L;;;;;N;;;;;
+144D9;ANATOLIAN HIEROGLYPH A190;Lo;0;L;;;;;N;;;;;
+144DA;ANATOLIAN HIEROGLYPH A191;Lo;0;L;;;;;N;;;;;
+144DB;ANATOLIAN HIEROGLYPH A192;Lo;0;L;;;;;N;;;;;
+144DC;ANATOLIAN HIEROGLYPH A193;Lo;0;L;;;;;N;;;;;
+144DD;ANATOLIAN HIEROGLYPH A194;Lo;0;L;;;;;N;;;;;
+144DE;ANATOLIAN HIEROGLYPH A195;Lo;0;L;;;;;N;;;;;
+144DF;ANATOLIAN HIEROGLYPH A196;Lo;0;L;;;;;N;;;;;
+144E0;ANATOLIAN HIEROGLYPH A197;Lo;0;L;;;;;N;;;;;
+144E1;ANATOLIAN HIEROGLYPH A198;Lo;0;L;;;;;N;;;;;
+144E2;ANATOLIAN HIEROGLYPH A199;Lo;0;L;;;;;N;;;;;
+144E3;ANATOLIAN HIEROGLYPH A200;Lo;0;L;;;;;N;;;;;
+144E4;ANATOLIAN HIEROGLYPH A201;Lo;0;L;;;;;N;;;;;
+144E5;ANATOLIAN HIEROGLYPH A202;Lo;0;L;;;;;N;;;;;
+144E6;ANATOLIAN HIEROGLYPH A202A;Lo;0;L;;;;;N;;;;;
+144E7;ANATOLIAN HIEROGLYPH A202B;Lo;0;L;;;;;N;;;;;
+144E8;ANATOLIAN HIEROGLYPH A203;Lo;0;L;;;;;N;;;;;
+144E9;ANATOLIAN HIEROGLYPH A204;Lo;0;L;;;;;N;;;;;
+144EA;ANATOLIAN HIEROGLYPH A205;Lo;0;L;;;;;N;;;;;
+144EB;ANATOLIAN HIEROGLYPH A206;Lo;0;L;;;;;N;;;;;
+144EC;ANATOLIAN HIEROGLYPH A207;Lo;0;L;;;;;N;;;;;
+144ED;ANATOLIAN HIEROGLYPH A207A;Lo;0;L;;;;;N;;;;;
+144EE;ANATOLIAN HIEROGLYPH A208;Lo;0;L;;;;;N;;;;;
+144EF;ANATOLIAN HIEROGLYPH A209;Lo;0;L;;;;;N;;;;;
+144F0;ANATOLIAN HIEROGLYPH A209A;Lo;0;L;;;;;N;;;;;
+144F1;ANATOLIAN HIEROGLYPH A210;Lo;0;L;;;;;N;;;;;
+144F2;ANATOLIAN HIEROGLYPH A211;Lo;0;L;;;;;N;;;;;
+144F3;ANATOLIAN HIEROGLYPH A212;Lo;0;L;;;;;N;;;;;
+144F4;ANATOLIAN HIEROGLYPH A213;Lo;0;L;;;;;N;;;;;
+144F5;ANATOLIAN HIEROGLYPH A214;Lo;0;L;;;;;N;;;;;
+144F6;ANATOLIAN HIEROGLYPH A215;Lo;0;L;;;;;N;;;;;
+144F7;ANATOLIAN HIEROGLYPH A215A;Lo;0;L;;;;;N;;;;;
+144F8;ANATOLIAN HIEROGLYPH A216;Lo;0;L;;;;;N;;;;;
+144F9;ANATOLIAN HIEROGLYPH A216A;Lo;0;L;;;;;N;;;;;
+144FA;ANATOLIAN HIEROGLYPH A217;Lo;0;L;;;;;N;;;;;
+144FB;ANATOLIAN HIEROGLYPH A218;Lo;0;L;;;;;N;;;;;
+144FC;ANATOLIAN HIEROGLYPH A219;Lo;0;L;;;;;N;;;;;
+144FD;ANATOLIAN HIEROGLYPH A220;Lo;0;L;;;;;N;;;;;
+144FE;ANATOLIAN HIEROGLYPH A221;Lo;0;L;;;;;N;;;;;
+144FF;ANATOLIAN HIEROGLYPH A222;Lo;0;L;;;;;N;;;;;
+14500;ANATOLIAN HIEROGLYPH A223;Lo;0;L;;;;;N;;;;;
+14501;ANATOLIAN HIEROGLYPH A224;Lo;0;L;;;;;N;;;;;
+14502;ANATOLIAN HIEROGLYPH A225;Lo;0;L;;;;;N;;;;;
+14503;ANATOLIAN HIEROGLYPH A226;Lo;0;L;;;;;N;;;;;
+14504;ANATOLIAN HIEROGLYPH A227;Lo;0;L;;;;;N;;;;;
+14505;ANATOLIAN HIEROGLYPH A227A;Lo;0;L;;;;;N;;;;;
+14506;ANATOLIAN HIEROGLYPH A228;Lo;0;L;;;;;N;;;;;
+14507;ANATOLIAN HIEROGLYPH A229;Lo;0;L;;;;;N;;;;;
+14508;ANATOLIAN HIEROGLYPH A230;Lo;0;L;;;;;N;;;;;
+14509;ANATOLIAN HIEROGLYPH A231;Lo;0;L;;;;;N;;;;;
+1450A;ANATOLIAN HIEROGLYPH A232;Lo;0;L;;;;;N;;;;;
+1450B;ANATOLIAN HIEROGLYPH A233;Lo;0;L;;;;;N;;;;;
+1450C;ANATOLIAN HIEROGLYPH A234;Lo;0;L;;;;;N;;;;;
+1450D;ANATOLIAN HIEROGLYPH A235;Lo;0;L;;;;;N;;;;;
+1450E;ANATOLIAN HIEROGLYPH A236;Lo;0;L;;;;;N;;;;;
+1450F;ANATOLIAN HIEROGLYPH A237;Lo;0;L;;;;;N;;;;;
+14510;ANATOLIAN HIEROGLYPH A238;Lo;0;L;;;;;N;;;;;
+14511;ANATOLIAN HIEROGLYPH A239;Lo;0;L;;;;;N;;;;;
+14512;ANATOLIAN HIEROGLYPH A240;Lo;0;L;;;;;N;;;;;
+14513;ANATOLIAN HIEROGLYPH A241;Lo;0;L;;;;;N;;;;;
+14514;ANATOLIAN HIEROGLYPH A242;Lo;0;L;;;;;N;;;;;
+14515;ANATOLIAN HIEROGLYPH A243;Lo;0;L;;;;;N;;;;;
+14516;ANATOLIAN HIEROGLYPH A244;Lo;0;L;;;;;N;;;;;
+14517;ANATOLIAN HIEROGLYPH A245;Lo;0;L;;;;;N;;;;;
+14518;ANATOLIAN HIEROGLYPH A246;Lo;0;L;;;;;N;;;;;
+14519;ANATOLIAN HIEROGLYPH A247;Lo;0;L;;;;;N;;;;;
+1451A;ANATOLIAN HIEROGLYPH A248;Lo;0;L;;;;;N;;;;;
+1451B;ANATOLIAN HIEROGLYPH A249;Lo;0;L;;;;;N;;;;;
+1451C;ANATOLIAN HIEROGLYPH A250;Lo;0;L;;;;;N;;;;;
+1451D;ANATOLIAN HIEROGLYPH A251;Lo;0;L;;;;;N;;;;;
+1451E;ANATOLIAN HIEROGLYPH A252;Lo;0;L;;;;;N;;;;;
+1451F;ANATOLIAN HIEROGLYPH A253;Lo;0;L;;;;;N;;;;;
+14520;ANATOLIAN HIEROGLYPH A254;Lo;0;L;;;;;N;;;;;
+14521;ANATOLIAN HIEROGLYPH A255;Lo;0;L;;;;;N;;;;;
+14522;ANATOLIAN HIEROGLYPH A256;Lo;0;L;;;;;N;;;;;
+14523;ANATOLIAN HIEROGLYPH A257;Lo;0;L;;;;;N;;;;;
+14524;ANATOLIAN HIEROGLYPH A258;Lo;0;L;;;;;N;;;;;
+14525;ANATOLIAN HIEROGLYPH A259;Lo;0;L;;;;;N;;;;;
+14526;ANATOLIAN HIEROGLYPH A260;Lo;0;L;;;;;N;;;;;
+14527;ANATOLIAN HIEROGLYPH A261;Lo;0;L;;;;;N;;;;;
+14528;ANATOLIAN HIEROGLYPH A262;Lo;0;L;;;;;N;;;;;
+14529;ANATOLIAN HIEROGLYPH A263;Lo;0;L;;;;;N;;;;;
+1452A;ANATOLIAN HIEROGLYPH A264;Lo;0;L;;;;;N;;;;;
+1452B;ANATOLIAN HIEROGLYPH A265;Lo;0;L;;;;;N;;;;;
+1452C;ANATOLIAN HIEROGLYPH A266;Lo;0;L;;;;;N;;;;;
+1452D;ANATOLIAN HIEROGLYPH A267;Lo;0;L;;;;;N;;;;;
+1452E;ANATOLIAN HIEROGLYPH A267A;Lo;0;L;;;;;N;;;;;
+1452F;ANATOLIAN HIEROGLYPH A268;Lo;0;L;;;;;N;;;;;
+14530;ANATOLIAN HIEROGLYPH A269;Lo;0;L;;;;;N;;;;;
+14531;ANATOLIAN HIEROGLYPH A270;Lo;0;L;;;;;N;;;;;
+14532;ANATOLIAN HIEROGLYPH A271;Lo;0;L;;;;;N;;;;;
+14533;ANATOLIAN HIEROGLYPH A272;Lo;0;L;;;;;N;;;;;
+14534;ANATOLIAN HIEROGLYPH A273;Lo;0;L;;;;;N;;;;;
+14535;ANATOLIAN HIEROGLYPH A274;Lo;0;L;;;;;N;;;;;
+14536;ANATOLIAN HIEROGLYPH A275;Lo;0;L;;;;;N;;;;;
+14537;ANATOLIAN HIEROGLYPH A276;Lo;0;L;;;;;N;;;;;
+14538;ANATOLIAN HIEROGLYPH A277;Lo;0;L;;;;;N;;;;;
+14539;ANATOLIAN HIEROGLYPH A278;Lo;0;L;;;;;N;;;;;
+1453A;ANATOLIAN HIEROGLYPH A279;Lo;0;L;;;;;N;;;;;
+1453B;ANATOLIAN HIEROGLYPH A280;Lo;0;L;;;;;N;;;;;
+1453C;ANATOLIAN HIEROGLYPH A281;Lo;0;L;;;;;N;;;;;
+1453D;ANATOLIAN HIEROGLYPH A282;Lo;0;L;;;;;N;;;;;
+1453E;ANATOLIAN HIEROGLYPH A283;Lo;0;L;;;;;N;;;;;
+1453F;ANATOLIAN HIEROGLYPH A284;Lo;0;L;;;;;N;;;;;
+14540;ANATOLIAN HIEROGLYPH A285;Lo;0;L;;;;;N;;;;;
+14541;ANATOLIAN HIEROGLYPH A286;Lo;0;L;;;;;N;;;;;
+14542;ANATOLIAN HIEROGLYPH A287;Lo;0;L;;;;;N;;;;;
+14543;ANATOLIAN HIEROGLYPH A288;Lo;0;L;;;;;N;;;;;
+14544;ANATOLIAN HIEROGLYPH A289;Lo;0;L;;;;;N;;;;;
+14545;ANATOLIAN HIEROGLYPH A289A;Lo;0;L;;;;;N;;;;;
+14546;ANATOLIAN HIEROGLYPH A290;Lo;0;L;;;;;N;;;;;
+14547;ANATOLIAN HIEROGLYPH A291;Lo;0;L;;;;;N;;;;;
+14548;ANATOLIAN HIEROGLYPH A292;Lo;0;L;;;;;N;;;;;
+14549;ANATOLIAN HIEROGLYPH A293;Lo;0;L;;;;;N;;;;;
+1454A;ANATOLIAN HIEROGLYPH A294;Lo;0;L;;;;;N;;;;;
+1454B;ANATOLIAN HIEROGLYPH A294A;Lo;0;L;;;;;N;;;;;
+1454C;ANATOLIAN HIEROGLYPH A295;Lo;0;L;;;;;N;;;;;
+1454D;ANATOLIAN HIEROGLYPH A296;Lo;0;L;;;;;N;;;;;
+1454E;ANATOLIAN HIEROGLYPH A297;Lo;0;L;;;;;N;;;;;
+1454F;ANATOLIAN HIEROGLYPH A298;Lo;0;L;;;;;N;;;;;
+14550;ANATOLIAN HIEROGLYPH A299;Lo;0;L;;;;;N;;;;;
+14551;ANATOLIAN HIEROGLYPH A299A;Lo;0;L;;;;;N;;;;;
+14552;ANATOLIAN HIEROGLYPH A300;Lo;0;L;;;;;N;;;;;
+14553;ANATOLIAN HIEROGLYPH A301;Lo;0;L;;;;;N;;;;;
+14554;ANATOLIAN HIEROGLYPH A302;Lo;0;L;;;;;N;;;;;
+14555;ANATOLIAN HIEROGLYPH A303;Lo;0;L;;;;;N;;;;;
+14556;ANATOLIAN HIEROGLYPH A304;Lo;0;L;;;;;N;;;;;
+14557;ANATOLIAN HIEROGLYPH A305;Lo;0;L;;;;;N;;;;;
+14558;ANATOLIAN HIEROGLYPH A306;Lo;0;L;;;;;N;;;;;
+14559;ANATOLIAN HIEROGLYPH A307;Lo;0;L;;;;;N;;;;;
+1455A;ANATOLIAN HIEROGLYPH A308;Lo;0;L;;;;;N;;;;;
+1455B;ANATOLIAN HIEROGLYPH A309;Lo;0;L;;;;;N;;;;;
+1455C;ANATOLIAN HIEROGLYPH A309A;Lo;0;L;;;;;N;;;;;
+1455D;ANATOLIAN HIEROGLYPH A310;Lo;0;L;;;;;N;;;;;
+1455E;ANATOLIAN HIEROGLYPH A311;Lo;0;L;;;;;N;;;;;
+1455F;ANATOLIAN HIEROGLYPH A312;Lo;0;L;;;;;N;;;;;
+14560;ANATOLIAN HIEROGLYPH A313;Lo;0;L;;;;;N;;;;;
+14561;ANATOLIAN HIEROGLYPH A314;Lo;0;L;;;;;N;;;;;
+14562;ANATOLIAN HIEROGLYPH A315;Lo;0;L;;;;;N;;;;;
+14563;ANATOLIAN HIEROGLYPH A316;Lo;0;L;;;;;N;;;;;
+14564;ANATOLIAN HIEROGLYPH A317;Lo;0;L;;;;;N;;;;;
+14565;ANATOLIAN HIEROGLYPH A318;Lo;0;L;;;;;N;;;;;
+14566;ANATOLIAN HIEROGLYPH A319;Lo;0;L;;;;;N;;;;;
+14567;ANATOLIAN HIEROGLYPH A320;Lo;0;L;;;;;N;;;;;
+14568;ANATOLIAN HIEROGLYPH A321;Lo;0;L;;;;;N;;;;;
+14569;ANATOLIAN HIEROGLYPH A322;Lo;0;L;;;;;N;;;;;
+1456A;ANATOLIAN HIEROGLYPH A323;Lo;0;L;;;;;N;;;;;
+1456B;ANATOLIAN HIEROGLYPH A324;Lo;0;L;;;;;N;;;;;
+1456C;ANATOLIAN HIEROGLYPH A325;Lo;0;L;;;;;N;;;;;
+1456D;ANATOLIAN HIEROGLYPH A326;Lo;0;L;;;;;N;;;;;
+1456E;ANATOLIAN HIEROGLYPH A327;Lo;0;L;;;;;N;;;;;
+1456F;ANATOLIAN HIEROGLYPH A328;Lo;0;L;;;;;N;;;;;
+14570;ANATOLIAN HIEROGLYPH A329;Lo;0;L;;;;;N;;;;;
+14571;ANATOLIAN HIEROGLYPH A329A;Lo;0;L;;;;;N;;;;;
+14572;ANATOLIAN HIEROGLYPH A330;Lo;0;L;;;;;N;;;;;
+14573;ANATOLIAN HIEROGLYPH A331;Lo;0;L;;;;;N;;;;;
+14574;ANATOLIAN HIEROGLYPH A332A;Lo;0;L;;;;;N;;;;;
+14575;ANATOLIAN HIEROGLYPH A332B;Lo;0;L;;;;;N;;;;;
+14576;ANATOLIAN HIEROGLYPH A332C;Lo;0;L;;;;;N;;;;;
+14577;ANATOLIAN HIEROGLYPH A333;Lo;0;L;;;;;N;;;;;
+14578;ANATOLIAN HIEROGLYPH A334;Lo;0;L;;;;;N;;;;;
+14579;ANATOLIAN HIEROGLYPH A335;Lo;0;L;;;;;N;;;;;
+1457A;ANATOLIAN HIEROGLYPH A336;Lo;0;L;;;;;N;;;;;
+1457B;ANATOLIAN HIEROGLYPH A336A;Lo;0;L;;;;;N;;;;;
+1457C;ANATOLIAN HIEROGLYPH A336B;Lo;0;L;;;;;N;;;;;
+1457D;ANATOLIAN HIEROGLYPH A336C;Lo;0;L;;;;;N;;;;;
+1457E;ANATOLIAN HIEROGLYPH A337;Lo;0;L;;;;;N;;;;;
+1457F;ANATOLIAN HIEROGLYPH A338;Lo;0;L;;;;;N;;;;;
+14580;ANATOLIAN HIEROGLYPH A339;Lo;0;L;;;;;N;;;;;
+14581;ANATOLIAN HIEROGLYPH A340;Lo;0;L;;;;;N;;;;;
+14582;ANATOLIAN HIEROGLYPH A341;Lo;0;L;;;;;N;;;;;
+14583;ANATOLIAN HIEROGLYPH A342;Lo;0;L;;;;;N;;;;;
+14584;ANATOLIAN HIEROGLYPH A343;Lo;0;L;;;;;N;;;;;
+14585;ANATOLIAN HIEROGLYPH A344;Lo;0;L;;;;;N;;;;;
+14586;ANATOLIAN HIEROGLYPH A345;Lo;0;L;;;;;N;;;;;
+14587;ANATOLIAN HIEROGLYPH A346;Lo;0;L;;;;;N;;;;;
+14588;ANATOLIAN HIEROGLYPH A347;Lo;0;L;;;;;N;;;;;
+14589;ANATOLIAN HIEROGLYPH A348;Lo;0;L;;;;;N;;;;;
+1458A;ANATOLIAN HIEROGLYPH A349;Lo;0;L;;;;;N;;;;;
+1458B;ANATOLIAN HIEROGLYPH A350;Lo;0;L;;;;;N;;;;;
+1458C;ANATOLIAN HIEROGLYPH A351;Lo;0;L;;;;;N;;;;;
+1458D;ANATOLIAN HIEROGLYPH A352;Lo;0;L;;;;;N;;;;;
+1458E;ANATOLIAN HIEROGLYPH A353;Lo;0;L;;;;;N;;;;;
+1458F;ANATOLIAN HIEROGLYPH A354;Lo;0;L;;;;;N;;;;;
+14590;ANATOLIAN HIEROGLYPH A355;Lo;0;L;;;;;N;;;;;
+14591;ANATOLIAN HIEROGLYPH A356;Lo;0;L;;;;;N;;;;;
+14592;ANATOLIAN HIEROGLYPH A357;Lo;0;L;;;;;N;;;;;
+14593;ANATOLIAN HIEROGLYPH A358;Lo;0;L;;;;;N;;;;;
+14594;ANATOLIAN HIEROGLYPH A359;Lo;0;L;;;;;N;;;;;
+14595;ANATOLIAN HIEROGLYPH A359A;Lo;0;L;;;;;N;;;;;
+14596;ANATOLIAN HIEROGLYPH A360;Lo;0;L;;;;;N;;;;;
+14597;ANATOLIAN HIEROGLYPH A361;Lo;0;L;;;;;N;;;;;
+14598;ANATOLIAN HIEROGLYPH A362;Lo;0;L;;;;;N;;;;;
+14599;ANATOLIAN HIEROGLYPH A363;Lo;0;L;;;;;N;;;;;
+1459A;ANATOLIAN HIEROGLYPH A364;Lo;0;L;;;;;N;;;;;
+1459B;ANATOLIAN HIEROGLYPH A364A;Lo;0;L;;;;;N;;;;;
+1459C;ANATOLIAN HIEROGLYPH A365;Lo;0;L;;;;;N;;;;;
+1459D;ANATOLIAN HIEROGLYPH A366;Lo;0;L;;;;;N;;;;;
+1459E;ANATOLIAN HIEROGLYPH A367;Lo;0;L;;;;;N;;;;;
+1459F;ANATOLIAN HIEROGLYPH A368;Lo;0;L;;;;;N;;;;;
+145A0;ANATOLIAN HIEROGLYPH A368A;Lo;0;L;;;;;N;;;;;
+145A1;ANATOLIAN HIEROGLYPH A369;Lo;0;L;;;;;N;;;;;
+145A2;ANATOLIAN HIEROGLYPH A370;Lo;0;L;;;;;N;;;;;
+145A3;ANATOLIAN HIEROGLYPH A371;Lo;0;L;;;;;N;;;;;
+145A4;ANATOLIAN HIEROGLYPH A371A;Lo;0;L;;;;;N;;;;;
+145A5;ANATOLIAN HIEROGLYPH A372;Lo;0;L;;;;;N;;;;;
+145A6;ANATOLIAN HIEROGLYPH A373;Lo;0;L;;;;;N;;;;;
+145A7;ANATOLIAN HIEROGLYPH A374;Lo;0;L;;;;;N;;;;;
+145A8;ANATOLIAN HIEROGLYPH A375;Lo;0;L;;;;;N;;;;;
+145A9;ANATOLIAN HIEROGLYPH A376;Lo;0;L;;;;;N;;;;;
+145AA;ANATOLIAN HIEROGLYPH A377;Lo;0;L;;;;;N;;;;;
+145AB;ANATOLIAN HIEROGLYPH A378;Lo;0;L;;;;;N;;;;;
+145AC;ANATOLIAN HIEROGLYPH A379;Lo;0;L;;;;;N;;;;;
+145AD;ANATOLIAN HIEROGLYPH A380;Lo;0;L;;;;;N;;;;;
+145AE;ANATOLIAN HIEROGLYPH A381;Lo;0;L;;;;;N;;;;;
+145AF;ANATOLIAN HIEROGLYPH A381A;Lo;0;L;;;;;N;;;;;
+145B0;ANATOLIAN HIEROGLYPH A382;Lo;0;L;;;;;N;;;;;
+145B1;ANATOLIAN HIEROGLYPH A383 RA OR RI;Lo;0;L;;;;;N;;;;;
+145B2;ANATOLIAN HIEROGLYPH A383A;Lo;0;L;;;;;N;;;;;
+145B3;ANATOLIAN HIEROGLYPH A384;Lo;0;L;;;;;N;;;;;
+145B4;ANATOLIAN HIEROGLYPH A385;Lo;0;L;;;;;N;;;;;
+145B5;ANATOLIAN HIEROGLYPH A386;Lo;0;L;;;;;N;;;;;
+145B6;ANATOLIAN HIEROGLYPH A386A;Lo;0;L;;;;;N;;;;;
+145B7;ANATOLIAN HIEROGLYPH A387;Lo;0;L;;;;;N;;;;;
+145B8;ANATOLIAN HIEROGLYPH A388;Lo;0;L;;;;;N;;;;;
+145B9;ANATOLIAN HIEROGLYPH A389;Lo;0;L;;;;;N;;;;;
+145BA;ANATOLIAN HIEROGLYPH A390;Lo;0;L;;;;;N;;;;;
+145BB;ANATOLIAN HIEROGLYPH A391;Lo;0;L;;;;;N;;;;;
+145BC;ANATOLIAN HIEROGLYPH A392;Lo;0;L;;;;;N;;;;;
+145BD;ANATOLIAN HIEROGLYPH A393 EIGHT;Lo;0;L;;;;;N;;;;;
+145BE;ANATOLIAN HIEROGLYPH A394;Lo;0;L;;;;;N;;;;;
+145BF;ANATOLIAN HIEROGLYPH A395;Lo;0;L;;;;;N;;;;;
+145C0;ANATOLIAN HIEROGLYPH A396;Lo;0;L;;;;;N;;;;;
+145C1;ANATOLIAN HIEROGLYPH A397;Lo;0;L;;;;;N;;;;;
+145C2;ANATOLIAN HIEROGLYPH A398;Lo;0;L;;;;;N;;;;;
+145C3;ANATOLIAN HIEROGLYPH A399;Lo;0;L;;;;;N;;;;;
+145C4;ANATOLIAN HIEROGLYPH A400;Lo;0;L;;;;;N;;;;;
+145C5;ANATOLIAN HIEROGLYPH A401;Lo;0;L;;;;;N;;;;;
+145C6;ANATOLIAN HIEROGLYPH A402;Lo;0;L;;;;;N;;;;;
+145C7;ANATOLIAN HIEROGLYPH A403;Lo;0;L;;;;;N;;;;;
+145C8;ANATOLIAN HIEROGLYPH A404;Lo;0;L;;;;;N;;;;;
+145C9;ANATOLIAN HIEROGLYPH A405;Lo;0;L;;;;;N;;;;;
+145CA;ANATOLIAN HIEROGLYPH A406;Lo;0;L;;;;;N;;;;;
+145CB;ANATOLIAN HIEROGLYPH A407;Lo;0;L;;;;;N;;;;;
+145CC;ANATOLIAN HIEROGLYPH A408;Lo;0;L;;;;;N;;;;;
+145CD;ANATOLIAN HIEROGLYPH A409;Lo;0;L;;;;;N;;;;;
+145CE;ANATOLIAN HIEROGLYPH A410 BEGIN LOGOGRAM MARK;Lo;0;L;;;;;N;;;;;
+145CF;ANATOLIAN HIEROGLYPH A410A END LOGOGRAM MARK;Lo;0;L;;;;;N;;;;;
+145D0;ANATOLIAN HIEROGLYPH A411;Lo;0;L;;;;;N;;;;;
+145D1;ANATOLIAN HIEROGLYPH A412;Lo;0;L;;;;;N;;;;;
+145D2;ANATOLIAN HIEROGLYPH A413;Lo;0;L;;;;;N;;;;;
+145D3;ANATOLIAN HIEROGLYPH A414;Lo;0;L;;;;;N;;;;;
+145D4;ANATOLIAN HIEROGLYPH A415;Lo;0;L;;;;;N;;;;;
+145D5;ANATOLIAN HIEROGLYPH A416;Lo;0;L;;;;;N;;;;;
+145D6;ANATOLIAN HIEROGLYPH A417;Lo;0;L;;;;;N;;;;;
+145D7;ANATOLIAN HIEROGLYPH A418;Lo;0;L;;;;;N;;;;;
+145D8;ANATOLIAN HIEROGLYPH A419;Lo;0;L;;;;;N;;;;;
+145D9;ANATOLIAN HIEROGLYPH A420;Lo;0;L;;;;;N;;;;;
+145DA;ANATOLIAN HIEROGLYPH A421;Lo;0;L;;;;;N;;;;;
+145DB;ANATOLIAN HIEROGLYPH A422;Lo;0;L;;;;;N;;;;;
+145DC;ANATOLIAN HIEROGLYPH A423;Lo;0;L;;;;;N;;;;;
+145DD;ANATOLIAN HIEROGLYPH A424;Lo;0;L;;;;;N;;;;;
+145DE;ANATOLIAN HIEROGLYPH A425;Lo;0;L;;;;;N;;;;;
+145DF;ANATOLIAN HIEROGLYPH A426;Lo;0;L;;;;;N;;;;;
+145E0;ANATOLIAN HIEROGLYPH A427;Lo;0;L;;;;;N;;;;;
+145E1;ANATOLIAN HIEROGLYPH A428;Lo;0;L;;;;;N;;;;;
+145E2;ANATOLIAN HIEROGLYPH A429;Lo;0;L;;;;;N;;;;;
+145E3;ANATOLIAN HIEROGLYPH A430;Lo;0;L;;;;;N;;;;;
+145E4;ANATOLIAN HIEROGLYPH A431;Lo;0;L;;;;;N;;;;;
+145E5;ANATOLIAN HIEROGLYPH A432;Lo;0;L;;;;;N;;;;;
+145E6;ANATOLIAN HIEROGLYPH A433;Lo;0;L;;;;;N;;;;;
+145E7;ANATOLIAN HIEROGLYPH A434;Lo;0;L;;;;;N;;;;;
+145E8;ANATOLIAN HIEROGLYPH A435;Lo;0;L;;;;;N;;;;;
+145E9;ANATOLIAN HIEROGLYPH A436;Lo;0;L;;;;;N;;;;;
+145EA;ANATOLIAN HIEROGLYPH A437;Lo;0;L;;;;;N;;;;;
+145EB;ANATOLIAN HIEROGLYPH A438;Lo;0;L;;;;;N;;;;;
+145EC;ANATOLIAN HIEROGLYPH A439;Lo;0;L;;;;;N;;;;;
+145ED;ANATOLIAN HIEROGLYPH A440;Lo;0;L;;;;;N;;;;;
+145EE;ANATOLIAN HIEROGLYPH A441;Lo;0;L;;;;;N;;;;;
+145EF;ANATOLIAN HIEROGLYPH A442;Lo;0;L;;;;;N;;;;;
+145F0;ANATOLIAN HIEROGLYPH A443;Lo;0;L;;;;;N;;;;;
+145F1;ANATOLIAN HIEROGLYPH A444;Lo;0;L;;;;;N;;;;;
+145F2;ANATOLIAN HIEROGLYPH A445;Lo;0;L;;;;;N;;;;;
+145F3;ANATOLIAN HIEROGLYPH A446;Lo;0;L;;;;;N;;;;;
+145F4;ANATOLIAN HIEROGLYPH A447;Lo;0;L;;;;;N;;;;;
+145F5;ANATOLIAN HIEROGLYPH A448;Lo;0;L;;;;;N;;;;;
+145F6;ANATOLIAN HIEROGLYPH A449;Lo;0;L;;;;;N;;;;;
+145F7;ANATOLIAN HIEROGLYPH A450;Lo;0;L;;;;;N;;;;;
+145F8;ANATOLIAN HIEROGLYPH A450A;Lo;0;L;;;;;N;;;;;
+145F9;ANATOLIAN HIEROGLYPH A451;Lo;0;L;;;;;N;;;;;
+145FA;ANATOLIAN HIEROGLYPH A452;Lo;0;L;;;;;N;;;;;
+145FB;ANATOLIAN HIEROGLYPH A453;Lo;0;L;;;;;N;;;;;
+145FC;ANATOLIAN HIEROGLYPH A454;Lo;0;L;;;;;N;;;;;
+145FD;ANATOLIAN HIEROGLYPH A455;Lo;0;L;;;;;N;;;;;
+145FE;ANATOLIAN HIEROGLYPH A456;Lo;0;L;;;;;N;;;;;
+145FF;ANATOLIAN HIEROGLYPH A457;Lo;0;L;;;;;N;;;;;
+14600;ANATOLIAN HIEROGLYPH A457A;Lo;0;L;;;;;N;;;;;
+14601;ANATOLIAN HIEROGLYPH A458;Lo;0;L;;;;;N;;;;;
+14602;ANATOLIAN HIEROGLYPH A459;Lo;0;L;;;;;N;;;;;
+14603;ANATOLIAN HIEROGLYPH A460;Lo;0;L;;;;;N;;;;;
+14604;ANATOLIAN HIEROGLYPH A461;Lo;0;L;;;;;N;;;;;
+14605;ANATOLIAN HIEROGLYPH A462;Lo;0;L;;;;;N;;;;;
+14606;ANATOLIAN HIEROGLYPH A463;Lo;0;L;;;;;N;;;;;
+14607;ANATOLIAN HIEROGLYPH A464;Lo;0;L;;;;;N;;;;;
+14608;ANATOLIAN HIEROGLYPH A465;Lo;0;L;;;;;N;;;;;
+14609;ANATOLIAN HIEROGLYPH A466;Lo;0;L;;;;;N;;;;;
+1460A;ANATOLIAN HIEROGLYPH A467;Lo;0;L;;;;;N;;;;;
+1460B;ANATOLIAN HIEROGLYPH A468;Lo;0;L;;;;;N;;;;;
+1460C;ANATOLIAN HIEROGLYPH A469;Lo;0;L;;;;;N;;;;;
+1460D;ANATOLIAN HIEROGLYPH A470;Lo;0;L;;;;;N;;;;;
+1460E;ANATOLIAN HIEROGLYPH A471;Lo;0;L;;;;;N;;;;;
+1460F;ANATOLIAN HIEROGLYPH A472;Lo;0;L;;;;;N;;;;;
+14610;ANATOLIAN HIEROGLYPH A473;Lo;0;L;;;;;N;;;;;
+14611;ANATOLIAN HIEROGLYPH A474;Lo;0;L;;;;;N;;;;;
+14612;ANATOLIAN HIEROGLYPH A475;Lo;0;L;;;;;N;;;;;
+14613;ANATOLIAN HIEROGLYPH A476;Lo;0;L;;;;;N;;;;;
+14614;ANATOLIAN HIEROGLYPH A477;Lo;0;L;;;;;N;;;;;
+14615;ANATOLIAN HIEROGLYPH A478;Lo;0;L;;;;;N;;;;;
+14616;ANATOLIAN HIEROGLYPH A479;Lo;0;L;;;;;N;;;;;
+14617;ANATOLIAN HIEROGLYPH A480;Lo;0;L;;;;;N;;;;;
+14618;ANATOLIAN HIEROGLYPH A481;Lo;0;L;;;;;N;;;;;
+14619;ANATOLIAN HIEROGLYPH A482;Lo;0;L;;;;;N;;;;;
+1461A;ANATOLIAN HIEROGLYPH A483;Lo;0;L;;;;;N;;;;;
+1461B;ANATOLIAN HIEROGLYPH A484;Lo;0;L;;;;;N;;;;;
+1461C;ANATOLIAN HIEROGLYPH A485;Lo;0;L;;;;;N;;;;;
+1461D;ANATOLIAN HIEROGLYPH A486;Lo;0;L;;;;;N;;;;;
+1461E;ANATOLIAN HIEROGLYPH A487;Lo;0;L;;;;;N;;;;;
+1461F;ANATOLIAN HIEROGLYPH A488;Lo;0;L;;;;;N;;;;;
+14620;ANATOLIAN HIEROGLYPH A489;Lo;0;L;;;;;N;;;;;
+14621;ANATOLIAN HIEROGLYPH A490;Lo;0;L;;;;;N;;;;;
+14622;ANATOLIAN HIEROGLYPH A491;Lo;0;L;;;;;N;;;;;
+14623;ANATOLIAN HIEROGLYPH A492;Lo;0;L;;;;;N;;;;;
+14624;ANATOLIAN HIEROGLYPH A493;Lo;0;L;;;;;N;;;;;
+14625;ANATOLIAN HIEROGLYPH A494;Lo;0;L;;;;;N;;;;;
+14626;ANATOLIAN HIEROGLYPH A495;Lo;0;L;;;;;N;;;;;
+14627;ANATOLIAN HIEROGLYPH A496;Lo;0;L;;;;;N;;;;;
+14628;ANATOLIAN HIEROGLYPH A497;Lo;0;L;;;;;N;;;;;
+14629;ANATOLIAN HIEROGLYPH A501;Lo;0;L;;;;;N;;;;;
+1462A;ANATOLIAN HIEROGLYPH A502;Lo;0;L;;;;;N;;;;;
+1462B;ANATOLIAN HIEROGLYPH A503;Lo;0;L;;;;;N;;;;;
+1462C;ANATOLIAN HIEROGLYPH A504;Lo;0;L;;;;;N;;;;;
+1462D;ANATOLIAN HIEROGLYPH A505;Lo;0;L;;;;;N;;;;;
+1462E;ANATOLIAN HIEROGLYPH A506;Lo;0;L;;;;;N;;;;;
+1462F;ANATOLIAN HIEROGLYPH A507;Lo;0;L;;;;;N;;;;;
+14630;ANATOLIAN HIEROGLYPH A508;Lo;0;L;;;;;N;;;;;
+14631;ANATOLIAN HIEROGLYPH A509;Lo;0;L;;;;;N;;;;;
+14632;ANATOLIAN HIEROGLYPH A510;Lo;0;L;;;;;N;;;;;
+14633;ANATOLIAN HIEROGLYPH A511;Lo;0;L;;;;;N;;;;;
+14634;ANATOLIAN HIEROGLYPH A512;Lo;0;L;;;;;N;;;;;
+14635;ANATOLIAN HIEROGLYPH A513;Lo;0;L;;;;;N;;;;;
+14636;ANATOLIAN HIEROGLYPH A514;Lo;0;L;;;;;N;;;;;
+14637;ANATOLIAN HIEROGLYPH A515;Lo;0;L;;;;;N;;;;;
+14638;ANATOLIAN HIEROGLYPH A516;Lo;0;L;;;;;N;;;;;
+14639;ANATOLIAN HIEROGLYPH A517;Lo;0;L;;;;;N;;;;;
+1463A;ANATOLIAN HIEROGLYPH A518;Lo;0;L;;;;;N;;;;;
+1463B;ANATOLIAN HIEROGLYPH A519;Lo;0;L;;;;;N;;;;;
+1463C;ANATOLIAN HIEROGLYPH A520;Lo;0;L;;;;;N;;;;;
+1463D;ANATOLIAN HIEROGLYPH A521;Lo;0;L;;;;;N;;;;;
+1463E;ANATOLIAN HIEROGLYPH A522;Lo;0;L;;;;;N;;;;;
+1463F;ANATOLIAN HIEROGLYPH A523;Lo;0;L;;;;;N;;;;;
+14640;ANATOLIAN HIEROGLYPH A524;Lo;0;L;;;;;N;;;;;
+14641;ANATOLIAN HIEROGLYPH A525;Lo;0;L;;;;;N;;;;;
+14642;ANATOLIAN HIEROGLYPH A526;Lo;0;L;;;;;N;;;;;
+14643;ANATOLIAN HIEROGLYPH A527;Lo;0;L;;;;;N;;;;;
+14644;ANATOLIAN HIEROGLYPH A528;Lo;0;L;;;;;N;;;;;
+14645;ANATOLIAN HIEROGLYPH A529;Lo;0;L;;;;;N;;;;;
+14646;ANATOLIAN HIEROGLYPH A530;Lo;0;L;;;;;N;;;;;
+16800;BAMUM LETTER PHASE-A NGKUE MFON;Lo;0;L;;;;;N;;;;;
+16801;BAMUM LETTER PHASE-A GBIEE FON;Lo;0;L;;;;;N;;;;;
+16802;BAMUM LETTER PHASE-A PON MFON PIPAEMGBIEE;Lo;0;L;;;;;N;;;;;
+16803;BAMUM LETTER PHASE-A PON MFON PIPAEMBA;Lo;0;L;;;;;N;;;;;
+16804;BAMUM LETTER PHASE-A NAA MFON;Lo;0;L;;;;;N;;;;;
+16805;BAMUM LETTER PHASE-A SHUENSHUET;Lo;0;L;;;;;N;;;;;
+16806;BAMUM LETTER PHASE-A TITA MFON;Lo;0;L;;;;;N;;;;;
+16807;BAMUM LETTER PHASE-A NZA MFON;Lo;0;L;;;;;N;;;;;
+16808;BAMUM LETTER PHASE-A SHINDA PA NJI;Lo;0;L;;;;;N;;;;;
+16809;BAMUM LETTER PHASE-A PON PA NJI PIPAEMGBIEE;Lo;0;L;;;;;N;;;;;
+1680A;BAMUM LETTER PHASE-A PON PA NJI PIPAEMBA;Lo;0;L;;;;;N;;;;;
+1680B;BAMUM LETTER PHASE-A MAEMBGBIEE;Lo;0;L;;;;;N;;;;;
+1680C;BAMUM LETTER PHASE-A TU MAEMBA;Lo;0;L;;;;;N;;;;;
+1680D;BAMUM LETTER PHASE-A NGANGU;Lo;0;L;;;;;N;;;;;
+1680E;BAMUM LETTER PHASE-A MAEMVEUX;Lo;0;L;;;;;N;;;;;
+1680F;BAMUM LETTER PHASE-A MANSUAE;Lo;0;L;;;;;N;;;;;
+16810;BAMUM LETTER PHASE-A MVEUAENGAM;Lo;0;L;;;;;N;;;;;
+16811;BAMUM LETTER PHASE-A SEUNYAM;Lo;0;L;;;;;N;;;;;
+16812;BAMUM LETTER PHASE-A NTOQPEN;Lo;0;L;;;;;N;;;;;
+16813;BAMUM LETTER PHASE-A KEUKEUTNDA;Lo;0;L;;;;;N;;;;;
+16814;BAMUM LETTER PHASE-A NKINDI;Lo;0;L;;;;;N;;;;;
+16815;BAMUM LETTER PHASE-A SUU;Lo;0;L;;;;;N;;;;;
+16816;BAMUM LETTER PHASE-A NGKUENZEUM;Lo;0;L;;;;;N;;;;;
+16817;BAMUM LETTER PHASE-A LAPAQ;Lo;0;L;;;;;N;;;;;
+16818;BAMUM LETTER PHASE-A LET KUT;Lo;0;L;;;;;N;;;;;
+16819;BAMUM LETTER PHASE-A NTAP MFAA;Lo;0;L;;;;;N;;;;;
+1681A;BAMUM LETTER PHASE-A MAEKEUP;Lo;0;L;;;;;N;;;;;
+1681B;BAMUM LETTER PHASE-A PASHAE;Lo;0;L;;;;;N;;;;;
+1681C;BAMUM LETTER PHASE-A GHEUAERAE;Lo;0;L;;;;;N;;;;;
+1681D;BAMUM LETTER PHASE-A PAMSHAE;Lo;0;L;;;;;N;;;;;
+1681E;BAMUM LETTER PHASE-A MON NGGEUAET;Lo;0;L;;;;;N;;;;;
+1681F;BAMUM LETTER PHASE-A NZUN MEUT;Lo;0;L;;;;;N;;;;;
+16820;BAMUM LETTER PHASE-A U YUQ NAE;Lo;0;L;;;;;N;;;;;
+16821;BAMUM LETTER PHASE-A GHEUAEGHEUAE;Lo;0;L;;;;;N;;;;;
+16822;BAMUM LETTER PHASE-A NTAP NTAA;Lo;0;L;;;;;N;;;;;
+16823;BAMUM LETTER PHASE-A SISA;Lo;0;L;;;;;N;;;;;
+16824;BAMUM LETTER PHASE-A MGBASA;Lo;0;L;;;;;N;;;;;
+16825;BAMUM LETTER PHASE-A MEUNJOMNDEUQ;Lo;0;L;;;;;N;;;;;
+16826;BAMUM LETTER PHASE-A MOOMPUQ;Lo;0;L;;;;;N;;;;;
+16827;BAMUM LETTER PHASE-A KAFA;Lo;0;L;;;;;N;;;;;
+16828;BAMUM LETTER PHASE-A PA LEERAEWA;Lo;0;L;;;;;N;;;;;
+16829;BAMUM LETTER PHASE-A NDA LEERAEWA;Lo;0;L;;;;;N;;;;;
+1682A;BAMUM LETTER PHASE-A PET;Lo;0;L;;;;;N;;;;;
+1682B;BAMUM LETTER PHASE-A MAEMKPEN;Lo;0;L;;;;;N;;;;;
+1682C;BAMUM LETTER PHASE-A NIKA;Lo;0;L;;;;;N;;;;;
+1682D;BAMUM LETTER PHASE-A PUP;Lo;0;L;;;;;N;;;;;
+1682E;BAMUM LETTER PHASE-A TUAEP;Lo;0;L;;;;;N;;;;;
+1682F;BAMUM LETTER PHASE-A LUAEP;Lo;0;L;;;;;N;;;;;
+16830;BAMUM LETTER PHASE-A SONJAM;Lo;0;L;;;;;N;;;;;
+16831;BAMUM LETTER PHASE-A TEUTEUWEN;Lo;0;L;;;;;N;;;;;
+16832;BAMUM LETTER PHASE-A MAENYI;Lo;0;L;;;;;N;;;;;
+16833;BAMUM LETTER PHASE-A KET;Lo;0;L;;;;;N;;;;;
+16834;BAMUM LETTER PHASE-A NDAANGGEUAET;Lo;0;L;;;;;N;;;;;
+16835;BAMUM LETTER PHASE-A KUOQ;Lo;0;L;;;;;N;;;;;
+16836;BAMUM LETTER PHASE-A MOOMEUT;Lo;0;L;;;;;N;;;;;
+16837;BAMUM LETTER PHASE-A SHUM;Lo;0;L;;;;;N;;;;;
+16838;BAMUM LETTER PHASE-A LOMMAE;Lo;0;L;;;;;N;;;;;
+16839;BAMUM LETTER PHASE-A FIRI;Lo;0;L;;;;;N;;;;;
+1683A;BAMUM LETTER PHASE-A ROM;Lo;0;L;;;;;N;;;;;
+1683B;BAMUM LETTER PHASE-A KPOQ;Lo;0;L;;;;;N;;;;;
+1683C;BAMUM LETTER PHASE-A SOQ;Lo;0;L;;;;;N;;;;;
+1683D;BAMUM LETTER PHASE-A MAP PIEET;Lo;0;L;;;;;N;;;;;
+1683E;BAMUM LETTER PHASE-A SHIRAE;Lo;0;L;;;;;N;;;;;
+1683F;BAMUM LETTER PHASE-A NTAP;Lo;0;L;;;;;N;;;;;
+16840;BAMUM LETTER PHASE-A SHOQ NSHUT YUM;Lo;0;L;;;;;N;;;;;
+16841;BAMUM LETTER PHASE-A NYIT MONGKEUAEQ;Lo;0;L;;;;;N;;;;;
+16842;BAMUM LETTER PHASE-A PAARAE;Lo;0;L;;;;;N;;;;;
+16843;BAMUM LETTER PHASE-A NKAARAE;Lo;0;L;;;;;N;;;;;
+16844;BAMUM LETTER PHASE-A UNKNOWN;Lo;0;L;;;;;N;;;;;
+16845;BAMUM LETTER PHASE-A NGGEN;Lo;0;L;;;;;N;;;;;
+16846;BAMUM LETTER PHASE-A MAESI;Lo;0;L;;;;;N;;;;;
+16847;BAMUM LETTER PHASE-A NJAM;Lo;0;L;;;;;N;;;;;
+16848;BAMUM LETTER PHASE-A MBANYI;Lo;0;L;;;;;N;;;;;
+16849;BAMUM LETTER PHASE-A NYET;Lo;0;L;;;;;N;;;;;
+1684A;BAMUM LETTER PHASE-A TEUAEN;Lo;0;L;;;;;N;;;;;
+1684B;BAMUM LETTER PHASE-A SOT;Lo;0;L;;;;;N;;;;;
+1684C;BAMUM LETTER PHASE-A PAAM;Lo;0;L;;;;;N;;;;;
+1684D;BAMUM LETTER PHASE-A NSHIEE;Lo;0;L;;;;;N;;;;;
+1684E;BAMUM LETTER PHASE-A MAEM;Lo;0;L;;;;;N;;;;;
+1684F;BAMUM LETTER PHASE-A NYI;Lo;0;L;;;;;N;;;;;
+16850;BAMUM LETTER PHASE-A KAQ;Lo;0;L;;;;;N;;;;;
+16851;BAMUM LETTER PHASE-A NSHA;Lo;0;L;;;;;N;;;;;
+16852;BAMUM LETTER PHASE-A VEE;Lo;0;L;;;;;N;;;;;
+16853;BAMUM LETTER PHASE-A LU;Lo;0;L;;;;;N;;;;;
+16854;BAMUM LETTER PHASE-A NEN;Lo;0;L;;;;;N;;;;;
+16855;BAMUM LETTER PHASE-A NAQ;Lo;0;L;;;;;N;;;;;
+16856;BAMUM LETTER PHASE-A MBAQ;Lo;0;L;;;;;N;;;;;
+16857;BAMUM LETTER PHASE-B NSHUET;Lo;0;L;;;;;N;;;;;
+16858;BAMUM LETTER PHASE-B TU MAEMGBIEE;Lo;0;L;;;;;N;;;;;
+16859;BAMUM LETTER PHASE-B SIEE;Lo;0;L;;;;;N;;;;;
+1685A;BAMUM LETTER PHASE-B SET TU;Lo;0;L;;;;;N;;;;;
+1685B;BAMUM LETTER PHASE-B LOM NTEUM;Lo;0;L;;;;;N;;;;;
+1685C;BAMUM LETTER PHASE-B MBA MAELEE;Lo;0;L;;;;;N;;;;;
+1685D;BAMUM LETTER PHASE-B KIEEM;Lo;0;L;;;;;N;;;;;
+1685E;BAMUM LETTER PHASE-B YEURAE;Lo;0;L;;;;;N;;;;;
+1685F;BAMUM LETTER PHASE-B MBAARAE;Lo;0;L;;;;;N;;;;;
+16860;BAMUM LETTER PHASE-B KAM;Lo;0;L;;;;;N;;;;;
+16861;BAMUM LETTER PHASE-B PEESHI;Lo;0;L;;;;;N;;;;;
+16862;BAMUM LETTER PHASE-B YAFU LEERAEWA;Lo;0;L;;;;;N;;;;;
+16863;BAMUM LETTER PHASE-B LAM NSHUT NYAM;Lo;0;L;;;;;N;;;;;
+16864;BAMUM LETTER PHASE-B NTIEE SHEUOQ;Lo;0;L;;;;;N;;;;;
+16865;BAMUM LETTER PHASE-B NDU NJAA;Lo;0;L;;;;;N;;;;;
+16866;BAMUM LETTER PHASE-B GHEUGHEUAEM;Lo;0;L;;;;;N;;;;;
+16867;BAMUM LETTER PHASE-B PIT;Lo;0;L;;;;;N;;;;;
+16868;BAMUM LETTER PHASE-B TU NSIEE;Lo;0;L;;;;;N;;;;;
+16869;BAMUM LETTER PHASE-B SHET NJAQ;Lo;0;L;;;;;N;;;;;
+1686A;BAMUM LETTER PHASE-B SHEUAEQTU;Lo;0;L;;;;;N;;;;;
+1686B;BAMUM LETTER PHASE-B MFON TEUAEQ;Lo;0;L;;;;;N;;;;;
+1686C;BAMUM LETTER PHASE-B MBIT MBAAKET;Lo;0;L;;;;;N;;;;;
+1686D;BAMUM LETTER PHASE-B NYI NTEUM;Lo;0;L;;;;;N;;;;;
+1686E;BAMUM LETTER PHASE-B KEUPUQ;Lo;0;L;;;;;N;;;;;
+1686F;BAMUM LETTER PHASE-B GHEUGHEN;Lo;0;L;;;;;N;;;;;
+16870;BAMUM LETTER PHASE-B KEUYEUX;Lo;0;L;;;;;N;;;;;
+16871;BAMUM LETTER PHASE-B LAANAE;Lo;0;L;;;;;N;;;;;
+16872;BAMUM LETTER PHASE-B PARUM;Lo;0;L;;;;;N;;;;;
+16873;BAMUM LETTER PHASE-B VEUM;Lo;0;L;;;;;N;;;;;
+16874;BAMUM LETTER PHASE-B NGKINDI MVOP;Lo;0;L;;;;;N;;;;;
+16875;BAMUM LETTER PHASE-B NGGEU MBU;Lo;0;L;;;;;N;;;;;
+16876;BAMUM LETTER PHASE-B WUAET;Lo;0;L;;;;;N;;;;;
+16877;BAMUM LETTER PHASE-B SAKEUAE;Lo;0;L;;;;;N;;;;;
+16878;BAMUM LETTER PHASE-B TAAM;Lo;0;L;;;;;N;;;;;
+16879;BAMUM LETTER PHASE-B MEUQ;Lo;0;L;;;;;N;;;;;
+1687A;BAMUM LETTER PHASE-B NGGUOQ;Lo;0;L;;;;;N;;;;;
+1687B;BAMUM LETTER PHASE-B NGGUOQ LARGE;Lo;0;L;;;;;N;;;;;
+1687C;BAMUM LETTER PHASE-B MFIYAQ;Lo;0;L;;;;;N;;;;;
+1687D;BAMUM LETTER PHASE-B SUE;Lo;0;L;;;;;N;;;;;
+1687E;BAMUM LETTER PHASE-B MBEURI;Lo;0;L;;;;;N;;;;;
+1687F;BAMUM LETTER PHASE-B MONTIEEN;Lo;0;L;;;;;N;;;;;
+16880;BAMUM LETTER PHASE-B NYAEMAE;Lo;0;L;;;;;N;;;;;
+16881;BAMUM LETTER PHASE-B PUNGAAM;Lo;0;L;;;;;N;;;;;
+16882;BAMUM LETTER PHASE-B MEUT NGGEET;Lo;0;L;;;;;N;;;;;
+16883;BAMUM LETTER PHASE-B FEUX;Lo;0;L;;;;;N;;;;;
+16884;BAMUM LETTER PHASE-B MBUOQ;Lo;0;L;;;;;N;;;;;
+16885;BAMUM LETTER PHASE-B FEE;Lo;0;L;;;;;N;;;;;
+16886;BAMUM LETTER PHASE-B KEUAEM;Lo;0;L;;;;;N;;;;;
+16887;BAMUM LETTER PHASE-B MA NJEUAENA;Lo;0;L;;;;;N;;;;;
+16888;BAMUM LETTER PHASE-B MA NJUQA;Lo;0;L;;;;;N;;;;;
+16889;BAMUM LETTER PHASE-B LET;Lo;0;L;;;;;N;;;;;
+1688A;BAMUM LETTER PHASE-B NGGAAM;Lo;0;L;;;;;N;;;;;
+1688B;BAMUM LETTER PHASE-B NSEN;Lo;0;L;;;;;N;;;;;
+1688C;BAMUM LETTER PHASE-B MA;Lo;0;L;;;;;N;;;;;
+1688D;BAMUM LETTER PHASE-B KIQ;Lo;0;L;;;;;N;;;;;
+1688E;BAMUM LETTER PHASE-B NGOM;Lo;0;L;;;;;N;;;;;
+1688F;BAMUM LETTER PHASE-C NGKUE MAEMBA;Lo;0;L;;;;;N;;;;;
+16890;BAMUM LETTER PHASE-C NZA;Lo;0;L;;;;;N;;;;;
+16891;BAMUM LETTER PHASE-C YUM;Lo;0;L;;;;;N;;;;;
+16892;BAMUM LETTER PHASE-C WANGKUOQ;Lo;0;L;;;;;N;;;;;
+16893;BAMUM LETTER PHASE-C NGGEN;Lo;0;L;;;;;N;;;;;
+16894;BAMUM LETTER PHASE-C NDEUAEREE;Lo;0;L;;;;;N;;;;;
+16895;BAMUM LETTER PHASE-C NGKAQ;Lo;0;L;;;;;N;;;;;
+16896;BAMUM LETTER PHASE-C GHARAE;Lo;0;L;;;;;N;;;;;
+16897;BAMUM LETTER PHASE-C MBEEKEET;Lo;0;L;;;;;N;;;;;
+16898;BAMUM LETTER PHASE-C GBAYI;Lo;0;L;;;;;N;;;;;
+16899;BAMUM LETTER PHASE-C NYIR MKPARAQ MEUN;Lo;0;L;;;;;N;;;;;
+1689A;BAMUM LETTER PHASE-C NTU MBIT;Lo;0;L;;;;;N;;;;;
+1689B;BAMUM LETTER PHASE-C MBEUM;Lo;0;L;;;;;N;;;;;
+1689C;BAMUM LETTER PHASE-C PIRIEEN;Lo;0;L;;;;;N;;;;;
+1689D;BAMUM LETTER PHASE-C NDOMBU;Lo;0;L;;;;;N;;;;;
+1689E;BAMUM LETTER PHASE-C MBAA CABBAGE-TREE;Lo;0;L;;;;;N;;;;;
+1689F;BAMUM LETTER PHASE-C KEUSHEUAEP;Lo;0;L;;;;;N;;;;;
+168A0;BAMUM LETTER PHASE-C GHAP;Lo;0;L;;;;;N;;;;;
+168A1;BAMUM LETTER PHASE-C KEUKAQ;Lo;0;L;;;;;N;;;;;
+168A2;BAMUM LETTER PHASE-C YU MUOMAE;Lo;0;L;;;;;N;;;;;
+168A3;BAMUM LETTER PHASE-C NZEUM;Lo;0;L;;;;;N;;;;;
+168A4;BAMUM LETTER PHASE-C MBUE;Lo;0;L;;;;;N;;;;;
+168A5;BAMUM LETTER PHASE-C NSEUAEN;Lo;0;L;;;;;N;;;;;
+168A6;BAMUM LETTER PHASE-C MBIT;Lo;0;L;;;;;N;;;;;
+168A7;BAMUM LETTER PHASE-C YEUQ;Lo;0;L;;;;;N;;;;;
+168A8;BAMUM LETTER PHASE-C KPARAQ;Lo;0;L;;;;;N;;;;;
+168A9;BAMUM LETTER PHASE-C KAA;Lo;0;L;;;;;N;;;;;
+168AA;BAMUM LETTER PHASE-C SEUX;Lo;0;L;;;;;N;;;;;
+168AB;BAMUM LETTER PHASE-C NDIDA;Lo;0;L;;;;;N;;;;;
+168AC;BAMUM LETTER PHASE-C TAASHAE;Lo;0;L;;;;;N;;;;;
+168AD;BAMUM LETTER PHASE-C NJUEQ;Lo;0;L;;;;;N;;;;;
+168AE;BAMUM LETTER PHASE-C TITA YUE;Lo;0;L;;;;;N;;;;;
+168AF;BAMUM LETTER PHASE-C SUAET;Lo;0;L;;;;;N;;;;;
+168B0;BAMUM LETTER PHASE-C NGGUAEN NYAM;Lo;0;L;;;;;N;;;;;
+168B1;BAMUM LETTER PHASE-C VEUX;Lo;0;L;;;;;N;;;;;
+168B2;BAMUM LETTER PHASE-C NANSANAQ;Lo;0;L;;;;;N;;;;;
+168B3;BAMUM LETTER PHASE-C MA KEUAERI;Lo;0;L;;;;;N;;;;;
+168B4;BAMUM LETTER PHASE-C NTAA;Lo;0;L;;;;;N;;;;;
+168B5;BAMUM LETTER PHASE-C NGGUON;Lo;0;L;;;;;N;;;;;
+168B6;BAMUM LETTER PHASE-C LAP;Lo;0;L;;;;;N;;;;;
+168B7;BAMUM LETTER PHASE-C MBIRIEEN;Lo;0;L;;;;;N;;;;;
+168B8;BAMUM LETTER PHASE-C MGBASAQ;Lo;0;L;;;;;N;;;;;
+168B9;BAMUM LETTER PHASE-C NTEUNGBA;Lo;0;L;;;;;N;;;;;
+168BA;BAMUM LETTER PHASE-C TEUTEUX;Lo;0;L;;;;;N;;;;;
+168BB;BAMUM LETTER PHASE-C NGGUM;Lo;0;L;;;;;N;;;;;
+168BC;BAMUM LETTER PHASE-C FUE;Lo;0;L;;;;;N;;;;;
+168BD;BAMUM LETTER PHASE-C NDEUT;Lo;0;L;;;;;N;;;;;
+168BE;BAMUM LETTER PHASE-C NSA;Lo;0;L;;;;;N;;;;;
+168BF;BAMUM LETTER PHASE-C NSHAQ;Lo;0;L;;;;;N;;;;;
+168C0;BAMUM LETTER PHASE-C BUNG;Lo;0;L;;;;;N;;;;;
+168C1;BAMUM LETTER PHASE-C VEUAEPEN;Lo;0;L;;;;;N;;;;;
+168C2;BAMUM LETTER PHASE-C MBERAE;Lo;0;L;;;;;N;;;;;
+168C3;BAMUM LETTER PHASE-C RU;Lo;0;L;;;;;N;;;;;
+168C4;BAMUM LETTER PHASE-C NJAEM;Lo;0;L;;;;;N;;;;;
+168C5;BAMUM LETTER PHASE-C LAM;Lo;0;L;;;;;N;;;;;
+168C6;BAMUM LETTER PHASE-C TITUAEP;Lo;0;L;;;;;N;;;;;
+168C7;BAMUM LETTER PHASE-C NSUOT NGOM;Lo;0;L;;;;;N;;;;;
+168C8;BAMUM LETTER PHASE-C NJEEEE;Lo;0;L;;;;;N;;;;;
+168C9;BAMUM LETTER PHASE-C KET;Lo;0;L;;;;;N;;;;;
+168CA;BAMUM LETTER PHASE-C NGGU;Lo;0;L;;;;;N;;;;;
+168CB;BAMUM LETTER PHASE-C MAESI;Lo;0;L;;;;;N;;;;;
+168CC;BAMUM LETTER PHASE-C MBUAEM;Lo;0;L;;;;;N;;;;;
+168CD;BAMUM LETTER PHASE-C LU;Lo;0;L;;;;;N;;;;;
+168CE;BAMUM LETTER PHASE-C KUT;Lo;0;L;;;;;N;;;;;
+168CF;BAMUM LETTER PHASE-C NJAM;Lo;0;L;;;;;N;;;;;
+168D0;BAMUM LETTER PHASE-C NGOM;Lo;0;L;;;;;N;;;;;
+168D1;BAMUM LETTER PHASE-C WUP;Lo;0;L;;;;;N;;;;;
+168D2;BAMUM LETTER PHASE-C NGGUEET;Lo;0;L;;;;;N;;;;;
+168D3;BAMUM LETTER PHASE-C NSOM;Lo;0;L;;;;;N;;;;;
+168D4;BAMUM LETTER PHASE-C NTEN;Lo;0;L;;;;;N;;;;;
+168D5;BAMUM LETTER PHASE-C KUOP NKAARAE;Lo;0;L;;;;;N;;;;;
+168D6;BAMUM LETTER PHASE-C NSUN;Lo;0;L;;;;;N;;;;;
+168D7;BAMUM LETTER PHASE-C NDAM;Lo;0;L;;;;;N;;;;;
+168D8;BAMUM LETTER PHASE-C MA NSIEE;Lo;0;L;;;;;N;;;;;
+168D9;BAMUM LETTER PHASE-C YAA;Lo;0;L;;;;;N;;;;;
+168DA;BAMUM LETTER PHASE-C NDAP;Lo;0;L;;;;;N;;;;;
+168DB;BAMUM LETTER PHASE-C SHUEQ;Lo;0;L;;;;;N;;;;;
+168DC;BAMUM LETTER PHASE-C SETFON;Lo;0;L;;;;;N;;;;;
+168DD;BAMUM LETTER PHASE-C MBI;Lo;0;L;;;;;N;;;;;
+168DE;BAMUM LETTER PHASE-C MAEMBA;Lo;0;L;;;;;N;;;;;
+168DF;BAMUM LETTER PHASE-C MBANYI;Lo;0;L;;;;;N;;;;;
+168E0;BAMUM LETTER PHASE-C KEUSEUX;Lo;0;L;;;;;N;;;;;
+168E1;BAMUM LETTER PHASE-C MBEUX;Lo;0;L;;;;;N;;;;;
+168E2;BAMUM LETTER PHASE-C KEUM;Lo;0;L;;;;;N;;;;;
+168E3;BAMUM LETTER PHASE-C MBAA PICKET;Lo;0;L;;;;;N;;;;;
+168E4;BAMUM LETTER PHASE-C YUWOQ;Lo;0;L;;;;;N;;;;;
+168E5;BAMUM LETTER PHASE-C NJEUX;Lo;0;L;;;;;N;;;;;
+168E6;BAMUM LETTER PHASE-C MIEE;Lo;0;L;;;;;N;;;;;
+168E7;BAMUM LETTER PHASE-C MUAE;Lo;0;L;;;;;N;;;;;
+168E8;BAMUM LETTER PHASE-C SHIQ;Lo;0;L;;;;;N;;;;;
+168E9;BAMUM LETTER PHASE-C KEN LAW;Lo;0;L;;;;;N;;;;;
+168EA;BAMUM LETTER PHASE-C KEN FATIGUE;Lo;0;L;;;;;N;;;;;
+168EB;BAMUM LETTER PHASE-C NGAQ;Lo;0;L;;;;;N;;;;;
+168EC;BAMUM LETTER PHASE-C NAQ;Lo;0;L;;;;;N;;;;;
+168ED;BAMUM LETTER PHASE-C LIQ;Lo;0;L;;;;;N;;;;;
+168EE;BAMUM LETTER PHASE-C PIN;Lo;0;L;;;;;N;;;;;
+168EF;BAMUM LETTER PHASE-C PEN;Lo;0;L;;;;;N;;;;;
+168F0;BAMUM LETTER PHASE-C TET;Lo;0;L;;;;;N;;;;;
+168F1;BAMUM LETTER PHASE-D MBUO;Lo;0;L;;;;;N;;;;;
+168F2;BAMUM LETTER PHASE-D WAP;Lo;0;L;;;;;N;;;;;
+168F3;BAMUM LETTER PHASE-D NJI;Lo;0;L;;;;;N;;;;;
+168F4;BAMUM LETTER PHASE-D MFON;Lo;0;L;;;;;N;;;;;
+168F5;BAMUM LETTER PHASE-D NJIEE;Lo;0;L;;;;;N;;;;;
+168F6;BAMUM LETTER PHASE-D LIEE;Lo;0;L;;;;;N;;;;;
+168F7;BAMUM LETTER PHASE-D NJEUT;Lo;0;L;;;;;N;;;;;
+168F8;BAMUM LETTER PHASE-D NSHEE;Lo;0;L;;;;;N;;;;;
+168F9;BAMUM LETTER PHASE-D NGGAAMAE;Lo;0;L;;;;;N;;;;;
+168FA;BAMUM LETTER PHASE-D NYAM;Lo;0;L;;;;;N;;;;;
+168FB;BAMUM LETTER PHASE-D WUAEN;Lo;0;L;;;;;N;;;;;
+168FC;BAMUM LETTER PHASE-D NGKUN;Lo;0;L;;;;;N;;;;;
+168FD;BAMUM LETTER PHASE-D SHEE;Lo;0;L;;;;;N;;;;;
+168FE;BAMUM LETTER PHASE-D NGKAP;Lo;0;L;;;;;N;;;;;
+168FF;BAMUM LETTER PHASE-D KEUAETMEUN;Lo;0;L;;;;;N;;;;;
+16900;BAMUM LETTER PHASE-D TEUT;Lo;0;L;;;;;N;;;;;
+16901;BAMUM LETTER PHASE-D SHEUAE;Lo;0;L;;;;;N;;;;;
+16902;BAMUM LETTER PHASE-D NJAP;Lo;0;L;;;;;N;;;;;
+16903;BAMUM LETTER PHASE-D SUE;Lo;0;L;;;;;N;;;;;
+16904;BAMUM LETTER PHASE-D KET;Lo;0;L;;;;;N;;;;;
+16905;BAMUM LETTER PHASE-D YAEMMAE;Lo;0;L;;;;;N;;;;;
+16906;BAMUM LETTER PHASE-D KUOM;Lo;0;L;;;;;N;;;;;
+16907;BAMUM LETTER PHASE-D SAP;Lo;0;L;;;;;N;;;;;
+16908;BAMUM LETTER PHASE-D MFEUT;Lo;0;L;;;;;N;;;;;
+16909;BAMUM LETTER PHASE-D NDEUX;Lo;0;L;;;;;N;;;;;
+1690A;BAMUM LETTER PHASE-D MALEERI;Lo;0;L;;;;;N;;;;;
+1690B;BAMUM LETTER PHASE-D MEUT;Lo;0;L;;;;;N;;;;;
+1690C;BAMUM LETTER PHASE-D SEUAEQ;Lo;0;L;;;;;N;;;;;
+1690D;BAMUM LETTER PHASE-D YEN;Lo;0;L;;;;;N;;;;;
+1690E;BAMUM LETTER PHASE-D NJEUAEM;Lo;0;L;;;;;N;;;;;
+1690F;BAMUM LETTER PHASE-D KEUOT MBUAE;Lo;0;L;;;;;N;;;;;
+16910;BAMUM LETTER PHASE-D NGKEURI;Lo;0;L;;;;;N;;;;;
+16911;BAMUM LETTER PHASE-D TU;Lo;0;L;;;;;N;;;;;
+16912;BAMUM LETTER PHASE-D GHAA;Lo;0;L;;;;;N;;;;;
+16913;BAMUM LETTER PHASE-D NGKYEE;Lo;0;L;;;;;N;;;;;
+16914;BAMUM LETTER PHASE-D FEUFEUAET;Lo;0;L;;;;;N;;;;;
+16915;BAMUM LETTER PHASE-D NDEE;Lo;0;L;;;;;N;;;;;
+16916;BAMUM LETTER PHASE-D MGBOFUM;Lo;0;L;;;;;N;;;;;
+16917;BAMUM LETTER PHASE-D LEUAEP;Lo;0;L;;;;;N;;;;;
+16918;BAMUM LETTER PHASE-D NDON;Lo;0;L;;;;;N;;;;;
+16919;BAMUM LETTER PHASE-D MONI;Lo;0;L;;;;;N;;;;;
+1691A;BAMUM LETTER PHASE-D MGBEUN;Lo;0;L;;;;;N;;;;;
+1691B;BAMUM LETTER PHASE-D PUUT;Lo;0;L;;;;;N;;;;;
+1691C;BAMUM LETTER PHASE-D MGBIEE;Lo;0;L;;;;;N;;;;;
+1691D;BAMUM LETTER PHASE-D MFO;Lo;0;L;;;;;N;;;;;
+1691E;BAMUM LETTER PHASE-D LUM;Lo;0;L;;;;;N;;;;;
+1691F;BAMUM LETTER PHASE-D NSIEEP;Lo;0;L;;;;;N;;;;;
+16920;BAMUM LETTER PHASE-D MBAA;Lo;0;L;;;;;N;;;;;
+16921;BAMUM LETTER PHASE-D KWAET;Lo;0;L;;;;;N;;;;;
+16922;BAMUM LETTER PHASE-D NYET;Lo;0;L;;;;;N;;;;;
+16923;BAMUM LETTER PHASE-D TEUAEN;Lo;0;L;;;;;N;;;;;
+16924;BAMUM LETTER PHASE-D SOT;Lo;0;L;;;;;N;;;;;
+16925;BAMUM LETTER PHASE-D YUWOQ;Lo;0;L;;;;;N;;;;;
+16926;BAMUM LETTER PHASE-D KEUM;Lo;0;L;;;;;N;;;;;
+16927;BAMUM LETTER PHASE-D RAEM;Lo;0;L;;;;;N;;;;;
+16928;BAMUM LETTER PHASE-D TEEEE;Lo;0;L;;;;;N;;;;;
+16929;BAMUM LETTER PHASE-D NGKEUAEQ;Lo;0;L;;;;;N;;;;;
+1692A;BAMUM LETTER PHASE-D MFEUAE;Lo;0;L;;;;;N;;;;;
+1692B;BAMUM LETTER PHASE-D NSIEET;Lo;0;L;;;;;N;;;;;
+1692C;BAMUM LETTER PHASE-D KEUP;Lo;0;L;;;;;N;;;;;
+1692D;BAMUM LETTER PHASE-D PIP;Lo;0;L;;;;;N;;;;;
+1692E;BAMUM LETTER PHASE-D PEUTAE;Lo;0;L;;;;;N;;;;;
+1692F;BAMUM LETTER PHASE-D NYUE;Lo;0;L;;;;;N;;;;;
+16930;BAMUM LETTER PHASE-D LET;Lo;0;L;;;;;N;;;;;
+16931;BAMUM LETTER PHASE-D NGGAAM;Lo;0;L;;;;;N;;;;;
+16932;BAMUM LETTER PHASE-D MFIEE;Lo;0;L;;;;;N;;;;;
+16933;BAMUM LETTER PHASE-D NGGWAEN;Lo;0;L;;;;;N;;;;;
+16934;BAMUM LETTER PHASE-D YUOM;Lo;0;L;;;;;N;;;;;
+16935;BAMUM LETTER PHASE-D PAP;Lo;0;L;;;;;N;;;;;
+16936;BAMUM LETTER PHASE-D YUOP;Lo;0;L;;;;;N;;;;;
+16937;BAMUM LETTER PHASE-D NDAM;Lo;0;L;;;;;N;;;;;
+16938;BAMUM LETTER PHASE-D NTEUM;Lo;0;L;;;;;N;;;;;
+16939;BAMUM LETTER PHASE-D SUAE;Lo;0;L;;;;;N;;;;;
+1693A;BAMUM LETTER PHASE-D KUN;Lo;0;L;;;;;N;;;;;
+1693B;BAMUM LETTER PHASE-D NGGEUX;Lo;0;L;;;;;N;;;;;
+1693C;BAMUM LETTER PHASE-D NGKIEE;Lo;0;L;;;;;N;;;;;
+1693D;BAMUM LETTER PHASE-D TUOT;Lo;0;L;;;;;N;;;;;
+1693E;BAMUM LETTER PHASE-D MEUN;Lo;0;L;;;;;N;;;;;
+1693F;BAMUM LETTER PHASE-D KUQ;Lo;0;L;;;;;N;;;;;
+16940;BAMUM LETTER PHASE-D NSUM;Lo;0;L;;;;;N;;;;;
+16941;BAMUM LETTER PHASE-D TEUN;Lo;0;L;;;;;N;;;;;
+16942;BAMUM LETTER PHASE-D MAENJET;Lo;0;L;;;;;N;;;;;
+16943;BAMUM LETTER PHASE-D NGGAP;Lo;0;L;;;;;N;;;;;
+16944;BAMUM LETTER PHASE-D LEUM;Lo;0;L;;;;;N;;;;;
+16945;BAMUM LETTER PHASE-D NGGUOM;Lo;0;L;;;;;N;;;;;
+16946;BAMUM LETTER PHASE-D NSHUT;Lo;0;L;;;;;N;;;;;
+16947;BAMUM LETTER PHASE-D NJUEQ;Lo;0;L;;;;;N;;;;;
+16948;BAMUM LETTER PHASE-D GHEUAE;Lo;0;L;;;;;N;;;;;
+16949;BAMUM LETTER PHASE-D KU;Lo;0;L;;;;;N;;;;;
+1694A;BAMUM LETTER PHASE-D REN OLD;Lo;0;L;;;;;N;;;;;
+1694B;BAMUM LETTER PHASE-D TAE;Lo;0;L;;;;;N;;;;;
+1694C;BAMUM LETTER PHASE-D TOQ;Lo;0;L;;;;;N;;;;;
+1694D;BAMUM LETTER PHASE-D NYI;Lo;0;L;;;;;N;;;;;
+1694E;BAMUM LETTER PHASE-D RII;Lo;0;L;;;;;N;;;;;
+1694F;BAMUM LETTER PHASE-D LEEEE;Lo;0;L;;;;;N;;;;;
+16950;BAMUM LETTER PHASE-D MEEEE;Lo;0;L;;;;;N;;;;;
+16951;BAMUM LETTER PHASE-D M;Lo;0;L;;;;;N;;;;;
+16952;BAMUM LETTER PHASE-D SUU;Lo;0;L;;;;;N;;;;;
+16953;BAMUM LETTER PHASE-D MU;Lo;0;L;;;;;N;;;;;
+16954;BAMUM LETTER PHASE-D SHII;Lo;0;L;;;;;N;;;;;
+16955;BAMUM LETTER PHASE-D SHEUX;Lo;0;L;;;;;N;;;;;
+16956;BAMUM LETTER PHASE-D KYEE;Lo;0;L;;;;;N;;;;;
+16957;BAMUM LETTER PHASE-D NU;Lo;0;L;;;;;N;;;;;
+16958;BAMUM LETTER PHASE-D SHU;Lo;0;L;;;;;N;;;;;
+16959;BAMUM LETTER PHASE-D NTEE;Lo;0;L;;;;;N;;;;;
+1695A;BAMUM LETTER PHASE-D PEE;Lo;0;L;;;;;N;;;;;
+1695B;BAMUM LETTER PHASE-D NI;Lo;0;L;;;;;N;;;;;
+1695C;BAMUM LETTER PHASE-D SHOQ;Lo;0;L;;;;;N;;;;;
+1695D;BAMUM LETTER PHASE-D PUQ;Lo;0;L;;;;;N;;;;;
+1695E;BAMUM LETTER PHASE-D MVOP;Lo;0;L;;;;;N;;;;;
+1695F;BAMUM LETTER PHASE-D LOQ;Lo;0;L;;;;;N;;;;;
+16960;BAMUM LETTER PHASE-D REN MUCH;Lo;0;L;;;;;N;;;;;
+16961;BAMUM LETTER PHASE-D TI;Lo;0;L;;;;;N;;;;;
+16962;BAMUM LETTER PHASE-D NTUU;Lo;0;L;;;;;N;;;;;
+16963;BAMUM LETTER PHASE-D MBAA SEVEN;Lo;0;L;;;;;N;;;;;
+16964;BAMUM LETTER PHASE-D SAQ;Lo;0;L;;;;;N;;;;;
+16965;BAMUM LETTER PHASE-D FAA;Lo;0;L;;;;;N;;;;;
+16966;BAMUM LETTER PHASE-E NDAP;Lo;0;L;;;;;N;;;;;
+16967;BAMUM LETTER PHASE-E TOON;Lo;0;L;;;;;N;;;;;
+16968;BAMUM LETTER PHASE-E MBEUM;Lo;0;L;;;;;N;;;;;
+16969;BAMUM LETTER PHASE-E LAP;Lo;0;L;;;;;N;;;;;
+1696A;BAMUM LETTER PHASE-E VOM;Lo;0;L;;;;;N;;;;;
+1696B;BAMUM LETTER PHASE-E LOON;Lo;0;L;;;;;N;;;;;
+1696C;BAMUM LETTER PHASE-E PAA;Lo;0;L;;;;;N;;;;;
+1696D;BAMUM LETTER PHASE-E SOM;Lo;0;L;;;;;N;;;;;
+1696E;BAMUM LETTER PHASE-E RAQ;Lo;0;L;;;;;N;;;;;
+1696F;BAMUM LETTER PHASE-E NSHUOP;Lo;0;L;;;;;N;;;;;
+16970;BAMUM LETTER PHASE-E NDUN;Lo;0;L;;;;;N;;;;;
+16971;BAMUM LETTER PHASE-E PUAE;Lo;0;L;;;;;N;;;;;
+16972;BAMUM LETTER PHASE-E TAM;Lo;0;L;;;;;N;;;;;
+16973;BAMUM LETTER PHASE-E NGKA;Lo;0;L;;;;;N;;;;;
+16974;BAMUM LETTER PHASE-E KPEUX;Lo;0;L;;;;;N;;;;;
+16975;BAMUM LETTER PHASE-E WUO;Lo;0;L;;;;;N;;;;;
+16976;BAMUM LETTER PHASE-E SEE;Lo;0;L;;;;;N;;;;;
+16977;BAMUM LETTER PHASE-E NGGEUAET;Lo;0;L;;;;;N;;;;;
+16978;BAMUM LETTER PHASE-E PAAM;Lo;0;L;;;;;N;;;;;
+16979;BAMUM LETTER PHASE-E TOO;Lo;0;L;;;;;N;;;;;
+1697A;BAMUM LETTER PHASE-E KUOP;Lo;0;L;;;;;N;;;;;
+1697B;BAMUM LETTER PHASE-E LOM;Lo;0;L;;;;;N;;;;;
+1697C;BAMUM LETTER PHASE-E NSHIEE;Lo;0;L;;;;;N;;;;;
+1697D;BAMUM LETTER PHASE-E NGOP;Lo;0;L;;;;;N;;;;;
+1697E;BAMUM LETTER PHASE-E MAEM;Lo;0;L;;;;;N;;;;;
+1697F;BAMUM LETTER PHASE-E NGKEUX;Lo;0;L;;;;;N;;;;;
+16980;BAMUM LETTER PHASE-E NGOQ;Lo;0;L;;;;;N;;;;;
+16981;BAMUM LETTER PHASE-E NSHUE;Lo;0;L;;;;;N;;;;;
+16982;BAMUM LETTER PHASE-E RIMGBA;Lo;0;L;;;;;N;;;;;
+16983;BAMUM LETTER PHASE-E NJEUX;Lo;0;L;;;;;N;;;;;
+16984;BAMUM LETTER PHASE-E PEEM;Lo;0;L;;;;;N;;;;;
+16985;BAMUM LETTER PHASE-E SAA;Lo;0;L;;;;;N;;;;;
+16986;BAMUM LETTER PHASE-E NGGURAE;Lo;0;L;;;;;N;;;;;
+16987;BAMUM LETTER PHASE-E MGBA;Lo;0;L;;;;;N;;;;;
+16988;BAMUM LETTER PHASE-E GHEUX;Lo;0;L;;;;;N;;;;;
+16989;BAMUM LETTER PHASE-E NGKEUAEM;Lo;0;L;;;;;N;;;;;
+1698A;BAMUM LETTER PHASE-E NJAEMLI;Lo;0;L;;;;;N;;;;;
+1698B;BAMUM LETTER PHASE-E MAP;Lo;0;L;;;;;N;;;;;
+1698C;BAMUM LETTER PHASE-E LOOT;Lo;0;L;;;;;N;;;;;
+1698D;BAMUM LETTER PHASE-E NGGEEEE;Lo;0;L;;;;;N;;;;;
+1698E;BAMUM LETTER PHASE-E NDIQ;Lo;0;L;;;;;N;;;;;
+1698F;BAMUM LETTER PHASE-E TAEN NTEUM;Lo;0;L;;;;;N;;;;;
+16990;BAMUM LETTER PHASE-E SET;Lo;0;L;;;;;N;;;;;
+16991;BAMUM LETTER PHASE-E PUM;Lo;0;L;;;;;N;;;;;
+16992;BAMUM LETTER PHASE-E NDAA SOFTNESS;Lo;0;L;;;;;N;;;;;
+16993;BAMUM LETTER PHASE-E NGGUAESHAE NYAM;Lo;0;L;;;;;N;;;;;
+16994;BAMUM LETTER PHASE-E YIEE;Lo;0;L;;;;;N;;;;;
+16995;BAMUM LETTER PHASE-E GHEUN;Lo;0;L;;;;;N;;;;;
+16996;BAMUM LETTER PHASE-E TUAE;Lo;0;L;;;;;N;;;;;
+16997;BAMUM LETTER PHASE-E YEUAE;Lo;0;L;;;;;N;;;;;
+16998;BAMUM LETTER PHASE-E PO;Lo;0;L;;;;;N;;;;;
+16999;BAMUM LETTER PHASE-E TUMAE;Lo;0;L;;;;;N;;;;;
+1699A;BAMUM LETTER PHASE-E KEUAE;Lo;0;L;;;;;N;;;;;
+1699B;BAMUM LETTER PHASE-E SUAEN;Lo;0;L;;;;;N;;;;;
+1699C;BAMUM LETTER PHASE-E TEUAEQ;Lo;0;L;;;;;N;;;;;
+1699D;BAMUM LETTER PHASE-E VEUAE;Lo;0;L;;;;;N;;;;;
+1699E;BAMUM LETTER PHASE-E WEUX;Lo;0;L;;;;;N;;;;;
+1699F;BAMUM LETTER PHASE-E LAAM;Lo;0;L;;;;;N;;;;;
+169A0;BAMUM LETTER PHASE-E PU;Lo;0;L;;;;;N;;;;;
+169A1;BAMUM LETTER PHASE-E TAAQ;Lo;0;L;;;;;N;;;;;
+169A2;BAMUM LETTER PHASE-E GHAAMAE;Lo;0;L;;;;;N;;;;;
+169A3;BAMUM LETTER PHASE-E NGEUREUT;Lo;0;L;;;;;N;;;;;
+169A4;BAMUM LETTER PHASE-E SHEUAEQ;Lo;0;L;;;;;N;;;;;
+169A5;BAMUM LETTER PHASE-E MGBEN;Lo;0;L;;;;;N;;;;;
+169A6;BAMUM LETTER PHASE-E MBEE;Lo;0;L;;;;;N;;;;;
+169A7;BAMUM LETTER PHASE-E NZAQ;Lo;0;L;;;;;N;;;;;
+169A8;BAMUM LETTER PHASE-E NKOM;Lo;0;L;;;;;N;;;;;
+169A9;BAMUM LETTER PHASE-E GBET;Lo;0;L;;;;;N;;;;;
+169AA;BAMUM LETTER PHASE-E TUM;Lo;0;L;;;;;N;;;;;
+169AB;BAMUM LETTER PHASE-E KUET;Lo;0;L;;;;;N;;;;;
+169AC;BAMUM LETTER PHASE-E YAP;Lo;0;L;;;;;N;;;;;
+169AD;BAMUM LETTER PHASE-E NYI CLEAVER;Lo;0;L;;;;;N;;;;;
+169AE;BAMUM LETTER PHASE-E YIT;Lo;0;L;;;;;N;;;;;
+169AF;BAMUM LETTER PHASE-E MFEUQ;Lo;0;L;;;;;N;;;;;
+169B0;BAMUM LETTER PHASE-E NDIAQ;Lo;0;L;;;;;N;;;;;
+169B1;BAMUM LETTER PHASE-E PIEEQ;Lo;0;L;;;;;N;;;;;
+169B2;BAMUM LETTER PHASE-E YUEQ;Lo;0;L;;;;;N;;;;;
+169B3;BAMUM LETTER PHASE-E LEUAEM;Lo;0;L;;;;;N;;;;;
+169B4;BAMUM LETTER PHASE-E FUE;Lo;0;L;;;;;N;;;;;
+169B5;BAMUM LETTER PHASE-E GBEUX;Lo;0;L;;;;;N;;;;;
+169B6;BAMUM LETTER PHASE-E NGKUP;Lo;0;L;;;;;N;;;;;
+169B7;BAMUM LETTER PHASE-E KET;Lo;0;L;;;;;N;;;;;
+169B8;BAMUM LETTER PHASE-E MAE;Lo;0;L;;;;;N;;;;;
+169B9;BAMUM LETTER PHASE-E NGKAAMI;Lo;0;L;;;;;N;;;;;
+169BA;BAMUM LETTER PHASE-E GHET;Lo;0;L;;;;;N;;;;;
+169BB;BAMUM LETTER PHASE-E FA;Lo;0;L;;;;;N;;;;;
+169BC;BAMUM LETTER PHASE-E NTUM;Lo;0;L;;;;;N;;;;;
+169BD;BAMUM LETTER PHASE-E PEUT;Lo;0;L;;;;;N;;;;;
+169BE;BAMUM LETTER PHASE-E YEUM;Lo;0;L;;;;;N;;;;;
+169BF;BAMUM LETTER PHASE-E NGGEUAE;Lo;0;L;;;;;N;;;;;
+169C0;BAMUM LETTER PHASE-E NYI BETWEEN;Lo;0;L;;;;;N;;;;;
+169C1;BAMUM LETTER PHASE-E NZUQ;Lo;0;L;;;;;N;;;;;
+169C2;BAMUM LETTER PHASE-E POON;Lo;0;L;;;;;N;;;;;
+169C3;BAMUM LETTER PHASE-E MIEE;Lo;0;L;;;;;N;;;;;
+169C4;BAMUM LETTER PHASE-E FUET;Lo;0;L;;;;;N;;;;;
+169C5;BAMUM LETTER PHASE-E NAE;Lo;0;L;;;;;N;;;;;
+169C6;BAMUM LETTER PHASE-E MUAE;Lo;0;L;;;;;N;;;;;
+169C7;BAMUM LETTER PHASE-E GHEUAE;Lo;0;L;;;;;N;;;;;
+169C8;BAMUM LETTER PHASE-E FU I;Lo;0;L;;;;;N;;;;;
+169C9;BAMUM LETTER PHASE-E MVI;Lo;0;L;;;;;N;;;;;
+169CA;BAMUM LETTER PHASE-E PUAQ;Lo;0;L;;;;;N;;;;;
+169CB;BAMUM LETTER PHASE-E NGKUM;Lo;0;L;;;;;N;;;;;
+169CC;BAMUM LETTER PHASE-E KUT;Lo;0;L;;;;;N;;;;;
+169CD;BAMUM LETTER PHASE-E PIET;Lo;0;L;;;;;N;;;;;
+169CE;BAMUM LETTER PHASE-E NTAP;Lo;0;L;;;;;N;;;;;
+169CF;BAMUM LETTER PHASE-E YEUAET;Lo;0;L;;;;;N;;;;;
+169D0;BAMUM LETTER PHASE-E NGGUP;Lo;0;L;;;;;N;;;;;
+169D1;BAMUM LETTER PHASE-E PA PEOPLE;Lo;0;L;;;;;N;;;;;
+169D2;BAMUM LETTER PHASE-E FU CALL;Lo;0;L;;;;;N;;;;;
+169D3;BAMUM LETTER PHASE-E FOM;Lo;0;L;;;;;N;;;;;
+169D4;BAMUM LETTER PHASE-E NJEE;Lo;0;L;;;;;N;;;;;
+169D5;BAMUM LETTER PHASE-E A;Lo;0;L;;;;;N;;;;;
+169D6;BAMUM LETTER PHASE-E TOQ;Lo;0;L;;;;;N;;;;;
+169D7;BAMUM LETTER PHASE-E O;Lo;0;L;;;;;N;;;;;
+169D8;BAMUM LETTER PHASE-E I;Lo;0;L;;;;;N;;;;;
+169D9;BAMUM LETTER PHASE-E LAQ;Lo;0;L;;;;;N;;;;;
+169DA;BAMUM LETTER PHASE-E PA PLURAL;Lo;0;L;;;;;N;;;;;
+169DB;BAMUM LETTER PHASE-E TAA;Lo;0;L;;;;;N;;;;;
+169DC;BAMUM LETTER PHASE-E TAQ;Lo;0;L;;;;;N;;;;;
+169DD;BAMUM LETTER PHASE-E NDAA MY HOUSE;Lo;0;L;;;;;N;;;;;
+169DE;BAMUM LETTER PHASE-E SHIQ;Lo;0;L;;;;;N;;;;;
+169DF;BAMUM LETTER PHASE-E YEUX;Lo;0;L;;;;;N;;;;;
+169E0;BAMUM LETTER PHASE-E NGUAE;Lo;0;L;;;;;N;;;;;
+169E1;BAMUM LETTER PHASE-E YUAEN;Lo;0;L;;;;;N;;;;;
+169E2;BAMUM LETTER PHASE-E YOQ SWIMMING;Lo;0;L;;;;;N;;;;;
+169E3;BAMUM LETTER PHASE-E YOQ COVER;Lo;0;L;;;;;N;;;;;
+169E4;BAMUM LETTER PHASE-E YUQ;Lo;0;L;;;;;N;;;;;
+169E5;BAMUM LETTER PHASE-E YUN;Lo;0;L;;;;;N;;;;;
+169E6;BAMUM LETTER PHASE-E KEUX;Lo;0;L;;;;;N;;;;;
+169E7;BAMUM LETTER PHASE-E PEUX;Lo;0;L;;;;;N;;;;;
+169E8;BAMUM LETTER PHASE-E NJEE EPOCH;Lo;0;L;;;;;N;;;;;
+169E9;BAMUM LETTER PHASE-E PUE;Lo;0;L;;;;;N;;;;;
+169EA;BAMUM LETTER PHASE-E WUE;Lo;0;L;;;;;N;;;;;
+169EB;BAMUM LETTER PHASE-E FEE;Lo;0;L;;;;;N;;;;;
+169EC;BAMUM LETTER PHASE-E VEE;Lo;0;L;;;;;N;;;;;
+169ED;BAMUM LETTER PHASE-E LU;Lo;0;L;;;;;N;;;;;
+169EE;BAMUM LETTER PHASE-E MI;Lo;0;L;;;;;N;;;;;
+169EF;BAMUM LETTER PHASE-E REUX;Lo;0;L;;;;;N;;;;;
+169F0;BAMUM LETTER PHASE-E RAE;Lo;0;L;;;;;N;;;;;
+169F1;BAMUM LETTER PHASE-E NGUAET;Lo;0;L;;;;;N;;;;;
+169F2;BAMUM LETTER PHASE-E NGA;Lo;0;L;;;;;N;;;;;
+169F3;BAMUM LETTER PHASE-E SHO;Lo;0;L;;;;;N;;;;;
+169F4;BAMUM LETTER PHASE-E SHOQ;Lo;0;L;;;;;N;;;;;
+169F5;BAMUM LETTER PHASE-E FU REMEDY;Lo;0;L;;;;;N;;;;;
+169F6;BAMUM LETTER PHASE-E NA;Lo;0;L;;;;;N;;;;;
+169F7;BAMUM LETTER PHASE-E PI;Lo;0;L;;;;;N;;;;;
+169F8;BAMUM LETTER PHASE-E LOQ;Lo;0;L;;;;;N;;;;;
+169F9;BAMUM LETTER PHASE-E KO;Lo;0;L;;;;;N;;;;;
+169FA;BAMUM LETTER PHASE-E MEN;Lo;0;L;;;;;N;;;;;
+169FB;BAMUM LETTER PHASE-E MA;Lo;0;L;;;;;N;;;;;
+169FC;BAMUM LETTER PHASE-E MAQ;Lo;0;L;;;;;N;;;;;
+169FD;BAMUM LETTER PHASE-E TEU;Lo;0;L;;;;;N;;;;;
+169FE;BAMUM LETTER PHASE-E KI;Lo;0;L;;;;;N;;;;;
+169FF;BAMUM LETTER PHASE-E MON;Lo;0;L;;;;;N;;;;;
+16A00;BAMUM LETTER PHASE-E TEN;Lo;0;L;;;;;N;;;;;
+16A01;BAMUM LETTER PHASE-E FAQ;Lo;0;L;;;;;N;;;;;
+16A02;BAMUM LETTER PHASE-E GHOM;Lo;0;L;;;;;N;;;;;
+16A03;BAMUM LETTER PHASE-F KA;Lo;0;L;;;;;N;;;;;
+16A04;BAMUM LETTER PHASE-F U;Lo;0;L;;;;;N;;;;;
+16A05;BAMUM LETTER PHASE-F KU;Lo;0;L;;;;;N;;;;;
+16A06;BAMUM LETTER PHASE-F EE;Lo;0;L;;;;;N;;;;;
+16A07;BAMUM LETTER PHASE-F REE;Lo;0;L;;;;;N;;;;;
+16A08;BAMUM LETTER PHASE-F TAE;Lo;0;L;;;;;N;;;;;
+16A09;BAMUM LETTER PHASE-F NYI;Lo;0;L;;;;;N;;;;;
+16A0A;BAMUM LETTER PHASE-F LA;Lo;0;L;;;;;N;;;;;
+16A0B;BAMUM LETTER PHASE-F RII;Lo;0;L;;;;;N;;;;;
+16A0C;BAMUM LETTER PHASE-F RIEE;Lo;0;L;;;;;N;;;;;
+16A0D;BAMUM LETTER PHASE-F MEEEE;Lo;0;L;;;;;N;;;;;
+16A0E;BAMUM LETTER PHASE-F TAA;Lo;0;L;;;;;N;;;;;
+16A0F;BAMUM LETTER PHASE-F NDAA;Lo;0;L;;;;;N;;;;;
+16A10;BAMUM LETTER PHASE-F NJAEM;Lo;0;L;;;;;N;;;;;
+16A11;BAMUM LETTER PHASE-F M;Lo;0;L;;;;;N;;;;;
+16A12;BAMUM LETTER PHASE-F SUU;Lo;0;L;;;;;N;;;;;
+16A13;BAMUM LETTER PHASE-F SHII;Lo;0;L;;;;;N;;;;;
+16A14;BAMUM LETTER PHASE-F SI;Lo;0;L;;;;;N;;;;;
+16A15;BAMUM LETTER PHASE-F SEUX;Lo;0;L;;;;;N;;;;;
+16A16;BAMUM LETTER PHASE-F KYEE;Lo;0;L;;;;;N;;;;;
+16A17;BAMUM LETTER PHASE-F KET;Lo;0;L;;;;;N;;;;;
+16A18;BAMUM LETTER PHASE-F NUAE;Lo;0;L;;;;;N;;;;;
+16A19;BAMUM LETTER PHASE-F NU;Lo;0;L;;;;;N;;;;;
+16A1A;BAMUM LETTER PHASE-F NJUAE;Lo;0;L;;;;;N;;;;;
+16A1B;BAMUM LETTER PHASE-F YOQ;Lo;0;L;;;;;N;;;;;
+16A1C;BAMUM LETTER PHASE-F SHU;Lo;0;L;;;;;N;;;;;
+16A1D;BAMUM LETTER PHASE-F YA;Lo;0;L;;;;;N;;;;;
+16A1E;BAMUM LETTER PHASE-F NSHA;Lo;0;L;;;;;N;;;;;
+16A1F;BAMUM LETTER PHASE-F PEUX;Lo;0;L;;;;;N;;;;;
+16A20;BAMUM LETTER PHASE-F NTEE;Lo;0;L;;;;;N;;;;;
+16A21;BAMUM LETTER PHASE-F WUE;Lo;0;L;;;;;N;;;;;
+16A22;BAMUM LETTER PHASE-F PEE;Lo;0;L;;;;;N;;;;;
+16A23;BAMUM LETTER PHASE-F RU;Lo;0;L;;;;;N;;;;;
+16A24;BAMUM LETTER PHASE-F NI;Lo;0;L;;;;;N;;;;;
+16A25;BAMUM LETTER PHASE-F REUX;Lo;0;L;;;;;N;;;;;
+16A26;BAMUM LETTER PHASE-F KEN;Lo;0;L;;;;;N;;;;;
+16A27;BAMUM LETTER PHASE-F NGKWAEN;Lo;0;L;;;;;N;;;;;
+16A28;BAMUM LETTER PHASE-F NGGA;Lo;0;L;;;;;N;;;;;
+16A29;BAMUM LETTER PHASE-F SHO;Lo;0;L;;;;;N;;;;;
+16A2A;BAMUM LETTER PHASE-F PUAE;Lo;0;L;;;;;N;;;;;
+16A2B;BAMUM LETTER PHASE-F FOM;Lo;0;L;;;;;N;;;;;
+16A2C;BAMUM LETTER PHASE-F WA;Lo;0;L;;;;;N;;;;;
+16A2D;BAMUM LETTER PHASE-F LI;Lo;0;L;;;;;N;;;;;
+16A2E;BAMUM LETTER PHASE-F LOQ;Lo;0;L;;;;;N;;;;;
+16A2F;BAMUM LETTER PHASE-F KO;Lo;0;L;;;;;N;;;;;
+16A30;BAMUM LETTER PHASE-F MBEN;Lo;0;L;;;;;N;;;;;
+16A31;BAMUM LETTER PHASE-F REN;Lo;0;L;;;;;N;;;;;
+16A32;BAMUM LETTER PHASE-F MA;Lo;0;L;;;;;N;;;;;
+16A33;BAMUM LETTER PHASE-F MO;Lo;0;L;;;;;N;;;;;
+16A34;BAMUM LETTER PHASE-F MBAA;Lo;0;L;;;;;N;;;;;
+16A35;BAMUM LETTER PHASE-F TET;Lo;0;L;;;;;N;;;;;
+16A36;BAMUM LETTER PHASE-F KPA;Lo;0;L;;;;;N;;;;;
+16A37;BAMUM LETTER PHASE-F SAMBA;Lo;0;L;;;;;N;;;;;
+16A38;BAMUM LETTER PHASE-F VUEQ;Lo;0;L;;;;;N;;;;;
+16A40;MRO LETTER TA;Lo;0;L;;;;;N;;;;;
+16A41;MRO LETTER NGI;Lo;0;L;;;;;N;;;;;
+16A42;MRO LETTER YO;Lo;0;L;;;;;N;;;;;
+16A43;MRO LETTER MIM;Lo;0;L;;;;;N;;;;;
+16A44;MRO LETTER BA;Lo;0;L;;;;;N;;;;;
+16A45;MRO LETTER DA;Lo;0;L;;;;;N;;;;;
+16A46;MRO LETTER A;Lo;0;L;;;;;N;;;;;
+16A47;MRO LETTER PHI;Lo;0;L;;;;;N;;;;;
+16A48;MRO LETTER KHAI;Lo;0;L;;;;;N;;;;;
+16A49;MRO LETTER HAO;Lo;0;L;;;;;N;;;;;
+16A4A;MRO LETTER DAI;Lo;0;L;;;;;N;;;;;
+16A4B;MRO LETTER CHU;Lo;0;L;;;;;N;;;;;
+16A4C;MRO LETTER KEAAE;Lo;0;L;;;;;N;;;;;
+16A4D;MRO LETTER OL;Lo;0;L;;;;;N;;;;;
+16A4E;MRO LETTER MAEM;Lo;0;L;;;;;N;;;;;
+16A4F;MRO LETTER NIN;Lo;0;L;;;;;N;;;;;
+16A50;MRO LETTER PA;Lo;0;L;;;;;N;;;;;
+16A51;MRO LETTER OO;Lo;0;L;;;;;N;;;;;
+16A52;MRO LETTER O;Lo;0;L;;;;;N;;;;;
+16A53;MRO LETTER RO;Lo;0;L;;;;;N;;;;;
+16A54;MRO LETTER SHI;Lo;0;L;;;;;N;;;;;
+16A55;MRO LETTER THEA;Lo;0;L;;;;;N;;;;;
+16A56;MRO LETTER EA;Lo;0;L;;;;;N;;;;;
+16A57;MRO LETTER WA;Lo;0;L;;;;;N;;;;;
+16A58;MRO LETTER E;Lo;0;L;;;;;N;;;;;
+16A59;MRO LETTER KO;Lo;0;L;;;;;N;;;;;
+16A5A;MRO LETTER LAN;Lo;0;L;;;;;N;;;;;
+16A5B;MRO LETTER LA;Lo;0;L;;;;;N;;;;;
+16A5C;MRO LETTER HAI;Lo;0;L;;;;;N;;;;;
+16A5D;MRO LETTER RI;Lo;0;L;;;;;N;;;;;
+16A5E;MRO LETTER TEK;Lo;0;L;;;;;N;;;;;
+16A60;MRO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+16A61;MRO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+16A62;MRO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+16A63;MRO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+16A64;MRO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+16A65;MRO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+16A66;MRO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+16A67;MRO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+16A68;MRO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+16A69;MRO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+16A6E;MRO DANDA;Po;0;L;;;;;N;;;;;
+16A6F;MRO DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+16AD0;BASSA VAH LETTER ENNI;Lo;0;L;;;;;N;;;;;
+16AD1;BASSA VAH LETTER KA;Lo;0;L;;;;;N;;;;;
+16AD2;BASSA VAH LETTER SE;Lo;0;L;;;;;N;;;;;
+16AD3;BASSA VAH LETTER FA;Lo;0;L;;;;;N;;;;;
+16AD4;BASSA VAH LETTER MBE;Lo;0;L;;;;;N;;;;;
+16AD5;BASSA VAH LETTER YIE;Lo;0;L;;;;;N;;;;;
+16AD6;BASSA VAH LETTER GAH;Lo;0;L;;;;;N;;;;;
+16AD7;BASSA VAH LETTER DHII;Lo;0;L;;;;;N;;;;;
+16AD8;BASSA VAH LETTER KPAH;Lo;0;L;;;;;N;;;;;
+16AD9;BASSA VAH LETTER JO;Lo;0;L;;;;;N;;;;;
+16ADA;BASSA VAH LETTER HWAH;Lo;0;L;;;;;N;;;;;
+16ADB;BASSA VAH LETTER WA;Lo;0;L;;;;;N;;;;;
+16ADC;BASSA VAH LETTER ZO;Lo;0;L;;;;;N;;;;;
+16ADD;BASSA VAH LETTER GBU;Lo;0;L;;;;;N;;;;;
+16ADE;BASSA VAH LETTER DO;Lo;0;L;;;;;N;;;;;
+16ADF;BASSA VAH LETTER CE;Lo;0;L;;;;;N;;;;;
+16AE0;BASSA VAH LETTER UWU;Lo;0;L;;;;;N;;;;;
+16AE1;BASSA VAH LETTER TO;Lo;0;L;;;;;N;;;;;
+16AE2;BASSA VAH LETTER BA;Lo;0;L;;;;;N;;;;;
+16AE3;BASSA VAH LETTER VU;Lo;0;L;;;;;N;;;;;
+16AE4;BASSA VAH LETTER YEIN;Lo;0;L;;;;;N;;;;;
+16AE5;BASSA VAH LETTER PA;Lo;0;L;;;;;N;;;;;
+16AE6;BASSA VAH LETTER WADDA;Lo;0;L;;;;;N;;;;;
+16AE7;BASSA VAH LETTER A;Lo;0;L;;;;;N;;;;;
+16AE8;BASSA VAH LETTER O;Lo;0;L;;;;;N;;;;;
+16AE9;BASSA VAH LETTER OO;Lo;0;L;;;;;N;;;;;
+16AEA;BASSA VAH LETTER U;Lo;0;L;;;;;N;;;;;
+16AEB;BASSA VAH LETTER EE;Lo;0;L;;;;;N;;;;;
+16AEC;BASSA VAH LETTER E;Lo;0;L;;;;;N;;;;;
+16AED;BASSA VAH LETTER I;Lo;0;L;;;;;N;;;;;
+16AF0;BASSA VAH COMBINING HIGH TONE;Mn;1;NSM;;;;;N;;;;;
+16AF1;BASSA VAH COMBINING LOW TONE;Mn;1;NSM;;;;;N;;;;;
+16AF2;BASSA VAH COMBINING MID TONE;Mn;1;NSM;;;;;N;;;;;
+16AF3;BASSA VAH COMBINING LOW-MID TONE;Mn;1;NSM;;;;;N;;;;;
+16AF4;BASSA VAH COMBINING HIGH-LOW TONE;Mn;1;NSM;;;;;N;;;;;
+16AF5;BASSA VAH FULL STOP;Po;0;L;;;;;N;;;;;
+16B00;PAHAWH HMONG VOWEL KEEB;Lo;0;L;;;;;N;;;;;
+16B01;PAHAWH HMONG VOWEL KEEV;Lo;0;L;;;;;N;;;;;
+16B02;PAHAWH HMONG VOWEL KIB;Lo;0;L;;;;;N;;;;;
+16B03;PAHAWH HMONG VOWEL KIV;Lo;0;L;;;;;N;;;;;
+16B04;PAHAWH HMONG VOWEL KAUB;Lo;0;L;;;;;N;;;;;
+16B05;PAHAWH HMONG VOWEL KAUV;Lo;0;L;;;;;N;;;;;
+16B06;PAHAWH HMONG VOWEL KUB;Lo;0;L;;;;;N;;;;;
+16B07;PAHAWH HMONG VOWEL KUV;Lo;0;L;;;;;N;;;;;
+16B08;PAHAWH HMONG VOWEL KEB;Lo;0;L;;;;;N;;;;;
+16B09;PAHAWH HMONG VOWEL KEV;Lo;0;L;;;;;N;;;;;
+16B0A;PAHAWH HMONG VOWEL KAIB;Lo;0;L;;;;;N;;;;;
+16B0B;PAHAWH HMONG VOWEL KAIV;Lo;0;L;;;;;N;;;;;
+16B0C;PAHAWH HMONG VOWEL KOOB;Lo;0;L;;;;;N;;;;;
+16B0D;PAHAWH HMONG VOWEL KOOV;Lo;0;L;;;;;N;;;;;
+16B0E;PAHAWH HMONG VOWEL KAWB;Lo;0;L;;;;;N;;;;;
+16B0F;PAHAWH HMONG VOWEL KAWV;Lo;0;L;;;;;N;;;;;
+16B10;PAHAWH HMONG VOWEL KUAB;Lo;0;L;;;;;N;;;;;
+16B11;PAHAWH HMONG VOWEL KUAV;Lo;0;L;;;;;N;;;;;
+16B12;PAHAWH HMONG VOWEL KOB;Lo;0;L;;;;;N;;;;;
+16B13;PAHAWH HMONG VOWEL KOV;Lo;0;L;;;;;N;;;;;
+16B14;PAHAWH HMONG VOWEL KIAB;Lo;0;L;;;;;N;;;;;
+16B15;PAHAWH HMONG VOWEL KIAV;Lo;0;L;;;;;N;;;;;
+16B16;PAHAWH HMONG VOWEL KAB;Lo;0;L;;;;;N;;;;;
+16B17;PAHAWH HMONG VOWEL KAV;Lo;0;L;;;;;N;;;;;
+16B18;PAHAWH HMONG VOWEL KWB;Lo;0;L;;;;;N;;;;;
+16B19;PAHAWH HMONG VOWEL KWV;Lo;0;L;;;;;N;;;;;
+16B1A;PAHAWH HMONG VOWEL KAAB;Lo;0;L;;;;;N;;;;;
+16B1B;PAHAWH HMONG VOWEL KAAV;Lo;0;L;;;;;N;;;;;
+16B1C;PAHAWH HMONG CONSONANT VAU;Lo;0;L;;;;;N;;;;;
+16B1D;PAHAWH HMONG CONSONANT NTSAU;Lo;0;L;;;;;N;;;;;
+16B1E;PAHAWH HMONG CONSONANT LAU;Lo;0;L;;;;;N;;;;;
+16B1F;PAHAWH HMONG CONSONANT HAU;Lo;0;L;;;;;N;;;;;
+16B20;PAHAWH HMONG CONSONANT NLAU;Lo;0;L;;;;;N;;;;;
+16B21;PAHAWH HMONG CONSONANT RAU;Lo;0;L;;;;;N;;;;;
+16B22;PAHAWH HMONG CONSONANT NKAU;Lo;0;L;;;;;N;;;;;
+16B23;PAHAWH HMONG CONSONANT QHAU;Lo;0;L;;;;;N;;;;;
+16B24;PAHAWH HMONG CONSONANT YAU;Lo;0;L;;;;;N;;;;;
+16B25;PAHAWH HMONG CONSONANT HLAU;Lo;0;L;;;;;N;;;;;
+16B26;PAHAWH HMONG CONSONANT MAU;Lo;0;L;;;;;N;;;;;
+16B27;PAHAWH HMONG CONSONANT CHAU;Lo;0;L;;;;;N;;;;;
+16B28;PAHAWH HMONG CONSONANT NCHAU;Lo;0;L;;;;;N;;;;;
+16B29;PAHAWH HMONG CONSONANT HNAU;Lo;0;L;;;;;N;;;;;
+16B2A;PAHAWH HMONG CONSONANT PLHAU;Lo;0;L;;;;;N;;;;;
+16B2B;PAHAWH HMONG CONSONANT NTHAU;Lo;0;L;;;;;N;;;;;
+16B2C;PAHAWH HMONG CONSONANT NAU;Lo;0;L;;;;;N;;;;;
+16B2D;PAHAWH HMONG CONSONANT AU;Lo;0;L;;;;;N;;;;;
+16B2E;PAHAWH HMONG CONSONANT XAU;Lo;0;L;;;;;N;;;;;
+16B2F;PAHAWH HMONG CONSONANT CAU;Lo;0;L;;;;;N;;;;;
+16B30;PAHAWH HMONG MARK CIM TUB;Mn;230;NSM;;;;;N;;;;;
+16B31;PAHAWH HMONG MARK CIM SO;Mn;230;NSM;;;;;N;;;;;
+16B32;PAHAWH HMONG MARK CIM KES;Mn;230;NSM;;;;;N;;;;;
+16B33;PAHAWH HMONG MARK CIM KHAV;Mn;230;NSM;;;;;N;;;;;
+16B34;PAHAWH HMONG MARK CIM SUAM;Mn;230;NSM;;;;;N;;;;;
+16B35;PAHAWH HMONG MARK CIM HOM;Mn;230;NSM;;;;;N;;;;;
+16B36;PAHAWH HMONG MARK CIM TAUM;Mn;230;NSM;;;;;N;;;;;
+16B37;PAHAWH HMONG SIGN VOS THOM;Po;0;L;;;;;N;;;;;
+16B38;PAHAWH HMONG SIGN VOS TSHAB CEEB;Po;0;L;;;;;N;;;;;
+16B39;PAHAWH HMONG SIGN CIM CHEEM;Po;0;L;;;;;N;;;;;
+16B3A;PAHAWH HMONG SIGN VOS THIAB;Po;0;L;;;;;N;;;;;
+16B3B;PAHAWH HMONG SIGN VOS FEEM;Po;0;L;;;;;N;;;;;
+16B3C;PAHAWH HMONG SIGN XYEEM NTXIV;So;0;L;;;;;N;;;;;
+16B3D;PAHAWH HMONG SIGN XYEEM RHO;So;0;L;;;;;N;;;;;
+16B3E;PAHAWH HMONG SIGN XYEEM TOV;So;0;L;;;;;N;;;;;
+16B3F;PAHAWH HMONG SIGN XYEEM FAIB;So;0;L;;;;;N;;;;;
+16B40;PAHAWH HMONG SIGN VOS SEEV;Lm;0;L;;;;;N;;;;;
+16B41;PAHAWH HMONG SIGN MEEJ SUAB;Lm;0;L;;;;;N;;;;;
+16B42;PAHAWH HMONG SIGN VOS NRUA;Lm;0;L;;;;;N;;;;;
+16B43;PAHAWH HMONG SIGN IB YAM;Lm;0;L;;;;;N;;;;;
+16B44;PAHAWH HMONG SIGN XAUS;Po;0;L;;;;;N;;;;;
+16B45;PAHAWH HMONG SIGN CIM TSOV ROG;So;0;L;;;;;N;;;;;
+16B50;PAHAWH HMONG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+16B51;PAHAWH HMONG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+16B52;PAHAWH HMONG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+16B53;PAHAWH HMONG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+16B54;PAHAWH HMONG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+16B55;PAHAWH HMONG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+16B56;PAHAWH HMONG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+16B57;PAHAWH HMONG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+16B58;PAHAWH HMONG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+16B59;PAHAWH HMONG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+16B5B;PAHAWH HMONG NUMBER TENS;No;0;L;;;;10;N;;;;;
+16B5C;PAHAWH HMONG NUMBER HUNDREDS;No;0;L;;;;100;N;;;;;
+16B5D;PAHAWH HMONG NUMBER TEN THOUSANDS;No;0;L;;;;10000;N;;;;;
+16B5E;PAHAWH HMONG NUMBER MILLIONS;No;0;L;;;;1000000;N;;;;;
+16B5F;PAHAWH HMONG NUMBER HUNDRED MILLIONS;No;0;L;;;;100000000;N;;;;;
+16B60;PAHAWH HMONG NUMBER TEN BILLIONS;No;0;L;;;;10000000000;N;;;;;
+16B61;PAHAWH HMONG NUMBER TRILLIONS;No;0;L;;;;1000000000000;N;;;;;
+16B63;PAHAWH HMONG SIGN VOS LUB;Lo;0;L;;;;;N;;;;;
+16B64;PAHAWH HMONG SIGN XYOO;Lo;0;L;;;;;N;;;;;
+16B65;PAHAWH HMONG SIGN HLI;Lo;0;L;;;;;N;;;;;
+16B66;PAHAWH HMONG SIGN THIRD-STAGE HLI;Lo;0;L;;;;;N;;;;;
+16B67;PAHAWH HMONG SIGN ZWJ THAJ;Lo;0;L;;;;;N;;;;;
+16B68;PAHAWH HMONG SIGN HNUB;Lo;0;L;;;;;N;;;;;
+16B69;PAHAWH HMONG SIGN NQIG;Lo;0;L;;;;;N;;;;;
+16B6A;PAHAWH HMONG SIGN XIAB;Lo;0;L;;;;;N;;;;;
+16B6B;PAHAWH HMONG SIGN NTUJ;Lo;0;L;;;;;N;;;;;
+16B6C;PAHAWH HMONG SIGN AV;Lo;0;L;;;;;N;;;;;
+16B6D;PAHAWH HMONG SIGN TXHEEJ CEEV;Lo;0;L;;;;;N;;;;;
+16B6E;PAHAWH HMONG SIGN MEEJ TSEEB;Lo;0;L;;;;;N;;;;;
+16B6F;PAHAWH HMONG SIGN TAU;Lo;0;L;;;;;N;;;;;
+16B70;PAHAWH HMONG SIGN LOS;Lo;0;L;;;;;N;;;;;
+16B71;PAHAWH HMONG SIGN MUS;Lo;0;L;;;;;N;;;;;
+16B72;PAHAWH HMONG SIGN CIM HAIS LUS NTOG NTOG;Lo;0;L;;;;;N;;;;;
+16B73;PAHAWH HMONG SIGN CIM CUAM TSHOOJ;Lo;0;L;;;;;N;;;;;
+16B74;PAHAWH HMONG SIGN CIM TXWV;Lo;0;L;;;;;N;;;;;
+16B75;PAHAWH HMONG SIGN CIM TXWV CHWV;Lo;0;L;;;;;N;;;;;
+16B76;PAHAWH HMONG SIGN CIM PUB DAWB;Lo;0;L;;;;;N;;;;;
+16B77;PAHAWH HMONG SIGN CIM NRES TOS;Lo;0;L;;;;;N;;;;;
+16B7D;PAHAWH HMONG CLAN SIGN TSHEEJ;Lo;0;L;;;;;N;;;;;
+16B7E;PAHAWH HMONG CLAN SIGN YEEG;Lo;0;L;;;;;N;;;;;
+16B7F;PAHAWH HMONG CLAN SIGN LIS;Lo;0;L;;;;;N;;;;;
+16B80;PAHAWH HMONG CLAN SIGN LAUJ;Lo;0;L;;;;;N;;;;;
+16B81;PAHAWH HMONG CLAN SIGN XYOOJ;Lo;0;L;;;;;N;;;;;
+16B82;PAHAWH HMONG CLAN SIGN KOO;Lo;0;L;;;;;N;;;;;
+16B83;PAHAWH HMONG CLAN SIGN HAWJ;Lo;0;L;;;;;N;;;;;
+16B84;PAHAWH HMONG CLAN SIGN MUAS;Lo;0;L;;;;;N;;;;;
+16B85;PAHAWH HMONG CLAN SIGN THOJ;Lo;0;L;;;;;N;;;;;
+16B86;PAHAWH HMONG CLAN SIGN TSAB;Lo;0;L;;;;;N;;;;;
+16B87;PAHAWH HMONG CLAN SIGN PHAB;Lo;0;L;;;;;N;;;;;
+16B88;PAHAWH HMONG CLAN SIGN KHAB;Lo;0;L;;;;;N;;;;;
+16B89;PAHAWH HMONG CLAN SIGN HAM;Lo;0;L;;;;;N;;;;;
+16B8A;PAHAWH HMONG CLAN SIGN VAJ;Lo;0;L;;;;;N;;;;;
+16B8B;PAHAWH HMONG CLAN SIGN FAJ;Lo;0;L;;;;;N;;;;;
+16B8C;PAHAWH HMONG CLAN SIGN YAJ;Lo;0;L;;;;;N;;;;;
+16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;;
+16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;;
+16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;;
+16E40;MEDEFAIDRIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;16E60;
+16E41;MEDEFAIDRIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;16E61;
+16E42;MEDEFAIDRIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;16E62;
+16E43;MEDEFAIDRIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;16E63;
+16E44;MEDEFAIDRIN CAPITAL LETTER ATIU;Lu;0;L;;;;;N;;;;16E64;
+16E45;MEDEFAIDRIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;16E65;
+16E46;MEDEFAIDRIN CAPITAL LETTER KP;Lu;0;L;;;;;N;;;;16E66;
+16E47;MEDEFAIDRIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;16E67;
+16E48;MEDEFAIDRIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;16E68;
+16E49;MEDEFAIDRIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;16E69;
+16E4A;MEDEFAIDRIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;16E6A;
+16E4B;MEDEFAIDRIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;16E6B;
+16E4C;MEDEFAIDRIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;16E6C;
+16E4D;MEDEFAIDRIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;16E6D;
+16E4E;MEDEFAIDRIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;16E6E;
+16E4F;MEDEFAIDRIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;16E6F;
+16E50;MEDEFAIDRIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;16E70;
+16E51;MEDEFAIDRIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;16E71;
+16E52;MEDEFAIDRIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;16E72;
+16E53;MEDEFAIDRIN CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;16E73;
+16E54;MEDEFAIDRIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;16E74;
+16E55;MEDEFAIDRIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;16E75;
+16E56;MEDEFAIDRIN CAPITAL LETTER HP;Lu;0;L;;;;;N;;;;16E76;
+16E57;MEDEFAIDRIN CAPITAL LETTER NY;Lu;0;L;;;;;N;;;;16E77;
+16E58;MEDEFAIDRIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;16E78;
+16E59;MEDEFAIDRIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;16E79;
+16E5A;MEDEFAIDRIN CAPITAL LETTER OE;Lu;0;L;;;;;N;;;;16E7A;
+16E5B;MEDEFAIDRIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;16E7B;
+16E5C;MEDEFAIDRIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;16E7C;
+16E5D;MEDEFAIDRIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;16E7D;
+16E5E;MEDEFAIDRIN CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;16E7E;
+16E5F;MEDEFAIDRIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;16E7F;
+16E60;MEDEFAIDRIN SMALL LETTER M;Ll;0;L;;;;;N;;;16E40;;16E40
+16E61;MEDEFAIDRIN SMALL LETTER S;Ll;0;L;;;;;N;;;16E41;;16E41
+16E62;MEDEFAIDRIN SMALL LETTER V;Ll;0;L;;;;;N;;;16E42;;16E42
+16E63;MEDEFAIDRIN SMALL LETTER W;Ll;0;L;;;;;N;;;16E43;;16E43
+16E64;MEDEFAIDRIN SMALL LETTER ATIU;Ll;0;L;;;;;N;;;16E44;;16E44
+16E65;MEDEFAIDRIN SMALL LETTER Z;Ll;0;L;;;;;N;;;16E45;;16E45
+16E66;MEDEFAIDRIN SMALL LETTER KP;Ll;0;L;;;;;N;;;16E46;;16E46
+16E67;MEDEFAIDRIN SMALL LETTER P;Ll;0;L;;;;;N;;;16E47;;16E47
+16E68;MEDEFAIDRIN SMALL LETTER T;Ll;0;L;;;;;N;;;16E48;;16E48
+16E69;MEDEFAIDRIN SMALL LETTER G;Ll;0;L;;;;;N;;;16E49;;16E49
+16E6A;MEDEFAIDRIN SMALL LETTER F;Ll;0;L;;;;;N;;;16E4A;;16E4A
+16E6B;MEDEFAIDRIN SMALL LETTER I;Ll;0;L;;;;;N;;;16E4B;;16E4B
+16E6C;MEDEFAIDRIN SMALL LETTER K;Ll;0;L;;;;;N;;;16E4C;;16E4C
+16E6D;MEDEFAIDRIN SMALL LETTER A;Ll;0;L;;;;;N;;;16E4D;;16E4D
+16E6E;MEDEFAIDRIN SMALL LETTER J;Ll;0;L;;;;;N;;;16E4E;;16E4E
+16E6F;MEDEFAIDRIN SMALL LETTER E;Ll;0;L;;;;;N;;;16E4F;;16E4F
+16E70;MEDEFAIDRIN SMALL LETTER B;Ll;0;L;;;;;N;;;16E50;;16E50
+16E71;MEDEFAIDRIN SMALL LETTER C;Ll;0;L;;;;;N;;;16E51;;16E51
+16E72;MEDEFAIDRIN SMALL LETTER U;Ll;0;L;;;;;N;;;16E52;;16E52
+16E73;MEDEFAIDRIN SMALL LETTER YU;Ll;0;L;;;;;N;;;16E53;;16E53
+16E74;MEDEFAIDRIN SMALL LETTER L;Ll;0;L;;;;;N;;;16E54;;16E54
+16E75;MEDEFAIDRIN SMALL LETTER Q;Ll;0;L;;;;;N;;;16E55;;16E55
+16E76;MEDEFAIDRIN SMALL LETTER HP;Ll;0;L;;;;;N;;;16E56;;16E56
+16E77;MEDEFAIDRIN SMALL LETTER NY;Ll;0;L;;;;;N;;;16E57;;16E57
+16E78;MEDEFAIDRIN SMALL LETTER X;Ll;0;L;;;;;N;;;16E58;;16E58
+16E79;MEDEFAIDRIN SMALL LETTER D;Ll;0;L;;;;;N;;;16E59;;16E59
+16E7A;MEDEFAIDRIN SMALL LETTER OE;Ll;0;L;;;;;N;;;16E5A;;16E5A
+16E7B;MEDEFAIDRIN SMALL LETTER N;Ll;0;L;;;;;N;;;16E5B;;16E5B
+16E7C;MEDEFAIDRIN SMALL LETTER R;Ll;0;L;;;;;N;;;16E5C;;16E5C
+16E7D;MEDEFAIDRIN SMALL LETTER O;Ll;0;L;;;;;N;;;16E5D;;16E5D
+16E7E;MEDEFAIDRIN SMALL LETTER AI;Ll;0;L;;;;;N;;;16E5E;;16E5E
+16E7F;MEDEFAIDRIN SMALL LETTER Y;Ll;0;L;;;;;N;;;16E5F;;16E5F
+16E80;MEDEFAIDRIN DIGIT ZERO;No;0;L;;;;0;N;;;;;
+16E81;MEDEFAIDRIN DIGIT ONE;No;0;L;;;;1;N;;;;;
+16E82;MEDEFAIDRIN DIGIT TWO;No;0;L;;;;2;N;;;;;
+16E83;MEDEFAIDRIN DIGIT THREE;No;0;L;;;;3;N;;;;;
+16E84;MEDEFAIDRIN DIGIT FOUR;No;0;L;;;;4;N;;;;;
+16E85;MEDEFAIDRIN DIGIT FIVE;No;0;L;;;;5;N;;;;;
+16E86;MEDEFAIDRIN DIGIT SIX;No;0;L;;;;6;N;;;;;
+16E87;MEDEFAIDRIN DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+16E88;MEDEFAIDRIN DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+16E89;MEDEFAIDRIN DIGIT NINE;No;0;L;;;;9;N;;;;;
+16E8A;MEDEFAIDRIN NUMBER TEN;No;0;L;;;;10;N;;;;;
+16E8B;MEDEFAIDRIN NUMBER ELEVEN;No;0;L;;;;11;N;;;;;
+16E8C;MEDEFAIDRIN NUMBER TWELVE;No;0;L;;;;12;N;;;;;
+16E8D;MEDEFAIDRIN NUMBER THIRTEEN;No;0;L;;;;13;N;;;;;
+16E8E;MEDEFAIDRIN NUMBER FOURTEEN;No;0;L;;;;14;N;;;;;
+16E8F;MEDEFAIDRIN NUMBER FIFTEEN;No;0;L;;;;15;N;;;;;
+16E90;MEDEFAIDRIN NUMBER SIXTEEN;No;0;L;;;;16;N;;;;;
+16E91;MEDEFAIDRIN NUMBER SEVENTEEN;No;0;L;;;;17;N;;;;;
+16E92;MEDEFAIDRIN NUMBER EIGHTEEN;No;0;L;;;;18;N;;;;;
+16E93;MEDEFAIDRIN NUMBER NINETEEN;No;0;L;;;;19;N;;;;;
+16E94;MEDEFAIDRIN DIGIT ONE ALTERNATE FORM;No;0;L;;;;1;N;;;;;
+16E95;MEDEFAIDRIN DIGIT TWO ALTERNATE FORM;No;0;L;;;;2;N;;;;;
+16E96;MEDEFAIDRIN DIGIT THREE ALTERNATE FORM;No;0;L;;;;3;N;;;;;
+16E97;MEDEFAIDRIN COMMA;Po;0;L;;;;;N;;;;;
+16E98;MEDEFAIDRIN FULL STOP;Po;0;L;;;;;N;;;;;
+16E99;MEDEFAIDRIN SYMBOL AIVA;Po;0;L;;;;;N;;;;;
+16E9A;MEDEFAIDRIN EXCLAMATION OH;Po;0;L;;;;;N;;;;;
+16F00;MIAO LETTER PA;Lo;0;L;;;;;N;;;;;
+16F01;MIAO LETTER BA;Lo;0;L;;;;;N;;;;;
+16F02;MIAO LETTER YI PA;Lo;0;L;;;;;N;;;;;
+16F03;MIAO LETTER PLA;Lo;0;L;;;;;N;;;;;
+16F04;MIAO LETTER MA;Lo;0;L;;;;;N;;;;;
+16F05;MIAO LETTER MHA;Lo;0;L;;;;;N;;;;;
+16F06;MIAO LETTER ARCHAIC MA;Lo;0;L;;;;;N;;;;;
+16F07;MIAO LETTER FA;Lo;0;L;;;;;N;;;;;
+16F08;MIAO LETTER VA;Lo;0;L;;;;;N;;;;;
+16F09;MIAO LETTER VFA;Lo;0;L;;;;;N;;;;;
+16F0A;MIAO LETTER TA;Lo;0;L;;;;;N;;;;;
+16F0B;MIAO LETTER DA;Lo;0;L;;;;;N;;;;;
+16F0C;MIAO LETTER YI TTA;Lo;0;L;;;;;N;;;;;
+16F0D;MIAO LETTER YI TA;Lo;0;L;;;;;N;;;;;
+16F0E;MIAO LETTER TTA;Lo;0;L;;;;;N;;;;;
+16F0F;MIAO LETTER DDA;Lo;0;L;;;;;N;;;;;
+16F10;MIAO LETTER NA;Lo;0;L;;;;;N;;;;;
+16F11;MIAO LETTER NHA;Lo;0;L;;;;;N;;;;;
+16F12;MIAO LETTER YI NNA;Lo;0;L;;;;;N;;;;;
+16F13;MIAO LETTER ARCHAIC NA;Lo;0;L;;;;;N;;;;;
+16F14;MIAO LETTER NNA;Lo;0;L;;;;;N;;;;;
+16F15;MIAO LETTER NNHA;Lo;0;L;;;;;N;;;;;
+16F16;MIAO LETTER LA;Lo;0;L;;;;;N;;;;;
+16F17;MIAO LETTER LYA;Lo;0;L;;;;;N;;;;;
+16F18;MIAO LETTER LHA;Lo;0;L;;;;;N;;;;;
+16F19;MIAO LETTER LHYA;Lo;0;L;;;;;N;;;;;
+16F1A;MIAO LETTER TLHA;Lo;0;L;;;;;N;;;;;
+16F1B;MIAO LETTER DLHA;Lo;0;L;;;;;N;;;;;
+16F1C;MIAO LETTER TLHYA;Lo;0;L;;;;;N;;;;;
+16F1D;MIAO LETTER DLHYA;Lo;0;L;;;;;N;;;;;
+16F1E;MIAO LETTER KA;Lo;0;L;;;;;N;;;;;
+16F1F;MIAO LETTER GA;Lo;0;L;;;;;N;;;;;
+16F20;MIAO LETTER YI KA;Lo;0;L;;;;;N;;;;;
+16F21;MIAO LETTER QA;Lo;0;L;;;;;N;;;;;
+16F22;MIAO LETTER QGA;Lo;0;L;;;;;N;;;;;
+16F23;MIAO LETTER NGA;Lo;0;L;;;;;N;;;;;
+16F24;MIAO LETTER NGHA;Lo;0;L;;;;;N;;;;;
+16F25;MIAO LETTER ARCHAIC NGA;Lo;0;L;;;;;N;;;;;
+16F26;MIAO LETTER HA;Lo;0;L;;;;;N;;;;;
+16F27;MIAO LETTER XA;Lo;0;L;;;;;N;;;;;
+16F28;MIAO LETTER GHA;Lo;0;L;;;;;N;;;;;
+16F29;MIAO LETTER GHHA;Lo;0;L;;;;;N;;;;;
+16F2A;MIAO LETTER TSSA;Lo;0;L;;;;;N;;;;;
+16F2B;MIAO LETTER DZZA;Lo;0;L;;;;;N;;;;;
+16F2C;MIAO LETTER NYA;Lo;0;L;;;;;N;;;;;
+16F2D;MIAO LETTER NYHA;Lo;0;L;;;;;N;;;;;
+16F2E;MIAO LETTER TSHA;Lo;0;L;;;;;N;;;;;
+16F2F;MIAO LETTER DZHA;Lo;0;L;;;;;N;;;;;
+16F30;MIAO LETTER YI TSHA;Lo;0;L;;;;;N;;;;;
+16F31;MIAO LETTER YI DZHA;Lo;0;L;;;;;N;;;;;
+16F32;MIAO LETTER REFORMED TSHA;Lo;0;L;;;;;N;;;;;
+16F33;MIAO LETTER SHA;Lo;0;L;;;;;N;;;;;
+16F34;MIAO LETTER SSA;Lo;0;L;;;;;N;;;;;
+16F35;MIAO LETTER ZHA;Lo;0;L;;;;;N;;;;;
+16F36;MIAO LETTER ZSHA;Lo;0;L;;;;;N;;;;;
+16F37;MIAO LETTER TSA;Lo;0;L;;;;;N;;;;;
+16F38;MIAO LETTER DZA;Lo;0;L;;;;;N;;;;;
+16F39;MIAO LETTER YI TSA;Lo;0;L;;;;;N;;;;;
+16F3A;MIAO LETTER SA;Lo;0;L;;;;;N;;;;;
+16F3B;MIAO LETTER ZA;Lo;0;L;;;;;N;;;;;
+16F3C;MIAO LETTER ZSA;Lo;0;L;;;;;N;;;;;
+16F3D;MIAO LETTER ZZA;Lo;0;L;;;;;N;;;;;
+16F3E;MIAO LETTER ZZSA;Lo;0;L;;;;;N;;;;;
+16F3F;MIAO LETTER ARCHAIC ZZA;Lo;0;L;;;;;N;;;;;
+16F40;MIAO LETTER ZZYA;Lo;0;L;;;;;N;;;;;
+16F41;MIAO LETTER ZZSYA;Lo;0;L;;;;;N;;;;;
+16F42;MIAO LETTER WA;Lo;0;L;;;;;N;;;;;
+16F43;MIAO LETTER AH;Lo;0;L;;;;;N;;;;;
+16F44;MIAO LETTER HHA;Lo;0;L;;;;;N;;;;;
+16F45;MIAO LETTER BRI;Lo;0;L;;;;;N;;;;;
+16F46;MIAO LETTER SYI;Lo;0;L;;;;;N;;;;;
+16F47;MIAO LETTER DZYI;Lo;0;L;;;;;N;;;;;
+16F48;MIAO LETTER TE;Lo;0;L;;;;;N;;;;;
+16F49;MIAO LETTER TSE;Lo;0;L;;;;;N;;;;;
+16F4A;MIAO LETTER RTE;Lo;0;L;;;;;N;;;;;
+16F4F;MIAO SIGN CONSONANT MODIFIER BAR;Mn;0;NSM;;;;;N;;;;;
+16F50;MIAO LETTER NASALIZATION;Lo;0;L;;;;;N;;;;;
+16F51;MIAO SIGN ASPIRATION;Mc;0;L;;;;;N;;;;;
+16F52;MIAO SIGN REFORMED VOICING;Mc;0;L;;;;;N;;;;;
+16F53;MIAO SIGN REFORMED ASPIRATION;Mc;0;L;;;;;N;;;;;
+16F54;MIAO VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+16F55;MIAO VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+16F56;MIAO VOWEL SIGN AHH;Mc;0;L;;;;;N;;;;;
+16F57;MIAO VOWEL SIGN AN;Mc;0;L;;;;;N;;;;;
+16F58;MIAO VOWEL SIGN ANG;Mc;0;L;;;;;N;;;;;
+16F59;MIAO VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+16F5A;MIAO VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+16F5B;MIAO VOWEL SIGN WO;Mc;0;L;;;;;N;;;;;
+16F5C;MIAO VOWEL SIGN W;Mc;0;L;;;;;N;;;;;
+16F5D;MIAO VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+16F5E;MIAO VOWEL SIGN EN;Mc;0;L;;;;;N;;;;;
+16F5F;MIAO VOWEL SIGN ENG;Mc;0;L;;;;;N;;;;;
+16F60;MIAO VOWEL SIGN OEY;Mc;0;L;;;;;N;;;;;
+16F61;MIAO VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+16F62;MIAO VOWEL SIGN IA;Mc;0;L;;;;;N;;;;;
+16F63;MIAO VOWEL SIGN IAN;Mc;0;L;;;;;N;;;;;
+16F64;MIAO VOWEL SIGN IANG;Mc;0;L;;;;;N;;;;;
+16F65;MIAO VOWEL SIGN IO;Mc;0;L;;;;;N;;;;;
+16F66;MIAO VOWEL SIGN IE;Mc;0;L;;;;;N;;;;;
+16F67;MIAO VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+16F68;MIAO VOWEL SIGN IU;Mc;0;L;;;;;N;;;;;
+16F69;MIAO VOWEL SIGN ING;Mc;0;L;;;;;N;;;;;
+16F6A;MIAO VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+16F6B;MIAO VOWEL SIGN UA;Mc;0;L;;;;;N;;;;;
+16F6C;MIAO VOWEL SIGN UAN;Mc;0;L;;;;;N;;;;;
+16F6D;MIAO VOWEL SIGN UANG;Mc;0;L;;;;;N;;;;;
+16F6E;MIAO VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+16F6F;MIAO VOWEL SIGN UEI;Mc;0;L;;;;;N;;;;;
+16F70;MIAO VOWEL SIGN UNG;Mc;0;L;;;;;N;;;;;
+16F71;MIAO VOWEL SIGN Y;Mc;0;L;;;;;N;;;;;
+16F72;MIAO VOWEL SIGN YI;Mc;0;L;;;;;N;;;;;
+16F73;MIAO VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+16F74;MIAO VOWEL SIGN AEE;Mc;0;L;;;;;N;;;;;
+16F75;MIAO VOWEL SIGN ERR;Mc;0;L;;;;;N;;;;;
+16F76;MIAO VOWEL SIGN ROUNDED ERR;Mc;0;L;;;;;N;;;;;
+16F77;MIAO VOWEL SIGN ER;Mc;0;L;;;;;N;;;;;
+16F78;MIAO VOWEL SIGN ROUNDED ER;Mc;0;L;;;;;N;;;;;
+16F79;MIAO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+16F7A;MIAO VOWEL SIGN EI;Mc;0;L;;;;;N;;;;;
+16F7B;MIAO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+16F7C;MIAO VOWEL SIGN OU;Mc;0;L;;;;;N;;;;;
+16F7D;MIAO VOWEL SIGN N;Mc;0;L;;;;;N;;;;;
+16F7E;MIAO VOWEL SIGN NG;Mc;0;L;;;;;N;;;;;
+16F7F;MIAO VOWEL SIGN UOG;Mc;0;L;;;;;N;;;;;
+16F80;MIAO VOWEL SIGN YUI;Mc;0;L;;;;;N;;;;;
+16F81;MIAO VOWEL SIGN OG;Mc;0;L;;;;;N;;;;;
+16F82;MIAO VOWEL SIGN OER;Mc;0;L;;;;;N;;;;;
+16F83;MIAO VOWEL SIGN VW;Mc;0;L;;;;;N;;;;;
+16F84;MIAO VOWEL SIGN IG;Mc;0;L;;;;;N;;;;;
+16F85;MIAO VOWEL SIGN EA;Mc;0;L;;;;;N;;;;;
+16F86;MIAO VOWEL SIGN IONG;Mc;0;L;;;;;N;;;;;
+16F87;MIAO VOWEL SIGN UI;Mc;0;L;;;;;N;;;;;
+16F8F;MIAO TONE RIGHT;Mn;0;NSM;;;;;N;;;;;
+16F90;MIAO TONE TOP RIGHT;Mn;0;NSM;;;;;N;;;;;
+16F91;MIAO TONE ABOVE;Mn;0;NSM;;;;;N;;;;;
+16F92;MIAO TONE BELOW;Mn;0;NSM;;;;;N;;;;;
+16F93;MIAO LETTER TONE-2;Lm;0;L;;;;;N;;;;;
+16F94;MIAO LETTER TONE-3;Lm;0;L;;;;;N;;;;;
+16F95;MIAO LETTER TONE-4;Lm;0;L;;;;;N;;;;;
+16F96;MIAO LETTER TONE-5;Lm;0;L;;;;;N;;;;;
+16F97;MIAO LETTER TONE-6;Lm;0;L;;;;;N;;;;;
+16F98;MIAO LETTER TONE-7;Lm;0;L;;;;;N;;;;;
+16F99;MIAO LETTER TONE-8;Lm;0;L;;;;;N;;;;;
+16F9A;MIAO LETTER REFORMED TONE-1;Lm;0;L;;;;;N;;;;;
+16F9B;MIAO LETTER REFORMED TONE-2;Lm;0;L;;;;;N;;;;;
+16F9C;MIAO LETTER REFORMED TONE-4;Lm;0;L;;;;;N;;;;;
+16F9D;MIAO LETTER REFORMED TONE-5;Lm;0;L;;;;;N;;;;;
+16F9E;MIAO LETTER REFORMED TONE-6;Lm;0;L;;;;;N;;;;;
+16F9F;MIAO LETTER REFORMED TONE-8;Lm;0;L;;;;;N;;;;;
+16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
+16FE1;NUSHU ITERATION MARK;Lm;0;L;;;;;N;;;;;
+16FE2;OLD CHINESE HOOK MARK;Po;0;ON;;;;;N;;;;;
+16FE3;OLD CHINESE ITERATION MARK;Lm;0;L;;;;;N;;;;;
+16FE4;KHITAN SMALL SCRIPT FILLER;Mn;0;NSM;;;;;N;;;;;
+16FF0;VIETNAMESE ALTERNATE READING MARK CA;Mc;6;L;;;;;N;;;;;
+16FF1;VIETNAMESE ALTERNATE READING MARK NHAY;Mc;6;L;;;;;N;;;;;
+17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
+187F7;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
+18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
+18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
+18803;TANGUT COMPONENT-004;Lo;0;L;;;;;N;;;;;
+18804;TANGUT COMPONENT-005;Lo;0;L;;;;;N;;;;;
+18805;TANGUT COMPONENT-006;Lo;0;L;;;;;N;;;;;
+18806;TANGUT COMPONENT-007;Lo;0;L;;;;;N;;;;;
+18807;TANGUT COMPONENT-008;Lo;0;L;;;;;N;;;;;
+18808;TANGUT COMPONENT-009;Lo;0;L;;;;;N;;;;;
+18809;TANGUT COMPONENT-010;Lo;0;L;;;;;N;;;;;
+1880A;TANGUT COMPONENT-011;Lo;0;L;;;;;N;;;;;
+1880B;TANGUT COMPONENT-012;Lo;0;L;;;;;N;;;;;
+1880C;TANGUT COMPONENT-013;Lo;0;L;;;;;N;;;;;
+1880D;TANGUT COMPONENT-014;Lo;0;L;;;;;N;;;;;
+1880E;TANGUT COMPONENT-015;Lo;0;L;;;;;N;;;;;
+1880F;TANGUT COMPONENT-016;Lo;0;L;;;;;N;;;;;
+18810;TANGUT COMPONENT-017;Lo;0;L;;;;;N;;;;;
+18811;TANGUT COMPONENT-018;Lo;0;L;;;;;N;;;;;
+18812;TANGUT COMPONENT-019;Lo;0;L;;;;;N;;;;;
+18813;TANGUT COMPONENT-020;Lo;0;L;;;;;N;;;;;
+18814;TANGUT COMPONENT-021;Lo;0;L;;;;;N;;;;;
+18815;TANGUT COMPONENT-022;Lo;0;L;;;;;N;;;;;
+18816;TANGUT COMPONENT-023;Lo;0;L;;;;;N;;;;;
+18817;TANGUT COMPONENT-024;Lo;0;L;;;;;N;;;;;
+18818;TANGUT COMPONENT-025;Lo;0;L;;;;;N;;;;;
+18819;TANGUT COMPONENT-026;Lo;0;L;;;;;N;;;;;
+1881A;TANGUT COMPONENT-027;Lo;0;L;;;;;N;;;;;
+1881B;TANGUT COMPONENT-028;Lo;0;L;;;;;N;;;;;
+1881C;TANGUT COMPONENT-029;Lo;0;L;;;;;N;;;;;
+1881D;TANGUT COMPONENT-030;Lo;0;L;;;;;N;;;;;
+1881E;TANGUT COMPONENT-031;Lo;0;L;;;;;N;;;;;
+1881F;TANGUT COMPONENT-032;Lo;0;L;;;;;N;;;;;
+18820;TANGUT COMPONENT-033;Lo;0;L;;;;;N;;;;;
+18821;TANGUT COMPONENT-034;Lo;0;L;;;;;N;;;;;
+18822;TANGUT COMPONENT-035;Lo;0;L;;;;;N;;;;;
+18823;TANGUT COMPONENT-036;Lo;0;L;;;;;N;;;;;
+18824;TANGUT COMPONENT-037;Lo;0;L;;;;;N;;;;;
+18825;TANGUT COMPONENT-038;Lo;0;L;;;;;N;;;;;
+18826;TANGUT COMPONENT-039;Lo;0;L;;;;;N;;;;;
+18827;TANGUT COMPONENT-040;Lo;0;L;;;;;N;;;;;
+18828;TANGUT COMPONENT-041;Lo;0;L;;;;;N;;;;;
+18829;TANGUT COMPONENT-042;Lo;0;L;;;;;N;;;;;
+1882A;TANGUT COMPONENT-043;Lo;0;L;;;;;N;;;;;
+1882B;TANGUT COMPONENT-044;Lo;0;L;;;;;N;;;;;
+1882C;TANGUT COMPONENT-045;Lo;0;L;;;;;N;;;;;
+1882D;TANGUT COMPONENT-046;Lo;0;L;;;;;N;;;;;
+1882E;TANGUT COMPONENT-047;Lo;0;L;;;;;N;;;;;
+1882F;TANGUT COMPONENT-048;Lo;0;L;;;;;N;;;;;
+18830;TANGUT COMPONENT-049;Lo;0;L;;;;;N;;;;;
+18831;TANGUT COMPONENT-050;Lo;0;L;;;;;N;;;;;
+18832;TANGUT COMPONENT-051;Lo;0;L;;;;;N;;;;;
+18833;TANGUT COMPONENT-052;Lo;0;L;;;;;N;;;;;
+18834;TANGUT COMPONENT-053;Lo;0;L;;;;;N;;;;;
+18835;TANGUT COMPONENT-054;Lo;0;L;;;;;N;;;;;
+18836;TANGUT COMPONENT-055;Lo;0;L;;;;;N;;;;;
+18837;TANGUT COMPONENT-056;Lo;0;L;;;;;N;;;;;
+18838;TANGUT COMPONENT-057;Lo;0;L;;;;;N;;;;;
+18839;TANGUT COMPONENT-058;Lo;0;L;;;;;N;;;;;
+1883A;TANGUT COMPONENT-059;Lo;0;L;;;;;N;;;;;
+1883B;TANGUT COMPONENT-060;Lo;0;L;;;;;N;;;;;
+1883C;TANGUT COMPONENT-061;Lo;0;L;;;;;N;;;;;
+1883D;TANGUT COMPONENT-062;Lo;0;L;;;;;N;;;;;
+1883E;TANGUT COMPONENT-063;Lo;0;L;;;;;N;;;;;
+1883F;TANGUT COMPONENT-064;Lo;0;L;;;;;N;;;;;
+18840;TANGUT COMPONENT-065;Lo;0;L;;;;;N;;;;;
+18841;TANGUT COMPONENT-066;Lo;0;L;;;;;N;;;;;
+18842;TANGUT COMPONENT-067;Lo;0;L;;;;;N;;;;;
+18843;TANGUT COMPONENT-068;Lo;0;L;;;;;N;;;;;
+18844;TANGUT COMPONENT-069;Lo;0;L;;;;;N;;;;;
+18845;TANGUT COMPONENT-070;Lo;0;L;;;;;N;;;;;
+18846;TANGUT COMPONENT-071;Lo;0;L;;;;;N;;;;;
+18847;TANGUT COMPONENT-072;Lo;0;L;;;;;N;;;;;
+18848;TANGUT COMPONENT-073;Lo;0;L;;;;;N;;;;;
+18849;TANGUT COMPONENT-074;Lo;0;L;;;;;N;;;;;
+1884A;TANGUT COMPONENT-075;Lo;0;L;;;;;N;;;;;
+1884B;TANGUT COMPONENT-076;Lo;0;L;;;;;N;;;;;
+1884C;TANGUT COMPONENT-077;Lo;0;L;;;;;N;;;;;
+1884D;TANGUT COMPONENT-078;Lo;0;L;;;;;N;;;;;
+1884E;TANGUT COMPONENT-079;Lo;0;L;;;;;N;;;;;
+1884F;TANGUT COMPONENT-080;Lo;0;L;;;;;N;;;;;
+18850;TANGUT COMPONENT-081;Lo;0;L;;;;;N;;;;;
+18851;TANGUT COMPONENT-082;Lo;0;L;;;;;N;;;;;
+18852;TANGUT COMPONENT-083;Lo;0;L;;;;;N;;;;;
+18853;TANGUT COMPONENT-084;Lo;0;L;;;;;N;;;;;
+18854;TANGUT COMPONENT-085;Lo;0;L;;;;;N;;;;;
+18855;TANGUT COMPONENT-086;Lo;0;L;;;;;N;;;;;
+18856;TANGUT COMPONENT-087;Lo;0;L;;;;;N;;;;;
+18857;TANGUT COMPONENT-088;Lo;0;L;;;;;N;;;;;
+18858;TANGUT COMPONENT-089;Lo;0;L;;;;;N;;;;;
+18859;TANGUT COMPONENT-090;Lo;0;L;;;;;N;;;;;
+1885A;TANGUT COMPONENT-091;Lo;0;L;;;;;N;;;;;
+1885B;TANGUT COMPONENT-092;Lo;0;L;;;;;N;;;;;
+1885C;TANGUT COMPONENT-093;Lo;0;L;;;;;N;;;;;
+1885D;TANGUT COMPONENT-094;Lo;0;L;;;;;N;;;;;
+1885E;TANGUT COMPONENT-095;Lo;0;L;;;;;N;;;;;
+1885F;TANGUT COMPONENT-096;Lo;0;L;;;;;N;;;;;
+18860;TANGUT COMPONENT-097;Lo;0;L;;;;;N;;;;;
+18861;TANGUT COMPONENT-098;Lo;0;L;;;;;N;;;;;
+18862;TANGUT COMPONENT-099;Lo;0;L;;;;;N;;;;;
+18863;TANGUT COMPONENT-100;Lo;0;L;;;;;N;;;;;
+18864;TANGUT COMPONENT-101;Lo;0;L;;;;;N;;;;;
+18865;TANGUT COMPONENT-102;Lo;0;L;;;;;N;;;;;
+18866;TANGUT COMPONENT-103;Lo;0;L;;;;;N;;;;;
+18867;TANGUT COMPONENT-104;Lo;0;L;;;;;N;;;;;
+18868;TANGUT COMPONENT-105;Lo;0;L;;;;;N;;;;;
+18869;TANGUT COMPONENT-106;Lo;0;L;;;;;N;;;;;
+1886A;TANGUT COMPONENT-107;Lo;0;L;;;;;N;;;;;
+1886B;TANGUT COMPONENT-108;Lo;0;L;;;;;N;;;;;
+1886C;TANGUT COMPONENT-109;Lo;0;L;;;;;N;;;;;
+1886D;TANGUT COMPONENT-110;Lo;0;L;;;;;N;;;;;
+1886E;TANGUT COMPONENT-111;Lo;0;L;;;;;N;;;;;
+1886F;TANGUT COMPONENT-112;Lo;0;L;;;;;N;;;;;
+18870;TANGUT COMPONENT-113;Lo;0;L;;;;;N;;;;;
+18871;TANGUT COMPONENT-114;Lo;0;L;;;;;N;;;;;
+18872;TANGUT COMPONENT-115;Lo;0;L;;;;;N;;;;;
+18873;TANGUT COMPONENT-116;Lo;0;L;;;;;N;;;;;
+18874;TANGUT COMPONENT-117;Lo;0;L;;;;;N;;;;;
+18875;TANGUT COMPONENT-118;Lo;0;L;;;;;N;;;;;
+18876;TANGUT COMPONENT-119;Lo;0;L;;;;;N;;;;;
+18877;TANGUT COMPONENT-120;Lo;0;L;;;;;N;;;;;
+18878;TANGUT COMPONENT-121;Lo;0;L;;;;;N;;;;;
+18879;TANGUT COMPONENT-122;Lo;0;L;;;;;N;;;;;
+1887A;TANGUT COMPONENT-123;Lo;0;L;;;;;N;;;;;
+1887B;TANGUT COMPONENT-124;Lo;0;L;;;;;N;;;;;
+1887C;TANGUT COMPONENT-125;Lo;0;L;;;;;N;;;;;
+1887D;TANGUT COMPONENT-126;Lo;0;L;;;;;N;;;;;
+1887E;TANGUT COMPONENT-127;Lo;0;L;;;;;N;;;;;
+1887F;TANGUT COMPONENT-128;Lo;0;L;;;;;N;;;;;
+18880;TANGUT COMPONENT-129;Lo;0;L;;;;;N;;;;;
+18881;TANGUT COMPONENT-130;Lo;0;L;;;;;N;;;;;
+18882;TANGUT COMPONENT-131;Lo;0;L;;;;;N;;;;;
+18883;TANGUT COMPONENT-132;Lo;0;L;;;;;N;;;;;
+18884;TANGUT COMPONENT-133;Lo;0;L;;;;;N;;;;;
+18885;TANGUT COMPONENT-134;Lo;0;L;;;;;N;;;;;
+18886;TANGUT COMPONENT-135;Lo;0;L;;;;;N;;;;;
+18887;TANGUT COMPONENT-136;Lo;0;L;;;;;N;;;;;
+18888;TANGUT COMPONENT-137;Lo;0;L;;;;;N;;;;;
+18889;TANGUT COMPONENT-138;Lo;0;L;;;;;N;;;;;
+1888A;TANGUT COMPONENT-139;Lo;0;L;;;;;N;;;;;
+1888B;TANGUT COMPONENT-140;Lo;0;L;;;;;N;;;;;
+1888C;TANGUT COMPONENT-141;Lo;0;L;;;;;N;;;;;
+1888D;TANGUT COMPONENT-142;Lo;0;L;;;;;N;;;;;
+1888E;TANGUT COMPONENT-143;Lo;0;L;;;;;N;;;;;
+1888F;TANGUT COMPONENT-144;Lo;0;L;;;;;N;;;;;
+18890;TANGUT COMPONENT-145;Lo;0;L;;;;;N;;;;;
+18891;TANGUT COMPONENT-146;Lo;0;L;;;;;N;;;;;
+18892;TANGUT COMPONENT-147;Lo;0;L;;;;;N;;;;;
+18893;TANGUT COMPONENT-148;Lo;0;L;;;;;N;;;;;
+18894;TANGUT COMPONENT-149;Lo;0;L;;;;;N;;;;;
+18895;TANGUT COMPONENT-150;Lo;0;L;;;;;N;;;;;
+18896;TANGUT COMPONENT-151;Lo;0;L;;;;;N;;;;;
+18897;TANGUT COMPONENT-152;Lo;0;L;;;;;N;;;;;
+18898;TANGUT COMPONENT-153;Lo;0;L;;;;;N;;;;;
+18899;TANGUT COMPONENT-154;Lo;0;L;;;;;N;;;;;
+1889A;TANGUT COMPONENT-155;Lo;0;L;;;;;N;;;;;
+1889B;TANGUT COMPONENT-156;Lo;0;L;;;;;N;;;;;
+1889C;TANGUT COMPONENT-157;Lo;0;L;;;;;N;;;;;
+1889D;TANGUT COMPONENT-158;Lo;0;L;;;;;N;;;;;
+1889E;TANGUT COMPONENT-159;Lo;0;L;;;;;N;;;;;
+1889F;TANGUT COMPONENT-160;Lo;0;L;;;;;N;;;;;
+188A0;TANGUT COMPONENT-161;Lo;0;L;;;;;N;;;;;
+188A1;TANGUT COMPONENT-162;Lo;0;L;;;;;N;;;;;
+188A2;TANGUT COMPONENT-163;Lo;0;L;;;;;N;;;;;
+188A3;TANGUT COMPONENT-164;Lo;0;L;;;;;N;;;;;
+188A4;TANGUT COMPONENT-165;Lo;0;L;;;;;N;;;;;
+188A5;TANGUT COMPONENT-166;Lo;0;L;;;;;N;;;;;
+188A6;TANGUT COMPONENT-167;Lo;0;L;;;;;N;;;;;
+188A7;TANGUT COMPONENT-168;Lo;0;L;;;;;N;;;;;
+188A8;TANGUT COMPONENT-169;Lo;0;L;;;;;N;;;;;
+188A9;TANGUT COMPONENT-170;Lo;0;L;;;;;N;;;;;
+188AA;TANGUT COMPONENT-171;Lo;0;L;;;;;N;;;;;
+188AB;TANGUT COMPONENT-172;Lo;0;L;;;;;N;;;;;
+188AC;TANGUT COMPONENT-173;Lo;0;L;;;;;N;;;;;
+188AD;TANGUT COMPONENT-174;Lo;0;L;;;;;N;;;;;
+188AE;TANGUT COMPONENT-175;Lo;0;L;;;;;N;;;;;
+188AF;TANGUT COMPONENT-176;Lo;0;L;;;;;N;;;;;
+188B0;TANGUT COMPONENT-177;Lo;0;L;;;;;N;;;;;
+188B1;TANGUT COMPONENT-178;Lo;0;L;;;;;N;;;;;
+188B2;TANGUT COMPONENT-179;Lo;0;L;;;;;N;;;;;
+188B3;TANGUT COMPONENT-180;Lo;0;L;;;;;N;;;;;
+188B4;TANGUT COMPONENT-181;Lo;0;L;;;;;N;;;;;
+188B5;TANGUT COMPONENT-182;Lo;0;L;;;;;N;;;;;
+188B6;TANGUT COMPONENT-183;Lo;0;L;;;;;N;;;;;
+188B7;TANGUT COMPONENT-184;Lo;0;L;;;;;N;;;;;
+188B8;TANGUT COMPONENT-185;Lo;0;L;;;;;N;;;;;
+188B9;TANGUT COMPONENT-186;Lo;0;L;;;;;N;;;;;
+188BA;TANGUT COMPONENT-187;Lo;0;L;;;;;N;;;;;
+188BB;TANGUT COMPONENT-188;Lo;0;L;;;;;N;;;;;
+188BC;TANGUT COMPONENT-189;Lo;0;L;;;;;N;;;;;
+188BD;TANGUT COMPONENT-190;Lo;0;L;;;;;N;;;;;
+188BE;TANGUT COMPONENT-191;Lo;0;L;;;;;N;;;;;
+188BF;TANGUT COMPONENT-192;Lo;0;L;;;;;N;;;;;
+188C0;TANGUT COMPONENT-193;Lo;0;L;;;;;N;;;;;
+188C1;TANGUT COMPONENT-194;Lo;0;L;;;;;N;;;;;
+188C2;TANGUT COMPONENT-195;Lo;0;L;;;;;N;;;;;
+188C3;TANGUT COMPONENT-196;Lo;0;L;;;;;N;;;;;
+188C4;TANGUT COMPONENT-197;Lo;0;L;;;;;N;;;;;
+188C5;TANGUT COMPONENT-198;Lo;0;L;;;;;N;;;;;
+188C6;TANGUT COMPONENT-199;Lo;0;L;;;;;N;;;;;
+188C7;TANGUT COMPONENT-200;Lo;0;L;;;;;N;;;;;
+188C8;TANGUT COMPONENT-201;Lo;0;L;;;;;N;;;;;
+188C9;TANGUT COMPONENT-202;Lo;0;L;;;;;N;;;;;
+188CA;TANGUT COMPONENT-203;Lo;0;L;;;;;N;;;;;
+188CB;TANGUT COMPONENT-204;Lo;0;L;;;;;N;;;;;
+188CC;TANGUT COMPONENT-205;Lo;0;L;;;;;N;;;;;
+188CD;TANGUT COMPONENT-206;Lo;0;L;;;;;N;;;;;
+188CE;TANGUT COMPONENT-207;Lo;0;L;;;;;N;;;;;
+188CF;TANGUT COMPONENT-208;Lo;0;L;;;;;N;;;;;
+188D0;TANGUT COMPONENT-209;Lo;0;L;;;;;N;;;;;
+188D1;TANGUT COMPONENT-210;Lo;0;L;;;;;N;;;;;
+188D2;TANGUT COMPONENT-211;Lo;0;L;;;;;N;;;;;
+188D3;TANGUT COMPONENT-212;Lo;0;L;;;;;N;;;;;
+188D4;TANGUT COMPONENT-213;Lo;0;L;;;;;N;;;;;
+188D5;TANGUT COMPONENT-214;Lo;0;L;;;;;N;;;;;
+188D6;TANGUT COMPONENT-215;Lo;0;L;;;;;N;;;;;
+188D7;TANGUT COMPONENT-216;Lo;0;L;;;;;N;;;;;
+188D8;TANGUT COMPONENT-217;Lo;0;L;;;;;N;;;;;
+188D9;TANGUT COMPONENT-218;Lo;0;L;;;;;N;;;;;
+188DA;TANGUT COMPONENT-219;Lo;0;L;;;;;N;;;;;
+188DB;TANGUT COMPONENT-220;Lo;0;L;;;;;N;;;;;
+188DC;TANGUT COMPONENT-221;Lo;0;L;;;;;N;;;;;
+188DD;TANGUT COMPONENT-222;Lo;0;L;;;;;N;;;;;
+188DE;TANGUT COMPONENT-223;Lo;0;L;;;;;N;;;;;
+188DF;TANGUT COMPONENT-224;Lo;0;L;;;;;N;;;;;
+188E0;TANGUT COMPONENT-225;Lo;0;L;;;;;N;;;;;
+188E1;TANGUT COMPONENT-226;Lo;0;L;;;;;N;;;;;
+188E2;TANGUT COMPONENT-227;Lo;0;L;;;;;N;;;;;
+188E3;TANGUT COMPONENT-228;Lo;0;L;;;;;N;;;;;
+188E4;TANGUT COMPONENT-229;Lo;0;L;;;;;N;;;;;
+188E5;TANGUT COMPONENT-230;Lo;0;L;;;;;N;;;;;
+188E6;TANGUT COMPONENT-231;Lo;0;L;;;;;N;;;;;
+188E7;TANGUT COMPONENT-232;Lo;0;L;;;;;N;;;;;
+188E8;TANGUT COMPONENT-233;Lo;0;L;;;;;N;;;;;
+188E9;TANGUT COMPONENT-234;Lo;0;L;;;;;N;;;;;
+188EA;TANGUT COMPONENT-235;Lo;0;L;;;;;N;;;;;
+188EB;TANGUT COMPONENT-236;Lo;0;L;;;;;N;;;;;
+188EC;TANGUT COMPONENT-237;Lo;0;L;;;;;N;;;;;
+188ED;TANGUT COMPONENT-238;Lo;0;L;;;;;N;;;;;
+188EE;TANGUT COMPONENT-239;Lo;0;L;;;;;N;;;;;
+188EF;TANGUT COMPONENT-240;Lo;0;L;;;;;N;;;;;
+188F0;TANGUT COMPONENT-241;Lo;0;L;;;;;N;;;;;
+188F1;TANGUT COMPONENT-242;Lo;0;L;;;;;N;;;;;
+188F2;TANGUT COMPONENT-243;Lo;0;L;;;;;N;;;;;
+188F3;TANGUT COMPONENT-244;Lo;0;L;;;;;N;;;;;
+188F4;TANGUT COMPONENT-245;Lo;0;L;;;;;N;;;;;
+188F5;TANGUT COMPONENT-246;Lo;0;L;;;;;N;;;;;
+188F6;TANGUT COMPONENT-247;Lo;0;L;;;;;N;;;;;
+188F7;TANGUT COMPONENT-248;Lo;0;L;;;;;N;;;;;
+188F8;TANGUT COMPONENT-249;Lo;0;L;;;;;N;;;;;
+188F9;TANGUT COMPONENT-250;Lo;0;L;;;;;N;;;;;
+188FA;TANGUT COMPONENT-251;Lo;0;L;;;;;N;;;;;
+188FB;TANGUT COMPONENT-252;Lo;0;L;;;;;N;;;;;
+188FC;TANGUT COMPONENT-253;Lo;0;L;;;;;N;;;;;
+188FD;TANGUT COMPONENT-254;Lo;0;L;;;;;N;;;;;
+188FE;TANGUT COMPONENT-255;Lo;0;L;;;;;N;;;;;
+188FF;TANGUT COMPONENT-256;Lo;0;L;;;;;N;;;;;
+18900;TANGUT COMPONENT-257;Lo;0;L;;;;;N;;;;;
+18901;TANGUT COMPONENT-258;Lo;0;L;;;;;N;;;;;
+18902;TANGUT COMPONENT-259;Lo;0;L;;;;;N;;;;;
+18903;TANGUT COMPONENT-260;Lo;0;L;;;;;N;;;;;
+18904;TANGUT COMPONENT-261;Lo;0;L;;;;;N;;;;;
+18905;TANGUT COMPONENT-262;Lo;0;L;;;;;N;;;;;
+18906;TANGUT COMPONENT-263;Lo;0;L;;;;;N;;;;;
+18907;TANGUT COMPONENT-264;Lo;0;L;;;;;N;;;;;
+18908;TANGUT COMPONENT-265;Lo;0;L;;;;;N;;;;;
+18909;TANGUT COMPONENT-266;Lo;0;L;;;;;N;;;;;
+1890A;TANGUT COMPONENT-267;Lo;0;L;;;;;N;;;;;
+1890B;TANGUT COMPONENT-268;Lo;0;L;;;;;N;;;;;
+1890C;TANGUT COMPONENT-269;Lo;0;L;;;;;N;;;;;
+1890D;TANGUT COMPONENT-270;Lo;0;L;;;;;N;;;;;
+1890E;TANGUT COMPONENT-271;Lo;0;L;;;;;N;;;;;
+1890F;TANGUT COMPONENT-272;Lo;0;L;;;;;N;;;;;
+18910;TANGUT COMPONENT-273;Lo;0;L;;;;;N;;;;;
+18911;TANGUT COMPONENT-274;Lo;0;L;;;;;N;;;;;
+18912;TANGUT COMPONENT-275;Lo;0;L;;;;;N;;;;;
+18913;TANGUT COMPONENT-276;Lo;0;L;;;;;N;;;;;
+18914;TANGUT COMPONENT-277;Lo;0;L;;;;;N;;;;;
+18915;TANGUT COMPONENT-278;Lo;0;L;;;;;N;;;;;
+18916;TANGUT COMPONENT-279;Lo;0;L;;;;;N;;;;;
+18917;TANGUT COMPONENT-280;Lo;0;L;;;;;N;;;;;
+18918;TANGUT COMPONENT-281;Lo;0;L;;;;;N;;;;;
+18919;TANGUT COMPONENT-282;Lo;0;L;;;;;N;;;;;
+1891A;TANGUT COMPONENT-283;Lo;0;L;;;;;N;;;;;
+1891B;TANGUT COMPONENT-284;Lo;0;L;;;;;N;;;;;
+1891C;TANGUT COMPONENT-285;Lo;0;L;;;;;N;;;;;
+1891D;TANGUT COMPONENT-286;Lo;0;L;;;;;N;;;;;
+1891E;TANGUT COMPONENT-287;Lo;0;L;;;;;N;;;;;
+1891F;TANGUT COMPONENT-288;Lo;0;L;;;;;N;;;;;
+18920;TANGUT COMPONENT-289;Lo;0;L;;;;;N;;;;;
+18921;TANGUT COMPONENT-290;Lo;0;L;;;;;N;;;;;
+18922;TANGUT COMPONENT-291;Lo;0;L;;;;;N;;;;;
+18923;TANGUT COMPONENT-292;Lo;0;L;;;;;N;;;;;
+18924;TANGUT COMPONENT-293;Lo;0;L;;;;;N;;;;;
+18925;TANGUT COMPONENT-294;Lo;0;L;;;;;N;;;;;
+18926;TANGUT COMPONENT-295;Lo;0;L;;;;;N;;;;;
+18927;TANGUT COMPONENT-296;Lo;0;L;;;;;N;;;;;
+18928;TANGUT COMPONENT-297;Lo;0;L;;;;;N;;;;;
+18929;TANGUT COMPONENT-298;Lo;0;L;;;;;N;;;;;
+1892A;TANGUT COMPONENT-299;Lo;0;L;;;;;N;;;;;
+1892B;TANGUT COMPONENT-300;Lo;0;L;;;;;N;;;;;
+1892C;TANGUT COMPONENT-301;Lo;0;L;;;;;N;;;;;
+1892D;TANGUT COMPONENT-302;Lo;0;L;;;;;N;;;;;
+1892E;TANGUT COMPONENT-303;Lo;0;L;;;;;N;;;;;
+1892F;TANGUT COMPONENT-304;Lo;0;L;;;;;N;;;;;
+18930;TANGUT COMPONENT-305;Lo;0;L;;;;;N;;;;;
+18931;TANGUT COMPONENT-306;Lo;0;L;;;;;N;;;;;
+18932;TANGUT COMPONENT-307;Lo;0;L;;;;;N;;;;;
+18933;TANGUT COMPONENT-308;Lo;0;L;;;;;N;;;;;
+18934;TANGUT COMPONENT-309;Lo;0;L;;;;;N;;;;;
+18935;TANGUT COMPONENT-310;Lo;0;L;;;;;N;;;;;
+18936;TANGUT COMPONENT-311;Lo;0;L;;;;;N;;;;;
+18937;TANGUT COMPONENT-312;Lo;0;L;;;;;N;;;;;
+18938;TANGUT COMPONENT-313;Lo;0;L;;;;;N;;;;;
+18939;TANGUT COMPONENT-314;Lo;0;L;;;;;N;;;;;
+1893A;TANGUT COMPONENT-315;Lo;0;L;;;;;N;;;;;
+1893B;TANGUT COMPONENT-316;Lo;0;L;;;;;N;;;;;
+1893C;TANGUT COMPONENT-317;Lo;0;L;;;;;N;;;;;
+1893D;TANGUT COMPONENT-318;Lo;0;L;;;;;N;;;;;
+1893E;TANGUT COMPONENT-319;Lo;0;L;;;;;N;;;;;
+1893F;TANGUT COMPONENT-320;Lo;0;L;;;;;N;;;;;
+18940;TANGUT COMPONENT-321;Lo;0;L;;;;;N;;;;;
+18941;TANGUT COMPONENT-322;Lo;0;L;;;;;N;;;;;
+18942;TANGUT COMPONENT-323;Lo;0;L;;;;;N;;;;;
+18943;TANGUT COMPONENT-324;Lo;0;L;;;;;N;;;;;
+18944;TANGUT COMPONENT-325;Lo;0;L;;;;;N;;;;;
+18945;TANGUT COMPONENT-326;Lo;0;L;;;;;N;;;;;
+18946;TANGUT COMPONENT-327;Lo;0;L;;;;;N;;;;;
+18947;TANGUT COMPONENT-328;Lo;0;L;;;;;N;;;;;
+18948;TANGUT COMPONENT-329;Lo;0;L;;;;;N;;;;;
+18949;TANGUT COMPONENT-330;Lo;0;L;;;;;N;;;;;
+1894A;TANGUT COMPONENT-331;Lo;0;L;;;;;N;;;;;
+1894B;TANGUT COMPONENT-332;Lo;0;L;;;;;N;;;;;
+1894C;TANGUT COMPONENT-333;Lo;0;L;;;;;N;;;;;
+1894D;TANGUT COMPONENT-334;Lo;0;L;;;;;N;;;;;
+1894E;TANGUT COMPONENT-335;Lo;0;L;;;;;N;;;;;
+1894F;TANGUT COMPONENT-336;Lo;0;L;;;;;N;;;;;
+18950;TANGUT COMPONENT-337;Lo;0;L;;;;;N;;;;;
+18951;TANGUT COMPONENT-338;Lo;0;L;;;;;N;;;;;
+18952;TANGUT COMPONENT-339;Lo;0;L;;;;;N;;;;;
+18953;TANGUT COMPONENT-340;Lo;0;L;;;;;N;;;;;
+18954;TANGUT COMPONENT-341;Lo;0;L;;;;;N;;;;;
+18955;TANGUT COMPONENT-342;Lo;0;L;;;;;N;;;;;
+18956;TANGUT COMPONENT-343;Lo;0;L;;;;;N;;;;;
+18957;TANGUT COMPONENT-344;Lo;0;L;;;;;N;;;;;
+18958;TANGUT COMPONENT-345;Lo;0;L;;;;;N;;;;;
+18959;TANGUT COMPONENT-346;Lo;0;L;;;;;N;;;;;
+1895A;TANGUT COMPONENT-347;Lo;0;L;;;;;N;;;;;
+1895B;TANGUT COMPONENT-348;Lo;0;L;;;;;N;;;;;
+1895C;TANGUT COMPONENT-349;Lo;0;L;;;;;N;;;;;
+1895D;TANGUT COMPONENT-350;Lo;0;L;;;;;N;;;;;
+1895E;TANGUT COMPONENT-351;Lo;0;L;;;;;N;;;;;
+1895F;TANGUT COMPONENT-352;Lo;0;L;;;;;N;;;;;
+18960;TANGUT COMPONENT-353;Lo;0;L;;;;;N;;;;;
+18961;TANGUT COMPONENT-354;Lo;0;L;;;;;N;;;;;
+18962;TANGUT COMPONENT-355;Lo;0;L;;;;;N;;;;;
+18963;TANGUT COMPONENT-356;Lo;0;L;;;;;N;;;;;
+18964;TANGUT COMPONENT-357;Lo;0;L;;;;;N;;;;;
+18965;TANGUT COMPONENT-358;Lo;0;L;;;;;N;;;;;
+18966;TANGUT COMPONENT-359;Lo;0;L;;;;;N;;;;;
+18967;TANGUT COMPONENT-360;Lo;0;L;;;;;N;;;;;
+18968;TANGUT COMPONENT-361;Lo;0;L;;;;;N;;;;;
+18969;TANGUT COMPONENT-362;Lo;0;L;;;;;N;;;;;
+1896A;TANGUT COMPONENT-363;Lo;0;L;;;;;N;;;;;
+1896B;TANGUT COMPONENT-364;Lo;0;L;;;;;N;;;;;
+1896C;TANGUT COMPONENT-365;Lo;0;L;;;;;N;;;;;
+1896D;TANGUT COMPONENT-366;Lo;0;L;;;;;N;;;;;
+1896E;TANGUT COMPONENT-367;Lo;0;L;;;;;N;;;;;
+1896F;TANGUT COMPONENT-368;Lo;0;L;;;;;N;;;;;
+18970;TANGUT COMPONENT-369;Lo;0;L;;;;;N;;;;;
+18971;TANGUT COMPONENT-370;Lo;0;L;;;;;N;;;;;
+18972;TANGUT COMPONENT-371;Lo;0;L;;;;;N;;;;;
+18973;TANGUT COMPONENT-372;Lo;0;L;;;;;N;;;;;
+18974;TANGUT COMPONENT-373;Lo;0;L;;;;;N;;;;;
+18975;TANGUT COMPONENT-374;Lo;0;L;;;;;N;;;;;
+18976;TANGUT COMPONENT-375;Lo;0;L;;;;;N;;;;;
+18977;TANGUT COMPONENT-376;Lo;0;L;;;;;N;;;;;
+18978;TANGUT COMPONENT-377;Lo;0;L;;;;;N;;;;;
+18979;TANGUT COMPONENT-378;Lo;0;L;;;;;N;;;;;
+1897A;TANGUT COMPONENT-379;Lo;0;L;;;;;N;;;;;
+1897B;TANGUT COMPONENT-380;Lo;0;L;;;;;N;;;;;
+1897C;TANGUT COMPONENT-381;Lo;0;L;;;;;N;;;;;
+1897D;TANGUT COMPONENT-382;Lo;0;L;;;;;N;;;;;
+1897E;TANGUT COMPONENT-383;Lo;0;L;;;;;N;;;;;
+1897F;TANGUT COMPONENT-384;Lo;0;L;;;;;N;;;;;
+18980;TANGUT COMPONENT-385;Lo;0;L;;;;;N;;;;;
+18981;TANGUT COMPONENT-386;Lo;0;L;;;;;N;;;;;
+18982;TANGUT COMPONENT-387;Lo;0;L;;;;;N;;;;;
+18983;TANGUT COMPONENT-388;Lo;0;L;;;;;N;;;;;
+18984;TANGUT COMPONENT-389;Lo;0;L;;;;;N;;;;;
+18985;TANGUT COMPONENT-390;Lo;0;L;;;;;N;;;;;
+18986;TANGUT COMPONENT-391;Lo;0;L;;;;;N;;;;;
+18987;TANGUT COMPONENT-392;Lo;0;L;;;;;N;;;;;
+18988;TANGUT COMPONENT-393;Lo;0;L;;;;;N;;;;;
+18989;TANGUT COMPONENT-394;Lo;0;L;;;;;N;;;;;
+1898A;TANGUT COMPONENT-395;Lo;0;L;;;;;N;;;;;
+1898B;TANGUT COMPONENT-396;Lo;0;L;;;;;N;;;;;
+1898C;TANGUT COMPONENT-397;Lo;0;L;;;;;N;;;;;
+1898D;TANGUT COMPONENT-398;Lo;0;L;;;;;N;;;;;
+1898E;TANGUT COMPONENT-399;Lo;0;L;;;;;N;;;;;
+1898F;TANGUT COMPONENT-400;Lo;0;L;;;;;N;;;;;
+18990;TANGUT COMPONENT-401;Lo;0;L;;;;;N;;;;;
+18991;TANGUT COMPONENT-402;Lo;0;L;;;;;N;;;;;
+18992;TANGUT COMPONENT-403;Lo;0;L;;;;;N;;;;;
+18993;TANGUT COMPONENT-404;Lo;0;L;;;;;N;;;;;
+18994;TANGUT COMPONENT-405;Lo;0;L;;;;;N;;;;;
+18995;TANGUT COMPONENT-406;Lo;0;L;;;;;N;;;;;
+18996;TANGUT COMPONENT-407;Lo;0;L;;;;;N;;;;;
+18997;TANGUT COMPONENT-408;Lo;0;L;;;;;N;;;;;
+18998;TANGUT COMPONENT-409;Lo;0;L;;;;;N;;;;;
+18999;TANGUT COMPONENT-410;Lo;0;L;;;;;N;;;;;
+1899A;TANGUT COMPONENT-411;Lo;0;L;;;;;N;;;;;
+1899B;TANGUT COMPONENT-412;Lo;0;L;;;;;N;;;;;
+1899C;TANGUT COMPONENT-413;Lo;0;L;;;;;N;;;;;
+1899D;TANGUT COMPONENT-414;Lo;0;L;;;;;N;;;;;
+1899E;TANGUT COMPONENT-415;Lo;0;L;;;;;N;;;;;
+1899F;TANGUT COMPONENT-416;Lo;0;L;;;;;N;;;;;
+189A0;TANGUT COMPONENT-417;Lo;0;L;;;;;N;;;;;
+189A1;TANGUT COMPONENT-418;Lo;0;L;;;;;N;;;;;
+189A2;TANGUT COMPONENT-419;Lo;0;L;;;;;N;;;;;
+189A3;TANGUT COMPONENT-420;Lo;0;L;;;;;N;;;;;
+189A4;TANGUT COMPONENT-421;Lo;0;L;;;;;N;;;;;
+189A5;TANGUT COMPONENT-422;Lo;0;L;;;;;N;;;;;
+189A6;TANGUT COMPONENT-423;Lo;0;L;;;;;N;;;;;
+189A7;TANGUT COMPONENT-424;Lo;0;L;;;;;N;;;;;
+189A8;TANGUT COMPONENT-425;Lo;0;L;;;;;N;;;;;
+189A9;TANGUT COMPONENT-426;Lo;0;L;;;;;N;;;;;
+189AA;TANGUT COMPONENT-427;Lo;0;L;;;;;N;;;;;
+189AB;TANGUT COMPONENT-428;Lo;0;L;;;;;N;;;;;
+189AC;TANGUT COMPONENT-429;Lo;0;L;;;;;N;;;;;
+189AD;TANGUT COMPONENT-430;Lo;0;L;;;;;N;;;;;
+189AE;TANGUT COMPONENT-431;Lo;0;L;;;;;N;;;;;
+189AF;TANGUT COMPONENT-432;Lo;0;L;;;;;N;;;;;
+189B0;TANGUT COMPONENT-433;Lo;0;L;;;;;N;;;;;
+189B1;TANGUT COMPONENT-434;Lo;0;L;;;;;N;;;;;
+189B2;TANGUT COMPONENT-435;Lo;0;L;;;;;N;;;;;
+189B3;TANGUT COMPONENT-436;Lo;0;L;;;;;N;;;;;
+189B4;TANGUT COMPONENT-437;Lo;0;L;;;;;N;;;;;
+189B5;TANGUT COMPONENT-438;Lo;0;L;;;;;N;;;;;
+189B6;TANGUT COMPONENT-439;Lo;0;L;;;;;N;;;;;
+189B7;TANGUT COMPONENT-440;Lo;0;L;;;;;N;;;;;
+189B8;TANGUT COMPONENT-441;Lo;0;L;;;;;N;;;;;
+189B9;TANGUT COMPONENT-442;Lo;0;L;;;;;N;;;;;
+189BA;TANGUT COMPONENT-443;Lo;0;L;;;;;N;;;;;
+189BB;TANGUT COMPONENT-444;Lo;0;L;;;;;N;;;;;
+189BC;TANGUT COMPONENT-445;Lo;0;L;;;;;N;;;;;
+189BD;TANGUT COMPONENT-446;Lo;0;L;;;;;N;;;;;
+189BE;TANGUT COMPONENT-447;Lo;0;L;;;;;N;;;;;
+189BF;TANGUT COMPONENT-448;Lo;0;L;;;;;N;;;;;
+189C0;TANGUT COMPONENT-449;Lo;0;L;;;;;N;;;;;
+189C1;TANGUT COMPONENT-450;Lo;0;L;;;;;N;;;;;
+189C2;TANGUT COMPONENT-451;Lo;0;L;;;;;N;;;;;
+189C3;TANGUT COMPONENT-452;Lo;0;L;;;;;N;;;;;
+189C4;TANGUT COMPONENT-453;Lo;0;L;;;;;N;;;;;
+189C5;TANGUT COMPONENT-454;Lo;0;L;;;;;N;;;;;
+189C6;TANGUT COMPONENT-455;Lo;0;L;;;;;N;;;;;
+189C7;TANGUT COMPONENT-456;Lo;0;L;;;;;N;;;;;
+189C8;TANGUT COMPONENT-457;Lo;0;L;;;;;N;;;;;
+189C9;TANGUT COMPONENT-458;Lo;0;L;;;;;N;;;;;
+189CA;TANGUT COMPONENT-459;Lo;0;L;;;;;N;;;;;
+189CB;TANGUT COMPONENT-460;Lo;0;L;;;;;N;;;;;
+189CC;TANGUT COMPONENT-461;Lo;0;L;;;;;N;;;;;
+189CD;TANGUT COMPONENT-462;Lo;0;L;;;;;N;;;;;
+189CE;TANGUT COMPONENT-463;Lo;0;L;;;;;N;;;;;
+189CF;TANGUT COMPONENT-464;Lo;0;L;;;;;N;;;;;
+189D0;TANGUT COMPONENT-465;Lo;0;L;;;;;N;;;;;
+189D1;TANGUT COMPONENT-466;Lo;0;L;;;;;N;;;;;
+189D2;TANGUT COMPONENT-467;Lo;0;L;;;;;N;;;;;
+189D3;TANGUT COMPONENT-468;Lo;0;L;;;;;N;;;;;
+189D4;TANGUT COMPONENT-469;Lo;0;L;;;;;N;;;;;
+189D5;TANGUT COMPONENT-470;Lo;0;L;;;;;N;;;;;
+189D6;TANGUT COMPONENT-471;Lo;0;L;;;;;N;;;;;
+189D7;TANGUT COMPONENT-472;Lo;0;L;;;;;N;;;;;
+189D8;TANGUT COMPONENT-473;Lo;0;L;;;;;N;;;;;
+189D9;TANGUT COMPONENT-474;Lo;0;L;;;;;N;;;;;
+189DA;TANGUT COMPONENT-475;Lo;0;L;;;;;N;;;;;
+189DB;TANGUT COMPONENT-476;Lo;0;L;;;;;N;;;;;
+189DC;TANGUT COMPONENT-477;Lo;0;L;;;;;N;;;;;
+189DD;TANGUT COMPONENT-478;Lo;0;L;;;;;N;;;;;
+189DE;TANGUT COMPONENT-479;Lo;0;L;;;;;N;;;;;
+189DF;TANGUT COMPONENT-480;Lo;0;L;;;;;N;;;;;
+189E0;TANGUT COMPONENT-481;Lo;0;L;;;;;N;;;;;
+189E1;TANGUT COMPONENT-482;Lo;0;L;;;;;N;;;;;
+189E2;TANGUT COMPONENT-483;Lo;0;L;;;;;N;;;;;
+189E3;TANGUT COMPONENT-484;Lo;0;L;;;;;N;;;;;
+189E4;TANGUT COMPONENT-485;Lo;0;L;;;;;N;;;;;
+189E5;TANGUT COMPONENT-486;Lo;0;L;;;;;N;;;;;
+189E6;TANGUT COMPONENT-487;Lo;0;L;;;;;N;;;;;
+189E7;TANGUT COMPONENT-488;Lo;0;L;;;;;N;;;;;
+189E8;TANGUT COMPONENT-489;Lo;0;L;;;;;N;;;;;
+189E9;TANGUT COMPONENT-490;Lo;0;L;;;;;N;;;;;
+189EA;TANGUT COMPONENT-491;Lo;0;L;;;;;N;;;;;
+189EB;TANGUT COMPONENT-492;Lo;0;L;;;;;N;;;;;
+189EC;TANGUT COMPONENT-493;Lo;0;L;;;;;N;;;;;
+189ED;TANGUT COMPONENT-494;Lo;0;L;;;;;N;;;;;
+189EE;TANGUT COMPONENT-495;Lo;0;L;;;;;N;;;;;
+189EF;TANGUT COMPONENT-496;Lo;0;L;;;;;N;;;;;
+189F0;TANGUT COMPONENT-497;Lo;0;L;;;;;N;;;;;
+189F1;TANGUT COMPONENT-498;Lo;0;L;;;;;N;;;;;
+189F2;TANGUT COMPONENT-499;Lo;0;L;;;;;N;;;;;
+189F3;TANGUT COMPONENT-500;Lo;0;L;;;;;N;;;;;
+189F4;TANGUT COMPONENT-501;Lo;0;L;;;;;N;;;;;
+189F5;TANGUT COMPONENT-502;Lo;0;L;;;;;N;;;;;
+189F6;TANGUT COMPONENT-503;Lo;0;L;;;;;N;;;;;
+189F7;TANGUT COMPONENT-504;Lo;0;L;;;;;N;;;;;
+189F8;TANGUT COMPONENT-505;Lo;0;L;;;;;N;;;;;
+189F9;TANGUT COMPONENT-506;Lo;0;L;;;;;N;;;;;
+189FA;TANGUT COMPONENT-507;Lo;0;L;;;;;N;;;;;
+189FB;TANGUT COMPONENT-508;Lo;0;L;;;;;N;;;;;
+189FC;TANGUT COMPONENT-509;Lo;0;L;;;;;N;;;;;
+189FD;TANGUT COMPONENT-510;Lo;0;L;;;;;N;;;;;
+189FE;TANGUT COMPONENT-511;Lo;0;L;;;;;N;;;;;
+189FF;TANGUT COMPONENT-512;Lo;0;L;;;;;N;;;;;
+18A00;TANGUT COMPONENT-513;Lo;0;L;;;;;N;;;;;
+18A01;TANGUT COMPONENT-514;Lo;0;L;;;;;N;;;;;
+18A02;TANGUT COMPONENT-515;Lo;0;L;;;;;N;;;;;
+18A03;TANGUT COMPONENT-516;Lo;0;L;;;;;N;;;;;
+18A04;TANGUT COMPONENT-517;Lo;0;L;;;;;N;;;;;
+18A05;TANGUT COMPONENT-518;Lo;0;L;;;;;N;;;;;
+18A06;TANGUT COMPONENT-519;Lo;0;L;;;;;N;;;;;
+18A07;TANGUT COMPONENT-520;Lo;0;L;;;;;N;;;;;
+18A08;TANGUT COMPONENT-521;Lo;0;L;;;;;N;;;;;
+18A09;TANGUT COMPONENT-522;Lo;0;L;;;;;N;;;;;
+18A0A;TANGUT COMPONENT-523;Lo;0;L;;;;;N;;;;;
+18A0B;TANGUT COMPONENT-524;Lo;0;L;;;;;N;;;;;
+18A0C;TANGUT COMPONENT-525;Lo;0;L;;;;;N;;;;;
+18A0D;TANGUT COMPONENT-526;Lo;0;L;;;;;N;;;;;
+18A0E;TANGUT COMPONENT-527;Lo;0;L;;;;;N;;;;;
+18A0F;TANGUT COMPONENT-528;Lo;0;L;;;;;N;;;;;
+18A10;TANGUT COMPONENT-529;Lo;0;L;;;;;N;;;;;
+18A11;TANGUT COMPONENT-530;Lo;0;L;;;;;N;;;;;
+18A12;TANGUT COMPONENT-531;Lo;0;L;;;;;N;;;;;
+18A13;TANGUT COMPONENT-532;Lo;0;L;;;;;N;;;;;
+18A14;TANGUT COMPONENT-533;Lo;0;L;;;;;N;;;;;
+18A15;TANGUT COMPONENT-534;Lo;0;L;;;;;N;;;;;
+18A16;TANGUT COMPONENT-535;Lo;0;L;;;;;N;;;;;
+18A17;TANGUT COMPONENT-536;Lo;0;L;;;;;N;;;;;
+18A18;TANGUT COMPONENT-537;Lo;0;L;;;;;N;;;;;
+18A19;TANGUT COMPONENT-538;Lo;0;L;;;;;N;;;;;
+18A1A;TANGUT COMPONENT-539;Lo;0;L;;;;;N;;;;;
+18A1B;TANGUT COMPONENT-540;Lo;0;L;;;;;N;;;;;
+18A1C;TANGUT COMPONENT-541;Lo;0;L;;;;;N;;;;;
+18A1D;TANGUT COMPONENT-542;Lo;0;L;;;;;N;;;;;
+18A1E;TANGUT COMPONENT-543;Lo;0;L;;;;;N;;;;;
+18A1F;TANGUT COMPONENT-544;Lo;0;L;;;;;N;;;;;
+18A20;TANGUT COMPONENT-545;Lo;0;L;;;;;N;;;;;
+18A21;TANGUT COMPONENT-546;Lo;0;L;;;;;N;;;;;
+18A22;TANGUT COMPONENT-547;Lo;0;L;;;;;N;;;;;
+18A23;TANGUT COMPONENT-548;Lo;0;L;;;;;N;;;;;
+18A24;TANGUT COMPONENT-549;Lo;0;L;;;;;N;;;;;
+18A25;TANGUT COMPONENT-550;Lo;0;L;;;;;N;;;;;
+18A26;TANGUT COMPONENT-551;Lo;0;L;;;;;N;;;;;
+18A27;TANGUT COMPONENT-552;Lo;0;L;;;;;N;;;;;
+18A28;TANGUT COMPONENT-553;Lo;0;L;;;;;N;;;;;
+18A29;TANGUT COMPONENT-554;Lo;0;L;;;;;N;;;;;
+18A2A;TANGUT COMPONENT-555;Lo;0;L;;;;;N;;;;;
+18A2B;TANGUT COMPONENT-556;Lo;0;L;;;;;N;;;;;
+18A2C;TANGUT COMPONENT-557;Lo;0;L;;;;;N;;;;;
+18A2D;TANGUT COMPONENT-558;Lo;0;L;;;;;N;;;;;
+18A2E;TANGUT COMPONENT-559;Lo;0;L;;;;;N;;;;;
+18A2F;TANGUT COMPONENT-560;Lo;0;L;;;;;N;;;;;
+18A30;TANGUT COMPONENT-561;Lo;0;L;;;;;N;;;;;
+18A31;TANGUT COMPONENT-562;Lo;0;L;;;;;N;;;;;
+18A32;TANGUT COMPONENT-563;Lo;0;L;;;;;N;;;;;
+18A33;TANGUT COMPONENT-564;Lo;0;L;;;;;N;;;;;
+18A34;TANGUT COMPONENT-565;Lo;0;L;;;;;N;;;;;
+18A35;TANGUT COMPONENT-566;Lo;0;L;;;;;N;;;;;
+18A36;TANGUT COMPONENT-567;Lo;0;L;;;;;N;;;;;
+18A37;TANGUT COMPONENT-568;Lo;0;L;;;;;N;;;;;
+18A38;TANGUT COMPONENT-569;Lo;0;L;;;;;N;;;;;
+18A39;TANGUT COMPONENT-570;Lo;0;L;;;;;N;;;;;
+18A3A;TANGUT COMPONENT-571;Lo;0;L;;;;;N;;;;;
+18A3B;TANGUT COMPONENT-572;Lo;0;L;;;;;N;;;;;
+18A3C;TANGUT COMPONENT-573;Lo;0;L;;;;;N;;;;;
+18A3D;TANGUT COMPONENT-574;Lo;0;L;;;;;N;;;;;
+18A3E;TANGUT COMPONENT-575;Lo;0;L;;;;;N;;;;;
+18A3F;TANGUT COMPONENT-576;Lo;0;L;;;;;N;;;;;
+18A40;TANGUT COMPONENT-577;Lo;0;L;;;;;N;;;;;
+18A41;TANGUT COMPONENT-578;Lo;0;L;;;;;N;;;;;
+18A42;TANGUT COMPONENT-579;Lo;0;L;;;;;N;;;;;
+18A43;TANGUT COMPONENT-580;Lo;0;L;;;;;N;;;;;
+18A44;TANGUT COMPONENT-581;Lo;0;L;;;;;N;;;;;
+18A45;TANGUT COMPONENT-582;Lo;0;L;;;;;N;;;;;
+18A46;TANGUT COMPONENT-583;Lo;0;L;;;;;N;;;;;
+18A47;TANGUT COMPONENT-584;Lo;0;L;;;;;N;;;;;
+18A48;TANGUT COMPONENT-585;Lo;0;L;;;;;N;;;;;
+18A49;TANGUT COMPONENT-586;Lo;0;L;;;;;N;;;;;
+18A4A;TANGUT COMPONENT-587;Lo;0;L;;;;;N;;;;;
+18A4B;TANGUT COMPONENT-588;Lo;0;L;;;;;N;;;;;
+18A4C;TANGUT COMPONENT-589;Lo;0;L;;;;;N;;;;;
+18A4D;TANGUT COMPONENT-590;Lo;0;L;;;;;N;;;;;
+18A4E;TANGUT COMPONENT-591;Lo;0;L;;;;;N;;;;;
+18A4F;TANGUT COMPONENT-592;Lo;0;L;;;;;N;;;;;
+18A50;TANGUT COMPONENT-593;Lo;0;L;;;;;N;;;;;
+18A51;TANGUT COMPONENT-594;Lo;0;L;;;;;N;;;;;
+18A52;TANGUT COMPONENT-595;Lo;0;L;;;;;N;;;;;
+18A53;TANGUT COMPONENT-596;Lo;0;L;;;;;N;;;;;
+18A54;TANGUT COMPONENT-597;Lo;0;L;;;;;N;;;;;
+18A55;TANGUT COMPONENT-598;Lo;0;L;;;;;N;;;;;
+18A56;TANGUT COMPONENT-599;Lo;0;L;;;;;N;;;;;
+18A57;TANGUT COMPONENT-600;Lo;0;L;;;;;N;;;;;
+18A58;TANGUT COMPONENT-601;Lo;0;L;;;;;N;;;;;
+18A59;TANGUT COMPONENT-602;Lo;0;L;;;;;N;;;;;
+18A5A;TANGUT COMPONENT-603;Lo;0;L;;;;;N;;;;;
+18A5B;TANGUT COMPONENT-604;Lo;0;L;;;;;N;;;;;
+18A5C;TANGUT COMPONENT-605;Lo;0;L;;;;;N;;;;;
+18A5D;TANGUT COMPONENT-606;Lo;0;L;;;;;N;;;;;
+18A5E;TANGUT COMPONENT-607;Lo;0;L;;;;;N;;;;;
+18A5F;TANGUT COMPONENT-608;Lo;0;L;;;;;N;;;;;
+18A60;TANGUT COMPONENT-609;Lo;0;L;;;;;N;;;;;
+18A61;TANGUT COMPONENT-610;Lo;0;L;;;;;N;;;;;
+18A62;TANGUT COMPONENT-611;Lo;0;L;;;;;N;;;;;
+18A63;TANGUT COMPONENT-612;Lo;0;L;;;;;N;;;;;
+18A64;TANGUT COMPONENT-613;Lo;0;L;;;;;N;;;;;
+18A65;TANGUT COMPONENT-614;Lo;0;L;;;;;N;;;;;
+18A66;TANGUT COMPONENT-615;Lo;0;L;;;;;N;;;;;
+18A67;TANGUT COMPONENT-616;Lo;0;L;;;;;N;;;;;
+18A68;TANGUT COMPONENT-617;Lo;0;L;;;;;N;;;;;
+18A69;TANGUT COMPONENT-618;Lo;0;L;;;;;N;;;;;
+18A6A;TANGUT COMPONENT-619;Lo;0;L;;;;;N;;;;;
+18A6B;TANGUT COMPONENT-620;Lo;0;L;;;;;N;;;;;
+18A6C;TANGUT COMPONENT-621;Lo;0;L;;;;;N;;;;;
+18A6D;TANGUT COMPONENT-622;Lo;0;L;;;;;N;;;;;
+18A6E;TANGUT COMPONENT-623;Lo;0;L;;;;;N;;;;;
+18A6F;TANGUT COMPONENT-624;Lo;0;L;;;;;N;;;;;
+18A70;TANGUT COMPONENT-625;Lo;0;L;;;;;N;;;;;
+18A71;TANGUT COMPONENT-626;Lo;0;L;;;;;N;;;;;
+18A72;TANGUT COMPONENT-627;Lo;0;L;;;;;N;;;;;
+18A73;TANGUT COMPONENT-628;Lo;0;L;;;;;N;;;;;
+18A74;TANGUT COMPONENT-629;Lo;0;L;;;;;N;;;;;
+18A75;TANGUT COMPONENT-630;Lo;0;L;;;;;N;;;;;
+18A76;TANGUT COMPONENT-631;Lo;0;L;;;;;N;;;;;
+18A77;TANGUT COMPONENT-632;Lo;0;L;;;;;N;;;;;
+18A78;TANGUT COMPONENT-633;Lo;0;L;;;;;N;;;;;
+18A79;TANGUT COMPONENT-634;Lo;0;L;;;;;N;;;;;
+18A7A;TANGUT COMPONENT-635;Lo;0;L;;;;;N;;;;;
+18A7B;TANGUT COMPONENT-636;Lo;0;L;;;;;N;;;;;
+18A7C;TANGUT COMPONENT-637;Lo;0;L;;;;;N;;;;;
+18A7D;TANGUT COMPONENT-638;Lo;0;L;;;;;N;;;;;
+18A7E;TANGUT COMPONENT-639;Lo;0;L;;;;;N;;;;;
+18A7F;TANGUT COMPONENT-640;Lo;0;L;;;;;N;;;;;
+18A80;TANGUT COMPONENT-641;Lo;0;L;;;;;N;;;;;
+18A81;TANGUT COMPONENT-642;Lo;0;L;;;;;N;;;;;
+18A82;TANGUT COMPONENT-643;Lo;0;L;;;;;N;;;;;
+18A83;TANGUT COMPONENT-644;Lo;0;L;;;;;N;;;;;
+18A84;TANGUT COMPONENT-645;Lo;0;L;;;;;N;;;;;
+18A85;TANGUT COMPONENT-646;Lo;0;L;;;;;N;;;;;
+18A86;TANGUT COMPONENT-647;Lo;0;L;;;;;N;;;;;
+18A87;TANGUT COMPONENT-648;Lo;0;L;;;;;N;;;;;
+18A88;TANGUT COMPONENT-649;Lo;0;L;;;;;N;;;;;
+18A89;TANGUT COMPONENT-650;Lo;0;L;;;;;N;;;;;
+18A8A;TANGUT COMPONENT-651;Lo;0;L;;;;;N;;;;;
+18A8B;TANGUT COMPONENT-652;Lo;0;L;;;;;N;;;;;
+18A8C;TANGUT COMPONENT-653;Lo;0;L;;;;;N;;;;;
+18A8D;TANGUT COMPONENT-654;Lo;0;L;;;;;N;;;;;
+18A8E;TANGUT COMPONENT-655;Lo;0;L;;;;;N;;;;;
+18A8F;TANGUT COMPONENT-656;Lo;0;L;;;;;N;;;;;
+18A90;TANGUT COMPONENT-657;Lo;0;L;;;;;N;;;;;
+18A91;TANGUT COMPONENT-658;Lo;0;L;;;;;N;;;;;
+18A92;TANGUT COMPONENT-659;Lo;0;L;;;;;N;;;;;
+18A93;TANGUT COMPONENT-660;Lo;0;L;;;;;N;;;;;
+18A94;TANGUT COMPONENT-661;Lo;0;L;;;;;N;;;;;
+18A95;TANGUT COMPONENT-662;Lo;0;L;;;;;N;;;;;
+18A96;TANGUT COMPONENT-663;Lo;0;L;;;;;N;;;;;
+18A97;TANGUT COMPONENT-664;Lo;0;L;;;;;N;;;;;
+18A98;TANGUT COMPONENT-665;Lo;0;L;;;;;N;;;;;
+18A99;TANGUT COMPONENT-666;Lo;0;L;;;;;N;;;;;
+18A9A;TANGUT COMPONENT-667;Lo;0;L;;;;;N;;;;;
+18A9B;TANGUT COMPONENT-668;Lo;0;L;;;;;N;;;;;
+18A9C;TANGUT COMPONENT-669;Lo;0;L;;;;;N;;;;;
+18A9D;TANGUT COMPONENT-670;Lo;0;L;;;;;N;;;;;
+18A9E;TANGUT COMPONENT-671;Lo;0;L;;;;;N;;;;;
+18A9F;TANGUT COMPONENT-672;Lo;0;L;;;;;N;;;;;
+18AA0;TANGUT COMPONENT-673;Lo;0;L;;;;;N;;;;;
+18AA1;TANGUT COMPONENT-674;Lo;0;L;;;;;N;;;;;
+18AA2;TANGUT COMPONENT-675;Lo;0;L;;;;;N;;;;;
+18AA3;TANGUT COMPONENT-676;Lo;0;L;;;;;N;;;;;
+18AA4;TANGUT COMPONENT-677;Lo;0;L;;;;;N;;;;;
+18AA5;TANGUT COMPONENT-678;Lo;0;L;;;;;N;;;;;
+18AA6;TANGUT COMPONENT-679;Lo;0;L;;;;;N;;;;;
+18AA7;TANGUT COMPONENT-680;Lo;0;L;;;;;N;;;;;
+18AA8;TANGUT COMPONENT-681;Lo;0;L;;;;;N;;;;;
+18AA9;TANGUT COMPONENT-682;Lo;0;L;;;;;N;;;;;
+18AAA;TANGUT COMPONENT-683;Lo;0;L;;;;;N;;;;;
+18AAB;TANGUT COMPONENT-684;Lo;0;L;;;;;N;;;;;
+18AAC;TANGUT COMPONENT-685;Lo;0;L;;;;;N;;;;;
+18AAD;TANGUT COMPONENT-686;Lo;0;L;;;;;N;;;;;
+18AAE;TANGUT COMPONENT-687;Lo;0;L;;;;;N;;;;;
+18AAF;TANGUT COMPONENT-688;Lo;0;L;;;;;N;;;;;
+18AB0;TANGUT COMPONENT-689;Lo;0;L;;;;;N;;;;;
+18AB1;TANGUT COMPONENT-690;Lo;0;L;;;;;N;;;;;
+18AB2;TANGUT COMPONENT-691;Lo;0;L;;;;;N;;;;;
+18AB3;TANGUT COMPONENT-692;Lo;0;L;;;;;N;;;;;
+18AB4;TANGUT COMPONENT-693;Lo;0;L;;;;;N;;;;;
+18AB5;TANGUT COMPONENT-694;Lo;0;L;;;;;N;;;;;
+18AB6;TANGUT COMPONENT-695;Lo;0;L;;;;;N;;;;;
+18AB7;TANGUT COMPONENT-696;Lo;0;L;;;;;N;;;;;
+18AB8;TANGUT COMPONENT-697;Lo;0;L;;;;;N;;;;;
+18AB9;TANGUT COMPONENT-698;Lo;0;L;;;;;N;;;;;
+18ABA;TANGUT COMPONENT-699;Lo;0;L;;;;;N;;;;;
+18ABB;TANGUT COMPONENT-700;Lo;0;L;;;;;N;;;;;
+18ABC;TANGUT COMPONENT-701;Lo;0;L;;;;;N;;;;;
+18ABD;TANGUT COMPONENT-702;Lo;0;L;;;;;N;;;;;
+18ABE;TANGUT COMPONENT-703;Lo;0;L;;;;;N;;;;;
+18ABF;TANGUT COMPONENT-704;Lo;0;L;;;;;N;;;;;
+18AC0;TANGUT COMPONENT-705;Lo;0;L;;;;;N;;;;;
+18AC1;TANGUT COMPONENT-706;Lo;0;L;;;;;N;;;;;
+18AC2;TANGUT COMPONENT-707;Lo;0;L;;;;;N;;;;;
+18AC3;TANGUT COMPONENT-708;Lo;0;L;;;;;N;;;;;
+18AC4;TANGUT COMPONENT-709;Lo;0;L;;;;;N;;;;;
+18AC5;TANGUT COMPONENT-710;Lo;0;L;;;;;N;;;;;
+18AC6;TANGUT COMPONENT-711;Lo;0;L;;;;;N;;;;;
+18AC7;TANGUT COMPONENT-712;Lo;0;L;;;;;N;;;;;
+18AC8;TANGUT COMPONENT-713;Lo;0;L;;;;;N;;;;;
+18AC9;TANGUT COMPONENT-714;Lo;0;L;;;;;N;;;;;
+18ACA;TANGUT COMPONENT-715;Lo;0;L;;;;;N;;;;;
+18ACB;TANGUT COMPONENT-716;Lo;0;L;;;;;N;;;;;
+18ACC;TANGUT COMPONENT-717;Lo;0;L;;;;;N;;;;;
+18ACD;TANGUT COMPONENT-718;Lo;0;L;;;;;N;;;;;
+18ACE;TANGUT COMPONENT-719;Lo;0;L;;;;;N;;;;;
+18ACF;TANGUT COMPONENT-720;Lo;0;L;;;;;N;;;;;
+18AD0;TANGUT COMPONENT-721;Lo;0;L;;;;;N;;;;;
+18AD1;TANGUT COMPONENT-722;Lo;0;L;;;;;N;;;;;
+18AD2;TANGUT COMPONENT-723;Lo;0;L;;;;;N;;;;;
+18AD3;TANGUT COMPONENT-724;Lo;0;L;;;;;N;;;;;
+18AD4;TANGUT COMPONENT-725;Lo;0;L;;;;;N;;;;;
+18AD5;TANGUT COMPONENT-726;Lo;0;L;;;;;N;;;;;
+18AD6;TANGUT COMPONENT-727;Lo;0;L;;;;;N;;;;;
+18AD7;TANGUT COMPONENT-728;Lo;0;L;;;;;N;;;;;
+18AD8;TANGUT COMPONENT-729;Lo;0;L;;;;;N;;;;;
+18AD9;TANGUT COMPONENT-730;Lo;0;L;;;;;N;;;;;
+18ADA;TANGUT COMPONENT-731;Lo;0;L;;;;;N;;;;;
+18ADB;TANGUT COMPONENT-732;Lo;0;L;;;;;N;;;;;
+18ADC;TANGUT COMPONENT-733;Lo;0;L;;;;;N;;;;;
+18ADD;TANGUT COMPONENT-734;Lo;0;L;;;;;N;;;;;
+18ADE;TANGUT COMPONENT-735;Lo;0;L;;;;;N;;;;;
+18ADF;TANGUT COMPONENT-736;Lo;0;L;;;;;N;;;;;
+18AE0;TANGUT COMPONENT-737;Lo;0;L;;;;;N;;;;;
+18AE1;TANGUT COMPONENT-738;Lo;0;L;;;;;N;;;;;
+18AE2;TANGUT COMPONENT-739;Lo;0;L;;;;;N;;;;;
+18AE3;TANGUT COMPONENT-740;Lo;0;L;;;;;N;;;;;
+18AE4;TANGUT COMPONENT-741;Lo;0;L;;;;;N;;;;;
+18AE5;TANGUT COMPONENT-742;Lo;0;L;;;;;N;;;;;
+18AE6;TANGUT COMPONENT-743;Lo;0;L;;;;;N;;;;;
+18AE7;TANGUT COMPONENT-744;Lo;0;L;;;;;N;;;;;
+18AE8;TANGUT COMPONENT-745;Lo;0;L;;;;;N;;;;;
+18AE9;TANGUT COMPONENT-746;Lo;0;L;;;;;N;;;;;
+18AEA;TANGUT COMPONENT-747;Lo;0;L;;;;;N;;;;;
+18AEB;TANGUT COMPONENT-748;Lo;0;L;;;;;N;;;;;
+18AEC;TANGUT COMPONENT-749;Lo;0;L;;;;;N;;;;;
+18AED;TANGUT COMPONENT-750;Lo;0;L;;;;;N;;;;;
+18AEE;TANGUT COMPONENT-751;Lo;0;L;;;;;N;;;;;
+18AEF;TANGUT COMPONENT-752;Lo;0;L;;;;;N;;;;;
+18AF0;TANGUT COMPONENT-753;Lo;0;L;;;;;N;;;;;
+18AF1;TANGUT COMPONENT-754;Lo;0;L;;;;;N;;;;;
+18AF2;TANGUT COMPONENT-755;Lo;0;L;;;;;N;;;;;
+18AF3;TANGUT COMPONENT-756;Lo;0;L;;;;;N;;;;;
+18AF4;TANGUT COMPONENT-757;Lo;0;L;;;;;N;;;;;
+18AF5;TANGUT COMPONENT-758;Lo;0;L;;;;;N;;;;;
+18AF6;TANGUT COMPONENT-759;Lo;0;L;;;;;N;;;;;
+18AF7;TANGUT COMPONENT-760;Lo;0;L;;;;;N;;;;;
+18AF8;TANGUT COMPONENT-761;Lo;0;L;;;;;N;;;;;
+18AF9;TANGUT COMPONENT-762;Lo;0;L;;;;;N;;;;;
+18AFA;TANGUT COMPONENT-763;Lo;0;L;;;;;N;;;;;
+18AFB;TANGUT COMPONENT-764;Lo;0;L;;;;;N;;;;;
+18AFC;TANGUT COMPONENT-765;Lo;0;L;;;;;N;;;;;
+18AFD;TANGUT COMPONENT-766;Lo;0;L;;;;;N;;;;;
+18AFE;TANGUT COMPONENT-767;Lo;0;L;;;;;N;;;;;
+18AFF;TANGUT COMPONENT-768;Lo;0;L;;;;;N;;;;;
+18B00;KHITAN SMALL SCRIPT CHARACTER-18B00;Lo;0;L;;;;;N;;;;;
+18B01;KHITAN SMALL SCRIPT CHARACTER-18B01;Lo;0;L;;;;;N;;;;;
+18B02;KHITAN SMALL SCRIPT CHARACTER-18B02;Lo;0;L;;;;;N;;;;;
+18B03;KHITAN SMALL SCRIPT CHARACTER-18B03;Lo;0;L;;;;;N;;;;;
+18B04;KHITAN SMALL SCRIPT CHARACTER-18B04;Lo;0;L;;;;;N;;;;;
+18B05;KHITAN SMALL SCRIPT CHARACTER-18B05;Lo;0;L;;;;;N;;;;;
+18B06;KHITAN SMALL SCRIPT CHARACTER-18B06;Lo;0;L;;;;;N;;;;;
+18B07;KHITAN SMALL SCRIPT CHARACTER-18B07;Lo;0;L;;;;;N;;;;;
+18B08;KHITAN SMALL SCRIPT CHARACTER-18B08;Lo;0;L;;;;;N;;;;;
+18B09;KHITAN SMALL SCRIPT CHARACTER-18B09;Lo;0;L;;;;;N;;;;;
+18B0A;KHITAN SMALL SCRIPT CHARACTER-18B0A;Lo;0;L;;;;;N;;;;;
+18B0B;KHITAN SMALL SCRIPT CHARACTER-18B0B;Lo;0;L;;;;;N;;;;;
+18B0C;KHITAN SMALL SCRIPT CHARACTER-18B0C;Lo;0;L;;;;;N;;;;;
+18B0D;KHITAN SMALL SCRIPT CHARACTER-18B0D;Lo;0;L;;;;;N;;;;;
+18B0E;KHITAN SMALL SCRIPT CHARACTER-18B0E;Lo;0;L;;;;;N;;;;;
+18B0F;KHITAN SMALL SCRIPT CHARACTER-18B0F;Lo;0;L;;;;;N;;;;;
+18B10;KHITAN SMALL SCRIPT CHARACTER-18B10;Lo;0;L;;;;;N;;;;;
+18B11;KHITAN SMALL SCRIPT CHARACTER-18B11;Lo;0;L;;;;;N;;;;;
+18B12;KHITAN SMALL SCRIPT CHARACTER-18B12;Lo;0;L;;;;;N;;;;;
+18B13;KHITAN SMALL SCRIPT CHARACTER-18B13;Lo;0;L;;;;;N;;;;;
+18B14;KHITAN SMALL SCRIPT CHARACTER-18B14;Lo;0;L;;;;;N;;;;;
+18B15;KHITAN SMALL SCRIPT CHARACTER-18B15;Lo;0;L;;;;;N;;;;;
+18B16;KHITAN SMALL SCRIPT CHARACTER-18B16;Lo;0;L;;;;;N;;;;;
+18B17;KHITAN SMALL SCRIPT CHARACTER-18B17;Lo;0;L;;;;;N;;;;;
+18B18;KHITAN SMALL SCRIPT CHARACTER-18B18;Lo;0;L;;;;;N;;;;;
+18B19;KHITAN SMALL SCRIPT CHARACTER-18B19;Lo;0;L;;;;;N;;;;;
+18B1A;KHITAN SMALL SCRIPT CHARACTER-18B1A;Lo;0;L;;;;;N;;;;;
+18B1B;KHITAN SMALL SCRIPT CHARACTER-18B1B;Lo;0;L;;;;;N;;;;;
+18B1C;KHITAN SMALL SCRIPT CHARACTER-18B1C;Lo;0;L;;;;;N;;;;;
+18B1D;KHITAN SMALL SCRIPT CHARACTER-18B1D;Lo;0;L;;;;;N;;;;;
+18B1E;KHITAN SMALL SCRIPT CHARACTER-18B1E;Lo;0;L;;;;;N;;;;;
+18B1F;KHITAN SMALL SCRIPT CHARACTER-18B1F;Lo;0;L;;;;;N;;;;;
+18B20;KHITAN SMALL SCRIPT CHARACTER-18B20;Lo;0;L;;;;;N;;;;;
+18B21;KHITAN SMALL SCRIPT CHARACTER-18B21;Lo;0;L;;;;;N;;;;;
+18B22;KHITAN SMALL SCRIPT CHARACTER-18B22;Lo;0;L;;;;;N;;;;;
+18B23;KHITAN SMALL SCRIPT CHARACTER-18B23;Lo;0;L;;;;;N;;;;;
+18B24;KHITAN SMALL SCRIPT CHARACTER-18B24;Lo;0;L;;;;;N;;;;;
+18B25;KHITAN SMALL SCRIPT CHARACTER-18B25;Lo;0;L;;;;;N;;;;;
+18B26;KHITAN SMALL SCRIPT CHARACTER-18B26;Lo;0;L;;;;;N;;;;;
+18B27;KHITAN SMALL SCRIPT CHARACTER-18B27;Lo;0;L;;;;;N;;;;;
+18B28;KHITAN SMALL SCRIPT CHARACTER-18B28;Lo;0;L;;;;;N;;;;;
+18B29;KHITAN SMALL SCRIPT CHARACTER-18B29;Lo;0;L;;;;;N;;;;;
+18B2A;KHITAN SMALL SCRIPT CHARACTER-18B2A;Lo;0;L;;;;;N;;;;;
+18B2B;KHITAN SMALL SCRIPT CHARACTER-18B2B;Lo;0;L;;;;;N;;;;;
+18B2C;KHITAN SMALL SCRIPT CHARACTER-18B2C;Lo;0;L;;;;;N;;;;;
+18B2D;KHITAN SMALL SCRIPT CHARACTER-18B2D;Lo;0;L;;;;;N;;;;;
+18B2E;KHITAN SMALL SCRIPT CHARACTER-18B2E;Lo;0;L;;;;;N;;;;;
+18B2F;KHITAN SMALL SCRIPT CHARACTER-18B2F;Lo;0;L;;;;;N;;;;;
+18B30;KHITAN SMALL SCRIPT CHARACTER-18B30;Lo;0;L;;;;;N;;;;;
+18B31;KHITAN SMALL SCRIPT CHARACTER-18B31;Lo;0;L;;;;;N;;;;;
+18B32;KHITAN SMALL SCRIPT CHARACTER-18B32;Lo;0;L;;;;;N;;;;;
+18B33;KHITAN SMALL SCRIPT CHARACTER-18B33;Lo;0;L;;;;;N;;;;;
+18B34;KHITAN SMALL SCRIPT CHARACTER-18B34;Lo;0;L;;;;;N;;;;;
+18B35;KHITAN SMALL SCRIPT CHARACTER-18B35;Lo;0;L;;;;;N;;;;;
+18B36;KHITAN SMALL SCRIPT CHARACTER-18B36;Lo;0;L;;;;;N;;;;;
+18B37;KHITAN SMALL SCRIPT CHARACTER-18B37;Lo;0;L;;;;;N;;;;;
+18B38;KHITAN SMALL SCRIPT CHARACTER-18B38;Lo;0;L;;;;;N;;;;;
+18B39;KHITAN SMALL SCRIPT CHARACTER-18B39;Lo;0;L;;;;;N;;;;;
+18B3A;KHITAN SMALL SCRIPT CHARACTER-18B3A;Lo;0;L;;;;;N;;;;;
+18B3B;KHITAN SMALL SCRIPT CHARACTER-18B3B;Lo;0;L;;;;;N;;;;;
+18B3C;KHITAN SMALL SCRIPT CHARACTER-18B3C;Lo;0;L;;;;;N;;;;;
+18B3D;KHITAN SMALL SCRIPT CHARACTER-18B3D;Lo;0;L;;;;;N;;;;;
+18B3E;KHITAN SMALL SCRIPT CHARACTER-18B3E;Lo;0;L;;;;;N;;;;;
+18B3F;KHITAN SMALL SCRIPT CHARACTER-18B3F;Lo;0;L;;;;;N;;;;;
+18B40;KHITAN SMALL SCRIPT CHARACTER-18B40;Lo;0;L;;;;;N;;;;;
+18B41;KHITAN SMALL SCRIPT CHARACTER-18B41;Lo;0;L;;;;;N;;;;;
+18B42;KHITAN SMALL SCRIPT CHARACTER-18B42;Lo;0;L;;;;;N;;;;;
+18B43;KHITAN SMALL SCRIPT CHARACTER-18B43;Lo;0;L;;;;;N;;;;;
+18B44;KHITAN SMALL SCRIPT CHARACTER-18B44;Lo;0;L;;;;;N;;;;;
+18B45;KHITAN SMALL SCRIPT CHARACTER-18B45;Lo;0;L;;;;;N;;;;;
+18B46;KHITAN SMALL SCRIPT CHARACTER-18B46;Lo;0;L;;;;;N;;;;;
+18B47;KHITAN SMALL SCRIPT CHARACTER-18B47;Lo;0;L;;;;;N;;;;;
+18B48;KHITAN SMALL SCRIPT CHARACTER-18B48;Lo;0;L;;;;;N;;;;;
+18B49;KHITAN SMALL SCRIPT CHARACTER-18B49;Lo;0;L;;;;;N;;;;;
+18B4A;KHITAN SMALL SCRIPT CHARACTER-18B4A;Lo;0;L;;;;;N;;;;;
+18B4B;KHITAN SMALL SCRIPT CHARACTER-18B4B;Lo;0;L;;;;;N;;;;;
+18B4C;KHITAN SMALL SCRIPT CHARACTER-18B4C;Lo;0;L;;;;;N;;;;;
+18B4D;KHITAN SMALL SCRIPT CHARACTER-18B4D;Lo;0;L;;;;;N;;;;;
+18B4E;KHITAN SMALL SCRIPT CHARACTER-18B4E;Lo;0;L;;;;;N;;;;;
+18B4F;KHITAN SMALL SCRIPT CHARACTER-18B4F;Lo;0;L;;;;;N;;;;;
+18B50;KHITAN SMALL SCRIPT CHARACTER-18B50;Lo;0;L;;;;;N;;;;;
+18B51;KHITAN SMALL SCRIPT CHARACTER-18B51;Lo;0;L;;;;;N;;;;;
+18B52;KHITAN SMALL SCRIPT CHARACTER-18B52;Lo;0;L;;;;;N;;;;;
+18B53;KHITAN SMALL SCRIPT CHARACTER-18B53;Lo;0;L;;;;;N;;;;;
+18B54;KHITAN SMALL SCRIPT CHARACTER-18B54;Lo;0;L;;;;;N;;;;;
+18B55;KHITAN SMALL SCRIPT CHARACTER-18B55;Lo;0;L;;;;;N;;;;;
+18B56;KHITAN SMALL SCRIPT CHARACTER-18B56;Lo;0;L;;;;;N;;;;;
+18B57;KHITAN SMALL SCRIPT CHARACTER-18B57;Lo;0;L;;;;;N;;;;;
+18B58;KHITAN SMALL SCRIPT CHARACTER-18B58;Lo;0;L;;;;;N;;;;;
+18B59;KHITAN SMALL SCRIPT CHARACTER-18B59;Lo;0;L;;;;;N;;;;;
+18B5A;KHITAN SMALL SCRIPT CHARACTER-18B5A;Lo;0;L;;;;;N;;;;;
+18B5B;KHITAN SMALL SCRIPT CHARACTER-18B5B;Lo;0;L;;;;;N;;;;;
+18B5C;KHITAN SMALL SCRIPT CHARACTER-18B5C;Lo;0;L;;;;;N;;;;;
+18B5D;KHITAN SMALL SCRIPT CHARACTER-18B5D;Lo;0;L;;;;;N;;;;;
+18B5E;KHITAN SMALL SCRIPT CHARACTER-18B5E;Lo;0;L;;;;;N;;;;;
+18B5F;KHITAN SMALL SCRIPT CHARACTER-18B5F;Lo;0;L;;;;;N;;;;;
+18B60;KHITAN SMALL SCRIPT CHARACTER-18B60;Lo;0;L;;;;;N;;;;;
+18B61;KHITAN SMALL SCRIPT CHARACTER-18B61;Lo;0;L;;;;;N;;;;;
+18B62;KHITAN SMALL SCRIPT CHARACTER-18B62;Lo;0;L;;;;;N;;;;;
+18B63;KHITAN SMALL SCRIPT CHARACTER-18B63;Lo;0;L;;;;;N;;;;;
+18B64;KHITAN SMALL SCRIPT CHARACTER-18B64;Lo;0;L;;;;;N;;;;;
+18B65;KHITAN SMALL SCRIPT CHARACTER-18B65;Lo;0;L;;;;;N;;;;;
+18B66;KHITAN SMALL SCRIPT CHARACTER-18B66;Lo;0;L;;;;;N;;;;;
+18B67;KHITAN SMALL SCRIPT CHARACTER-18B67;Lo;0;L;;;;;N;;;;;
+18B68;KHITAN SMALL SCRIPT CHARACTER-18B68;Lo;0;L;;;;;N;;;;;
+18B69;KHITAN SMALL SCRIPT CHARACTER-18B69;Lo;0;L;;;;;N;;;;;
+18B6A;KHITAN SMALL SCRIPT CHARACTER-18B6A;Lo;0;L;;;;;N;;;;;
+18B6B;KHITAN SMALL SCRIPT CHARACTER-18B6B;Lo;0;L;;;;;N;;;;;
+18B6C;KHITAN SMALL SCRIPT CHARACTER-18B6C;Lo;0;L;;;;;N;;;;;
+18B6D;KHITAN SMALL SCRIPT CHARACTER-18B6D;Lo;0;L;;;;;N;;;;;
+18B6E;KHITAN SMALL SCRIPT CHARACTER-18B6E;Lo;0;L;;;;;N;;;;;
+18B6F;KHITAN SMALL SCRIPT CHARACTER-18B6F;Lo;0;L;;;;;N;;;;;
+18B70;KHITAN SMALL SCRIPT CHARACTER-18B70;Lo;0;L;;;;;N;;;;;
+18B71;KHITAN SMALL SCRIPT CHARACTER-18B71;Lo;0;L;;;;;N;;;;;
+18B72;KHITAN SMALL SCRIPT CHARACTER-18B72;Lo;0;L;;;;;N;;;;;
+18B73;KHITAN SMALL SCRIPT CHARACTER-18B73;Lo;0;L;;;;;N;;;;;
+18B74;KHITAN SMALL SCRIPT CHARACTER-18B74;Lo;0;L;;;;;N;;;;;
+18B75;KHITAN SMALL SCRIPT CHARACTER-18B75;Lo;0;L;;;;;N;;;;;
+18B76;KHITAN SMALL SCRIPT CHARACTER-18B76;Lo;0;L;;;;;N;;;;;
+18B77;KHITAN SMALL SCRIPT CHARACTER-18B77;Lo;0;L;;;;;N;;;;;
+18B78;KHITAN SMALL SCRIPT CHARACTER-18B78;Lo;0;L;;;;;N;;;;;
+18B79;KHITAN SMALL SCRIPT CHARACTER-18B79;Lo;0;L;;;;;N;;;;;
+18B7A;KHITAN SMALL SCRIPT CHARACTER-18B7A;Lo;0;L;;;;;N;;;;;
+18B7B;KHITAN SMALL SCRIPT CHARACTER-18B7B;Lo;0;L;;;;;N;;;;;
+18B7C;KHITAN SMALL SCRIPT CHARACTER-18B7C;Lo;0;L;;;;;N;;;;;
+18B7D;KHITAN SMALL SCRIPT CHARACTER-18B7D;Lo;0;L;;;;;N;;;;;
+18B7E;KHITAN SMALL SCRIPT CHARACTER-18B7E;Lo;0;L;;;;;N;;;;;
+18B7F;KHITAN SMALL SCRIPT CHARACTER-18B7F;Lo;0;L;;;;;N;;;;;
+18B80;KHITAN SMALL SCRIPT CHARACTER-18B80;Lo;0;L;;;;;N;;;;;
+18B81;KHITAN SMALL SCRIPT CHARACTER-18B81;Lo;0;L;;;;;N;;;;;
+18B82;KHITAN SMALL SCRIPT CHARACTER-18B82;Lo;0;L;;;;;N;;;;;
+18B83;KHITAN SMALL SCRIPT CHARACTER-18B83;Lo;0;L;;;;;N;;;;;
+18B84;KHITAN SMALL SCRIPT CHARACTER-18B84;Lo;0;L;;;;;N;;;;;
+18B85;KHITAN SMALL SCRIPT CHARACTER-18B85;Lo;0;L;;;;;N;;;;;
+18B86;KHITAN SMALL SCRIPT CHARACTER-18B86;Lo;0;L;;;;;N;;;;;
+18B87;KHITAN SMALL SCRIPT CHARACTER-18B87;Lo;0;L;;;;;N;;;;;
+18B88;KHITAN SMALL SCRIPT CHARACTER-18B88;Lo;0;L;;;;;N;;;;;
+18B89;KHITAN SMALL SCRIPT CHARACTER-18B89;Lo;0;L;;;;;N;;;;;
+18B8A;KHITAN SMALL SCRIPT CHARACTER-18B8A;Lo;0;L;;;;;N;;;;;
+18B8B;KHITAN SMALL SCRIPT CHARACTER-18B8B;Lo;0;L;;;;;N;;;;;
+18B8C;KHITAN SMALL SCRIPT CHARACTER-18B8C;Lo;0;L;;;;;N;;;;;
+18B8D;KHITAN SMALL SCRIPT CHARACTER-18B8D;Lo;0;L;;;;;N;;;;;
+18B8E;KHITAN SMALL SCRIPT CHARACTER-18B8E;Lo;0;L;;;;;N;;;;;
+18B8F;KHITAN SMALL SCRIPT CHARACTER-18B8F;Lo;0;L;;;;;N;;;;;
+18B90;KHITAN SMALL SCRIPT CHARACTER-18B90;Lo;0;L;;;;;N;;;;;
+18B91;KHITAN SMALL SCRIPT CHARACTER-18B91;Lo;0;L;;;;;N;;;;;
+18B92;KHITAN SMALL SCRIPT CHARACTER-18B92;Lo;0;L;;;;;N;;;;;
+18B93;KHITAN SMALL SCRIPT CHARACTER-18B93;Lo;0;L;;;;;N;;;;;
+18B94;KHITAN SMALL SCRIPT CHARACTER-18B94;Lo;0;L;;;;;N;;;;;
+18B95;KHITAN SMALL SCRIPT CHARACTER-18B95;Lo;0;L;;;;;N;;;;;
+18B96;KHITAN SMALL SCRIPT CHARACTER-18B96;Lo;0;L;;;;;N;;;;;
+18B97;KHITAN SMALL SCRIPT CHARACTER-18B97;Lo;0;L;;;;;N;;;;;
+18B98;KHITAN SMALL SCRIPT CHARACTER-18B98;Lo;0;L;;;;;N;;;;;
+18B99;KHITAN SMALL SCRIPT CHARACTER-18B99;Lo;0;L;;;;;N;;;;;
+18B9A;KHITAN SMALL SCRIPT CHARACTER-18B9A;Lo;0;L;;;;;N;;;;;
+18B9B;KHITAN SMALL SCRIPT CHARACTER-18B9B;Lo;0;L;;;;;N;;;;;
+18B9C;KHITAN SMALL SCRIPT CHARACTER-18B9C;Lo;0;L;;;;;N;;;;;
+18B9D;KHITAN SMALL SCRIPT CHARACTER-18B9D;Lo;0;L;;;;;N;;;;;
+18B9E;KHITAN SMALL SCRIPT CHARACTER-18B9E;Lo;0;L;;;;;N;;;;;
+18B9F;KHITAN SMALL SCRIPT CHARACTER-18B9F;Lo;0;L;;;;;N;;;;;
+18BA0;KHITAN SMALL SCRIPT CHARACTER-18BA0;Lo;0;L;;;;;N;;;;;
+18BA1;KHITAN SMALL SCRIPT CHARACTER-18BA1;Lo;0;L;;;;;N;;;;;
+18BA2;KHITAN SMALL SCRIPT CHARACTER-18BA2;Lo;0;L;;;;;N;;;;;
+18BA3;KHITAN SMALL SCRIPT CHARACTER-18BA3;Lo;0;L;;;;;N;;;;;
+18BA4;KHITAN SMALL SCRIPT CHARACTER-18BA4;Lo;0;L;;;;;N;;;;;
+18BA5;KHITAN SMALL SCRIPT CHARACTER-18BA5;Lo;0;L;;;;;N;;;;;
+18BA6;KHITAN SMALL SCRIPT CHARACTER-18BA6;Lo;0;L;;;;;N;;;;;
+18BA7;KHITAN SMALL SCRIPT CHARACTER-18BA7;Lo;0;L;;;;;N;;;;;
+18BA8;KHITAN SMALL SCRIPT CHARACTER-18BA8;Lo;0;L;;;;;N;;;;;
+18BA9;KHITAN SMALL SCRIPT CHARACTER-18BA9;Lo;0;L;;;;;N;;;;;
+18BAA;KHITAN SMALL SCRIPT CHARACTER-18BAA;Lo;0;L;;;;;N;;;;;
+18BAB;KHITAN SMALL SCRIPT CHARACTER-18BAB;Lo;0;L;;;;;N;;;;;
+18BAC;KHITAN SMALL SCRIPT CHARACTER-18BAC;Lo;0;L;;;;;N;;;;;
+18BAD;KHITAN SMALL SCRIPT CHARACTER-18BAD;Lo;0;L;;;;;N;;;;;
+18BAE;KHITAN SMALL SCRIPT CHARACTER-18BAE;Lo;0;L;;;;;N;;;;;
+18BAF;KHITAN SMALL SCRIPT CHARACTER-18BAF;Lo;0;L;;;;;N;;;;;
+18BB0;KHITAN SMALL SCRIPT CHARACTER-18BB0;Lo;0;L;;;;;N;;;;;
+18BB1;KHITAN SMALL SCRIPT CHARACTER-18BB1;Lo;0;L;;;;;N;;;;;
+18BB2;KHITAN SMALL SCRIPT CHARACTER-18BB2;Lo;0;L;;;;;N;;;;;
+18BB3;KHITAN SMALL SCRIPT CHARACTER-18BB3;Lo;0;L;;;;;N;;;;;
+18BB4;KHITAN SMALL SCRIPT CHARACTER-18BB4;Lo;0;L;;;;;N;;;;;
+18BB5;KHITAN SMALL SCRIPT CHARACTER-18BB5;Lo;0;L;;;;;N;;;;;
+18BB6;KHITAN SMALL SCRIPT CHARACTER-18BB6;Lo;0;L;;;;;N;;;;;
+18BB7;KHITAN SMALL SCRIPT CHARACTER-18BB7;Lo;0;L;;;;;N;;;;;
+18BB8;KHITAN SMALL SCRIPT CHARACTER-18BB8;Lo;0;L;;;;;N;;;;;
+18BB9;KHITAN SMALL SCRIPT CHARACTER-18BB9;Lo;0;L;;;;;N;;;;;
+18BBA;KHITAN SMALL SCRIPT CHARACTER-18BBA;Lo;0;L;;;;;N;;;;;
+18BBB;KHITAN SMALL SCRIPT CHARACTER-18BBB;Lo;0;L;;;;;N;;;;;
+18BBC;KHITAN SMALL SCRIPT CHARACTER-18BBC;Lo;0;L;;;;;N;;;;;
+18BBD;KHITAN SMALL SCRIPT CHARACTER-18BBD;Lo;0;L;;;;;N;;;;;
+18BBE;KHITAN SMALL SCRIPT CHARACTER-18BBE;Lo;0;L;;;;;N;;;;;
+18BBF;KHITAN SMALL SCRIPT CHARACTER-18BBF;Lo;0;L;;;;;N;;;;;
+18BC0;KHITAN SMALL SCRIPT CHARACTER-18BC0;Lo;0;L;;;;;N;;;;;
+18BC1;KHITAN SMALL SCRIPT CHARACTER-18BC1;Lo;0;L;;;;;N;;;;;
+18BC2;KHITAN SMALL SCRIPT CHARACTER-18BC2;Lo;0;L;;;;;N;;;;;
+18BC3;KHITAN SMALL SCRIPT CHARACTER-18BC3;Lo;0;L;;;;;N;;;;;
+18BC4;KHITAN SMALL SCRIPT CHARACTER-18BC4;Lo;0;L;;;;;N;;;;;
+18BC5;KHITAN SMALL SCRIPT CHARACTER-18BC5;Lo;0;L;;;;;N;;;;;
+18BC6;KHITAN SMALL SCRIPT CHARACTER-18BC6;Lo;0;L;;;;;N;;;;;
+18BC7;KHITAN SMALL SCRIPT CHARACTER-18BC7;Lo;0;L;;;;;N;;;;;
+18BC8;KHITAN SMALL SCRIPT CHARACTER-18BC8;Lo;0;L;;;;;N;;;;;
+18BC9;KHITAN SMALL SCRIPT CHARACTER-18BC9;Lo;0;L;;;;;N;;;;;
+18BCA;KHITAN SMALL SCRIPT CHARACTER-18BCA;Lo;0;L;;;;;N;;;;;
+18BCB;KHITAN SMALL SCRIPT CHARACTER-18BCB;Lo;0;L;;;;;N;;;;;
+18BCC;KHITAN SMALL SCRIPT CHARACTER-18BCC;Lo;0;L;;;;;N;;;;;
+18BCD;KHITAN SMALL SCRIPT CHARACTER-18BCD;Lo;0;L;;;;;N;;;;;
+18BCE;KHITAN SMALL SCRIPT CHARACTER-18BCE;Lo;0;L;;;;;N;;;;;
+18BCF;KHITAN SMALL SCRIPT CHARACTER-18BCF;Lo;0;L;;;;;N;;;;;
+18BD0;KHITAN SMALL SCRIPT CHARACTER-18BD0;Lo;0;L;;;;;N;;;;;
+18BD1;KHITAN SMALL SCRIPT CHARACTER-18BD1;Lo;0;L;;;;;N;;;;;
+18BD2;KHITAN SMALL SCRIPT CHARACTER-18BD2;Lo;0;L;;;;;N;;;;;
+18BD3;KHITAN SMALL SCRIPT CHARACTER-18BD3;Lo;0;L;;;;;N;;;;;
+18BD4;KHITAN SMALL SCRIPT CHARACTER-18BD4;Lo;0;L;;;;;N;;;;;
+18BD5;KHITAN SMALL SCRIPT CHARACTER-18BD5;Lo;0;L;;;;;N;;;;;
+18BD6;KHITAN SMALL SCRIPT CHARACTER-18BD6;Lo;0;L;;;;;N;;;;;
+18BD7;KHITAN SMALL SCRIPT CHARACTER-18BD7;Lo;0;L;;;;;N;;;;;
+18BD8;KHITAN SMALL SCRIPT CHARACTER-18BD8;Lo;0;L;;;;;N;;;;;
+18BD9;KHITAN SMALL SCRIPT CHARACTER-18BD9;Lo;0;L;;;;;N;;;;;
+18BDA;KHITAN SMALL SCRIPT CHARACTER-18BDA;Lo;0;L;;;;;N;;;;;
+18BDB;KHITAN SMALL SCRIPT CHARACTER-18BDB;Lo;0;L;;;;;N;;;;;
+18BDC;KHITAN SMALL SCRIPT CHARACTER-18BDC;Lo;0;L;;;;;N;;;;;
+18BDD;KHITAN SMALL SCRIPT CHARACTER-18BDD;Lo;0;L;;;;;N;;;;;
+18BDE;KHITAN SMALL SCRIPT CHARACTER-18BDE;Lo;0;L;;;;;N;;;;;
+18BDF;KHITAN SMALL SCRIPT CHARACTER-18BDF;Lo;0;L;;;;;N;;;;;
+18BE0;KHITAN SMALL SCRIPT CHARACTER-18BE0;Lo;0;L;;;;;N;;;;;
+18BE1;KHITAN SMALL SCRIPT CHARACTER-18BE1;Lo;0;L;;;;;N;;;;;
+18BE2;KHITAN SMALL SCRIPT CHARACTER-18BE2;Lo;0;L;;;;;N;;;;;
+18BE3;KHITAN SMALL SCRIPT CHARACTER-18BE3;Lo;0;L;;;;;N;;;;;
+18BE4;KHITAN SMALL SCRIPT CHARACTER-18BE4;Lo;0;L;;;;;N;;;;;
+18BE5;KHITAN SMALL SCRIPT CHARACTER-18BE5;Lo;0;L;;;;;N;;;;;
+18BE6;KHITAN SMALL SCRIPT CHARACTER-18BE6;Lo;0;L;;;;;N;;;;;
+18BE7;KHITAN SMALL SCRIPT CHARACTER-18BE7;Lo;0;L;;;;;N;;;;;
+18BE8;KHITAN SMALL SCRIPT CHARACTER-18BE8;Lo;0;L;;;;;N;;;;;
+18BE9;KHITAN SMALL SCRIPT CHARACTER-18BE9;Lo;0;L;;;;;N;;;;;
+18BEA;KHITAN SMALL SCRIPT CHARACTER-18BEA;Lo;0;L;;;;;N;;;;;
+18BEB;KHITAN SMALL SCRIPT CHARACTER-18BEB;Lo;0;L;;;;;N;;;;;
+18BEC;KHITAN SMALL SCRIPT CHARACTER-18BEC;Lo;0;L;;;;;N;;;;;
+18BED;KHITAN SMALL SCRIPT CHARACTER-18BED;Lo;0;L;;;;;N;;;;;
+18BEE;KHITAN SMALL SCRIPT CHARACTER-18BEE;Lo;0;L;;;;;N;;;;;
+18BEF;KHITAN SMALL SCRIPT CHARACTER-18BEF;Lo;0;L;;;;;N;;;;;
+18BF0;KHITAN SMALL SCRIPT CHARACTER-18BF0;Lo;0;L;;;;;N;;;;;
+18BF1;KHITAN SMALL SCRIPT CHARACTER-18BF1;Lo;0;L;;;;;N;;;;;
+18BF2;KHITAN SMALL SCRIPT CHARACTER-18BF2;Lo;0;L;;;;;N;;;;;
+18BF3;KHITAN SMALL SCRIPT CHARACTER-18BF3;Lo;0;L;;;;;N;;;;;
+18BF4;KHITAN SMALL SCRIPT CHARACTER-18BF4;Lo;0;L;;;;;N;;;;;
+18BF5;KHITAN SMALL SCRIPT CHARACTER-18BF5;Lo;0;L;;;;;N;;;;;
+18BF6;KHITAN SMALL SCRIPT CHARACTER-18BF6;Lo;0;L;;;;;N;;;;;
+18BF7;KHITAN SMALL SCRIPT CHARACTER-18BF7;Lo;0;L;;;;;N;;;;;
+18BF8;KHITAN SMALL SCRIPT CHARACTER-18BF8;Lo;0;L;;;;;N;;;;;
+18BF9;KHITAN SMALL SCRIPT CHARACTER-18BF9;Lo;0;L;;;;;N;;;;;
+18BFA;KHITAN SMALL SCRIPT CHARACTER-18BFA;Lo;0;L;;;;;N;;;;;
+18BFB;KHITAN SMALL SCRIPT CHARACTER-18BFB;Lo;0;L;;;;;N;;;;;
+18BFC;KHITAN SMALL SCRIPT CHARACTER-18BFC;Lo;0;L;;;;;N;;;;;
+18BFD;KHITAN SMALL SCRIPT CHARACTER-18BFD;Lo;0;L;;;;;N;;;;;
+18BFE;KHITAN SMALL SCRIPT CHARACTER-18BFE;Lo;0;L;;;;;N;;;;;
+18BFF;KHITAN SMALL SCRIPT CHARACTER-18BFF;Lo;0;L;;;;;N;;;;;
+18C00;KHITAN SMALL SCRIPT CHARACTER-18C00;Lo;0;L;;;;;N;;;;;
+18C01;KHITAN SMALL SCRIPT CHARACTER-18C01;Lo;0;L;;;;;N;;;;;
+18C02;KHITAN SMALL SCRIPT CHARACTER-18C02;Lo;0;L;;;;;N;;;;;
+18C03;KHITAN SMALL SCRIPT CHARACTER-18C03;Lo;0;L;;;;;N;;;;;
+18C04;KHITAN SMALL SCRIPT CHARACTER-18C04;Lo;0;L;;;;;N;;;;;
+18C05;KHITAN SMALL SCRIPT CHARACTER-18C05;Lo;0;L;;;;;N;;;;;
+18C06;KHITAN SMALL SCRIPT CHARACTER-18C06;Lo;0;L;;;;;N;;;;;
+18C07;KHITAN SMALL SCRIPT CHARACTER-18C07;Lo;0;L;;;;;N;;;;;
+18C08;KHITAN SMALL SCRIPT CHARACTER-18C08;Lo;0;L;;;;;N;;;;;
+18C09;KHITAN SMALL SCRIPT CHARACTER-18C09;Lo;0;L;;;;;N;;;;;
+18C0A;KHITAN SMALL SCRIPT CHARACTER-18C0A;Lo;0;L;;;;;N;;;;;
+18C0B;KHITAN SMALL SCRIPT CHARACTER-18C0B;Lo;0;L;;;;;N;;;;;
+18C0C;KHITAN SMALL SCRIPT CHARACTER-18C0C;Lo;0;L;;;;;N;;;;;
+18C0D;KHITAN SMALL SCRIPT CHARACTER-18C0D;Lo;0;L;;;;;N;;;;;
+18C0E;KHITAN SMALL SCRIPT CHARACTER-18C0E;Lo;0;L;;;;;N;;;;;
+18C0F;KHITAN SMALL SCRIPT CHARACTER-18C0F;Lo;0;L;;;;;N;;;;;
+18C10;KHITAN SMALL SCRIPT CHARACTER-18C10;Lo;0;L;;;;;N;;;;;
+18C11;KHITAN SMALL SCRIPT CHARACTER-18C11;Lo;0;L;;;;;N;;;;;
+18C12;KHITAN SMALL SCRIPT CHARACTER-18C12;Lo;0;L;;;;;N;;;;;
+18C13;KHITAN SMALL SCRIPT CHARACTER-18C13;Lo;0;L;;;;;N;;;;;
+18C14;KHITAN SMALL SCRIPT CHARACTER-18C14;Lo;0;L;;;;;N;;;;;
+18C15;KHITAN SMALL SCRIPT CHARACTER-18C15;Lo;0;L;;;;;N;;;;;
+18C16;KHITAN SMALL SCRIPT CHARACTER-18C16;Lo;0;L;;;;;N;;;;;
+18C17;KHITAN SMALL SCRIPT CHARACTER-18C17;Lo;0;L;;;;;N;;;;;
+18C18;KHITAN SMALL SCRIPT CHARACTER-18C18;Lo;0;L;;;;;N;;;;;
+18C19;KHITAN SMALL SCRIPT CHARACTER-18C19;Lo;0;L;;;;;N;;;;;
+18C1A;KHITAN SMALL SCRIPT CHARACTER-18C1A;Lo;0;L;;;;;N;;;;;
+18C1B;KHITAN SMALL SCRIPT CHARACTER-18C1B;Lo;0;L;;;;;N;;;;;
+18C1C;KHITAN SMALL SCRIPT CHARACTER-18C1C;Lo;0;L;;;;;N;;;;;
+18C1D;KHITAN SMALL SCRIPT CHARACTER-18C1D;Lo;0;L;;;;;N;;;;;
+18C1E;KHITAN SMALL SCRIPT CHARACTER-18C1E;Lo;0;L;;;;;N;;;;;
+18C1F;KHITAN SMALL SCRIPT CHARACTER-18C1F;Lo;0;L;;;;;N;;;;;
+18C20;KHITAN SMALL SCRIPT CHARACTER-18C20;Lo;0;L;;;;;N;;;;;
+18C21;KHITAN SMALL SCRIPT CHARACTER-18C21;Lo;0;L;;;;;N;;;;;
+18C22;KHITAN SMALL SCRIPT CHARACTER-18C22;Lo;0;L;;;;;N;;;;;
+18C23;KHITAN SMALL SCRIPT CHARACTER-18C23;Lo;0;L;;;;;N;;;;;
+18C24;KHITAN SMALL SCRIPT CHARACTER-18C24;Lo;0;L;;;;;N;;;;;
+18C25;KHITAN SMALL SCRIPT CHARACTER-18C25;Lo;0;L;;;;;N;;;;;
+18C26;KHITAN SMALL SCRIPT CHARACTER-18C26;Lo;0;L;;;;;N;;;;;
+18C27;KHITAN SMALL SCRIPT CHARACTER-18C27;Lo;0;L;;;;;N;;;;;
+18C28;KHITAN SMALL SCRIPT CHARACTER-18C28;Lo;0;L;;;;;N;;;;;
+18C29;KHITAN SMALL SCRIPT CHARACTER-18C29;Lo;0;L;;;;;N;;;;;
+18C2A;KHITAN SMALL SCRIPT CHARACTER-18C2A;Lo;0;L;;;;;N;;;;;
+18C2B;KHITAN SMALL SCRIPT CHARACTER-18C2B;Lo;0;L;;;;;N;;;;;
+18C2C;KHITAN SMALL SCRIPT CHARACTER-18C2C;Lo;0;L;;;;;N;;;;;
+18C2D;KHITAN SMALL SCRIPT CHARACTER-18C2D;Lo;0;L;;;;;N;;;;;
+18C2E;KHITAN SMALL SCRIPT CHARACTER-18C2E;Lo;0;L;;;;;N;;;;;
+18C2F;KHITAN SMALL SCRIPT CHARACTER-18C2F;Lo;0;L;;;;;N;;;;;
+18C30;KHITAN SMALL SCRIPT CHARACTER-18C30;Lo;0;L;;;;;N;;;;;
+18C31;KHITAN SMALL SCRIPT CHARACTER-18C31;Lo;0;L;;;;;N;;;;;
+18C32;KHITAN SMALL SCRIPT CHARACTER-18C32;Lo;0;L;;;;;N;;;;;
+18C33;KHITAN SMALL SCRIPT CHARACTER-18C33;Lo;0;L;;;;;N;;;;;
+18C34;KHITAN SMALL SCRIPT CHARACTER-18C34;Lo;0;L;;;;;N;;;;;
+18C35;KHITAN SMALL SCRIPT CHARACTER-18C35;Lo;0;L;;;;;N;;;;;
+18C36;KHITAN SMALL SCRIPT CHARACTER-18C36;Lo;0;L;;;;;N;;;;;
+18C37;KHITAN SMALL SCRIPT CHARACTER-18C37;Lo;0;L;;;;;N;;;;;
+18C38;KHITAN SMALL SCRIPT CHARACTER-18C38;Lo;0;L;;;;;N;;;;;
+18C39;KHITAN SMALL SCRIPT CHARACTER-18C39;Lo;0;L;;;;;N;;;;;
+18C3A;KHITAN SMALL SCRIPT CHARACTER-18C3A;Lo;0;L;;;;;N;;;;;
+18C3B;KHITAN SMALL SCRIPT CHARACTER-18C3B;Lo;0;L;;;;;N;;;;;
+18C3C;KHITAN SMALL SCRIPT CHARACTER-18C3C;Lo;0;L;;;;;N;;;;;
+18C3D;KHITAN SMALL SCRIPT CHARACTER-18C3D;Lo;0;L;;;;;N;;;;;
+18C3E;KHITAN SMALL SCRIPT CHARACTER-18C3E;Lo;0;L;;;;;N;;;;;
+18C3F;KHITAN SMALL SCRIPT CHARACTER-18C3F;Lo;0;L;;;;;N;;;;;
+18C40;KHITAN SMALL SCRIPT CHARACTER-18C40;Lo;0;L;;;;;N;;;;;
+18C41;KHITAN SMALL SCRIPT CHARACTER-18C41;Lo;0;L;;;;;N;;;;;
+18C42;KHITAN SMALL SCRIPT CHARACTER-18C42;Lo;0;L;;;;;N;;;;;
+18C43;KHITAN SMALL SCRIPT CHARACTER-18C43;Lo;0;L;;;;;N;;;;;
+18C44;KHITAN SMALL SCRIPT CHARACTER-18C44;Lo;0;L;;;;;N;;;;;
+18C45;KHITAN SMALL SCRIPT CHARACTER-18C45;Lo;0;L;;;;;N;;;;;
+18C46;KHITAN SMALL SCRIPT CHARACTER-18C46;Lo;0;L;;;;;N;;;;;
+18C47;KHITAN SMALL SCRIPT CHARACTER-18C47;Lo;0;L;;;;;N;;;;;
+18C48;KHITAN SMALL SCRIPT CHARACTER-18C48;Lo;0;L;;;;;N;;;;;
+18C49;KHITAN SMALL SCRIPT CHARACTER-18C49;Lo;0;L;;;;;N;;;;;
+18C4A;KHITAN SMALL SCRIPT CHARACTER-18C4A;Lo;0;L;;;;;N;;;;;
+18C4B;KHITAN SMALL SCRIPT CHARACTER-18C4B;Lo;0;L;;;;;N;;;;;
+18C4C;KHITAN SMALL SCRIPT CHARACTER-18C4C;Lo;0;L;;;;;N;;;;;
+18C4D;KHITAN SMALL SCRIPT CHARACTER-18C4D;Lo;0;L;;;;;N;;;;;
+18C4E;KHITAN SMALL SCRIPT CHARACTER-18C4E;Lo;0;L;;;;;N;;;;;
+18C4F;KHITAN SMALL SCRIPT CHARACTER-18C4F;Lo;0;L;;;;;N;;;;;
+18C50;KHITAN SMALL SCRIPT CHARACTER-18C50;Lo;0;L;;;;;N;;;;;
+18C51;KHITAN SMALL SCRIPT CHARACTER-18C51;Lo;0;L;;;;;N;;;;;
+18C52;KHITAN SMALL SCRIPT CHARACTER-18C52;Lo;0;L;;;;;N;;;;;
+18C53;KHITAN SMALL SCRIPT CHARACTER-18C53;Lo;0;L;;;;;N;;;;;
+18C54;KHITAN SMALL SCRIPT CHARACTER-18C54;Lo;0;L;;;;;N;;;;;
+18C55;KHITAN SMALL SCRIPT CHARACTER-18C55;Lo;0;L;;;;;N;;;;;
+18C56;KHITAN SMALL SCRIPT CHARACTER-18C56;Lo;0;L;;;;;N;;;;;
+18C57;KHITAN SMALL SCRIPT CHARACTER-18C57;Lo;0;L;;;;;N;;;;;
+18C58;KHITAN SMALL SCRIPT CHARACTER-18C58;Lo;0;L;;;;;N;;;;;
+18C59;KHITAN SMALL SCRIPT CHARACTER-18C59;Lo;0;L;;;;;N;;;;;
+18C5A;KHITAN SMALL SCRIPT CHARACTER-18C5A;Lo;0;L;;;;;N;;;;;
+18C5B;KHITAN SMALL SCRIPT CHARACTER-18C5B;Lo;0;L;;;;;N;;;;;
+18C5C;KHITAN SMALL SCRIPT CHARACTER-18C5C;Lo;0;L;;;;;N;;;;;
+18C5D;KHITAN SMALL SCRIPT CHARACTER-18C5D;Lo;0;L;;;;;N;;;;;
+18C5E;KHITAN SMALL SCRIPT CHARACTER-18C5E;Lo;0;L;;;;;N;;;;;
+18C5F;KHITAN SMALL SCRIPT CHARACTER-18C5F;Lo;0;L;;;;;N;;;;;
+18C60;KHITAN SMALL SCRIPT CHARACTER-18C60;Lo;0;L;;;;;N;;;;;
+18C61;KHITAN SMALL SCRIPT CHARACTER-18C61;Lo;0;L;;;;;N;;;;;
+18C62;KHITAN SMALL SCRIPT CHARACTER-18C62;Lo;0;L;;;;;N;;;;;
+18C63;KHITAN SMALL SCRIPT CHARACTER-18C63;Lo;0;L;;;;;N;;;;;
+18C64;KHITAN SMALL SCRIPT CHARACTER-18C64;Lo;0;L;;;;;N;;;;;
+18C65;KHITAN SMALL SCRIPT CHARACTER-18C65;Lo;0;L;;;;;N;;;;;
+18C66;KHITAN SMALL SCRIPT CHARACTER-18C66;Lo;0;L;;;;;N;;;;;
+18C67;KHITAN SMALL SCRIPT CHARACTER-18C67;Lo;0;L;;;;;N;;;;;
+18C68;KHITAN SMALL SCRIPT CHARACTER-18C68;Lo;0;L;;;;;N;;;;;
+18C69;KHITAN SMALL SCRIPT CHARACTER-18C69;Lo;0;L;;;;;N;;;;;
+18C6A;KHITAN SMALL SCRIPT CHARACTER-18C6A;Lo;0;L;;;;;N;;;;;
+18C6B;KHITAN SMALL SCRIPT CHARACTER-18C6B;Lo;0;L;;;;;N;;;;;
+18C6C;KHITAN SMALL SCRIPT CHARACTER-18C6C;Lo;0;L;;;;;N;;;;;
+18C6D;KHITAN SMALL SCRIPT CHARACTER-18C6D;Lo;0;L;;;;;N;;;;;
+18C6E;KHITAN SMALL SCRIPT CHARACTER-18C6E;Lo;0;L;;;;;N;;;;;
+18C6F;KHITAN SMALL SCRIPT CHARACTER-18C6F;Lo;0;L;;;;;N;;;;;
+18C70;KHITAN SMALL SCRIPT CHARACTER-18C70;Lo;0;L;;;;;N;;;;;
+18C71;KHITAN SMALL SCRIPT CHARACTER-18C71;Lo;0;L;;;;;N;;;;;
+18C72;KHITAN SMALL SCRIPT CHARACTER-18C72;Lo;0;L;;;;;N;;;;;
+18C73;KHITAN SMALL SCRIPT CHARACTER-18C73;Lo;0;L;;;;;N;;;;;
+18C74;KHITAN SMALL SCRIPT CHARACTER-18C74;Lo;0;L;;;;;N;;;;;
+18C75;KHITAN SMALL SCRIPT CHARACTER-18C75;Lo;0;L;;;;;N;;;;;
+18C76;KHITAN SMALL SCRIPT CHARACTER-18C76;Lo;0;L;;;;;N;;;;;
+18C77;KHITAN SMALL SCRIPT CHARACTER-18C77;Lo;0;L;;;;;N;;;;;
+18C78;KHITAN SMALL SCRIPT CHARACTER-18C78;Lo;0;L;;;;;N;;;;;
+18C79;KHITAN SMALL SCRIPT CHARACTER-18C79;Lo;0;L;;;;;N;;;;;
+18C7A;KHITAN SMALL SCRIPT CHARACTER-18C7A;Lo;0;L;;;;;N;;;;;
+18C7B;KHITAN SMALL SCRIPT CHARACTER-18C7B;Lo;0;L;;;;;N;;;;;
+18C7C;KHITAN SMALL SCRIPT CHARACTER-18C7C;Lo;0;L;;;;;N;;;;;
+18C7D;KHITAN SMALL SCRIPT CHARACTER-18C7D;Lo;0;L;;;;;N;;;;;
+18C7E;KHITAN SMALL SCRIPT CHARACTER-18C7E;Lo;0;L;;;;;N;;;;;
+18C7F;KHITAN SMALL SCRIPT CHARACTER-18C7F;Lo;0;L;;;;;N;;;;;
+18C80;KHITAN SMALL SCRIPT CHARACTER-18C80;Lo;0;L;;;;;N;;;;;
+18C81;KHITAN SMALL SCRIPT CHARACTER-18C81;Lo;0;L;;;;;N;;;;;
+18C82;KHITAN SMALL SCRIPT CHARACTER-18C82;Lo;0;L;;;;;N;;;;;
+18C83;KHITAN SMALL SCRIPT CHARACTER-18C83;Lo;0;L;;;;;N;;;;;
+18C84;KHITAN SMALL SCRIPT CHARACTER-18C84;Lo;0;L;;;;;N;;;;;
+18C85;KHITAN SMALL SCRIPT CHARACTER-18C85;Lo;0;L;;;;;N;;;;;
+18C86;KHITAN SMALL SCRIPT CHARACTER-18C86;Lo;0;L;;;;;N;;;;;
+18C87;KHITAN SMALL SCRIPT CHARACTER-18C87;Lo;0;L;;;;;N;;;;;
+18C88;KHITAN SMALL SCRIPT CHARACTER-18C88;Lo;0;L;;;;;N;;;;;
+18C89;KHITAN SMALL SCRIPT CHARACTER-18C89;Lo;0;L;;;;;N;;;;;
+18C8A;KHITAN SMALL SCRIPT CHARACTER-18C8A;Lo;0;L;;;;;N;;;;;
+18C8B;KHITAN SMALL SCRIPT CHARACTER-18C8B;Lo;0;L;;;;;N;;;;;
+18C8C;KHITAN SMALL SCRIPT CHARACTER-18C8C;Lo;0;L;;;;;N;;;;;
+18C8D;KHITAN SMALL SCRIPT CHARACTER-18C8D;Lo;0;L;;;;;N;;;;;
+18C8E;KHITAN SMALL SCRIPT CHARACTER-18C8E;Lo;0;L;;;;;N;;;;;
+18C8F;KHITAN SMALL SCRIPT CHARACTER-18C8F;Lo;0;L;;;;;N;;;;;
+18C90;KHITAN SMALL SCRIPT CHARACTER-18C90;Lo;0;L;;;;;N;;;;;
+18C91;KHITAN SMALL SCRIPT CHARACTER-18C91;Lo;0;L;;;;;N;;;;;
+18C92;KHITAN SMALL SCRIPT CHARACTER-18C92;Lo;0;L;;;;;N;;;;;
+18C93;KHITAN SMALL SCRIPT CHARACTER-18C93;Lo;0;L;;;;;N;;;;;
+18C94;KHITAN SMALL SCRIPT CHARACTER-18C94;Lo;0;L;;;;;N;;;;;
+18C95;KHITAN SMALL SCRIPT CHARACTER-18C95;Lo;0;L;;;;;N;;;;;
+18C96;KHITAN SMALL SCRIPT CHARACTER-18C96;Lo;0;L;;;;;N;;;;;
+18C97;KHITAN SMALL SCRIPT CHARACTER-18C97;Lo;0;L;;;;;N;;;;;
+18C98;KHITAN SMALL SCRIPT CHARACTER-18C98;Lo;0;L;;;;;N;;;;;
+18C99;KHITAN SMALL SCRIPT CHARACTER-18C99;Lo;0;L;;;;;N;;;;;
+18C9A;KHITAN SMALL SCRIPT CHARACTER-18C9A;Lo;0;L;;;;;N;;;;;
+18C9B;KHITAN SMALL SCRIPT CHARACTER-18C9B;Lo;0;L;;;;;N;;;;;
+18C9C;KHITAN SMALL SCRIPT CHARACTER-18C9C;Lo;0;L;;;;;N;;;;;
+18C9D;KHITAN SMALL SCRIPT CHARACTER-18C9D;Lo;0;L;;;;;N;;;;;
+18C9E;KHITAN SMALL SCRIPT CHARACTER-18C9E;Lo;0;L;;;;;N;;;;;
+18C9F;KHITAN SMALL SCRIPT CHARACTER-18C9F;Lo;0;L;;;;;N;;;;;
+18CA0;KHITAN SMALL SCRIPT CHARACTER-18CA0;Lo;0;L;;;;;N;;;;;
+18CA1;KHITAN SMALL SCRIPT CHARACTER-18CA1;Lo;0;L;;;;;N;;;;;
+18CA2;KHITAN SMALL SCRIPT CHARACTER-18CA2;Lo;0;L;;;;;N;;;;;
+18CA3;KHITAN SMALL SCRIPT CHARACTER-18CA3;Lo;0;L;;;;;N;;;;;
+18CA4;KHITAN SMALL SCRIPT CHARACTER-18CA4;Lo;0;L;;;;;N;;;;;
+18CA5;KHITAN SMALL SCRIPT CHARACTER-18CA5;Lo;0;L;;;;;N;;;;;
+18CA6;KHITAN SMALL SCRIPT CHARACTER-18CA6;Lo;0;L;;;;;N;;;;;
+18CA7;KHITAN SMALL SCRIPT CHARACTER-18CA7;Lo;0;L;;;;;N;;;;;
+18CA8;KHITAN SMALL SCRIPT CHARACTER-18CA8;Lo;0;L;;;;;N;;;;;
+18CA9;KHITAN SMALL SCRIPT CHARACTER-18CA9;Lo;0;L;;;;;N;;;;;
+18CAA;KHITAN SMALL SCRIPT CHARACTER-18CAA;Lo;0;L;;;;;N;;;;;
+18CAB;KHITAN SMALL SCRIPT CHARACTER-18CAB;Lo;0;L;;;;;N;;;;;
+18CAC;KHITAN SMALL SCRIPT CHARACTER-18CAC;Lo;0;L;;;;;N;;;;;
+18CAD;KHITAN SMALL SCRIPT CHARACTER-18CAD;Lo;0;L;;;;;N;;;;;
+18CAE;KHITAN SMALL SCRIPT CHARACTER-18CAE;Lo;0;L;;;;;N;;;;;
+18CAF;KHITAN SMALL SCRIPT CHARACTER-18CAF;Lo;0;L;;;;;N;;;;;
+18CB0;KHITAN SMALL SCRIPT CHARACTER-18CB0;Lo;0;L;;;;;N;;;;;
+18CB1;KHITAN SMALL SCRIPT CHARACTER-18CB1;Lo;0;L;;;;;N;;;;;
+18CB2;KHITAN SMALL SCRIPT CHARACTER-18CB2;Lo;0;L;;;;;N;;;;;
+18CB3;KHITAN SMALL SCRIPT CHARACTER-18CB3;Lo;0;L;;;;;N;;;;;
+18CB4;KHITAN SMALL SCRIPT CHARACTER-18CB4;Lo;0;L;;;;;N;;;;;
+18CB5;KHITAN SMALL SCRIPT CHARACTER-18CB5;Lo;0;L;;;;;N;;;;;
+18CB6;KHITAN SMALL SCRIPT CHARACTER-18CB6;Lo;0;L;;;;;N;;;;;
+18CB7;KHITAN SMALL SCRIPT CHARACTER-18CB7;Lo;0;L;;;;;N;;;;;
+18CB8;KHITAN SMALL SCRIPT CHARACTER-18CB8;Lo;0;L;;;;;N;;;;;
+18CB9;KHITAN SMALL SCRIPT CHARACTER-18CB9;Lo;0;L;;;;;N;;;;;
+18CBA;KHITAN SMALL SCRIPT CHARACTER-18CBA;Lo;0;L;;;;;N;;;;;
+18CBB;KHITAN SMALL SCRIPT CHARACTER-18CBB;Lo;0;L;;;;;N;;;;;
+18CBC;KHITAN SMALL SCRIPT CHARACTER-18CBC;Lo;0;L;;;;;N;;;;;
+18CBD;KHITAN SMALL SCRIPT CHARACTER-18CBD;Lo;0;L;;;;;N;;;;;
+18CBE;KHITAN SMALL SCRIPT CHARACTER-18CBE;Lo;0;L;;;;;N;;;;;
+18CBF;KHITAN SMALL SCRIPT CHARACTER-18CBF;Lo;0;L;;;;;N;;;;;
+18CC0;KHITAN SMALL SCRIPT CHARACTER-18CC0;Lo;0;L;;;;;N;;;;;
+18CC1;KHITAN SMALL SCRIPT CHARACTER-18CC1;Lo;0;L;;;;;N;;;;;
+18CC2;KHITAN SMALL SCRIPT CHARACTER-18CC2;Lo;0;L;;;;;N;;;;;
+18CC3;KHITAN SMALL SCRIPT CHARACTER-18CC3;Lo;0;L;;;;;N;;;;;
+18CC4;KHITAN SMALL SCRIPT CHARACTER-18CC4;Lo;0;L;;;;;N;;;;;
+18CC5;KHITAN SMALL SCRIPT CHARACTER-18CC5;Lo;0;L;;;;;N;;;;;
+18CC6;KHITAN SMALL SCRIPT CHARACTER-18CC6;Lo;0;L;;;;;N;;;;;
+18CC7;KHITAN SMALL SCRIPT CHARACTER-18CC7;Lo;0;L;;;;;N;;;;;
+18CC8;KHITAN SMALL SCRIPT CHARACTER-18CC8;Lo;0;L;;;;;N;;;;;
+18CC9;KHITAN SMALL SCRIPT CHARACTER-18CC9;Lo;0;L;;;;;N;;;;;
+18CCA;KHITAN SMALL SCRIPT CHARACTER-18CCA;Lo;0;L;;;;;N;;;;;
+18CCB;KHITAN SMALL SCRIPT CHARACTER-18CCB;Lo;0;L;;;;;N;;;;;
+18CCC;KHITAN SMALL SCRIPT CHARACTER-18CCC;Lo;0;L;;;;;N;;;;;
+18CCD;KHITAN SMALL SCRIPT CHARACTER-18CCD;Lo;0;L;;;;;N;;;;;
+18CCE;KHITAN SMALL SCRIPT CHARACTER-18CCE;Lo;0;L;;;;;N;;;;;
+18CCF;KHITAN SMALL SCRIPT CHARACTER-18CCF;Lo;0;L;;;;;N;;;;;
+18CD0;KHITAN SMALL SCRIPT CHARACTER-18CD0;Lo;0;L;;;;;N;;;;;
+18CD1;KHITAN SMALL SCRIPT CHARACTER-18CD1;Lo;0;L;;;;;N;;;;;
+18CD2;KHITAN SMALL SCRIPT CHARACTER-18CD2;Lo;0;L;;;;;N;;;;;
+18CD3;KHITAN SMALL SCRIPT CHARACTER-18CD3;Lo;0;L;;;;;N;;;;;
+18CD4;KHITAN SMALL SCRIPT CHARACTER-18CD4;Lo;0;L;;;;;N;;;;;
+18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;;
+18D00;<Tangut Ideograph Supplement, First>;Lo;0;L;;;;;N;;;;;
+18D08;<Tangut Ideograph Supplement, Last>;Lo;0;L;;;;;N;;;;;
+1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;;
+1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
+1B002;HENTAIGANA LETTER A-1;Lo;0;L;;;;;N;;;;;
+1B003;HENTAIGANA LETTER A-2;Lo;0;L;;;;;N;;;;;
+1B004;HENTAIGANA LETTER A-3;Lo;0;L;;;;;N;;;;;
+1B005;HENTAIGANA LETTER A-WO;Lo;0;L;;;;;N;;;;;
+1B006;HENTAIGANA LETTER I-1;Lo;0;L;;;;;N;;;;;
+1B007;HENTAIGANA LETTER I-2;Lo;0;L;;;;;N;;;;;
+1B008;HENTAIGANA LETTER I-3;Lo;0;L;;;;;N;;;;;
+1B009;HENTAIGANA LETTER I-4;Lo;0;L;;;;;N;;;;;
+1B00A;HENTAIGANA LETTER U-1;Lo;0;L;;;;;N;;;;;
+1B00B;HENTAIGANA LETTER U-2;Lo;0;L;;;;;N;;;;;
+1B00C;HENTAIGANA LETTER U-3;Lo;0;L;;;;;N;;;;;
+1B00D;HENTAIGANA LETTER U-4;Lo;0;L;;;;;N;;;;;
+1B00E;HENTAIGANA LETTER U-5;Lo;0;L;;;;;N;;;;;
+1B00F;HENTAIGANA LETTER E-2;Lo;0;L;;;;;N;;;;;
+1B010;HENTAIGANA LETTER E-3;Lo;0;L;;;;;N;;;;;
+1B011;HENTAIGANA LETTER E-4;Lo;0;L;;;;;N;;;;;
+1B012;HENTAIGANA LETTER E-5;Lo;0;L;;;;;N;;;;;
+1B013;HENTAIGANA LETTER E-6;Lo;0;L;;;;;N;;;;;
+1B014;HENTAIGANA LETTER O-1;Lo;0;L;;;;;N;;;;;
+1B015;HENTAIGANA LETTER O-2;Lo;0;L;;;;;N;;;;;
+1B016;HENTAIGANA LETTER O-3;Lo;0;L;;;;;N;;;;;
+1B017;HENTAIGANA LETTER KA-1;Lo;0;L;;;;;N;;;;;
+1B018;HENTAIGANA LETTER KA-2;Lo;0;L;;;;;N;;;;;
+1B019;HENTAIGANA LETTER KA-3;Lo;0;L;;;;;N;;;;;
+1B01A;HENTAIGANA LETTER KA-4;Lo;0;L;;;;;N;;;;;
+1B01B;HENTAIGANA LETTER KA-5;Lo;0;L;;;;;N;;;;;
+1B01C;HENTAIGANA LETTER KA-6;Lo;0;L;;;;;N;;;;;
+1B01D;HENTAIGANA LETTER KA-7;Lo;0;L;;;;;N;;;;;
+1B01E;HENTAIGANA LETTER KA-8;Lo;0;L;;;;;N;;;;;
+1B01F;HENTAIGANA LETTER KA-9;Lo;0;L;;;;;N;;;;;
+1B020;HENTAIGANA LETTER KA-10;Lo;0;L;;;;;N;;;;;
+1B021;HENTAIGANA LETTER KA-11;Lo;0;L;;;;;N;;;;;
+1B022;HENTAIGANA LETTER KA-KE;Lo;0;L;;;;;N;;;;;
+1B023;HENTAIGANA LETTER KI-1;Lo;0;L;;;;;N;;;;;
+1B024;HENTAIGANA LETTER KI-2;Lo;0;L;;;;;N;;;;;
+1B025;HENTAIGANA LETTER KI-3;Lo;0;L;;;;;N;;;;;
+1B026;HENTAIGANA LETTER KI-4;Lo;0;L;;;;;N;;;;;
+1B027;HENTAIGANA LETTER KI-5;Lo;0;L;;;;;N;;;;;
+1B028;HENTAIGANA LETTER KI-6;Lo;0;L;;;;;N;;;;;
+1B029;HENTAIGANA LETTER KI-7;Lo;0;L;;;;;N;;;;;
+1B02A;HENTAIGANA LETTER KI-8;Lo;0;L;;;;;N;;;;;
+1B02B;HENTAIGANA LETTER KU-1;Lo;0;L;;;;;N;;;;;
+1B02C;HENTAIGANA LETTER KU-2;Lo;0;L;;;;;N;;;;;
+1B02D;HENTAIGANA LETTER KU-3;Lo;0;L;;;;;N;;;;;
+1B02E;HENTAIGANA LETTER KU-4;Lo;0;L;;;;;N;;;;;
+1B02F;HENTAIGANA LETTER KU-5;Lo;0;L;;;;;N;;;;;
+1B030;HENTAIGANA LETTER KU-6;Lo;0;L;;;;;N;;;;;
+1B031;HENTAIGANA LETTER KU-7;Lo;0;L;;;;;N;;;;;
+1B032;HENTAIGANA LETTER KE-1;Lo;0;L;;;;;N;;;;;
+1B033;HENTAIGANA LETTER KE-2;Lo;0;L;;;;;N;;;;;
+1B034;HENTAIGANA LETTER KE-3;Lo;0;L;;;;;N;;;;;
+1B035;HENTAIGANA LETTER KE-4;Lo;0;L;;;;;N;;;;;
+1B036;HENTAIGANA LETTER KE-5;Lo;0;L;;;;;N;;;;;
+1B037;HENTAIGANA LETTER KE-6;Lo;0;L;;;;;N;;;;;
+1B038;HENTAIGANA LETTER KO-1;Lo;0;L;;;;;N;;;;;
+1B039;HENTAIGANA LETTER KO-2;Lo;0;L;;;;;N;;;;;
+1B03A;HENTAIGANA LETTER KO-3;Lo;0;L;;;;;N;;;;;
+1B03B;HENTAIGANA LETTER KO-KI;Lo;0;L;;;;;N;;;;;
+1B03C;HENTAIGANA LETTER SA-1;Lo;0;L;;;;;N;;;;;
+1B03D;HENTAIGANA LETTER SA-2;Lo;0;L;;;;;N;;;;;
+1B03E;HENTAIGANA LETTER SA-3;Lo;0;L;;;;;N;;;;;
+1B03F;HENTAIGANA LETTER SA-4;Lo;0;L;;;;;N;;;;;
+1B040;HENTAIGANA LETTER SA-5;Lo;0;L;;;;;N;;;;;
+1B041;HENTAIGANA LETTER SA-6;Lo;0;L;;;;;N;;;;;
+1B042;HENTAIGANA LETTER SA-7;Lo;0;L;;;;;N;;;;;
+1B043;HENTAIGANA LETTER SA-8;Lo;0;L;;;;;N;;;;;
+1B044;HENTAIGANA LETTER SI-1;Lo;0;L;;;;;N;;;;;
+1B045;HENTAIGANA LETTER SI-2;Lo;0;L;;;;;N;;;;;
+1B046;HENTAIGANA LETTER SI-3;Lo;0;L;;;;;N;;;;;
+1B047;HENTAIGANA LETTER SI-4;Lo;0;L;;;;;N;;;;;
+1B048;HENTAIGANA LETTER SI-5;Lo;0;L;;;;;N;;;;;
+1B049;HENTAIGANA LETTER SI-6;Lo;0;L;;;;;N;;;;;
+1B04A;HENTAIGANA LETTER SU-1;Lo;0;L;;;;;N;;;;;
+1B04B;HENTAIGANA LETTER SU-2;Lo;0;L;;;;;N;;;;;
+1B04C;HENTAIGANA LETTER SU-3;Lo;0;L;;;;;N;;;;;
+1B04D;HENTAIGANA LETTER SU-4;Lo;0;L;;;;;N;;;;;
+1B04E;HENTAIGANA LETTER SU-5;Lo;0;L;;;;;N;;;;;
+1B04F;HENTAIGANA LETTER SU-6;Lo;0;L;;;;;N;;;;;
+1B050;HENTAIGANA LETTER SU-7;Lo;0;L;;;;;N;;;;;
+1B051;HENTAIGANA LETTER SU-8;Lo;0;L;;;;;N;;;;;
+1B052;HENTAIGANA LETTER SE-1;Lo;0;L;;;;;N;;;;;
+1B053;HENTAIGANA LETTER SE-2;Lo;0;L;;;;;N;;;;;
+1B054;HENTAIGANA LETTER SE-3;Lo;0;L;;;;;N;;;;;
+1B055;HENTAIGANA LETTER SE-4;Lo;0;L;;;;;N;;;;;
+1B056;HENTAIGANA LETTER SE-5;Lo;0;L;;;;;N;;;;;
+1B057;HENTAIGANA LETTER SO-1;Lo;0;L;;;;;N;;;;;
+1B058;HENTAIGANA LETTER SO-2;Lo;0;L;;;;;N;;;;;
+1B059;HENTAIGANA LETTER SO-3;Lo;0;L;;;;;N;;;;;
+1B05A;HENTAIGANA LETTER SO-4;Lo;0;L;;;;;N;;;;;
+1B05B;HENTAIGANA LETTER SO-5;Lo;0;L;;;;;N;;;;;
+1B05C;HENTAIGANA LETTER SO-6;Lo;0;L;;;;;N;;;;;
+1B05D;HENTAIGANA LETTER SO-7;Lo;0;L;;;;;N;;;;;
+1B05E;HENTAIGANA LETTER TA-1;Lo;0;L;;;;;N;;;;;
+1B05F;HENTAIGANA LETTER TA-2;Lo;0;L;;;;;N;;;;;
+1B060;HENTAIGANA LETTER TA-3;Lo;0;L;;;;;N;;;;;
+1B061;HENTAIGANA LETTER TA-4;Lo;0;L;;;;;N;;;;;
+1B062;HENTAIGANA LETTER TI-1;Lo;0;L;;;;;N;;;;;
+1B063;HENTAIGANA LETTER TI-2;Lo;0;L;;;;;N;;;;;
+1B064;HENTAIGANA LETTER TI-3;Lo;0;L;;;;;N;;;;;
+1B065;HENTAIGANA LETTER TI-4;Lo;0;L;;;;;N;;;;;
+1B066;HENTAIGANA LETTER TI-5;Lo;0;L;;;;;N;;;;;
+1B067;HENTAIGANA LETTER TI-6;Lo;0;L;;;;;N;;;;;
+1B068;HENTAIGANA LETTER TI-7;Lo;0;L;;;;;N;;;;;
+1B069;HENTAIGANA LETTER TU-1;Lo;0;L;;;;;N;;;;;
+1B06A;HENTAIGANA LETTER TU-2;Lo;0;L;;;;;N;;;;;
+1B06B;HENTAIGANA LETTER TU-3;Lo;0;L;;;;;N;;;;;
+1B06C;HENTAIGANA LETTER TU-4;Lo;0;L;;;;;N;;;;;
+1B06D;HENTAIGANA LETTER TU-TO;Lo;0;L;;;;;N;;;;;
+1B06E;HENTAIGANA LETTER TE-1;Lo;0;L;;;;;N;;;;;
+1B06F;HENTAIGANA LETTER TE-2;Lo;0;L;;;;;N;;;;;
+1B070;HENTAIGANA LETTER TE-3;Lo;0;L;;;;;N;;;;;
+1B071;HENTAIGANA LETTER TE-4;Lo;0;L;;;;;N;;;;;
+1B072;HENTAIGANA LETTER TE-5;Lo;0;L;;;;;N;;;;;
+1B073;HENTAIGANA LETTER TE-6;Lo;0;L;;;;;N;;;;;
+1B074;HENTAIGANA LETTER TE-7;Lo;0;L;;;;;N;;;;;
+1B075;HENTAIGANA LETTER TE-8;Lo;0;L;;;;;N;;;;;
+1B076;HENTAIGANA LETTER TE-9;Lo;0;L;;;;;N;;;;;
+1B077;HENTAIGANA LETTER TO-1;Lo;0;L;;;;;N;;;;;
+1B078;HENTAIGANA LETTER TO-2;Lo;0;L;;;;;N;;;;;
+1B079;HENTAIGANA LETTER TO-3;Lo;0;L;;;;;N;;;;;
+1B07A;HENTAIGANA LETTER TO-4;Lo;0;L;;;;;N;;;;;
+1B07B;HENTAIGANA LETTER TO-5;Lo;0;L;;;;;N;;;;;
+1B07C;HENTAIGANA LETTER TO-6;Lo;0;L;;;;;N;;;;;
+1B07D;HENTAIGANA LETTER TO-RA;Lo;0;L;;;;;N;;;;;
+1B07E;HENTAIGANA LETTER NA-1;Lo;0;L;;;;;N;;;;;
+1B07F;HENTAIGANA LETTER NA-2;Lo;0;L;;;;;N;;;;;
+1B080;HENTAIGANA LETTER NA-3;Lo;0;L;;;;;N;;;;;
+1B081;HENTAIGANA LETTER NA-4;Lo;0;L;;;;;N;;;;;
+1B082;HENTAIGANA LETTER NA-5;Lo;0;L;;;;;N;;;;;
+1B083;HENTAIGANA LETTER NA-6;Lo;0;L;;;;;N;;;;;
+1B084;HENTAIGANA LETTER NA-7;Lo;0;L;;;;;N;;;;;
+1B085;HENTAIGANA LETTER NA-8;Lo;0;L;;;;;N;;;;;
+1B086;HENTAIGANA LETTER NA-9;Lo;0;L;;;;;N;;;;;
+1B087;HENTAIGANA LETTER NI-1;Lo;0;L;;;;;N;;;;;
+1B088;HENTAIGANA LETTER NI-2;Lo;0;L;;;;;N;;;;;
+1B089;HENTAIGANA LETTER NI-3;Lo;0;L;;;;;N;;;;;
+1B08A;HENTAIGANA LETTER NI-4;Lo;0;L;;;;;N;;;;;
+1B08B;HENTAIGANA LETTER NI-5;Lo;0;L;;;;;N;;;;;
+1B08C;HENTAIGANA LETTER NI-6;Lo;0;L;;;;;N;;;;;
+1B08D;HENTAIGANA LETTER NI-7;Lo;0;L;;;;;N;;;;;
+1B08E;HENTAIGANA LETTER NI-TE;Lo;0;L;;;;;N;;;;;
+1B08F;HENTAIGANA LETTER NU-1;Lo;0;L;;;;;N;;;;;
+1B090;HENTAIGANA LETTER NU-2;Lo;0;L;;;;;N;;;;;
+1B091;HENTAIGANA LETTER NU-3;Lo;0;L;;;;;N;;;;;
+1B092;HENTAIGANA LETTER NE-1;Lo;0;L;;;;;N;;;;;
+1B093;HENTAIGANA LETTER NE-2;Lo;0;L;;;;;N;;;;;
+1B094;HENTAIGANA LETTER NE-3;Lo;0;L;;;;;N;;;;;
+1B095;HENTAIGANA LETTER NE-4;Lo;0;L;;;;;N;;;;;
+1B096;HENTAIGANA LETTER NE-5;Lo;0;L;;;;;N;;;;;
+1B097;HENTAIGANA LETTER NE-6;Lo;0;L;;;;;N;;;;;
+1B098;HENTAIGANA LETTER NE-KO;Lo;0;L;;;;;N;;;;;
+1B099;HENTAIGANA LETTER NO-1;Lo;0;L;;;;;N;;;;;
+1B09A;HENTAIGANA LETTER NO-2;Lo;0;L;;;;;N;;;;;
+1B09B;HENTAIGANA LETTER NO-3;Lo;0;L;;;;;N;;;;;
+1B09C;HENTAIGANA LETTER NO-4;Lo;0;L;;;;;N;;;;;
+1B09D;HENTAIGANA LETTER NO-5;Lo;0;L;;;;;N;;;;;
+1B09E;HENTAIGANA LETTER HA-1;Lo;0;L;;;;;N;;;;;
+1B09F;HENTAIGANA LETTER HA-2;Lo;0;L;;;;;N;;;;;
+1B0A0;HENTAIGANA LETTER HA-3;Lo;0;L;;;;;N;;;;;
+1B0A1;HENTAIGANA LETTER HA-4;Lo;0;L;;;;;N;;;;;
+1B0A2;HENTAIGANA LETTER HA-5;Lo;0;L;;;;;N;;;;;
+1B0A3;HENTAIGANA LETTER HA-6;Lo;0;L;;;;;N;;;;;
+1B0A4;HENTAIGANA LETTER HA-7;Lo;0;L;;;;;N;;;;;
+1B0A5;HENTAIGANA LETTER HA-8;Lo;0;L;;;;;N;;;;;
+1B0A6;HENTAIGANA LETTER HA-9;Lo;0;L;;;;;N;;;;;
+1B0A7;HENTAIGANA LETTER HA-10;Lo;0;L;;;;;N;;;;;
+1B0A8;HENTAIGANA LETTER HA-11;Lo;0;L;;;;;N;;;;;
+1B0A9;HENTAIGANA LETTER HI-1;Lo;0;L;;;;;N;;;;;
+1B0AA;HENTAIGANA LETTER HI-2;Lo;0;L;;;;;N;;;;;
+1B0AB;HENTAIGANA LETTER HI-3;Lo;0;L;;;;;N;;;;;
+1B0AC;HENTAIGANA LETTER HI-4;Lo;0;L;;;;;N;;;;;
+1B0AD;HENTAIGANA LETTER HI-5;Lo;0;L;;;;;N;;;;;
+1B0AE;HENTAIGANA LETTER HI-6;Lo;0;L;;;;;N;;;;;
+1B0AF;HENTAIGANA LETTER HI-7;Lo;0;L;;;;;N;;;;;
+1B0B0;HENTAIGANA LETTER HU-1;Lo;0;L;;;;;N;;;;;
+1B0B1;HENTAIGANA LETTER HU-2;Lo;0;L;;;;;N;;;;;
+1B0B2;HENTAIGANA LETTER HU-3;Lo;0;L;;;;;N;;;;;
+1B0B3;HENTAIGANA LETTER HE-1;Lo;0;L;;;;;N;;;;;
+1B0B4;HENTAIGANA LETTER HE-2;Lo;0;L;;;;;N;;;;;
+1B0B5;HENTAIGANA LETTER HE-3;Lo;0;L;;;;;N;;;;;
+1B0B6;HENTAIGANA LETTER HE-4;Lo;0;L;;;;;N;;;;;
+1B0B7;HENTAIGANA LETTER HE-5;Lo;0;L;;;;;N;;;;;
+1B0B8;HENTAIGANA LETTER HE-6;Lo;0;L;;;;;N;;;;;
+1B0B9;HENTAIGANA LETTER HE-7;Lo;0;L;;;;;N;;;;;
+1B0BA;HENTAIGANA LETTER HO-1;Lo;0;L;;;;;N;;;;;
+1B0BB;HENTAIGANA LETTER HO-2;Lo;0;L;;;;;N;;;;;
+1B0BC;HENTAIGANA LETTER HO-3;Lo;0;L;;;;;N;;;;;
+1B0BD;HENTAIGANA LETTER HO-4;Lo;0;L;;;;;N;;;;;
+1B0BE;HENTAIGANA LETTER HO-5;Lo;0;L;;;;;N;;;;;
+1B0BF;HENTAIGANA LETTER HO-6;Lo;0;L;;;;;N;;;;;
+1B0C0;HENTAIGANA LETTER HO-7;Lo;0;L;;;;;N;;;;;
+1B0C1;HENTAIGANA LETTER HO-8;Lo;0;L;;;;;N;;;;;
+1B0C2;HENTAIGANA LETTER MA-1;Lo;0;L;;;;;N;;;;;
+1B0C3;HENTAIGANA LETTER MA-2;Lo;0;L;;;;;N;;;;;
+1B0C4;HENTAIGANA LETTER MA-3;Lo;0;L;;;;;N;;;;;
+1B0C5;HENTAIGANA LETTER MA-4;Lo;0;L;;;;;N;;;;;
+1B0C6;HENTAIGANA LETTER MA-5;Lo;0;L;;;;;N;;;;;
+1B0C7;HENTAIGANA LETTER MA-6;Lo;0;L;;;;;N;;;;;
+1B0C8;HENTAIGANA LETTER MA-7;Lo;0;L;;;;;N;;;;;
+1B0C9;HENTAIGANA LETTER MI-1;Lo;0;L;;;;;N;;;;;
+1B0CA;HENTAIGANA LETTER MI-2;Lo;0;L;;;;;N;;;;;
+1B0CB;HENTAIGANA LETTER MI-3;Lo;0;L;;;;;N;;;;;
+1B0CC;HENTAIGANA LETTER MI-4;Lo;0;L;;;;;N;;;;;
+1B0CD;HENTAIGANA LETTER MI-5;Lo;0;L;;;;;N;;;;;
+1B0CE;HENTAIGANA LETTER MI-6;Lo;0;L;;;;;N;;;;;
+1B0CF;HENTAIGANA LETTER MI-7;Lo;0;L;;;;;N;;;;;
+1B0D0;HENTAIGANA LETTER MU-1;Lo;0;L;;;;;N;;;;;
+1B0D1;HENTAIGANA LETTER MU-2;Lo;0;L;;;;;N;;;;;
+1B0D2;HENTAIGANA LETTER MU-3;Lo;0;L;;;;;N;;;;;
+1B0D3;HENTAIGANA LETTER MU-4;Lo;0;L;;;;;N;;;;;
+1B0D4;HENTAIGANA LETTER ME-1;Lo;0;L;;;;;N;;;;;
+1B0D5;HENTAIGANA LETTER ME-2;Lo;0;L;;;;;N;;;;;
+1B0D6;HENTAIGANA LETTER ME-MA;Lo;0;L;;;;;N;;;;;
+1B0D7;HENTAIGANA LETTER MO-1;Lo;0;L;;;;;N;;;;;
+1B0D8;HENTAIGANA LETTER MO-2;Lo;0;L;;;;;N;;;;;
+1B0D9;HENTAIGANA LETTER MO-3;Lo;0;L;;;;;N;;;;;
+1B0DA;HENTAIGANA LETTER MO-4;Lo;0;L;;;;;N;;;;;
+1B0DB;HENTAIGANA LETTER MO-5;Lo;0;L;;;;;N;;;;;
+1B0DC;HENTAIGANA LETTER MO-6;Lo;0;L;;;;;N;;;;;
+1B0DD;HENTAIGANA LETTER YA-1;Lo;0;L;;;;;N;;;;;
+1B0DE;HENTAIGANA LETTER YA-2;Lo;0;L;;;;;N;;;;;
+1B0DF;HENTAIGANA LETTER YA-3;Lo;0;L;;;;;N;;;;;
+1B0E0;HENTAIGANA LETTER YA-4;Lo;0;L;;;;;N;;;;;
+1B0E1;HENTAIGANA LETTER YA-5;Lo;0;L;;;;;N;;;;;
+1B0E2;HENTAIGANA LETTER YA-YO;Lo;0;L;;;;;N;;;;;
+1B0E3;HENTAIGANA LETTER YU-1;Lo;0;L;;;;;N;;;;;
+1B0E4;HENTAIGANA LETTER YU-2;Lo;0;L;;;;;N;;;;;
+1B0E5;HENTAIGANA LETTER YU-3;Lo;0;L;;;;;N;;;;;
+1B0E6;HENTAIGANA LETTER YU-4;Lo;0;L;;;;;N;;;;;
+1B0E7;HENTAIGANA LETTER YO-1;Lo;0;L;;;;;N;;;;;
+1B0E8;HENTAIGANA LETTER YO-2;Lo;0;L;;;;;N;;;;;
+1B0E9;HENTAIGANA LETTER YO-3;Lo;0;L;;;;;N;;;;;
+1B0EA;HENTAIGANA LETTER YO-4;Lo;0;L;;;;;N;;;;;
+1B0EB;HENTAIGANA LETTER YO-5;Lo;0;L;;;;;N;;;;;
+1B0EC;HENTAIGANA LETTER YO-6;Lo;0;L;;;;;N;;;;;
+1B0ED;HENTAIGANA LETTER RA-1;Lo;0;L;;;;;N;;;;;
+1B0EE;HENTAIGANA LETTER RA-2;Lo;0;L;;;;;N;;;;;
+1B0EF;HENTAIGANA LETTER RA-3;Lo;0;L;;;;;N;;;;;
+1B0F0;HENTAIGANA LETTER RA-4;Lo;0;L;;;;;N;;;;;
+1B0F1;HENTAIGANA LETTER RI-1;Lo;0;L;;;;;N;;;;;
+1B0F2;HENTAIGANA LETTER RI-2;Lo;0;L;;;;;N;;;;;
+1B0F3;HENTAIGANA LETTER RI-3;Lo;0;L;;;;;N;;;;;
+1B0F4;HENTAIGANA LETTER RI-4;Lo;0;L;;;;;N;;;;;
+1B0F5;HENTAIGANA LETTER RI-5;Lo;0;L;;;;;N;;;;;
+1B0F6;HENTAIGANA LETTER RI-6;Lo;0;L;;;;;N;;;;;
+1B0F7;HENTAIGANA LETTER RI-7;Lo;0;L;;;;;N;;;;;
+1B0F8;HENTAIGANA LETTER RU-1;Lo;0;L;;;;;N;;;;;
+1B0F9;HENTAIGANA LETTER RU-2;Lo;0;L;;;;;N;;;;;
+1B0FA;HENTAIGANA LETTER RU-3;Lo;0;L;;;;;N;;;;;
+1B0FB;HENTAIGANA LETTER RU-4;Lo;0;L;;;;;N;;;;;
+1B0FC;HENTAIGANA LETTER RU-5;Lo;0;L;;;;;N;;;;;
+1B0FD;HENTAIGANA LETTER RU-6;Lo;0;L;;;;;N;;;;;
+1B0FE;HENTAIGANA LETTER RE-1;Lo;0;L;;;;;N;;;;;
+1B0FF;HENTAIGANA LETTER RE-2;Lo;0;L;;;;;N;;;;;
+1B100;HENTAIGANA LETTER RE-3;Lo;0;L;;;;;N;;;;;
+1B101;HENTAIGANA LETTER RE-4;Lo;0;L;;;;;N;;;;;
+1B102;HENTAIGANA LETTER RO-1;Lo;0;L;;;;;N;;;;;
+1B103;HENTAIGANA LETTER RO-2;Lo;0;L;;;;;N;;;;;
+1B104;HENTAIGANA LETTER RO-3;Lo;0;L;;;;;N;;;;;
+1B105;HENTAIGANA LETTER RO-4;Lo;0;L;;;;;N;;;;;
+1B106;HENTAIGANA LETTER RO-5;Lo;0;L;;;;;N;;;;;
+1B107;HENTAIGANA LETTER RO-6;Lo;0;L;;;;;N;;;;;
+1B108;HENTAIGANA LETTER WA-1;Lo;0;L;;;;;N;;;;;
+1B109;HENTAIGANA LETTER WA-2;Lo;0;L;;;;;N;;;;;
+1B10A;HENTAIGANA LETTER WA-3;Lo;0;L;;;;;N;;;;;
+1B10B;HENTAIGANA LETTER WA-4;Lo;0;L;;;;;N;;;;;
+1B10C;HENTAIGANA LETTER WA-5;Lo;0;L;;;;;N;;;;;
+1B10D;HENTAIGANA LETTER WI-1;Lo;0;L;;;;;N;;;;;
+1B10E;HENTAIGANA LETTER WI-2;Lo;0;L;;;;;N;;;;;
+1B10F;HENTAIGANA LETTER WI-3;Lo;0;L;;;;;N;;;;;
+1B110;HENTAIGANA LETTER WI-4;Lo;0;L;;;;;N;;;;;
+1B111;HENTAIGANA LETTER WI-5;Lo;0;L;;;;;N;;;;;
+1B112;HENTAIGANA LETTER WE-1;Lo;0;L;;;;;N;;;;;
+1B113;HENTAIGANA LETTER WE-2;Lo;0;L;;;;;N;;;;;
+1B114;HENTAIGANA LETTER WE-3;Lo;0;L;;;;;N;;;;;
+1B115;HENTAIGANA LETTER WE-4;Lo;0;L;;;;;N;;;;;
+1B116;HENTAIGANA LETTER WO-1;Lo;0;L;;;;;N;;;;;
+1B117;HENTAIGANA LETTER WO-2;Lo;0;L;;;;;N;;;;;
+1B118;HENTAIGANA LETTER WO-3;Lo;0;L;;;;;N;;;;;
+1B119;HENTAIGANA LETTER WO-4;Lo;0;L;;;;;N;;;;;
+1B11A;HENTAIGANA LETTER WO-5;Lo;0;L;;;;;N;;;;;
+1B11B;HENTAIGANA LETTER WO-6;Lo;0;L;;;;;N;;;;;
+1B11C;HENTAIGANA LETTER WO-7;Lo;0;L;;;;;N;;;;;
+1B11D;HENTAIGANA LETTER N-MU-MO-1;Lo;0;L;;;;;N;;;;;
+1B11E;HENTAIGANA LETTER N-MU-MO-2;Lo;0;L;;;;;N;;;;;
+1B150;HIRAGANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;;
+1B151;HIRAGANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;;
+1B152;HIRAGANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;;
+1B164;KATAKANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;;
+1B165;KATAKANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;;
+1B166;KATAKANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;;
+1B167;KATAKANA LETTER SMALL N;Lo;0;L;;;;;N;;;;;
+1B170;NUSHU CHARACTER-1B170;Lo;0;L;;;;;N;;;;;
+1B171;NUSHU CHARACTER-1B171;Lo;0;L;;;;;N;;;;;
+1B172;NUSHU CHARACTER-1B172;Lo;0;L;;;;;N;;;;;
+1B173;NUSHU CHARACTER-1B173;Lo;0;L;;;;;N;;;;;
+1B174;NUSHU CHARACTER-1B174;Lo;0;L;;;;;N;;;;;
+1B175;NUSHU CHARACTER-1B175;Lo;0;L;;;;;N;;;;;
+1B176;NUSHU CHARACTER-1B176;Lo;0;L;;;;;N;;;;;
+1B177;NUSHU CHARACTER-1B177;Lo;0;L;;;;;N;;;;;
+1B178;NUSHU CHARACTER-1B178;Lo;0;L;;;;;N;;;;;
+1B179;NUSHU CHARACTER-1B179;Lo;0;L;;;;;N;;;;;
+1B17A;NUSHU CHARACTER-1B17A;Lo;0;L;;;;;N;;;;;
+1B17B;NUSHU CHARACTER-1B17B;Lo;0;L;;;;;N;;;;;
+1B17C;NUSHU CHARACTER-1B17C;Lo;0;L;;;;;N;;;;;
+1B17D;NUSHU CHARACTER-1B17D;Lo;0;L;;;;;N;;;;;
+1B17E;NUSHU CHARACTER-1B17E;Lo;0;L;;;;;N;;;;;
+1B17F;NUSHU CHARACTER-1B17F;Lo;0;L;;;;;N;;;;;
+1B180;NUSHU CHARACTER-1B180;Lo;0;L;;;;;N;;;;;
+1B181;NUSHU CHARACTER-1B181;Lo;0;L;;;;;N;;;;;
+1B182;NUSHU CHARACTER-1B182;Lo;0;L;;;;;N;;;;;
+1B183;NUSHU CHARACTER-1B183;Lo;0;L;;;;;N;;;;;
+1B184;NUSHU CHARACTER-1B184;Lo;0;L;;;;;N;;;;;
+1B185;NUSHU CHARACTER-1B185;Lo;0;L;;;;;N;;;;;
+1B186;NUSHU CHARACTER-1B186;Lo;0;L;;;;;N;;;;;
+1B187;NUSHU CHARACTER-1B187;Lo;0;L;;;;;N;;;;;
+1B188;NUSHU CHARACTER-1B188;Lo;0;L;;;;;N;;;;;
+1B189;NUSHU CHARACTER-1B189;Lo;0;L;;;;;N;;;;;
+1B18A;NUSHU CHARACTER-1B18A;Lo;0;L;;;;;N;;;;;
+1B18B;NUSHU CHARACTER-1B18B;Lo;0;L;;;;;N;;;;;
+1B18C;NUSHU CHARACTER-1B18C;Lo;0;L;;;;;N;;;;;
+1B18D;NUSHU CHARACTER-1B18D;Lo;0;L;;;;;N;;;;;
+1B18E;NUSHU CHARACTER-1B18E;Lo;0;L;;;;;N;;;;;
+1B18F;NUSHU CHARACTER-1B18F;Lo;0;L;;;;;N;;;;;
+1B190;NUSHU CHARACTER-1B190;Lo;0;L;;;;;N;;;;;
+1B191;NUSHU CHARACTER-1B191;Lo;0;L;;;;;N;;;;;
+1B192;NUSHU CHARACTER-1B192;Lo;0;L;;;;;N;;;;;
+1B193;NUSHU CHARACTER-1B193;Lo;0;L;;;;;N;;;;;
+1B194;NUSHU CHARACTER-1B194;Lo;0;L;;;;;N;;;;;
+1B195;NUSHU CHARACTER-1B195;Lo;0;L;;;;;N;;;;;
+1B196;NUSHU CHARACTER-1B196;Lo;0;L;;;;;N;;;;;
+1B197;NUSHU CHARACTER-1B197;Lo;0;L;;;;;N;;;;;
+1B198;NUSHU CHARACTER-1B198;Lo;0;L;;;;;N;;;;;
+1B199;NUSHU CHARACTER-1B199;Lo;0;L;;;;;N;;;;;
+1B19A;NUSHU CHARACTER-1B19A;Lo;0;L;;;;;N;;;;;
+1B19B;NUSHU CHARACTER-1B19B;Lo;0;L;;;;;N;;;;;
+1B19C;NUSHU CHARACTER-1B19C;Lo;0;L;;;;;N;;;;;
+1B19D;NUSHU CHARACTER-1B19D;Lo;0;L;;;;;N;;;;;
+1B19E;NUSHU CHARACTER-1B19E;Lo;0;L;;;;;N;;;;;
+1B19F;NUSHU CHARACTER-1B19F;Lo;0;L;;;;;N;;;;;
+1B1A0;NUSHU CHARACTER-1B1A0;Lo;0;L;;;;;N;;;;;
+1B1A1;NUSHU CHARACTER-1B1A1;Lo;0;L;;;;;N;;;;;
+1B1A2;NUSHU CHARACTER-1B1A2;Lo;0;L;;;;;N;;;;;
+1B1A3;NUSHU CHARACTER-1B1A3;Lo;0;L;;;;;N;;;;;
+1B1A4;NUSHU CHARACTER-1B1A4;Lo;0;L;;;;;N;;;;;
+1B1A5;NUSHU CHARACTER-1B1A5;Lo;0;L;;;;;N;;;;;
+1B1A6;NUSHU CHARACTER-1B1A6;Lo;0;L;;;;;N;;;;;
+1B1A7;NUSHU CHARACTER-1B1A7;Lo;0;L;;;;;N;;;;;
+1B1A8;NUSHU CHARACTER-1B1A8;Lo;0;L;;;;;N;;;;;
+1B1A9;NUSHU CHARACTER-1B1A9;Lo;0;L;;;;;N;;;;;
+1B1AA;NUSHU CHARACTER-1B1AA;Lo;0;L;;;;;N;;;;;
+1B1AB;NUSHU CHARACTER-1B1AB;Lo;0;L;;;;;N;;;;;
+1B1AC;NUSHU CHARACTER-1B1AC;Lo;0;L;;;;;N;;;;;
+1B1AD;NUSHU CHARACTER-1B1AD;Lo;0;L;;;;;N;;;;;
+1B1AE;NUSHU CHARACTER-1B1AE;Lo;0;L;;;;;N;;;;;
+1B1AF;NUSHU CHARACTER-1B1AF;Lo;0;L;;;;;N;;;;;
+1B1B0;NUSHU CHARACTER-1B1B0;Lo;0;L;;;;;N;;;;;
+1B1B1;NUSHU CHARACTER-1B1B1;Lo;0;L;;;;;N;;;;;
+1B1B2;NUSHU CHARACTER-1B1B2;Lo;0;L;;;;;N;;;;;
+1B1B3;NUSHU CHARACTER-1B1B3;Lo;0;L;;;;;N;;;;;
+1B1B4;NUSHU CHARACTER-1B1B4;Lo;0;L;;;;;N;;;;;
+1B1B5;NUSHU CHARACTER-1B1B5;Lo;0;L;;;;;N;;;;;
+1B1B6;NUSHU CHARACTER-1B1B6;Lo;0;L;;;;;N;;;;;
+1B1B7;NUSHU CHARACTER-1B1B7;Lo;0;L;;;;;N;;;;;
+1B1B8;NUSHU CHARACTER-1B1B8;Lo;0;L;;;;;N;;;;;
+1B1B9;NUSHU CHARACTER-1B1B9;Lo;0;L;;;;;N;;;;;
+1B1BA;NUSHU CHARACTER-1B1BA;Lo;0;L;;;;;N;;;;;
+1B1BB;NUSHU CHARACTER-1B1BB;Lo;0;L;;;;;N;;;;;
+1B1BC;NUSHU CHARACTER-1B1BC;Lo;0;L;;;;;N;;;;;
+1B1BD;NUSHU CHARACTER-1B1BD;Lo;0;L;;;;;N;;;;;
+1B1BE;NUSHU CHARACTER-1B1BE;Lo;0;L;;;;;N;;;;;
+1B1BF;NUSHU CHARACTER-1B1BF;Lo;0;L;;;;;N;;;;;
+1B1C0;NUSHU CHARACTER-1B1C0;Lo;0;L;;;;;N;;;;;
+1B1C1;NUSHU CHARACTER-1B1C1;Lo;0;L;;;;;N;;;;;
+1B1C2;NUSHU CHARACTER-1B1C2;Lo;0;L;;;;;N;;;;;
+1B1C3;NUSHU CHARACTER-1B1C3;Lo;0;L;;;;;N;;;;;
+1B1C4;NUSHU CHARACTER-1B1C4;Lo;0;L;;;;;N;;;;;
+1B1C5;NUSHU CHARACTER-1B1C5;Lo;0;L;;;;;N;;;;;
+1B1C6;NUSHU CHARACTER-1B1C6;Lo;0;L;;;;;N;;;;;
+1B1C7;NUSHU CHARACTER-1B1C7;Lo;0;L;;;;;N;;;;;
+1B1C8;NUSHU CHARACTER-1B1C8;Lo;0;L;;;;;N;;;;;
+1B1C9;NUSHU CHARACTER-1B1C9;Lo;0;L;;;;;N;;;;;
+1B1CA;NUSHU CHARACTER-1B1CA;Lo;0;L;;;;;N;;;;;
+1B1CB;NUSHU CHARACTER-1B1CB;Lo;0;L;;;;;N;;;;;
+1B1CC;NUSHU CHARACTER-1B1CC;Lo;0;L;;;;;N;;;;;
+1B1CD;NUSHU CHARACTER-1B1CD;Lo;0;L;;;;;N;;;;;
+1B1CE;NUSHU CHARACTER-1B1CE;Lo;0;L;;;;;N;;;;;
+1B1CF;NUSHU CHARACTER-1B1CF;Lo;0;L;;;;;N;;;;;
+1B1D0;NUSHU CHARACTER-1B1D0;Lo;0;L;;;;;N;;;;;
+1B1D1;NUSHU CHARACTER-1B1D1;Lo;0;L;;;;;N;;;;;
+1B1D2;NUSHU CHARACTER-1B1D2;Lo;0;L;;;;;N;;;;;
+1B1D3;NUSHU CHARACTER-1B1D3;Lo;0;L;;;;;N;;;;;
+1B1D4;NUSHU CHARACTER-1B1D4;Lo;0;L;;;;;N;;;;;
+1B1D5;NUSHU CHARACTER-1B1D5;Lo;0;L;;;;;N;;;;;
+1B1D6;NUSHU CHARACTER-1B1D6;Lo;0;L;;;;;N;;;;;
+1B1D7;NUSHU CHARACTER-1B1D7;Lo;0;L;;;;;N;;;;;
+1B1D8;NUSHU CHARACTER-1B1D8;Lo;0;L;;;;;N;;;;;
+1B1D9;NUSHU CHARACTER-1B1D9;Lo;0;L;;;;;N;;;;;
+1B1DA;NUSHU CHARACTER-1B1DA;Lo;0;L;;;;;N;;;;;
+1B1DB;NUSHU CHARACTER-1B1DB;Lo;0;L;;;;;N;;;;;
+1B1DC;NUSHU CHARACTER-1B1DC;Lo;0;L;;;;;N;;;;;
+1B1DD;NUSHU CHARACTER-1B1DD;Lo;0;L;;;;;N;;;;;
+1B1DE;NUSHU CHARACTER-1B1DE;Lo;0;L;;;;;N;;;;;
+1B1DF;NUSHU CHARACTER-1B1DF;Lo;0;L;;;;;N;;;;;
+1B1E0;NUSHU CHARACTER-1B1E0;Lo;0;L;;;;;N;;;;;
+1B1E1;NUSHU CHARACTER-1B1E1;Lo;0;L;;;;;N;;;;;
+1B1E2;NUSHU CHARACTER-1B1E2;Lo;0;L;;;;;N;;;;;
+1B1E3;NUSHU CHARACTER-1B1E3;Lo;0;L;;;;;N;;;;;
+1B1E4;NUSHU CHARACTER-1B1E4;Lo;0;L;;;;;N;;;;;
+1B1E5;NUSHU CHARACTER-1B1E5;Lo;0;L;;;;;N;;;;;
+1B1E6;NUSHU CHARACTER-1B1E6;Lo;0;L;;;;;N;;;;;
+1B1E7;NUSHU CHARACTER-1B1E7;Lo;0;L;;;;;N;;;;;
+1B1E8;NUSHU CHARACTER-1B1E8;Lo;0;L;;;;;N;;;;;
+1B1E9;NUSHU CHARACTER-1B1E9;Lo;0;L;;;;;N;;;;;
+1B1EA;NUSHU CHARACTER-1B1EA;Lo;0;L;;;;;N;;;;;
+1B1EB;NUSHU CHARACTER-1B1EB;Lo;0;L;;;;;N;;;;;
+1B1EC;NUSHU CHARACTER-1B1EC;Lo;0;L;;;;;N;;;;;
+1B1ED;NUSHU CHARACTER-1B1ED;Lo;0;L;;;;;N;;;;;
+1B1EE;NUSHU CHARACTER-1B1EE;Lo;0;L;;;;;N;;;;;
+1B1EF;NUSHU CHARACTER-1B1EF;Lo;0;L;;;;;N;;;;;
+1B1F0;NUSHU CHARACTER-1B1F0;Lo;0;L;;;;;N;;;;;
+1B1F1;NUSHU CHARACTER-1B1F1;Lo;0;L;;;;;N;;;;;
+1B1F2;NUSHU CHARACTER-1B1F2;Lo;0;L;;;;;N;;;;;
+1B1F3;NUSHU CHARACTER-1B1F3;Lo;0;L;;;;;N;;;;;
+1B1F4;NUSHU CHARACTER-1B1F4;Lo;0;L;;;;;N;;;;;
+1B1F5;NUSHU CHARACTER-1B1F5;Lo;0;L;;;;;N;;;;;
+1B1F6;NUSHU CHARACTER-1B1F6;Lo;0;L;;;;;N;;;;;
+1B1F7;NUSHU CHARACTER-1B1F7;Lo;0;L;;;;;N;;;;;
+1B1F8;NUSHU CHARACTER-1B1F8;Lo;0;L;;;;;N;;;;;
+1B1F9;NUSHU CHARACTER-1B1F9;Lo;0;L;;;;;N;;;;;
+1B1FA;NUSHU CHARACTER-1B1FA;Lo;0;L;;;;;N;;;;;
+1B1FB;NUSHU CHARACTER-1B1FB;Lo;0;L;;;;;N;;;;;
+1B1FC;NUSHU CHARACTER-1B1FC;Lo;0;L;;;;;N;;;;;
+1B1FD;NUSHU CHARACTER-1B1FD;Lo;0;L;;;;;N;;;;;
+1B1FE;NUSHU CHARACTER-1B1FE;Lo;0;L;;;;;N;;;;;
+1B1FF;NUSHU CHARACTER-1B1FF;Lo;0;L;;;;;N;;;;;
+1B200;NUSHU CHARACTER-1B200;Lo;0;L;;;;;N;;;;;
+1B201;NUSHU CHARACTER-1B201;Lo;0;L;;;;;N;;;;;
+1B202;NUSHU CHARACTER-1B202;Lo;0;L;;;;;N;;;;;
+1B203;NUSHU CHARACTER-1B203;Lo;0;L;;;;;N;;;;;
+1B204;NUSHU CHARACTER-1B204;Lo;0;L;;;;;N;;;;;
+1B205;NUSHU CHARACTER-1B205;Lo;0;L;;;;;N;;;;;
+1B206;NUSHU CHARACTER-1B206;Lo;0;L;;;;;N;;;;;
+1B207;NUSHU CHARACTER-1B207;Lo;0;L;;;;;N;;;;;
+1B208;NUSHU CHARACTER-1B208;Lo;0;L;;;;;N;;;;;
+1B209;NUSHU CHARACTER-1B209;Lo;0;L;;;;;N;;;;;
+1B20A;NUSHU CHARACTER-1B20A;Lo;0;L;;;;;N;;;;;
+1B20B;NUSHU CHARACTER-1B20B;Lo;0;L;;;;;N;;;;;
+1B20C;NUSHU CHARACTER-1B20C;Lo;0;L;;;;;N;;;;;
+1B20D;NUSHU CHARACTER-1B20D;Lo;0;L;;;;;N;;;;;
+1B20E;NUSHU CHARACTER-1B20E;Lo;0;L;;;;;N;;;;;
+1B20F;NUSHU CHARACTER-1B20F;Lo;0;L;;;;;N;;;;;
+1B210;NUSHU CHARACTER-1B210;Lo;0;L;;;;;N;;;;;
+1B211;NUSHU CHARACTER-1B211;Lo;0;L;;;;;N;;;;;
+1B212;NUSHU CHARACTER-1B212;Lo;0;L;;;;;N;;;;;
+1B213;NUSHU CHARACTER-1B213;Lo;0;L;;;;;N;;;;;
+1B214;NUSHU CHARACTER-1B214;Lo;0;L;;;;;N;;;;;
+1B215;NUSHU CHARACTER-1B215;Lo;0;L;;;;;N;;;;;
+1B216;NUSHU CHARACTER-1B216;Lo;0;L;;;;;N;;;;;
+1B217;NUSHU CHARACTER-1B217;Lo;0;L;;;;;N;;;;;
+1B218;NUSHU CHARACTER-1B218;Lo;0;L;;;;;N;;;;;
+1B219;NUSHU CHARACTER-1B219;Lo;0;L;;;;;N;;;;;
+1B21A;NUSHU CHARACTER-1B21A;Lo;0;L;;;;;N;;;;;
+1B21B;NUSHU CHARACTER-1B21B;Lo;0;L;;;;;N;;;;;
+1B21C;NUSHU CHARACTER-1B21C;Lo;0;L;;;;;N;;;;;
+1B21D;NUSHU CHARACTER-1B21D;Lo;0;L;;;;;N;;;;;
+1B21E;NUSHU CHARACTER-1B21E;Lo;0;L;;;;;N;;;;;
+1B21F;NUSHU CHARACTER-1B21F;Lo;0;L;;;;;N;;;;;
+1B220;NUSHU CHARACTER-1B220;Lo;0;L;;;;;N;;;;;
+1B221;NUSHU CHARACTER-1B221;Lo;0;L;;;;;N;;;;;
+1B222;NUSHU CHARACTER-1B222;Lo;0;L;;;;;N;;;;;
+1B223;NUSHU CHARACTER-1B223;Lo;0;L;;;;;N;;;;;
+1B224;NUSHU CHARACTER-1B224;Lo;0;L;;;;;N;;;;;
+1B225;NUSHU CHARACTER-1B225;Lo;0;L;;;;;N;;;;;
+1B226;NUSHU CHARACTER-1B226;Lo;0;L;;;;;N;;;;;
+1B227;NUSHU CHARACTER-1B227;Lo;0;L;;;;;N;;;;;
+1B228;NUSHU CHARACTER-1B228;Lo;0;L;;;;;N;;;;;
+1B229;NUSHU CHARACTER-1B229;Lo;0;L;;;;;N;;;;;
+1B22A;NUSHU CHARACTER-1B22A;Lo;0;L;;;;;N;;;;;
+1B22B;NUSHU CHARACTER-1B22B;Lo;0;L;;;;;N;;;;;
+1B22C;NUSHU CHARACTER-1B22C;Lo;0;L;;;;;N;;;;;
+1B22D;NUSHU CHARACTER-1B22D;Lo;0;L;;;;;N;;;;;
+1B22E;NUSHU CHARACTER-1B22E;Lo;0;L;;;;;N;;;;;
+1B22F;NUSHU CHARACTER-1B22F;Lo;0;L;;;;;N;;;;;
+1B230;NUSHU CHARACTER-1B230;Lo;0;L;;;;;N;;;;;
+1B231;NUSHU CHARACTER-1B231;Lo;0;L;;;;;N;;;;;
+1B232;NUSHU CHARACTER-1B232;Lo;0;L;;;;;N;;;;;
+1B233;NUSHU CHARACTER-1B233;Lo;0;L;;;;;N;;;;;
+1B234;NUSHU CHARACTER-1B234;Lo;0;L;;;;;N;;;;;
+1B235;NUSHU CHARACTER-1B235;Lo;0;L;;;;;N;;;;;
+1B236;NUSHU CHARACTER-1B236;Lo;0;L;;;;;N;;;;;
+1B237;NUSHU CHARACTER-1B237;Lo;0;L;;;;;N;;;;;
+1B238;NUSHU CHARACTER-1B238;Lo;0;L;;;;;N;;;;;
+1B239;NUSHU CHARACTER-1B239;Lo;0;L;;;;;N;;;;;
+1B23A;NUSHU CHARACTER-1B23A;Lo;0;L;;;;;N;;;;;
+1B23B;NUSHU CHARACTER-1B23B;Lo;0;L;;;;;N;;;;;
+1B23C;NUSHU CHARACTER-1B23C;Lo;0;L;;;;;N;;;;;
+1B23D;NUSHU CHARACTER-1B23D;Lo;0;L;;;;;N;;;;;
+1B23E;NUSHU CHARACTER-1B23E;Lo;0;L;;;;;N;;;;;
+1B23F;NUSHU CHARACTER-1B23F;Lo;0;L;;;;;N;;;;;
+1B240;NUSHU CHARACTER-1B240;Lo;0;L;;;;;N;;;;;
+1B241;NUSHU CHARACTER-1B241;Lo;0;L;;;;;N;;;;;
+1B242;NUSHU CHARACTER-1B242;Lo;0;L;;;;;N;;;;;
+1B243;NUSHU CHARACTER-1B243;Lo;0;L;;;;;N;;;;;
+1B244;NUSHU CHARACTER-1B244;Lo;0;L;;;;;N;;;;;
+1B245;NUSHU CHARACTER-1B245;Lo;0;L;;;;;N;;;;;
+1B246;NUSHU CHARACTER-1B246;Lo;0;L;;;;;N;;;;;
+1B247;NUSHU CHARACTER-1B247;Lo;0;L;;;;;N;;;;;
+1B248;NUSHU CHARACTER-1B248;Lo;0;L;;;;;N;;;;;
+1B249;NUSHU CHARACTER-1B249;Lo;0;L;;;;;N;;;;;
+1B24A;NUSHU CHARACTER-1B24A;Lo;0;L;;;;;N;;;;;
+1B24B;NUSHU CHARACTER-1B24B;Lo;0;L;;;;;N;;;;;
+1B24C;NUSHU CHARACTER-1B24C;Lo;0;L;;;;;N;;;;;
+1B24D;NUSHU CHARACTER-1B24D;Lo;0;L;;;;;N;;;;;
+1B24E;NUSHU CHARACTER-1B24E;Lo;0;L;;;;;N;;;;;
+1B24F;NUSHU CHARACTER-1B24F;Lo;0;L;;;;;N;;;;;
+1B250;NUSHU CHARACTER-1B250;Lo;0;L;;;;;N;;;;;
+1B251;NUSHU CHARACTER-1B251;Lo;0;L;;;;;N;;;;;
+1B252;NUSHU CHARACTER-1B252;Lo;0;L;;;;;N;;;;;
+1B253;NUSHU CHARACTER-1B253;Lo;0;L;;;;;N;;;;;
+1B254;NUSHU CHARACTER-1B254;Lo;0;L;;;;;N;;;;;
+1B255;NUSHU CHARACTER-1B255;Lo;0;L;;;;;N;;;;;
+1B256;NUSHU CHARACTER-1B256;Lo;0;L;;;;;N;;;;;
+1B257;NUSHU CHARACTER-1B257;Lo;0;L;;;;;N;;;;;
+1B258;NUSHU CHARACTER-1B258;Lo;0;L;;;;;N;;;;;
+1B259;NUSHU CHARACTER-1B259;Lo;0;L;;;;;N;;;;;
+1B25A;NUSHU CHARACTER-1B25A;Lo;0;L;;;;;N;;;;;
+1B25B;NUSHU CHARACTER-1B25B;Lo;0;L;;;;;N;;;;;
+1B25C;NUSHU CHARACTER-1B25C;Lo;0;L;;;;;N;;;;;
+1B25D;NUSHU CHARACTER-1B25D;Lo;0;L;;;;;N;;;;;
+1B25E;NUSHU CHARACTER-1B25E;Lo;0;L;;;;;N;;;;;
+1B25F;NUSHU CHARACTER-1B25F;Lo;0;L;;;;;N;;;;;
+1B260;NUSHU CHARACTER-1B260;Lo;0;L;;;;;N;;;;;
+1B261;NUSHU CHARACTER-1B261;Lo;0;L;;;;;N;;;;;
+1B262;NUSHU CHARACTER-1B262;Lo;0;L;;;;;N;;;;;
+1B263;NUSHU CHARACTER-1B263;Lo;0;L;;;;;N;;;;;
+1B264;NUSHU CHARACTER-1B264;Lo;0;L;;;;;N;;;;;
+1B265;NUSHU CHARACTER-1B265;Lo;0;L;;;;;N;;;;;
+1B266;NUSHU CHARACTER-1B266;Lo;0;L;;;;;N;;;;;
+1B267;NUSHU CHARACTER-1B267;Lo;0;L;;;;;N;;;;;
+1B268;NUSHU CHARACTER-1B268;Lo;0;L;;;;;N;;;;;
+1B269;NUSHU CHARACTER-1B269;Lo;0;L;;;;;N;;;;;
+1B26A;NUSHU CHARACTER-1B26A;Lo;0;L;;;;;N;;;;;
+1B26B;NUSHU CHARACTER-1B26B;Lo;0;L;;;;;N;;;;;
+1B26C;NUSHU CHARACTER-1B26C;Lo;0;L;;;;;N;;;;;
+1B26D;NUSHU CHARACTER-1B26D;Lo;0;L;;;;;N;;;;;
+1B26E;NUSHU CHARACTER-1B26E;Lo;0;L;;;;;N;;;;;
+1B26F;NUSHU CHARACTER-1B26F;Lo;0;L;;;;;N;;;;;
+1B270;NUSHU CHARACTER-1B270;Lo;0;L;;;;;N;;;;;
+1B271;NUSHU CHARACTER-1B271;Lo;0;L;;;;;N;;;;;
+1B272;NUSHU CHARACTER-1B272;Lo;0;L;;;;;N;;;;;
+1B273;NUSHU CHARACTER-1B273;Lo;0;L;;;;;N;;;;;
+1B274;NUSHU CHARACTER-1B274;Lo;0;L;;;;;N;;;;;
+1B275;NUSHU CHARACTER-1B275;Lo;0;L;;;;;N;;;;;
+1B276;NUSHU CHARACTER-1B276;Lo;0;L;;;;;N;;;;;
+1B277;NUSHU CHARACTER-1B277;Lo;0;L;;;;;N;;;;;
+1B278;NUSHU CHARACTER-1B278;Lo;0;L;;;;;N;;;;;
+1B279;NUSHU CHARACTER-1B279;Lo;0;L;;;;;N;;;;;
+1B27A;NUSHU CHARACTER-1B27A;Lo;0;L;;;;;N;;;;;
+1B27B;NUSHU CHARACTER-1B27B;Lo;0;L;;;;;N;;;;;
+1B27C;NUSHU CHARACTER-1B27C;Lo;0;L;;;;;N;;;;;
+1B27D;NUSHU CHARACTER-1B27D;Lo;0;L;;;;;N;;;;;
+1B27E;NUSHU CHARACTER-1B27E;Lo;0;L;;;;;N;;;;;
+1B27F;NUSHU CHARACTER-1B27F;Lo;0;L;;;;;N;;;;;
+1B280;NUSHU CHARACTER-1B280;Lo;0;L;;;;;N;;;;;
+1B281;NUSHU CHARACTER-1B281;Lo;0;L;;;;;N;;;;;
+1B282;NUSHU CHARACTER-1B282;Lo;0;L;;;;;N;;;;;
+1B283;NUSHU CHARACTER-1B283;Lo;0;L;;;;;N;;;;;
+1B284;NUSHU CHARACTER-1B284;Lo;0;L;;;;;N;;;;;
+1B285;NUSHU CHARACTER-1B285;Lo;0;L;;;;;N;;;;;
+1B286;NUSHU CHARACTER-1B286;Lo;0;L;;;;;N;;;;;
+1B287;NUSHU CHARACTER-1B287;Lo;0;L;;;;;N;;;;;
+1B288;NUSHU CHARACTER-1B288;Lo;0;L;;;;;N;;;;;
+1B289;NUSHU CHARACTER-1B289;Lo;0;L;;;;;N;;;;;
+1B28A;NUSHU CHARACTER-1B28A;Lo;0;L;;;;;N;;;;;
+1B28B;NUSHU CHARACTER-1B28B;Lo;0;L;;;;;N;;;;;
+1B28C;NUSHU CHARACTER-1B28C;Lo;0;L;;;;;N;;;;;
+1B28D;NUSHU CHARACTER-1B28D;Lo;0;L;;;;;N;;;;;
+1B28E;NUSHU CHARACTER-1B28E;Lo;0;L;;;;;N;;;;;
+1B28F;NUSHU CHARACTER-1B28F;Lo;0;L;;;;;N;;;;;
+1B290;NUSHU CHARACTER-1B290;Lo;0;L;;;;;N;;;;;
+1B291;NUSHU CHARACTER-1B291;Lo;0;L;;;;;N;;;;;
+1B292;NUSHU CHARACTER-1B292;Lo;0;L;;;;;N;;;;;
+1B293;NUSHU CHARACTER-1B293;Lo;0;L;;;;;N;;;;;
+1B294;NUSHU CHARACTER-1B294;Lo;0;L;;;;;N;;;;;
+1B295;NUSHU CHARACTER-1B295;Lo;0;L;;;;;N;;;;;
+1B296;NUSHU CHARACTER-1B296;Lo;0;L;;;;;N;;;;;
+1B297;NUSHU CHARACTER-1B297;Lo;0;L;;;;;N;;;;;
+1B298;NUSHU CHARACTER-1B298;Lo;0;L;;;;;N;;;;;
+1B299;NUSHU CHARACTER-1B299;Lo;0;L;;;;;N;;;;;
+1B29A;NUSHU CHARACTER-1B29A;Lo;0;L;;;;;N;;;;;
+1B29B;NUSHU CHARACTER-1B29B;Lo;0;L;;;;;N;;;;;
+1B29C;NUSHU CHARACTER-1B29C;Lo;0;L;;;;;N;;;;;
+1B29D;NUSHU CHARACTER-1B29D;Lo;0;L;;;;;N;;;;;
+1B29E;NUSHU CHARACTER-1B29E;Lo;0;L;;;;;N;;;;;
+1B29F;NUSHU CHARACTER-1B29F;Lo;0;L;;;;;N;;;;;
+1B2A0;NUSHU CHARACTER-1B2A0;Lo;0;L;;;;;N;;;;;
+1B2A1;NUSHU CHARACTER-1B2A1;Lo;0;L;;;;;N;;;;;
+1B2A2;NUSHU CHARACTER-1B2A2;Lo;0;L;;;;;N;;;;;
+1B2A3;NUSHU CHARACTER-1B2A3;Lo;0;L;;;;;N;;;;;
+1B2A4;NUSHU CHARACTER-1B2A4;Lo;0;L;;;;;N;;;;;
+1B2A5;NUSHU CHARACTER-1B2A5;Lo;0;L;;;;;N;;;;;
+1B2A6;NUSHU CHARACTER-1B2A6;Lo;0;L;;;;;N;;;;;
+1B2A7;NUSHU CHARACTER-1B2A7;Lo;0;L;;;;;N;;;;;
+1B2A8;NUSHU CHARACTER-1B2A8;Lo;0;L;;;;;N;;;;;
+1B2A9;NUSHU CHARACTER-1B2A9;Lo;0;L;;;;;N;;;;;
+1B2AA;NUSHU CHARACTER-1B2AA;Lo;0;L;;;;;N;;;;;
+1B2AB;NUSHU CHARACTER-1B2AB;Lo;0;L;;;;;N;;;;;
+1B2AC;NUSHU CHARACTER-1B2AC;Lo;0;L;;;;;N;;;;;
+1B2AD;NUSHU CHARACTER-1B2AD;Lo;0;L;;;;;N;;;;;
+1B2AE;NUSHU CHARACTER-1B2AE;Lo;0;L;;;;;N;;;;;
+1B2AF;NUSHU CHARACTER-1B2AF;Lo;0;L;;;;;N;;;;;
+1B2B0;NUSHU CHARACTER-1B2B0;Lo;0;L;;;;;N;;;;;
+1B2B1;NUSHU CHARACTER-1B2B1;Lo;0;L;;;;;N;;;;;
+1B2B2;NUSHU CHARACTER-1B2B2;Lo;0;L;;;;;N;;;;;
+1B2B3;NUSHU CHARACTER-1B2B3;Lo;0;L;;;;;N;;;;;
+1B2B4;NUSHU CHARACTER-1B2B4;Lo;0;L;;;;;N;;;;;
+1B2B5;NUSHU CHARACTER-1B2B5;Lo;0;L;;;;;N;;;;;
+1B2B6;NUSHU CHARACTER-1B2B6;Lo;0;L;;;;;N;;;;;
+1B2B7;NUSHU CHARACTER-1B2B7;Lo;0;L;;;;;N;;;;;
+1B2B8;NUSHU CHARACTER-1B2B8;Lo;0;L;;;;;N;;;;;
+1B2B9;NUSHU CHARACTER-1B2B9;Lo;0;L;;;;;N;;;;;
+1B2BA;NUSHU CHARACTER-1B2BA;Lo;0;L;;;;;N;;;;;
+1B2BB;NUSHU CHARACTER-1B2BB;Lo;0;L;;;;;N;;;;;
+1B2BC;NUSHU CHARACTER-1B2BC;Lo;0;L;;;;;N;;;;;
+1B2BD;NUSHU CHARACTER-1B2BD;Lo;0;L;;;;;N;;;;;
+1B2BE;NUSHU CHARACTER-1B2BE;Lo;0;L;;;;;N;;;;;
+1B2BF;NUSHU CHARACTER-1B2BF;Lo;0;L;;;;;N;;;;;
+1B2C0;NUSHU CHARACTER-1B2C0;Lo;0;L;;;;;N;;;;;
+1B2C1;NUSHU CHARACTER-1B2C1;Lo;0;L;;;;;N;;;;;
+1B2C2;NUSHU CHARACTER-1B2C2;Lo;0;L;;;;;N;;;;;
+1B2C3;NUSHU CHARACTER-1B2C3;Lo;0;L;;;;;N;;;;;
+1B2C4;NUSHU CHARACTER-1B2C4;Lo;0;L;;;;;N;;;;;
+1B2C5;NUSHU CHARACTER-1B2C5;Lo;0;L;;;;;N;;;;;
+1B2C6;NUSHU CHARACTER-1B2C6;Lo;0;L;;;;;N;;;;;
+1B2C7;NUSHU CHARACTER-1B2C7;Lo;0;L;;;;;N;;;;;
+1B2C8;NUSHU CHARACTER-1B2C8;Lo;0;L;;;;;N;;;;;
+1B2C9;NUSHU CHARACTER-1B2C9;Lo;0;L;;;;;N;;;;;
+1B2CA;NUSHU CHARACTER-1B2CA;Lo;0;L;;;;;N;;;;;
+1B2CB;NUSHU CHARACTER-1B2CB;Lo;0;L;;;;;N;;;;;
+1B2CC;NUSHU CHARACTER-1B2CC;Lo;0;L;;;;;N;;;;;
+1B2CD;NUSHU CHARACTER-1B2CD;Lo;0;L;;;;;N;;;;;
+1B2CE;NUSHU CHARACTER-1B2CE;Lo;0;L;;;;;N;;;;;
+1B2CF;NUSHU CHARACTER-1B2CF;Lo;0;L;;;;;N;;;;;
+1B2D0;NUSHU CHARACTER-1B2D0;Lo;0;L;;;;;N;;;;;
+1B2D1;NUSHU CHARACTER-1B2D1;Lo;0;L;;;;;N;;;;;
+1B2D2;NUSHU CHARACTER-1B2D2;Lo;0;L;;;;;N;;;;;
+1B2D3;NUSHU CHARACTER-1B2D3;Lo;0;L;;;;;N;;;;;
+1B2D4;NUSHU CHARACTER-1B2D4;Lo;0;L;;;;;N;;;;;
+1B2D5;NUSHU CHARACTER-1B2D5;Lo;0;L;;;;;N;;;;;
+1B2D6;NUSHU CHARACTER-1B2D6;Lo;0;L;;;;;N;;;;;
+1B2D7;NUSHU CHARACTER-1B2D7;Lo;0;L;;;;;N;;;;;
+1B2D8;NUSHU CHARACTER-1B2D8;Lo;0;L;;;;;N;;;;;
+1B2D9;NUSHU CHARACTER-1B2D9;Lo;0;L;;;;;N;;;;;
+1B2DA;NUSHU CHARACTER-1B2DA;Lo;0;L;;;;;N;;;;;
+1B2DB;NUSHU CHARACTER-1B2DB;Lo;0;L;;;;;N;;;;;
+1B2DC;NUSHU CHARACTER-1B2DC;Lo;0;L;;;;;N;;;;;
+1B2DD;NUSHU CHARACTER-1B2DD;Lo;0;L;;;;;N;;;;;
+1B2DE;NUSHU CHARACTER-1B2DE;Lo;0;L;;;;;N;;;;;
+1B2DF;NUSHU CHARACTER-1B2DF;Lo;0;L;;;;;N;;;;;
+1B2E0;NUSHU CHARACTER-1B2E0;Lo;0;L;;;;;N;;;;;
+1B2E1;NUSHU CHARACTER-1B2E1;Lo;0;L;;;;;N;;;;;
+1B2E2;NUSHU CHARACTER-1B2E2;Lo;0;L;;;;;N;;;;;
+1B2E3;NUSHU CHARACTER-1B2E3;Lo;0;L;;;;;N;;;;;
+1B2E4;NUSHU CHARACTER-1B2E4;Lo;0;L;;;;;N;;;;;
+1B2E5;NUSHU CHARACTER-1B2E5;Lo;0;L;;;;;N;;;;;
+1B2E6;NUSHU CHARACTER-1B2E6;Lo;0;L;;;;;N;;;;;
+1B2E7;NUSHU CHARACTER-1B2E7;Lo;0;L;;;;;N;;;;;
+1B2E8;NUSHU CHARACTER-1B2E8;Lo;0;L;;;;;N;;;;;
+1B2E9;NUSHU CHARACTER-1B2E9;Lo;0;L;;;;;N;;;;;
+1B2EA;NUSHU CHARACTER-1B2EA;Lo;0;L;;;;;N;;;;;
+1B2EB;NUSHU CHARACTER-1B2EB;Lo;0;L;;;;;N;;;;;
+1B2EC;NUSHU CHARACTER-1B2EC;Lo;0;L;;;;;N;;;;;
+1B2ED;NUSHU CHARACTER-1B2ED;Lo;0;L;;;;;N;;;;;
+1B2EE;NUSHU CHARACTER-1B2EE;Lo;0;L;;;;;N;;;;;
+1B2EF;NUSHU CHARACTER-1B2EF;Lo;0;L;;;;;N;;;;;
+1B2F0;NUSHU CHARACTER-1B2F0;Lo;0;L;;;;;N;;;;;
+1B2F1;NUSHU CHARACTER-1B2F1;Lo;0;L;;;;;N;;;;;
+1B2F2;NUSHU CHARACTER-1B2F2;Lo;0;L;;;;;N;;;;;
+1B2F3;NUSHU CHARACTER-1B2F3;Lo;0;L;;;;;N;;;;;
+1B2F4;NUSHU CHARACTER-1B2F4;Lo;0;L;;;;;N;;;;;
+1B2F5;NUSHU CHARACTER-1B2F5;Lo;0;L;;;;;N;;;;;
+1B2F6;NUSHU CHARACTER-1B2F6;Lo;0;L;;;;;N;;;;;
+1B2F7;NUSHU CHARACTER-1B2F7;Lo;0;L;;;;;N;;;;;
+1B2F8;NUSHU CHARACTER-1B2F8;Lo;0;L;;;;;N;;;;;
+1B2F9;NUSHU CHARACTER-1B2F9;Lo;0;L;;;;;N;;;;;
+1B2FA;NUSHU CHARACTER-1B2FA;Lo;0;L;;;;;N;;;;;
+1B2FB;NUSHU CHARACTER-1B2FB;Lo;0;L;;;;;N;;;;;
+1BC00;DUPLOYAN LETTER H;Lo;0;L;;;;;N;;;;;
+1BC01;DUPLOYAN LETTER X;Lo;0;L;;;;;N;;;;;
+1BC02;DUPLOYAN LETTER P;Lo;0;L;;;;;N;;;;;
+1BC03;DUPLOYAN LETTER T;Lo;0;L;;;;;N;;;;;
+1BC04;DUPLOYAN LETTER F;Lo;0;L;;;;;N;;;;;
+1BC05;DUPLOYAN LETTER K;Lo;0;L;;;;;N;;;;;
+1BC06;DUPLOYAN LETTER L;Lo;0;L;;;;;N;;;;;
+1BC07;DUPLOYAN LETTER B;Lo;0;L;;;;;N;;;;;
+1BC08;DUPLOYAN LETTER D;Lo;0;L;;;;;N;;;;;
+1BC09;DUPLOYAN LETTER V;Lo;0;L;;;;;N;;;;;
+1BC0A;DUPLOYAN LETTER G;Lo;0;L;;;;;N;;;;;
+1BC0B;DUPLOYAN LETTER R;Lo;0;L;;;;;N;;;;;
+1BC0C;DUPLOYAN LETTER P N;Lo;0;L;;;;;N;;;;;
+1BC0D;DUPLOYAN LETTER D S;Lo;0;L;;;;;N;;;;;
+1BC0E;DUPLOYAN LETTER F N;Lo;0;L;;;;;N;;;;;
+1BC0F;DUPLOYAN LETTER K M;Lo;0;L;;;;;N;;;;;
+1BC10;DUPLOYAN LETTER R S;Lo;0;L;;;;;N;;;;;
+1BC11;DUPLOYAN LETTER TH;Lo;0;L;;;;;N;;;;;
+1BC12;DUPLOYAN LETTER SLOAN DH;Lo;0;L;;;;;N;;;;;
+1BC13;DUPLOYAN LETTER DH;Lo;0;L;;;;;N;;;;;
+1BC14;DUPLOYAN LETTER KK;Lo;0;L;;;;;N;;;;;
+1BC15;DUPLOYAN LETTER SLOAN J;Lo;0;L;;;;;N;;;;;
+1BC16;DUPLOYAN LETTER HL;Lo;0;L;;;;;N;;;;;
+1BC17;DUPLOYAN LETTER LH;Lo;0;L;;;;;N;;;;;
+1BC18;DUPLOYAN LETTER RH;Lo;0;L;;;;;N;;;;;
+1BC19;DUPLOYAN LETTER M;Lo;0;L;;;;;N;;;;;
+1BC1A;DUPLOYAN LETTER N;Lo;0;L;;;;;N;;;;;
+1BC1B;DUPLOYAN LETTER J;Lo;0;L;;;;;N;;;;;
+1BC1C;DUPLOYAN LETTER S;Lo;0;L;;;;;N;;;;;
+1BC1D;DUPLOYAN LETTER M N;Lo;0;L;;;;;N;;;;;
+1BC1E;DUPLOYAN LETTER N M;Lo;0;L;;;;;N;;;;;
+1BC1F;DUPLOYAN LETTER J M;Lo;0;L;;;;;N;;;;;
+1BC20;DUPLOYAN LETTER S J;Lo;0;L;;;;;N;;;;;
+1BC21;DUPLOYAN LETTER M WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC22;DUPLOYAN LETTER N WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC23;DUPLOYAN LETTER J WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC24;DUPLOYAN LETTER J WITH DOTS INSIDE AND ABOVE;Lo;0;L;;;;;N;;;;;
+1BC25;DUPLOYAN LETTER S WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC26;DUPLOYAN LETTER S WITH DOT BELOW;Lo;0;L;;;;;N;;;;;
+1BC27;DUPLOYAN LETTER M S;Lo;0;L;;;;;N;;;;;
+1BC28;DUPLOYAN LETTER N S;Lo;0;L;;;;;N;;;;;
+1BC29;DUPLOYAN LETTER J S;Lo;0;L;;;;;N;;;;;
+1BC2A;DUPLOYAN LETTER S S;Lo;0;L;;;;;N;;;;;
+1BC2B;DUPLOYAN LETTER M N S;Lo;0;L;;;;;N;;;;;
+1BC2C;DUPLOYAN LETTER N M S;Lo;0;L;;;;;N;;;;;
+1BC2D;DUPLOYAN LETTER J M S;Lo;0;L;;;;;N;;;;;
+1BC2E;DUPLOYAN LETTER S J S;Lo;0;L;;;;;N;;;;;
+1BC2F;DUPLOYAN LETTER J S WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC30;DUPLOYAN LETTER J N;Lo;0;L;;;;;N;;;;;
+1BC31;DUPLOYAN LETTER J N S;Lo;0;L;;;;;N;;;;;
+1BC32;DUPLOYAN LETTER S T;Lo;0;L;;;;;N;;;;;
+1BC33;DUPLOYAN LETTER S T R;Lo;0;L;;;;;N;;;;;
+1BC34;DUPLOYAN LETTER S P;Lo;0;L;;;;;N;;;;;
+1BC35;DUPLOYAN LETTER S P R;Lo;0;L;;;;;N;;;;;
+1BC36;DUPLOYAN LETTER T S;Lo;0;L;;;;;N;;;;;
+1BC37;DUPLOYAN LETTER T R S;Lo;0;L;;;;;N;;;;;
+1BC38;DUPLOYAN LETTER W;Lo;0;L;;;;;N;;;;;
+1BC39;DUPLOYAN LETTER WH;Lo;0;L;;;;;N;;;;;
+1BC3A;DUPLOYAN LETTER W R;Lo;0;L;;;;;N;;;;;
+1BC3B;DUPLOYAN LETTER S N;Lo;0;L;;;;;N;;;;;
+1BC3C;DUPLOYAN LETTER S M;Lo;0;L;;;;;N;;;;;
+1BC3D;DUPLOYAN LETTER K R S;Lo;0;L;;;;;N;;;;;
+1BC3E;DUPLOYAN LETTER G R S;Lo;0;L;;;;;N;;;;;
+1BC3F;DUPLOYAN LETTER S K;Lo;0;L;;;;;N;;;;;
+1BC40;DUPLOYAN LETTER S K R;Lo;0;L;;;;;N;;;;;
+1BC41;DUPLOYAN LETTER A;Lo;0;L;;;;;N;;;;;
+1BC42;DUPLOYAN LETTER SLOAN OW;Lo;0;L;;;;;N;;;;;
+1BC43;DUPLOYAN LETTER OA;Lo;0;L;;;;;N;;;;;
+1BC44;DUPLOYAN LETTER O;Lo;0;L;;;;;N;;;;;
+1BC45;DUPLOYAN LETTER AOU;Lo;0;L;;;;;N;;;;;
+1BC46;DUPLOYAN LETTER I;Lo;0;L;;;;;N;;;;;
+1BC47;DUPLOYAN LETTER E;Lo;0;L;;;;;N;;;;;
+1BC48;DUPLOYAN LETTER IE;Lo;0;L;;;;;N;;;;;
+1BC49;DUPLOYAN LETTER SHORT I;Lo;0;L;;;;;N;;;;;
+1BC4A;DUPLOYAN LETTER UI;Lo;0;L;;;;;N;;;;;
+1BC4B;DUPLOYAN LETTER EE;Lo;0;L;;;;;N;;;;;
+1BC4C;DUPLOYAN LETTER SLOAN EH;Lo;0;L;;;;;N;;;;;
+1BC4D;DUPLOYAN LETTER ROMANIAN I;Lo;0;L;;;;;N;;;;;
+1BC4E;DUPLOYAN LETTER SLOAN EE;Lo;0;L;;;;;N;;;;;
+1BC4F;DUPLOYAN LETTER LONG I;Lo;0;L;;;;;N;;;;;
+1BC50;DUPLOYAN LETTER YE;Lo;0;L;;;;;N;;;;;
+1BC51;DUPLOYAN LETTER U;Lo;0;L;;;;;N;;;;;
+1BC52;DUPLOYAN LETTER EU;Lo;0;L;;;;;N;;;;;
+1BC53;DUPLOYAN LETTER XW;Lo;0;L;;;;;N;;;;;
+1BC54;DUPLOYAN LETTER U N;Lo;0;L;;;;;N;;;;;
+1BC55;DUPLOYAN LETTER LONG U;Lo;0;L;;;;;N;;;;;
+1BC56;DUPLOYAN LETTER ROMANIAN U;Lo;0;L;;;;;N;;;;;
+1BC57;DUPLOYAN LETTER UH;Lo;0;L;;;;;N;;;;;
+1BC58;DUPLOYAN LETTER SLOAN U;Lo;0;L;;;;;N;;;;;
+1BC59;DUPLOYAN LETTER OOH;Lo;0;L;;;;;N;;;;;
+1BC5A;DUPLOYAN LETTER OW;Lo;0;L;;;;;N;;;;;
+1BC5B;DUPLOYAN LETTER OU;Lo;0;L;;;;;N;;;;;
+1BC5C;DUPLOYAN LETTER WA;Lo;0;L;;;;;N;;;;;
+1BC5D;DUPLOYAN LETTER WO;Lo;0;L;;;;;N;;;;;
+1BC5E;DUPLOYAN LETTER WI;Lo;0;L;;;;;N;;;;;
+1BC5F;DUPLOYAN LETTER WEI;Lo;0;L;;;;;N;;;;;
+1BC60;DUPLOYAN LETTER WOW;Lo;0;L;;;;;N;;;;;
+1BC61;DUPLOYAN LETTER NASAL U;Lo;0;L;;;;;N;;;;;
+1BC62;DUPLOYAN LETTER NASAL O;Lo;0;L;;;;;N;;;;;
+1BC63;DUPLOYAN LETTER NASAL I;Lo;0;L;;;;;N;;;;;
+1BC64;DUPLOYAN LETTER NASAL A;Lo;0;L;;;;;N;;;;;
+1BC65;DUPLOYAN LETTER PERNIN AN;Lo;0;L;;;;;N;;;;;
+1BC66;DUPLOYAN LETTER PERNIN AM;Lo;0;L;;;;;N;;;;;
+1BC67;DUPLOYAN LETTER SLOAN EN;Lo;0;L;;;;;N;;;;;
+1BC68;DUPLOYAN LETTER SLOAN AN;Lo;0;L;;;;;N;;;;;
+1BC69;DUPLOYAN LETTER SLOAN ON;Lo;0;L;;;;;N;;;;;
+1BC6A;DUPLOYAN LETTER VOCALIC M;Lo;0;L;;;;;N;;;;;
+1BC70;DUPLOYAN AFFIX LEFT HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC71;DUPLOYAN AFFIX MID HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC72;DUPLOYAN AFFIX RIGHT HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC73;DUPLOYAN AFFIX LOW VERTICAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC74;DUPLOYAN AFFIX MID VERTICAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC75;DUPLOYAN AFFIX HIGH VERTICAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC76;DUPLOYAN AFFIX ATTACHED SECANT;Lo;0;L;;;;;N;;;;;
+1BC77;DUPLOYAN AFFIX ATTACHED LEFT-TO-RIGHT SECANT;Lo;0;L;;;;;N;;;;;
+1BC78;DUPLOYAN AFFIX ATTACHED TANGENT;Lo;0;L;;;;;N;;;;;
+1BC79;DUPLOYAN AFFIX ATTACHED TAIL;Lo;0;L;;;;;N;;;;;
+1BC7A;DUPLOYAN AFFIX ATTACHED E HOOK;Lo;0;L;;;;;N;;;;;
+1BC7B;DUPLOYAN AFFIX ATTACHED I HOOK;Lo;0;L;;;;;N;;;;;
+1BC7C;DUPLOYAN AFFIX ATTACHED TANGENT HOOK;Lo;0;L;;;;;N;;;;;
+1BC80;DUPLOYAN AFFIX HIGH ACUTE;Lo;0;L;;;;;N;;;;;
+1BC81;DUPLOYAN AFFIX HIGH TIGHT ACUTE;Lo;0;L;;;;;N;;;;;
+1BC82;DUPLOYAN AFFIX HIGH GRAVE;Lo;0;L;;;;;N;;;;;
+1BC83;DUPLOYAN AFFIX HIGH LONG GRAVE;Lo;0;L;;;;;N;;;;;
+1BC84;DUPLOYAN AFFIX HIGH DOT;Lo;0;L;;;;;N;;;;;
+1BC85;DUPLOYAN AFFIX HIGH CIRCLE;Lo;0;L;;;;;N;;;;;
+1BC86;DUPLOYAN AFFIX HIGH LINE;Lo;0;L;;;;;N;;;;;
+1BC87;DUPLOYAN AFFIX HIGH WAVE;Lo;0;L;;;;;N;;;;;
+1BC88;DUPLOYAN AFFIX HIGH VERTICAL;Lo;0;L;;;;;N;;;;;
+1BC90;DUPLOYAN AFFIX LOW ACUTE;Lo;0;L;;;;;N;;;;;
+1BC91;DUPLOYAN AFFIX LOW TIGHT ACUTE;Lo;0;L;;;;;N;;;;;
+1BC92;DUPLOYAN AFFIX LOW GRAVE;Lo;0;L;;;;;N;;;;;
+1BC93;DUPLOYAN AFFIX LOW LONG GRAVE;Lo;0;L;;;;;N;;;;;
+1BC94;DUPLOYAN AFFIX LOW DOT;Lo;0;L;;;;;N;;;;;
+1BC95;DUPLOYAN AFFIX LOW CIRCLE;Lo;0;L;;;;;N;;;;;
+1BC96;DUPLOYAN AFFIX LOW LINE;Lo;0;L;;;;;N;;;;;
+1BC97;DUPLOYAN AFFIX LOW WAVE;Lo;0;L;;;;;N;;;;;
+1BC98;DUPLOYAN AFFIX LOW VERTICAL;Lo;0;L;;;;;N;;;;;
+1BC99;DUPLOYAN AFFIX LOW ARROW;Lo;0;L;;;;;N;;;;;
+1BC9C;DUPLOYAN SIGN O WITH CROSS;So;0;L;;;;;N;;;;;
+1BC9D;DUPLOYAN THICK LETTER SELECTOR;Mn;0;NSM;;;;;N;;;;;
+1BC9E;DUPLOYAN DOUBLE MARK;Mn;1;NSM;;;;;N;;;;;
+1BC9F;DUPLOYAN PUNCTUATION CHINOOK FULL STOP;Po;0;L;;;;;N;;;;;
+1BCA0;SHORTHAND FORMAT LETTER OVERLAP;Cf;0;BN;;;;;N;;;;;
+1BCA1;SHORTHAND FORMAT CONTINUING OVERLAP;Cf;0;BN;;;;;N;;;;;
+1BCA2;SHORTHAND FORMAT DOWN STEP;Cf;0;BN;;;;;N;;;;;
+1BCA3;SHORTHAND FORMAT UP STEP;Cf;0;BN;;;;;N;;;;;
+1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;;
+1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;;
+1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;;
+1D003;BYZANTINE MUSICAL SYMBOL OXEIA EKFONITIKON;So;0;L;;;;;N;;;;;
+1D004;BYZANTINE MUSICAL SYMBOL OXEIA DIPLI;So;0;L;;;;;N;;;;;
+1D005;BYZANTINE MUSICAL SYMBOL VAREIA EKFONITIKON;So;0;L;;;;;N;;;;;
+1D006;BYZANTINE MUSICAL SYMBOL VAREIA DIPLI;So;0;L;;;;;N;;;;;
+1D007;BYZANTINE MUSICAL SYMBOL KATHISTI;So;0;L;;;;;N;;;;;
+1D008;BYZANTINE MUSICAL SYMBOL SYRMATIKI;So;0;L;;;;;N;;;;;
+1D009;BYZANTINE MUSICAL SYMBOL PARAKLITIKI;So;0;L;;;;;N;;;;;
+1D00A;BYZANTINE MUSICAL SYMBOL YPOKRISIS;So;0;L;;;;;N;;;;;
+1D00B;BYZANTINE MUSICAL SYMBOL YPOKRISIS DIPLI;So;0;L;;;;;N;;;;;
+1D00C;BYZANTINE MUSICAL SYMBOL KREMASTI;So;0;L;;;;;N;;;;;
+1D00D;BYZANTINE MUSICAL SYMBOL APESO EKFONITIKON;So;0;L;;;;;N;;;;;
+1D00E;BYZANTINE MUSICAL SYMBOL EXO EKFONITIKON;So;0;L;;;;;N;;;;;
+1D00F;BYZANTINE MUSICAL SYMBOL TELEIA;So;0;L;;;;;N;;;;;
+1D010;BYZANTINE MUSICAL SYMBOL KENTIMATA;So;0;L;;;;;N;;;;;
+1D011;BYZANTINE MUSICAL SYMBOL APOSTROFOS;So;0;L;;;;;N;;;;;
+1D012;BYZANTINE MUSICAL SYMBOL APOSTROFOS DIPLI;So;0;L;;;;;N;;;;;
+1D013;BYZANTINE MUSICAL SYMBOL SYNEVMA;So;0;L;;;;;N;;;;;
+1D014;BYZANTINE MUSICAL SYMBOL THITA;So;0;L;;;;;N;;;;;
+1D015;BYZANTINE MUSICAL SYMBOL OLIGON ARCHAION;So;0;L;;;;;N;;;;;
+1D016;BYZANTINE MUSICAL SYMBOL GORGON ARCHAION;So;0;L;;;;;N;;;;;
+1D017;BYZANTINE MUSICAL SYMBOL PSILON;So;0;L;;;;;N;;;;;
+1D018;BYZANTINE MUSICAL SYMBOL CHAMILON;So;0;L;;;;;N;;;;;
+1D019;BYZANTINE MUSICAL SYMBOL VATHY;So;0;L;;;;;N;;;;;
+1D01A;BYZANTINE MUSICAL SYMBOL ISON ARCHAION;So;0;L;;;;;N;;;;;
+1D01B;BYZANTINE MUSICAL SYMBOL KENTIMA ARCHAION;So;0;L;;;;;N;;;;;
+1D01C;BYZANTINE MUSICAL SYMBOL KENTIMATA ARCHAION;So;0;L;;;;;N;;;;;
+1D01D;BYZANTINE MUSICAL SYMBOL SAXIMATA;So;0;L;;;;;N;;;;;
+1D01E;BYZANTINE MUSICAL SYMBOL PARICHON;So;0;L;;;;;N;;;;;
+1D01F;BYZANTINE MUSICAL SYMBOL STAVROS APODEXIA;So;0;L;;;;;N;;;;;
+1D020;BYZANTINE MUSICAL SYMBOL OXEIAI ARCHAION;So;0;L;;;;;N;;;;;
+1D021;BYZANTINE MUSICAL SYMBOL VAREIAI ARCHAION;So;0;L;;;;;N;;;;;
+1D022;BYZANTINE MUSICAL SYMBOL APODERMA ARCHAION;So;0;L;;;;;N;;;;;
+1D023;BYZANTINE MUSICAL SYMBOL APOTHEMA;So;0;L;;;;;N;;;;;
+1D024;BYZANTINE MUSICAL SYMBOL KLASMA;So;0;L;;;;;N;;;;;
+1D025;BYZANTINE MUSICAL SYMBOL REVMA;So;0;L;;;;;N;;;;;
+1D026;BYZANTINE MUSICAL SYMBOL PIASMA ARCHAION;So;0;L;;;;;N;;;;;
+1D027;BYZANTINE MUSICAL SYMBOL TINAGMA;So;0;L;;;;;N;;;;;
+1D028;BYZANTINE MUSICAL SYMBOL ANATRICHISMA;So;0;L;;;;;N;;;;;
+1D029;BYZANTINE MUSICAL SYMBOL SEISMA;So;0;L;;;;;N;;;;;
+1D02A;BYZANTINE MUSICAL SYMBOL SYNAGMA ARCHAION;So;0;L;;;;;N;;;;;
+1D02B;BYZANTINE MUSICAL SYMBOL SYNAGMA META STAVROU;So;0;L;;;;;N;;;;;
+1D02C;BYZANTINE MUSICAL SYMBOL OYRANISMA ARCHAION;So;0;L;;;;;N;;;;;
+1D02D;BYZANTINE MUSICAL SYMBOL THEMA;So;0;L;;;;;N;;;;;
+1D02E;BYZANTINE MUSICAL SYMBOL LEMOI;So;0;L;;;;;N;;;;;
+1D02F;BYZANTINE MUSICAL SYMBOL DYO;So;0;L;;;;;N;;;;;
+1D030;BYZANTINE MUSICAL SYMBOL TRIA;So;0;L;;;;;N;;;;;
+1D031;BYZANTINE MUSICAL SYMBOL TESSERA;So;0;L;;;;;N;;;;;
+1D032;BYZANTINE MUSICAL SYMBOL KRATIMATA;So;0;L;;;;;N;;;;;
+1D033;BYZANTINE MUSICAL SYMBOL APESO EXO NEO;So;0;L;;;;;N;;;;;
+1D034;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION;So;0;L;;;;;N;;;;;
+1D035;BYZANTINE MUSICAL SYMBOL IMIFTHORA;So;0;L;;;;;N;;;;;
+1D036;BYZANTINE MUSICAL SYMBOL TROMIKON ARCHAION;So;0;L;;;;;N;;;;;
+1D037;BYZANTINE MUSICAL SYMBOL KATAVA TROMIKON;So;0;L;;;;;N;;;;;
+1D038;BYZANTINE MUSICAL SYMBOL PELASTON;So;0;L;;;;;N;;;;;
+1D039;BYZANTINE MUSICAL SYMBOL PSIFISTON;So;0;L;;;;;N;;;;;
+1D03A;BYZANTINE MUSICAL SYMBOL KONTEVMA;So;0;L;;;;;N;;;;;
+1D03B;BYZANTINE MUSICAL SYMBOL CHOREVMA ARCHAION;So;0;L;;;;;N;;;;;
+1D03C;BYZANTINE MUSICAL SYMBOL RAPISMA;So;0;L;;;;;N;;;;;
+1D03D;BYZANTINE MUSICAL SYMBOL PARAKALESMA ARCHAION;So;0;L;;;;;N;;;;;
+1D03E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI ARCHAION;So;0;L;;;;;N;;;;;
+1D03F;BYZANTINE MUSICAL SYMBOL ICHADIN;So;0;L;;;;;N;;;;;
+1D040;BYZANTINE MUSICAL SYMBOL NANA;So;0;L;;;;;N;;;;;
+1D041;BYZANTINE MUSICAL SYMBOL PETASMA;So;0;L;;;;;N;;;;;
+1D042;BYZANTINE MUSICAL SYMBOL KONTEVMA ALLO;So;0;L;;;;;N;;;;;
+1D043;BYZANTINE MUSICAL SYMBOL TROMIKON ALLO;So;0;L;;;;;N;;;;;
+1D044;BYZANTINE MUSICAL SYMBOL STRAGGISMATA;So;0;L;;;;;N;;;;;
+1D045;BYZANTINE MUSICAL SYMBOL GRONTHISMATA;So;0;L;;;;;N;;;;;
+1D046;BYZANTINE MUSICAL SYMBOL ISON NEO;So;0;L;;;;;N;;;;;
+1D047;BYZANTINE MUSICAL SYMBOL OLIGON NEO;So;0;L;;;;;N;;;;;
+1D048;BYZANTINE MUSICAL SYMBOL OXEIA NEO;So;0;L;;;;;N;;;;;
+1D049;BYZANTINE MUSICAL SYMBOL PETASTI;So;0;L;;;;;N;;;;;
+1D04A;BYZANTINE MUSICAL SYMBOL KOUFISMA;So;0;L;;;;;N;;;;;
+1D04B;BYZANTINE MUSICAL SYMBOL PETASTOKOUFISMA;So;0;L;;;;;N;;;;;
+1D04C;BYZANTINE MUSICAL SYMBOL KRATIMOKOUFISMA;So;0;L;;;;;N;;;;;
+1D04D;BYZANTINE MUSICAL SYMBOL PELASTON NEO;So;0;L;;;;;N;;;;;
+1D04E;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO ANO;So;0;L;;;;;N;;;;;
+1D04F;BYZANTINE MUSICAL SYMBOL KENTIMA NEO ANO;So;0;L;;;;;N;;;;;
+1D050;BYZANTINE MUSICAL SYMBOL YPSILI;So;0;L;;;;;N;;;;;
+1D051;BYZANTINE MUSICAL SYMBOL APOSTROFOS NEO;So;0;L;;;;;N;;;;;
+1D052;BYZANTINE MUSICAL SYMBOL APOSTROFOI SYNDESMOS NEO;So;0;L;;;;;N;;;;;
+1D053;BYZANTINE MUSICAL SYMBOL YPORROI;So;0;L;;;;;N;;;;;
+1D054;BYZANTINE MUSICAL SYMBOL KRATIMOYPORROON;So;0;L;;;;;N;;;;;
+1D055;BYZANTINE MUSICAL SYMBOL ELAFRON;So;0;L;;;;;N;;;;;
+1D056;BYZANTINE MUSICAL SYMBOL CHAMILI;So;0;L;;;;;N;;;;;
+1D057;BYZANTINE MUSICAL SYMBOL MIKRON ISON;So;0;L;;;;;N;;;;;
+1D058;BYZANTINE MUSICAL SYMBOL VAREIA NEO;So;0;L;;;;;N;;;;;
+1D059;BYZANTINE MUSICAL SYMBOL PIASMA NEO;So;0;L;;;;;N;;;;;
+1D05A;BYZANTINE MUSICAL SYMBOL PSIFISTON NEO;So;0;L;;;;;N;;;;;
+1D05B;BYZANTINE MUSICAL SYMBOL OMALON;So;0;L;;;;;N;;;;;
+1D05C;BYZANTINE MUSICAL SYMBOL ANTIKENOMA;So;0;L;;;;;N;;;;;
+1D05D;BYZANTINE MUSICAL SYMBOL LYGISMA;So;0;L;;;;;N;;;;;
+1D05E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI NEO;So;0;L;;;;;N;;;;;
+1D05F;BYZANTINE MUSICAL SYMBOL PARAKALESMA NEO;So;0;L;;;;;N;;;;;
+1D060;BYZANTINE MUSICAL SYMBOL ETERON PARAKALESMA;So;0;L;;;;;N;;;;;
+1D061;BYZANTINE MUSICAL SYMBOL KYLISMA;So;0;L;;;;;N;;;;;
+1D062;BYZANTINE MUSICAL SYMBOL ANTIKENOKYLISMA;So;0;L;;;;;N;;;;;
+1D063;BYZANTINE MUSICAL SYMBOL TROMIKON NEO;So;0;L;;;;;N;;;;;
+1D064;BYZANTINE MUSICAL SYMBOL EKSTREPTON;So;0;L;;;;;N;;;;;
+1D065;BYZANTINE MUSICAL SYMBOL SYNAGMA NEO;So;0;L;;;;;N;;;;;
+1D066;BYZANTINE MUSICAL SYMBOL SYRMA;So;0;L;;;;;N;;;;;
+1D067;BYZANTINE MUSICAL SYMBOL CHOREVMA NEO;So;0;L;;;;;N;;;;;
+1D068;BYZANTINE MUSICAL SYMBOL EPEGERMA;So;0;L;;;;;N;;;;;
+1D069;BYZANTINE MUSICAL SYMBOL SEISMA NEO;So;0;L;;;;;N;;;;;
+1D06A;BYZANTINE MUSICAL SYMBOL XIRON KLASMA;So;0;L;;;;;N;;;;;
+1D06B;BYZANTINE MUSICAL SYMBOL TROMIKOPSIFISTON;So;0;L;;;;;N;;;;;
+1D06C;BYZANTINE MUSICAL SYMBOL PSIFISTOLYGISMA;So;0;L;;;;;N;;;;;
+1D06D;BYZANTINE MUSICAL SYMBOL TROMIKOLYGISMA;So;0;L;;;;;N;;;;;
+1D06E;BYZANTINE MUSICAL SYMBOL TROMIKOPARAKALESMA;So;0;L;;;;;N;;;;;
+1D06F;BYZANTINE MUSICAL SYMBOL PSIFISTOPARAKALESMA;So;0;L;;;;;N;;;;;
+1D070;BYZANTINE MUSICAL SYMBOL TROMIKOSYNAGMA;So;0;L;;;;;N;;;;;
+1D071;BYZANTINE MUSICAL SYMBOL PSIFISTOSYNAGMA;So;0;L;;;;;N;;;;;
+1D072;BYZANTINE MUSICAL SYMBOL GORGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D073;BYZANTINE MUSICAL SYMBOL ARGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D074;BYZANTINE MUSICAL SYMBOL ETERON ARGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D075;BYZANTINE MUSICAL SYMBOL OYRANISMA NEO;So;0;L;;;;;N;;;;;
+1D076;BYZANTINE MUSICAL SYMBOL THEMATISMOS ESO;So;0;L;;;;;N;;;;;
+1D077;BYZANTINE MUSICAL SYMBOL THEMATISMOS EXO;So;0;L;;;;;N;;;;;
+1D078;BYZANTINE MUSICAL SYMBOL THEMA APLOUN;So;0;L;;;;;N;;;;;
+1D079;BYZANTINE MUSICAL SYMBOL THES KAI APOTHES;So;0;L;;;;;N;;;;;
+1D07A;BYZANTINE MUSICAL SYMBOL KATAVASMA;So;0;L;;;;;N;;;;;
+1D07B;BYZANTINE MUSICAL SYMBOL ENDOFONON;So;0;L;;;;;N;;;;;
+1D07C;BYZANTINE MUSICAL SYMBOL YFEN KATO;So;0;L;;;;;N;;;;;
+1D07D;BYZANTINE MUSICAL SYMBOL YFEN ANO;So;0;L;;;;;N;;;;;
+1D07E;BYZANTINE MUSICAL SYMBOL STAVROS;So;0;L;;;;;N;;;;;
+1D07F;BYZANTINE MUSICAL SYMBOL KLASMA ANO;So;0;L;;;;;N;;;;;
+1D080;BYZANTINE MUSICAL SYMBOL DIPLI ARCHAION;So;0;L;;;;;N;;;;;
+1D081;BYZANTINE MUSICAL SYMBOL KRATIMA ARCHAION;So;0;L;;;;;N;;;;;
+1D082;BYZANTINE MUSICAL SYMBOL KRATIMA ALLO;So;0;L;;;;;N;;;;;
+1D083;BYZANTINE MUSICAL SYMBOL KRATIMA NEO;So;0;L;;;;;N;;;;;
+1D084;BYZANTINE MUSICAL SYMBOL APODERMA NEO;So;0;L;;;;;N;;;;;
+1D085;BYZANTINE MUSICAL SYMBOL APLI;So;0;L;;;;;N;;;;;
+1D086;BYZANTINE MUSICAL SYMBOL DIPLI;So;0;L;;;;;N;;;;;
+1D087;BYZANTINE MUSICAL SYMBOL TRIPLI;So;0;L;;;;;N;;;;;
+1D088;BYZANTINE MUSICAL SYMBOL TETRAPLI;So;0;L;;;;;N;;;;;
+1D089;BYZANTINE MUSICAL SYMBOL KORONIS;So;0;L;;;;;N;;;;;
+1D08A;BYZANTINE MUSICAL SYMBOL LEIMMA ENOS CHRONOU;So;0;L;;;;;N;;;;;
+1D08B;BYZANTINE MUSICAL SYMBOL LEIMMA DYO CHRONON;So;0;L;;;;;N;;;;;
+1D08C;BYZANTINE MUSICAL SYMBOL LEIMMA TRION CHRONON;So;0;L;;;;;N;;;;;
+1D08D;BYZANTINE MUSICAL SYMBOL LEIMMA TESSARON CHRONON;So;0;L;;;;;N;;;;;
+1D08E;BYZANTINE MUSICAL SYMBOL LEIMMA IMISEOS CHRONOU;So;0;L;;;;;N;;;;;
+1D08F;BYZANTINE MUSICAL SYMBOL GORGON NEO ANO;So;0;L;;;;;N;;;;;
+1D090;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON ARISTERA;So;0;L;;;;;N;;;;;
+1D091;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
+1D092;BYZANTINE MUSICAL SYMBOL DIGORGON;So;0;L;;;;;N;;;;;
+1D093;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA KATO;So;0;L;;;;;N;;;;;
+1D094;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA ANO;So;0;L;;;;;N;;;;;
+1D095;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
+1D096;BYZANTINE MUSICAL SYMBOL TRIGORGON;So;0;L;;;;;N;;;;;
+1D097;BYZANTINE MUSICAL SYMBOL ARGON;So;0;L;;;;;N;;;;;
+1D098;BYZANTINE MUSICAL SYMBOL IMIDIARGON;So;0;L;;;;;N;;;;;
+1D099;BYZANTINE MUSICAL SYMBOL DIARGON;So;0;L;;;;;N;;;;;
+1D09A;BYZANTINE MUSICAL SYMBOL AGOGI POLI ARGI;So;0;L;;;;;N;;;;;
+1D09B;BYZANTINE MUSICAL SYMBOL AGOGI ARGOTERI;So;0;L;;;;;N;;;;;
+1D09C;BYZANTINE MUSICAL SYMBOL AGOGI ARGI;So;0;L;;;;;N;;;;;
+1D09D;BYZANTINE MUSICAL SYMBOL AGOGI METRIA;So;0;L;;;;;N;;;;;
+1D09E;BYZANTINE MUSICAL SYMBOL AGOGI MESI;So;0;L;;;;;N;;;;;
+1D09F;BYZANTINE MUSICAL SYMBOL AGOGI GORGI;So;0;L;;;;;N;;;;;
+1D0A0;BYZANTINE MUSICAL SYMBOL AGOGI GORGOTERI;So;0;L;;;;;N;;;;;
+1D0A1;BYZANTINE MUSICAL SYMBOL AGOGI POLI GORGI;So;0;L;;;;;N;;;;;
+1D0A2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A3;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI PROTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A4;BYZANTINE MUSICAL SYMBOL MARTYRIA DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
+1D0A5;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
+1D0A6;BYZANTINE MUSICAL SYMBOL MARTYRIA TRITOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A7;BYZANTINE MUSICAL SYMBOL MARTYRIA TRIFONIAS;So;0;L;;;;;N;;;;;
+1D0A8;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A9;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS LEGETOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AA;BYZANTINE MUSICAL SYMBOL MARTYRIA LEGETOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AB;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AC;BYZANTINE MUSICAL SYMBOL ISAKIA TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
+1D0AD;BYZANTINE MUSICAL SYMBOL APOSTROFOI TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
+1D0AE;BYZANTINE MUSICAL SYMBOL FANEROSIS TETRAFONIAS;So;0;L;;;;;N;;;;;
+1D0AF;BYZANTINE MUSICAL SYMBOL FANEROSIS MONOFONIAS;So;0;L;;;;;N;;;;;
+1D0B0;BYZANTINE MUSICAL SYMBOL FANEROSIS DIFONIAS;So;0;L;;;;;N;;;;;
+1D0B1;BYZANTINE MUSICAL SYMBOL MARTYRIA VARYS ICHOS;So;0;L;;;;;N;;;;;
+1D0B2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOVARYS ICHOS;So;0;L;;;;;N;;;;;
+1D0B3;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS TETARTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0B4;BYZANTINE MUSICAL SYMBOL GORTHMIKON N APLOUN;So;0;L;;;;;N;;;;;
+1D0B5;BYZANTINE MUSICAL SYMBOL GORTHMIKON N DIPLOUN;So;0;L;;;;;N;;;;;
+1D0B6;BYZANTINE MUSICAL SYMBOL ENARXIS KAI FTHORA VOU;So;0;L;;;;;N;;;;;
+1D0B7;BYZANTINE MUSICAL SYMBOL IMIFONON;So;0;L;;;;;N;;;;;
+1D0B8;BYZANTINE MUSICAL SYMBOL IMIFTHORON;So;0;L;;;;;N;;;;;
+1D0B9;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION DEYTEROU ICHOU;So;0;L;;;;;N;;;;;
+1D0BA;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI PA;So;0;L;;;;;N;;;;;
+1D0BB;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NANA;So;0;L;;;;;N;;;;;
+1D0BC;BYZANTINE MUSICAL SYMBOL FTHORA NAOS ICHOS;So;0;L;;;;;N;;;;;
+1D0BD;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI DI;So;0;L;;;;;N;;;;;
+1D0BE;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON DIATONON DI;So;0;L;;;;;N;;;;;
+1D0BF;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI KE;So;0;L;;;;;N;;;;;
+1D0C0;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI ZO;So;0;L;;;;;N;;;;;
+1D0C1;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI KATO;So;0;L;;;;;N;;;;;
+1D0C2;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI ANO;So;0;L;;;;;N;;;;;
+1D0C3;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA DIFONIAS;So;0;L;;;;;N;;;;;
+1D0C4;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA MONOFONIAS;So;0;L;;;;;N;;;;;
+1D0C5;BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS;So;0;L;;;;;N;;;;;
+1D0C6;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA SYNAFI;So;0;L;;;;;N;;;;;
+1D0C7;BYZANTINE MUSICAL SYMBOL FTHORA NENANO;So;0;L;;;;;N;;;;;
+1D0C8;BYZANTINE MUSICAL SYMBOL CHROA ZYGOS;So;0;L;;;;;N;;;;;
+1D0C9;BYZANTINE MUSICAL SYMBOL CHROA KLITON;So;0;L;;;;;N;;;;;
+1D0CA;BYZANTINE MUSICAL SYMBOL CHROA SPATHI;So;0;L;;;;;N;;;;;
+1D0CB;BYZANTINE MUSICAL SYMBOL FTHORA I YFESIS TETARTIMORION;So;0;L;;;;;N;;;;;
+1D0CC;BYZANTINE MUSICAL SYMBOL FTHORA ENARMONIOS ANTIFONIA;So;0;L;;;;;N;;;;;
+1D0CD;BYZANTINE MUSICAL SYMBOL YFESIS TRITIMORION;So;0;L;;;;;N;;;;;
+1D0CE;BYZANTINE MUSICAL SYMBOL DIESIS TRITIMORION;So;0;L;;;;;N;;;;;
+1D0CF;BYZANTINE MUSICAL SYMBOL DIESIS TETARTIMORION;So;0;L;;;;;N;;;;;
+1D0D0;BYZANTINE MUSICAL SYMBOL DIESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D1;BYZANTINE MUSICAL SYMBOL DIESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
+1D0D2;BYZANTINE MUSICAL SYMBOL DIESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
+1D0D3;BYZANTINE MUSICAL SYMBOL DIESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D4;BYZANTINE MUSICAL SYMBOL YFESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D5;BYZANTINE MUSICAL SYMBOL YFESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
+1D0D6;BYZANTINE MUSICAL SYMBOL YFESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
+1D0D7;BYZANTINE MUSICAL SYMBOL YFESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D8;BYZANTINE MUSICAL SYMBOL GENIKI DIESIS;So;0;L;;;;;N;;;;;
+1D0D9;BYZANTINE MUSICAL SYMBOL GENIKI YFESIS;So;0;L;;;;;N;;;;;
+1D0DA;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MIKRI;So;0;L;;;;;N;;;;;
+1D0DB;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MEGALI;So;0;L;;;;;N;;;;;
+1D0DC;BYZANTINE MUSICAL SYMBOL DIASTOLI DIPLI;So;0;L;;;;;N;;;;;
+1D0DD;BYZANTINE MUSICAL SYMBOL DIASTOLI THESEOS;So;0;L;;;;;N;;;;;
+1D0DE;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS;So;0;L;;;;;N;;;;;
+1D0DF;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS DISIMOU;So;0;L;;;;;N;;;;;
+1D0E0;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TRISIMOU;So;0;L;;;;;N;;;;;
+1D0E1;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TETRASIMOU;So;0;L;;;;;N;;;;;
+1D0E2;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS;So;0;L;;;;;N;;;;;
+1D0E3;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS DISIMOU;So;0;L;;;;;N;;;;;
+1D0E4;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TRISIMOU;So;0;L;;;;;N;;;;;
+1D0E5;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TETRASIMOU;So;0;L;;;;;N;;;;;
+1D0E6;BYZANTINE MUSICAL SYMBOL DIGRAMMA GG;So;0;L;;;;;N;;;;;
+1D0E7;BYZANTINE MUSICAL SYMBOL DIFTOGGOS OU;So;0;L;;;;;N;;;;;
+1D0E8;BYZANTINE MUSICAL SYMBOL STIGMA;So;0;L;;;;;N;;;;;
+1D0E9;BYZANTINE MUSICAL SYMBOL ARKTIKO PA;So;0;L;;;;;N;;;;;
+1D0EA;BYZANTINE MUSICAL SYMBOL ARKTIKO VOU;So;0;L;;;;;N;;;;;
+1D0EB;BYZANTINE MUSICAL SYMBOL ARKTIKO GA;So;0;L;;;;;N;;;;;
+1D0EC;BYZANTINE MUSICAL SYMBOL ARKTIKO DI;So;0;L;;;;;N;;;;;
+1D0ED;BYZANTINE MUSICAL SYMBOL ARKTIKO KE;So;0;L;;;;;N;;;;;
+1D0EE;BYZANTINE MUSICAL SYMBOL ARKTIKO ZO;So;0;L;;;;;N;;;;;
+1D0EF;BYZANTINE MUSICAL SYMBOL ARKTIKO NI;So;0;L;;;;;N;;;;;
+1D0F0;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO MESO;So;0;L;;;;;N;;;;;
+1D0F1;BYZANTINE MUSICAL SYMBOL KENTIMA NEO MESO;So;0;L;;;;;N;;;;;
+1D0F2;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO KATO;So;0;L;;;;;N;;;;;
+1D0F3;BYZANTINE MUSICAL SYMBOL KENTIMA NEO KATO;So;0;L;;;;;N;;;;;
+1D0F4;BYZANTINE MUSICAL SYMBOL KLASMA KATO;So;0;L;;;;;N;;;;;
+1D0F5;BYZANTINE MUSICAL SYMBOL GORGON NEO KATO;So;0;L;;;;;N;;;;;
+1D100;MUSICAL SYMBOL SINGLE BARLINE;So;0;L;;;;;N;;;;;
+1D101;MUSICAL SYMBOL DOUBLE BARLINE;So;0;L;;;;;N;;;;;
+1D102;MUSICAL SYMBOL FINAL BARLINE;So;0;L;;;;;N;;;;;
+1D103;MUSICAL SYMBOL REVERSE FINAL BARLINE;So;0;L;;;;;N;;;;;
+1D104;MUSICAL SYMBOL DASHED BARLINE;So;0;L;;;;;N;;;;;
+1D105;MUSICAL SYMBOL SHORT BARLINE;So;0;L;;;;;N;;;;;
+1D106;MUSICAL SYMBOL LEFT REPEAT SIGN;So;0;L;;;;;N;;;;;
+1D107;MUSICAL SYMBOL RIGHT REPEAT SIGN;So;0;L;;;;;N;;;;;
+1D108;MUSICAL SYMBOL REPEAT DOTS;So;0;L;;;;;N;;;;;
+1D109;MUSICAL SYMBOL DAL SEGNO;So;0;L;;;;;N;;;;;
+1D10A;MUSICAL SYMBOL DA CAPO;So;0;L;;;;;N;;;;;
+1D10B;MUSICAL SYMBOL SEGNO;So;0;L;;;;;N;;;;;
+1D10C;MUSICAL SYMBOL CODA;So;0;L;;;;;N;;;;;
+1D10D;MUSICAL SYMBOL REPEATED FIGURE-1;So;0;L;;;;;N;;;;;
+1D10E;MUSICAL SYMBOL REPEATED FIGURE-2;So;0;L;;;;;N;;;;;
+1D10F;MUSICAL SYMBOL REPEATED FIGURE-3;So;0;L;;;;;N;;;;;
+1D110;MUSICAL SYMBOL FERMATA;So;0;L;;;;;N;;;;;
+1D111;MUSICAL SYMBOL FERMATA BELOW;So;0;L;;;;;N;;;;;
+1D112;MUSICAL SYMBOL BREATH MARK;So;0;L;;;;;N;;;;;
+1D113;MUSICAL SYMBOL CAESURA;So;0;L;;;;;N;;;;;
+1D114;MUSICAL SYMBOL BRACE;So;0;L;;;;;N;;;;;
+1D115;MUSICAL SYMBOL BRACKET;So;0;L;;;;;N;;;;;
+1D116;MUSICAL SYMBOL ONE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D117;MUSICAL SYMBOL TWO-LINE STAFF;So;0;L;;;;;N;;;;;
+1D118;MUSICAL SYMBOL THREE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D119;MUSICAL SYMBOL FOUR-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11A;MUSICAL SYMBOL FIVE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11B;MUSICAL SYMBOL SIX-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11C;MUSICAL SYMBOL SIX-STRING FRETBOARD;So;0;L;;;;;N;;;;;
+1D11D;MUSICAL SYMBOL FOUR-STRING FRETBOARD;So;0;L;;;;;N;;;;;
+1D11E;MUSICAL SYMBOL G CLEF;So;0;L;;;;;N;;;;;
+1D11F;MUSICAL SYMBOL G CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D120;MUSICAL SYMBOL G CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D121;MUSICAL SYMBOL C CLEF;So;0;L;;;;;N;;;;;
+1D122;MUSICAL SYMBOL F CLEF;So;0;L;;;;;N;;;;;
+1D123;MUSICAL SYMBOL F CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D124;MUSICAL SYMBOL F CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D125;MUSICAL SYMBOL DRUM CLEF-1;So;0;L;;;;;N;;;;;
+1D126;MUSICAL SYMBOL DRUM CLEF-2;So;0;L;;;;;N;;;;;
+1D129;MUSICAL SYMBOL MULTIPLE MEASURE REST;So;0;L;;;;;N;;;;;
+1D12A;MUSICAL SYMBOL DOUBLE SHARP;So;0;L;;;;;N;;;;;
+1D12B;MUSICAL SYMBOL DOUBLE FLAT;So;0;L;;;;;N;;;;;
+1D12C;MUSICAL SYMBOL FLAT UP;So;0;L;;;;;N;;;;;
+1D12D;MUSICAL SYMBOL FLAT DOWN;So;0;L;;;;;N;;;;;
+1D12E;MUSICAL SYMBOL NATURAL UP;So;0;L;;;;;N;;;;;
+1D12F;MUSICAL SYMBOL NATURAL DOWN;So;0;L;;;;;N;;;;;
+1D130;MUSICAL SYMBOL SHARP UP;So;0;L;;;;;N;;;;;
+1D131;MUSICAL SYMBOL SHARP DOWN;So;0;L;;;;;N;;;;;
+1D132;MUSICAL SYMBOL QUARTER TONE SHARP;So;0;L;;;;;N;;;;;
+1D133;MUSICAL SYMBOL QUARTER TONE FLAT;So;0;L;;;;;N;;;;;
+1D134;MUSICAL SYMBOL COMMON TIME;So;0;L;;;;;N;;;;;
+1D135;MUSICAL SYMBOL CUT TIME;So;0;L;;;;;N;;;;;
+1D136;MUSICAL SYMBOL OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D137;MUSICAL SYMBOL OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D138;MUSICAL SYMBOL QUINDICESIMA ALTA;So;0;L;;;;;N;;;;;
+1D139;MUSICAL SYMBOL QUINDICESIMA BASSA;So;0;L;;;;;N;;;;;
+1D13A;MUSICAL SYMBOL MULTI REST;So;0;L;;;;;N;;;;;
+1D13B;MUSICAL SYMBOL WHOLE REST;So;0;L;;;;;N;;;;;
+1D13C;MUSICAL SYMBOL HALF REST;So;0;L;;;;;N;;;;;
+1D13D;MUSICAL SYMBOL QUARTER REST;So;0;L;;;;;N;;;;;
+1D13E;MUSICAL SYMBOL EIGHTH REST;So;0;L;;;;;N;;;;;
+1D13F;MUSICAL SYMBOL SIXTEENTH REST;So;0;L;;;;;N;;;;;
+1D140;MUSICAL SYMBOL THIRTY-SECOND REST;So;0;L;;;;;N;;;;;
+1D141;MUSICAL SYMBOL SIXTY-FOURTH REST;So;0;L;;;;;N;;;;;
+1D142;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST;So;0;L;;;;;N;;;;;
+1D143;MUSICAL SYMBOL X NOTEHEAD;So;0;L;;;;;N;;;;;
+1D144;MUSICAL SYMBOL PLUS NOTEHEAD;So;0;L;;;;;N;;;;;
+1D145;MUSICAL SYMBOL CIRCLE X NOTEHEAD;So;0;L;;;;;N;;;;;
+1D146;MUSICAL SYMBOL SQUARE NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D147;MUSICAL SYMBOL SQUARE NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D148;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE;So;0;L;;;;;N;;;;;
+1D149;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK;So;0;L;;;;;N;;;;;
+1D14A;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE;So;0;L;;;;;N;;;;;
+1D14B;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK;So;0;L;;;;;N;;;;;
+1D14C;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE;So;0;L;;;;;N;;;;;
+1D14D;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK;So;0;L;;;;;N;;;;;
+1D14E;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
+1D14F;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
+1D150;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE;So;0;L;;;;;N;;;;;
+1D151;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK;So;0;L;;;;;N;;;;;
+1D152;MUSICAL SYMBOL MOON NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D153;MUSICAL SYMBOL MOON NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D154;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
+1D155;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
+1D156;MUSICAL SYMBOL PARENTHESIS NOTEHEAD;So;0;L;;;;;N;;;;;
+1D157;MUSICAL SYMBOL VOID NOTEHEAD;So;0;L;;;;;N;;;;;
+1D158;MUSICAL SYMBOL NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D159;MUSICAL SYMBOL NULL NOTEHEAD;So;0;L;;;;;N;;;;;
+1D15A;MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D15B;MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D15C;MUSICAL SYMBOL BREVE;So;0;L;;;;;N;;;;;
+1D15D;MUSICAL SYMBOL WHOLE NOTE;So;0;L;;;;;N;;;;;
+1D15E;MUSICAL SYMBOL HALF NOTE;So;0;L;1D157 1D165;;;;N;;;;;
+1D15F;MUSICAL SYMBOL QUARTER NOTE;So;0;L;1D158 1D165;;;;N;;;;;
+1D160;MUSICAL SYMBOL EIGHTH NOTE;So;0;L;1D15F 1D16E;;;;N;;;;;
+1D161;MUSICAL SYMBOL SIXTEENTH NOTE;So;0;L;1D15F 1D16F;;;;N;;;;;
+1D162;MUSICAL SYMBOL THIRTY-SECOND NOTE;So;0;L;1D15F 1D170;;;;N;;;;;
+1D163;MUSICAL SYMBOL SIXTY-FOURTH NOTE;So;0;L;1D15F 1D171;;;;N;;;;;
+1D164;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE;So;0;L;1D15F 1D172;;;;N;;;;;
+1D165;MUSICAL SYMBOL COMBINING STEM;Mc;216;L;;;;;N;;;;;
+1D166;MUSICAL SYMBOL COMBINING SPRECHGESANG STEM;Mc;216;L;;;;;N;;;;;
+1D167;MUSICAL SYMBOL COMBINING TREMOLO-1;Mn;1;NSM;;;;;N;;;;;
+1D168;MUSICAL SYMBOL COMBINING TREMOLO-2;Mn;1;NSM;;;;;N;;;;;
+1D169;MUSICAL SYMBOL COMBINING TREMOLO-3;Mn;1;NSM;;;;;N;;;;;
+1D16A;MUSICAL SYMBOL FINGERED TREMOLO-1;So;0;L;;;;;N;;;;;
+1D16B;MUSICAL SYMBOL FINGERED TREMOLO-2;So;0;L;;;;;N;;;;;
+1D16C;MUSICAL SYMBOL FINGERED TREMOLO-3;So;0;L;;;;;N;;;;;
+1D16D;MUSICAL SYMBOL COMBINING AUGMENTATION DOT;Mc;226;L;;;;;N;;;;;
+1D16E;MUSICAL SYMBOL COMBINING FLAG-1;Mc;216;L;;;;;N;;;;;
+1D16F;MUSICAL SYMBOL COMBINING FLAG-2;Mc;216;L;;;;;N;;;;;
+1D170;MUSICAL SYMBOL COMBINING FLAG-3;Mc;216;L;;;;;N;;;;;
+1D171;MUSICAL SYMBOL COMBINING FLAG-4;Mc;216;L;;;;;N;;;;;
+1D172;MUSICAL SYMBOL COMBINING FLAG-5;Mc;216;L;;;;;N;;;;;
+1D173;MUSICAL SYMBOL BEGIN BEAM;Cf;0;BN;;;;;N;;;;;
+1D174;MUSICAL SYMBOL END BEAM;Cf;0;BN;;;;;N;;;;;
+1D175;MUSICAL SYMBOL BEGIN TIE;Cf;0;BN;;;;;N;;;;;
+1D176;MUSICAL SYMBOL END TIE;Cf;0;BN;;;;;N;;;;;
+1D177;MUSICAL SYMBOL BEGIN SLUR;Cf;0;BN;;;;;N;;;;;
+1D178;MUSICAL SYMBOL END SLUR;Cf;0;BN;;;;;N;;;;;
+1D179;MUSICAL SYMBOL BEGIN PHRASE;Cf;0;BN;;;;;N;;;;;
+1D17A;MUSICAL SYMBOL END PHRASE;Cf;0;BN;;;;;N;;;;;
+1D17B;MUSICAL SYMBOL COMBINING ACCENT;Mn;220;NSM;;;;;N;;;;;
+1D17C;MUSICAL SYMBOL COMBINING STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D17D;MUSICAL SYMBOL COMBINING TENUTO;Mn;220;NSM;;;;;N;;;;;
+1D17E;MUSICAL SYMBOL COMBINING STACCATISSIMO;Mn;220;NSM;;;;;N;;;;;
+1D17F;MUSICAL SYMBOL COMBINING MARCATO;Mn;220;NSM;;;;;N;;;;;
+1D180;MUSICAL SYMBOL COMBINING MARCATO-STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D181;MUSICAL SYMBOL COMBINING ACCENT-STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D182;MUSICAL SYMBOL COMBINING LOURE;Mn;220;NSM;;;;;N;;;;;
+1D183;MUSICAL SYMBOL ARPEGGIATO UP;So;0;L;;;;;N;;;;;
+1D184;MUSICAL SYMBOL ARPEGGIATO DOWN;So;0;L;;;;;N;;;;;
+1D185;MUSICAL SYMBOL COMBINING DOIT;Mn;230;NSM;;;;;N;;;;;
+1D186;MUSICAL SYMBOL COMBINING RIP;Mn;230;NSM;;;;;N;;;;;
+1D187;MUSICAL SYMBOL COMBINING FLIP;Mn;230;NSM;;;;;N;;;;;
+1D188;MUSICAL SYMBOL COMBINING SMEAR;Mn;230;NSM;;;;;N;;;;;
+1D189;MUSICAL SYMBOL COMBINING BEND;Mn;230;NSM;;;;;N;;;;;
+1D18A;MUSICAL SYMBOL COMBINING DOUBLE TONGUE;Mn;220;NSM;;;;;N;;;;;
+1D18B;MUSICAL SYMBOL COMBINING TRIPLE TONGUE;Mn;220;NSM;;;;;N;;;;;
+1D18C;MUSICAL SYMBOL RINFORZANDO;So;0;L;;;;;N;;;;;
+1D18D;MUSICAL SYMBOL SUBITO;So;0;L;;;;;N;;;;;
+1D18E;MUSICAL SYMBOL Z;So;0;L;;;;;N;;;;;
+1D18F;MUSICAL SYMBOL PIANO;So;0;L;;;;;N;;;;;
+1D190;MUSICAL SYMBOL MEZZO;So;0;L;;;;;N;;;;;
+1D191;MUSICAL SYMBOL FORTE;So;0;L;;;;;N;;;;;
+1D192;MUSICAL SYMBOL CRESCENDO;So;0;L;;;;;N;;;;;
+1D193;MUSICAL SYMBOL DECRESCENDO;So;0;L;;;;;N;;;;;
+1D194;MUSICAL SYMBOL GRACE NOTE SLASH;So;0;L;;;;;N;;;;;
+1D195;MUSICAL SYMBOL GRACE NOTE NO SLASH;So;0;L;;;;;N;;;;;
+1D196;MUSICAL SYMBOL TR;So;0;L;;;;;N;;;;;
+1D197;MUSICAL SYMBOL TURN;So;0;L;;;;;N;;;;;
+1D198;MUSICAL SYMBOL INVERTED TURN;So;0;L;;;;;N;;;;;
+1D199;MUSICAL SYMBOL TURN SLASH;So;0;L;;;;;N;;;;;
+1D19A;MUSICAL SYMBOL TURN UP;So;0;L;;;;;N;;;;;
+1D19B;MUSICAL SYMBOL ORNAMENT STROKE-1;So;0;L;;;;;N;;;;;
+1D19C;MUSICAL SYMBOL ORNAMENT STROKE-2;So;0;L;;;;;N;;;;;
+1D19D;MUSICAL SYMBOL ORNAMENT STROKE-3;So;0;L;;;;;N;;;;;
+1D19E;MUSICAL SYMBOL ORNAMENT STROKE-4;So;0;L;;;;;N;;;;;
+1D19F;MUSICAL SYMBOL ORNAMENT STROKE-5;So;0;L;;;;;N;;;;;
+1D1A0;MUSICAL SYMBOL ORNAMENT STROKE-6;So;0;L;;;;;N;;;;;
+1D1A1;MUSICAL SYMBOL ORNAMENT STROKE-7;So;0;L;;;;;N;;;;;
+1D1A2;MUSICAL SYMBOL ORNAMENT STROKE-8;So;0;L;;;;;N;;;;;
+1D1A3;MUSICAL SYMBOL ORNAMENT STROKE-9;So;0;L;;;;;N;;;;;
+1D1A4;MUSICAL SYMBOL ORNAMENT STROKE-10;So;0;L;;;;;N;;;;;
+1D1A5;MUSICAL SYMBOL ORNAMENT STROKE-11;So;0;L;;;;;N;;;;;
+1D1A6;MUSICAL SYMBOL HAUPTSTIMME;So;0;L;;;;;N;;;;;
+1D1A7;MUSICAL SYMBOL NEBENSTIMME;So;0;L;;;;;N;;;;;
+1D1A8;MUSICAL SYMBOL END OF STIMME;So;0;L;;;;;N;;;;;
+1D1A9;MUSICAL SYMBOL DEGREE SLASH;So;0;L;;;;;N;;;;;
+1D1AA;MUSICAL SYMBOL COMBINING DOWN BOW;Mn;230;NSM;;;;;N;;;;;
+1D1AB;MUSICAL SYMBOL COMBINING UP BOW;Mn;230;NSM;;;;;N;;;;;
+1D1AC;MUSICAL SYMBOL COMBINING HARMONIC;Mn;230;NSM;;;;;N;;;;;
+1D1AD;MUSICAL SYMBOL COMBINING SNAP PIZZICATO;Mn;230;NSM;;;;;N;;;;;
+1D1AE;MUSICAL SYMBOL PEDAL MARK;So;0;L;;;;;N;;;;;
+1D1AF;MUSICAL SYMBOL PEDAL UP MARK;So;0;L;;;;;N;;;;;
+1D1B0;MUSICAL SYMBOL HALF PEDAL MARK;So;0;L;;;;;N;;;;;
+1D1B1;MUSICAL SYMBOL GLISSANDO UP;So;0;L;;;;;N;;;;;
+1D1B2;MUSICAL SYMBOL GLISSANDO DOWN;So;0;L;;;;;N;;;;;
+1D1B3;MUSICAL SYMBOL WITH FINGERNAILS;So;0;L;;;;;N;;;;;
+1D1B4;MUSICAL SYMBOL DAMP;So;0;L;;;;;N;;;;;
+1D1B5;MUSICAL SYMBOL DAMP ALL;So;0;L;;;;;N;;;;;
+1D1B6;MUSICAL SYMBOL MAXIMA;So;0;L;;;;;N;;;;;
+1D1B7;MUSICAL SYMBOL LONGA;So;0;L;;;;;N;;;;;
+1D1B8;MUSICAL SYMBOL BREVIS;So;0;L;;;;;N;;;;;
+1D1B9;MUSICAL SYMBOL SEMIBREVIS WHITE;So;0;L;;;;;N;;;;;
+1D1BA;MUSICAL SYMBOL SEMIBREVIS BLACK;So;0;L;;;;;N;;;;;
+1D1BB;MUSICAL SYMBOL MINIMA;So;0;L;1D1B9 1D165;;;;N;;;;;
+1D1BC;MUSICAL SYMBOL MINIMA BLACK;So;0;L;1D1BA 1D165;;;;N;;;;;
+1D1BD;MUSICAL SYMBOL SEMIMINIMA WHITE;So;0;L;1D1BB 1D16E;;;;N;;;;;
+1D1BE;MUSICAL SYMBOL SEMIMINIMA BLACK;So;0;L;1D1BC 1D16E;;;;N;;;;;
+1D1BF;MUSICAL SYMBOL FUSA WHITE;So;0;L;1D1BB 1D16F;;;;N;;;;;
+1D1C0;MUSICAL SYMBOL FUSA BLACK;So;0;L;1D1BC 1D16F;;;;N;;;;;
+1D1C1;MUSICAL SYMBOL LONGA PERFECTA REST;So;0;L;;;;;N;;;;;
+1D1C2;MUSICAL SYMBOL LONGA IMPERFECTA REST;So;0;L;;;;;N;;;;;
+1D1C3;MUSICAL SYMBOL BREVIS REST;So;0;L;;;;;N;;;;;
+1D1C4;MUSICAL SYMBOL SEMIBREVIS REST;So;0;L;;;;;N;;;;;
+1D1C5;MUSICAL SYMBOL MINIMA REST;So;0;L;;;;;N;;;;;
+1D1C6;MUSICAL SYMBOL SEMIMINIMA REST;So;0;L;;;;;N;;;;;
+1D1C7;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
+1D1C8;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
+1D1C9;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
+1D1CA;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
+1D1CB;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
+1D1CC;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
+1D1CD;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2;So;0;L;;;;;N;;;;;
+1D1CE;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3;So;0;L;;;;;N;;;;;
+1D1CF;MUSICAL SYMBOL CROIX;So;0;L;;;;;N;;;;;
+1D1D0;MUSICAL SYMBOL GREGORIAN C CLEF;So;0;L;;;;;N;;;;;
+1D1D1;MUSICAL SYMBOL GREGORIAN F CLEF;So;0;L;;;;;N;;;;;
+1D1D2;MUSICAL SYMBOL SQUARE B;So;0;L;;;;;N;;;;;
+1D1D3;MUSICAL SYMBOL VIRGA;So;0;L;;;;;N;;;;;
+1D1D4;MUSICAL SYMBOL PODATUS;So;0;L;;;;;N;;;;;
+1D1D5;MUSICAL SYMBOL CLIVIS;So;0;L;;;;;N;;;;;
+1D1D6;MUSICAL SYMBOL SCANDICUS;So;0;L;;;;;N;;;;;
+1D1D7;MUSICAL SYMBOL CLIMACUS;So;0;L;;;;;N;;;;;
+1D1D8;MUSICAL SYMBOL TORCULUS;So;0;L;;;;;N;;;;;
+1D1D9;MUSICAL SYMBOL PORRECTUS;So;0;L;;;;;N;;;;;
+1D1DA;MUSICAL SYMBOL PORRECTUS FLEXUS;So;0;L;;;;;N;;;;;
+1D1DB;MUSICAL SYMBOL SCANDICUS FLEXUS;So;0;L;;;;;N;;;;;
+1D1DC;MUSICAL SYMBOL TORCULUS RESUPINUS;So;0;L;;;;;N;;;;;
+1D1DD;MUSICAL SYMBOL PES SUBPUNCTIS;So;0;L;;;;;N;;;;;
+1D1DE;MUSICAL SYMBOL KIEVAN C CLEF;So;0;L;;;;;N;;;;;
+1D1DF;MUSICAL SYMBOL KIEVAN END OF PIECE;So;0;L;;;;;N;;;;;
+1D1E0;MUSICAL SYMBOL KIEVAN FINAL NOTE;So;0;L;;;;;N;;;;;
+1D1E1;MUSICAL SYMBOL KIEVAN RECITATIVE MARK;So;0;L;;;;;N;;;;;
+1D1E2;MUSICAL SYMBOL KIEVAN WHOLE NOTE;So;0;L;;;;;N;;;;;
+1D1E3;MUSICAL SYMBOL KIEVAN HALF NOTE;So;0;L;;;;;N;;;;;
+1D1E4;MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM DOWN;So;0;L;;;;;N;;;;;
+1D1E5;MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM UP;So;0;L;;;;;N;;;;;
+1D1E6;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM DOWN;So;0;L;;;;;N;;;;;
+1D1E7;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM UP;So;0;L;;;;;N;;;;;
+1D1E8;MUSICAL SYMBOL KIEVAN FLAT SIGN;So;0;L;;;;;N;;;;;
+1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
+1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
+1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;;
+1D203;GREEK VOCAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
+1D204;GREEK VOCAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
+1D205;GREEK VOCAL NOTATION SYMBOL-6;So;0;ON;;;;;N;;;;;
+1D206;GREEK VOCAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
+1D207;GREEK VOCAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
+1D208;GREEK VOCAL NOTATION SYMBOL-9;So;0;ON;;;;;N;;;;;
+1D209;GREEK VOCAL NOTATION SYMBOL-10;So;0;ON;;;;;N;;;;;
+1D20A;GREEK VOCAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
+1D20B;GREEK VOCAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
+1D20C;GREEK VOCAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
+1D20D;GREEK VOCAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
+1D20E;GREEK VOCAL NOTATION SYMBOL-15;So;0;ON;;;;;N;;;;;
+1D20F;GREEK VOCAL NOTATION SYMBOL-16;So;0;ON;;;;;N;;;;;
+1D210;GREEK VOCAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
+1D211;GREEK VOCAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
+1D212;GREEK VOCAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
+1D213;GREEK VOCAL NOTATION SYMBOL-20;So;0;ON;;;;;N;;;;;
+1D214;GREEK VOCAL NOTATION SYMBOL-21;So;0;ON;;;;;N;;;;;
+1D215;GREEK VOCAL NOTATION SYMBOL-22;So;0;ON;;;;;N;;;;;
+1D216;GREEK VOCAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
+1D217;GREEK VOCAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
+1D218;GREEK VOCAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
+1D219;GREEK VOCAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
+1D21A;GREEK VOCAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
+1D21B;GREEK VOCAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
+1D21C;GREEK VOCAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
+1D21D;GREEK INSTRUMENTAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
+1D21E;GREEK INSTRUMENTAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
+1D21F;GREEK INSTRUMENTAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
+1D220;GREEK INSTRUMENTAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
+1D221;GREEK INSTRUMENTAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
+1D222;GREEK INSTRUMENTAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
+1D223;GREEK INSTRUMENTAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
+1D224;GREEK INSTRUMENTAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
+1D225;GREEK INSTRUMENTAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
+1D226;GREEK INSTRUMENTAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
+1D227;GREEK INSTRUMENTAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
+1D228;GREEK INSTRUMENTAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
+1D229;GREEK INSTRUMENTAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
+1D22A;GREEK INSTRUMENTAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
+1D22B;GREEK INSTRUMENTAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
+1D22C;GREEK INSTRUMENTAL NOTATION SYMBOL-25;So;0;ON;;;;;N;;;;;
+1D22D;GREEK INSTRUMENTAL NOTATION SYMBOL-26;So;0;ON;;;;;N;;;;;
+1D22E;GREEK INSTRUMENTAL NOTATION SYMBOL-27;So;0;ON;;;;;N;;;;;
+1D22F;GREEK INSTRUMENTAL NOTATION SYMBOL-29;So;0;ON;;;;;N;;;;;
+1D230;GREEK INSTRUMENTAL NOTATION SYMBOL-30;So;0;ON;;;;;N;;;;;
+1D231;GREEK INSTRUMENTAL NOTATION SYMBOL-32;So;0;ON;;;;;N;;;;;
+1D232;GREEK INSTRUMENTAL NOTATION SYMBOL-36;So;0;ON;;;;;N;;;;;
+1D233;GREEK INSTRUMENTAL NOTATION SYMBOL-37;So;0;ON;;;;;N;;;;;
+1D234;GREEK INSTRUMENTAL NOTATION SYMBOL-38;So;0;ON;;;;;N;;;;;
+1D235;GREEK INSTRUMENTAL NOTATION SYMBOL-39;So;0;ON;;;;;N;;;;;
+1D236;GREEK INSTRUMENTAL NOTATION SYMBOL-40;So;0;ON;;;;;N;;;;;
+1D237;GREEK INSTRUMENTAL NOTATION SYMBOL-42;So;0;ON;;;;;N;;;;;
+1D238;GREEK INSTRUMENTAL NOTATION SYMBOL-43;So;0;ON;;;;;N;;;;;
+1D239;GREEK INSTRUMENTAL NOTATION SYMBOL-45;So;0;ON;;;;;N;;;;;
+1D23A;GREEK INSTRUMENTAL NOTATION SYMBOL-47;So;0;ON;;;;;N;;;;;
+1D23B;GREEK INSTRUMENTAL NOTATION SYMBOL-48;So;0;ON;;;;;N;;;;;
+1D23C;GREEK INSTRUMENTAL NOTATION SYMBOL-49;So;0;ON;;;;;N;;;;;
+1D23D;GREEK INSTRUMENTAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
+1D23E;GREEK INSTRUMENTAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
+1D23F;GREEK INSTRUMENTAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
+1D240;GREEK INSTRUMENTAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
+1D241;GREEK INSTRUMENTAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
+1D242;COMBINING GREEK MUSICAL TRISEME;Mn;230;NSM;;;;;N;;;;;
+1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
+1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
+1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
+1D2E0;MAYAN NUMERAL ZERO;No;0;L;;;;0;N;;;;;
+1D2E1;MAYAN NUMERAL ONE;No;0;L;;;;1;N;;;;;
+1D2E2;MAYAN NUMERAL TWO;No;0;L;;;;2;N;;;;;
+1D2E3;MAYAN NUMERAL THREE;No;0;L;;;;3;N;;;;;
+1D2E4;MAYAN NUMERAL FOUR;No;0;L;;;;4;N;;;;;
+1D2E5;MAYAN NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+1D2E6;MAYAN NUMERAL SIX;No;0;L;;;;6;N;;;;;
+1D2E7;MAYAN NUMERAL SEVEN;No;0;L;;;;7;N;;;;;
+1D2E8;MAYAN NUMERAL EIGHT;No;0;L;;;;8;N;;;;;
+1D2E9;MAYAN NUMERAL NINE;No;0;L;;;;9;N;;;;;
+1D2EA;MAYAN NUMERAL TEN;No;0;L;;;;10;N;;;;;
+1D2EB;MAYAN NUMERAL ELEVEN;No;0;L;;;;11;N;;;;;
+1D2EC;MAYAN NUMERAL TWELVE;No;0;L;;;;12;N;;;;;
+1D2ED;MAYAN NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;;
+1D2EE;MAYAN NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;;
+1D2EF;MAYAN NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;;
+1D2F0;MAYAN NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;;
+1D2F1;MAYAN NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;;
+1D2F2;MAYAN NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;;
+1D2F3;MAYAN NUMERAL NINETEEN;No;0;L;;;;19;N;;;;;
+1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;;;;
+1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;;;;
+1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;;;;
+1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;;;;
+1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+1D306;TETRAGRAM FOR CENTRE;So;0;ON;;;;;N;;;;;
+1D307;TETRAGRAM FOR FULL CIRCLE;So;0;ON;;;;;N;;;;;
+1D308;TETRAGRAM FOR MIRED;So;0;ON;;;;;N;;;;;
+1D309;TETRAGRAM FOR BARRIER;So;0;ON;;;;;N;;;;;
+1D30A;TETRAGRAM FOR KEEPING SMALL;So;0;ON;;;;;N;;;;;
+1D30B;TETRAGRAM FOR CONTRARIETY;So;0;ON;;;;;N;;;;;
+1D30C;TETRAGRAM FOR ASCENT;So;0;ON;;;;;N;;;;;
+1D30D;TETRAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
+1D30E;TETRAGRAM FOR BRANCHING OUT;So;0;ON;;;;;N;;;;;
+1D30F;TETRAGRAM FOR DEFECTIVENESS OR DISTORTION;So;0;ON;;;;;N;;;;;
+1D310;TETRAGRAM FOR DIVERGENCE;So;0;ON;;;;;N;;;;;
+1D311;TETRAGRAM FOR YOUTHFULNESS;So;0;ON;;;;;N;;;;;
+1D312;TETRAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
+1D313;TETRAGRAM FOR PENETRATION;So;0;ON;;;;;N;;;;;
+1D314;TETRAGRAM FOR REACH;So;0;ON;;;;;N;;;;;
+1D315;TETRAGRAM FOR CONTACT;So;0;ON;;;;;N;;;;;
+1D316;TETRAGRAM FOR HOLDING BACK;So;0;ON;;;;;N;;;;;
+1D317;TETRAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
+1D318;TETRAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
+1D319;TETRAGRAM FOR ADVANCE;So;0;ON;;;;;N;;;;;
+1D31A;TETRAGRAM FOR RELEASE;So;0;ON;;;;;N;;;;;
+1D31B;TETRAGRAM FOR RESISTANCE;So;0;ON;;;;;N;;;;;
+1D31C;TETRAGRAM FOR EASE;So;0;ON;;;;;N;;;;;
+1D31D;TETRAGRAM FOR JOY;So;0;ON;;;;;N;;;;;
+1D31E;TETRAGRAM FOR CONTENTION;So;0;ON;;;;;N;;;;;
+1D31F;TETRAGRAM FOR ENDEAVOUR;So;0;ON;;;;;N;;;;;
+1D320;TETRAGRAM FOR DUTIES;So;0;ON;;;;;N;;;;;
+1D321;TETRAGRAM FOR CHANGE;So;0;ON;;;;;N;;;;;
+1D322;TETRAGRAM FOR DECISIVENESS;So;0;ON;;;;;N;;;;;
+1D323;TETRAGRAM FOR BOLD RESOLUTION;So;0;ON;;;;;N;;;;;
+1D324;TETRAGRAM FOR PACKING;So;0;ON;;;;;N;;;;;
+1D325;TETRAGRAM FOR LEGION;So;0;ON;;;;;N;;;;;
+1D326;TETRAGRAM FOR CLOSENESS;So;0;ON;;;;;N;;;;;
+1D327;TETRAGRAM FOR KINSHIP;So;0;ON;;;;;N;;;;;
+1D328;TETRAGRAM FOR GATHERING;So;0;ON;;;;;N;;;;;
+1D329;TETRAGRAM FOR STRENGTH;So;0;ON;;;;;N;;;;;
+1D32A;TETRAGRAM FOR PURITY;So;0;ON;;;;;N;;;;;
+1D32B;TETRAGRAM FOR FULLNESS;So;0;ON;;;;;N;;;;;
+1D32C;TETRAGRAM FOR RESIDENCE;So;0;ON;;;;;N;;;;;
+1D32D;TETRAGRAM FOR LAW OR MODEL;So;0;ON;;;;;N;;;;;
+1D32E;TETRAGRAM FOR RESPONSE;So;0;ON;;;;;N;;;;;
+1D32F;TETRAGRAM FOR GOING TO MEET;So;0;ON;;;;;N;;;;;
+1D330;TETRAGRAM FOR ENCOUNTERS;So;0;ON;;;;;N;;;;;
+1D331;TETRAGRAM FOR STOVE;So;0;ON;;;;;N;;;;;
+1D332;TETRAGRAM FOR GREATNESS;So;0;ON;;;;;N;;;;;
+1D333;TETRAGRAM FOR ENLARGEMENT;So;0;ON;;;;;N;;;;;
+1D334;TETRAGRAM FOR PATTERN;So;0;ON;;;;;N;;;;;
+1D335;TETRAGRAM FOR RITUAL;So;0;ON;;;;;N;;;;;
+1D336;TETRAGRAM FOR FLIGHT;So;0;ON;;;;;N;;;;;
+1D337;TETRAGRAM FOR VASTNESS OR WASTING;So;0;ON;;;;;N;;;;;
+1D338;TETRAGRAM FOR CONSTANCY;So;0;ON;;;;;N;;;;;
+1D339;TETRAGRAM FOR MEASURE;So;0;ON;;;;;N;;;;;
+1D33A;TETRAGRAM FOR ETERNITY;So;0;ON;;;;;N;;;;;
+1D33B;TETRAGRAM FOR UNITY;So;0;ON;;;;;N;;;;;
+1D33C;TETRAGRAM FOR DIMINISHMENT;So;0;ON;;;;;N;;;;;
+1D33D;TETRAGRAM FOR CLOSED MOUTH;So;0;ON;;;;;N;;;;;
+1D33E;TETRAGRAM FOR GUARDEDNESS;So;0;ON;;;;;N;;;;;
+1D33F;TETRAGRAM FOR GATHERING IN;So;0;ON;;;;;N;;;;;
+1D340;TETRAGRAM FOR MASSING;So;0;ON;;;;;N;;;;;
+1D341;TETRAGRAM FOR ACCUMULATION;So;0;ON;;;;;N;;;;;
+1D342;TETRAGRAM FOR EMBELLISHMENT;So;0;ON;;;;;N;;;;;
+1D343;TETRAGRAM FOR DOUBT;So;0;ON;;;;;N;;;;;
+1D344;TETRAGRAM FOR WATCH;So;0;ON;;;;;N;;;;;
+1D345;TETRAGRAM FOR SINKING;So;0;ON;;;;;N;;;;;
+1D346;TETRAGRAM FOR INNER;So;0;ON;;;;;N;;;;;
+1D347;TETRAGRAM FOR DEPARTURE;So;0;ON;;;;;N;;;;;
+1D348;TETRAGRAM FOR DARKENING;So;0;ON;;;;;N;;;;;
+1D349;TETRAGRAM FOR DIMMING;So;0;ON;;;;;N;;;;;
+1D34A;TETRAGRAM FOR EXHAUSTION;So;0;ON;;;;;N;;;;;
+1D34B;TETRAGRAM FOR SEVERANCE;So;0;ON;;;;;N;;;;;
+1D34C;TETRAGRAM FOR STOPPAGE;So;0;ON;;;;;N;;;;;
+1D34D;TETRAGRAM FOR HARDNESS;So;0;ON;;;;;N;;;;;
+1D34E;TETRAGRAM FOR COMPLETION;So;0;ON;;;;;N;;;;;
+1D34F;TETRAGRAM FOR CLOSURE;So;0;ON;;;;;N;;;;;
+1D350;TETRAGRAM FOR FAILURE;So;0;ON;;;;;N;;;;;
+1D351;TETRAGRAM FOR AGGRAVATION;So;0;ON;;;;;N;;;;;
+1D352;TETRAGRAM FOR COMPLIANCE;So;0;ON;;;;;N;;;;;
+1D353;TETRAGRAM FOR ON THE VERGE;So;0;ON;;;;;N;;;;;
+1D354;TETRAGRAM FOR DIFFICULTIES;So;0;ON;;;;;N;;;;;
+1D355;TETRAGRAM FOR LABOURING;So;0;ON;;;;;N;;;;;
+1D356;TETRAGRAM FOR FOSTERING;So;0;ON;;;;;N;;;;;
+1D360;COUNTING ROD UNIT DIGIT ONE;No;0;L;;;;1;N;;;;;
+1D361;COUNTING ROD UNIT DIGIT TWO;No;0;L;;;;2;N;;;;;
+1D362;COUNTING ROD UNIT DIGIT THREE;No;0;L;;;;3;N;;;;;
+1D363;COUNTING ROD UNIT DIGIT FOUR;No;0;L;;;;4;N;;;;;
+1D364;COUNTING ROD UNIT DIGIT FIVE;No;0;L;;;;5;N;;;;;
+1D365;COUNTING ROD UNIT DIGIT SIX;No;0;L;;;;6;N;;;;;
+1D366;COUNTING ROD UNIT DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+1D367;COUNTING ROD UNIT DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+1D368;COUNTING ROD UNIT DIGIT NINE;No;0;L;;;;9;N;;;;;
+1D369;COUNTING ROD TENS DIGIT ONE;No;0;L;;;;10;N;;;;;
+1D36A;COUNTING ROD TENS DIGIT TWO;No;0;L;;;;20;N;;;;;
+1D36B;COUNTING ROD TENS DIGIT THREE;No;0;L;;;;30;N;;;;;
+1D36C;COUNTING ROD TENS DIGIT FOUR;No;0;L;;;;40;N;;;;;
+1D36D;COUNTING ROD TENS DIGIT FIVE;No;0;L;;;;50;N;;;;;
+1D36E;COUNTING ROD TENS DIGIT SIX;No;0;L;;;;60;N;;;;;
+1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;;
+1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;;
+1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;;
+1D372;IDEOGRAPHIC TALLY MARK ONE;No;0;L;;;;1;N;;;;;
+1D373;IDEOGRAPHIC TALLY MARK TWO;No;0;L;;;;2;N;;;;;
+1D374;IDEOGRAPHIC TALLY MARK THREE;No;0;L;;;;3;N;;;;;
+1D375;IDEOGRAPHIC TALLY MARK FOUR;No;0;L;;;;4;N;;;;;
+1D376;IDEOGRAPHIC TALLY MARK FIVE;No;0;L;;;;5;N;;;;;
+1D377;TALLY MARK ONE;No;0;L;;;;1;N;;;;;
+1D378;TALLY MARK FIVE;No;0;L;;;;5;N;;;;;
+1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D403;MATHEMATICAL BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D404;MATHEMATICAL BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D405;MATHEMATICAL BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D406;MATHEMATICAL BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D407;MATHEMATICAL BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D408;MATHEMATICAL BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D409;MATHEMATICAL BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D40A;MATHEMATICAL BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D40B;MATHEMATICAL BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D40C;MATHEMATICAL BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D40D;MATHEMATICAL BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D40E;MATHEMATICAL BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D40F;MATHEMATICAL BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D410;MATHEMATICAL BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D411;MATHEMATICAL BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D412;MATHEMATICAL BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D413;MATHEMATICAL BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D414;MATHEMATICAL BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D415;MATHEMATICAL BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D416;MATHEMATICAL BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D417;MATHEMATICAL BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D418;MATHEMATICAL BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D419;MATHEMATICAL BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D41A;MATHEMATICAL BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D41B;MATHEMATICAL BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D41C;MATHEMATICAL BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D41D;MATHEMATICAL BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D41E;MATHEMATICAL BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D41F;MATHEMATICAL BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D420;MATHEMATICAL BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D421;MATHEMATICAL BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D422;MATHEMATICAL BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D423;MATHEMATICAL BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D424;MATHEMATICAL BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D425;MATHEMATICAL BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D426;MATHEMATICAL BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D427;MATHEMATICAL BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D428;MATHEMATICAL BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D429;MATHEMATICAL BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D42A;MATHEMATICAL BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D42B;MATHEMATICAL BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D42C;MATHEMATICAL BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D42D;MATHEMATICAL BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D42E;MATHEMATICAL BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D42F;MATHEMATICAL BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D430;MATHEMATICAL BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D431;MATHEMATICAL BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D432;MATHEMATICAL BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D433;MATHEMATICAL BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D434;MATHEMATICAL ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D435;MATHEMATICAL ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D436;MATHEMATICAL ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D437;MATHEMATICAL ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D438;MATHEMATICAL ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D439;MATHEMATICAL ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D43A;MATHEMATICAL ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D43B;MATHEMATICAL ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D43C;MATHEMATICAL ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D43D;MATHEMATICAL ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D43E;MATHEMATICAL ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D43F;MATHEMATICAL ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D440;MATHEMATICAL ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D441;MATHEMATICAL ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D442;MATHEMATICAL ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D443;MATHEMATICAL ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D444;MATHEMATICAL ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D445;MATHEMATICAL ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D446;MATHEMATICAL ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D447;MATHEMATICAL ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D448;MATHEMATICAL ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D449;MATHEMATICAL ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D44A;MATHEMATICAL ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D44B;MATHEMATICAL ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D44C;MATHEMATICAL ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D44D;MATHEMATICAL ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D44E;MATHEMATICAL ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D44F;MATHEMATICAL ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D450;MATHEMATICAL ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D451;MATHEMATICAL ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D452;MATHEMATICAL ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D453;MATHEMATICAL ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D454;MATHEMATICAL ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D456;MATHEMATICAL ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D457;MATHEMATICAL ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D458;MATHEMATICAL ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D459;MATHEMATICAL ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D45A;MATHEMATICAL ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D45B;MATHEMATICAL ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D45C;MATHEMATICAL ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D45D;MATHEMATICAL ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D45E;MATHEMATICAL ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D45F;MATHEMATICAL ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D460;MATHEMATICAL ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D461;MATHEMATICAL ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D462;MATHEMATICAL ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D463;MATHEMATICAL ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D464;MATHEMATICAL ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D465;MATHEMATICAL ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D466;MATHEMATICAL ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D467;MATHEMATICAL ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D468;MATHEMATICAL BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D469;MATHEMATICAL BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D46A;MATHEMATICAL BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D46B;MATHEMATICAL BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D46C;MATHEMATICAL BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D46D;MATHEMATICAL BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D46E;MATHEMATICAL BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D46F;MATHEMATICAL BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D470;MATHEMATICAL BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D471;MATHEMATICAL BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D472;MATHEMATICAL BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D473;MATHEMATICAL BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D474;MATHEMATICAL BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D475;MATHEMATICAL BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D476;MATHEMATICAL BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D477;MATHEMATICAL BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D478;MATHEMATICAL BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D479;MATHEMATICAL BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D47A;MATHEMATICAL BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D47B;MATHEMATICAL BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D47C;MATHEMATICAL BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D47D;MATHEMATICAL BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D47E;MATHEMATICAL BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D47F;MATHEMATICAL BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D480;MATHEMATICAL BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D481;MATHEMATICAL BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D482;MATHEMATICAL BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D483;MATHEMATICAL BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D484;MATHEMATICAL BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D485;MATHEMATICAL BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D486;MATHEMATICAL BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D487;MATHEMATICAL BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D488;MATHEMATICAL BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D489;MATHEMATICAL BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D48A;MATHEMATICAL BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D48B;MATHEMATICAL BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D48C;MATHEMATICAL BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D48D;MATHEMATICAL BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D48E;MATHEMATICAL BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D48F;MATHEMATICAL BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D490;MATHEMATICAL BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D491;MATHEMATICAL BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D492;MATHEMATICAL BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D493;MATHEMATICAL BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D494;MATHEMATICAL BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D495;MATHEMATICAL BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D496;MATHEMATICAL BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D497;MATHEMATICAL BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D498;MATHEMATICAL BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D499;MATHEMATICAL BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D49A;MATHEMATICAL BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D49B;MATHEMATICAL BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D49C;MATHEMATICAL SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D49E;MATHEMATICAL SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D49F;MATHEMATICAL SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D4A2;MATHEMATICAL SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D4A5;MATHEMATICAL SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D4A6;MATHEMATICAL SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D4A9;MATHEMATICAL SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D4AA;MATHEMATICAL SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D4AB;MATHEMATICAL SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D4AC;MATHEMATICAL SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D4AE;MATHEMATICAL SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D4AF;MATHEMATICAL SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D4B0;MATHEMATICAL SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D4B1;MATHEMATICAL SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D4B2;MATHEMATICAL SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D4B3;MATHEMATICAL SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D4B4;MATHEMATICAL SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D4B5;MATHEMATICAL SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D4B6;MATHEMATICAL SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D4B7;MATHEMATICAL SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D4B8;MATHEMATICAL SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D4B9;MATHEMATICAL SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D4BB;MATHEMATICAL SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D4BD;MATHEMATICAL SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D4BE;MATHEMATICAL SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D4BF;MATHEMATICAL SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D4C0;MATHEMATICAL SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D4C1;MATHEMATICAL SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D4C2;MATHEMATICAL SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D4C3;MATHEMATICAL SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D4C5;MATHEMATICAL SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D4C6;MATHEMATICAL SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D4C7;MATHEMATICAL SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D4C8;MATHEMATICAL SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D4C9;MATHEMATICAL SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D4CA;MATHEMATICAL SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D4CB;MATHEMATICAL SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D4CC;MATHEMATICAL SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D4CD;MATHEMATICAL SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D4CE;MATHEMATICAL SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D4CF;MATHEMATICAL SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D4D0;MATHEMATICAL BOLD SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D4D1;MATHEMATICAL BOLD SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D4D2;MATHEMATICAL BOLD SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D4D3;MATHEMATICAL BOLD SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D4D4;MATHEMATICAL BOLD SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D4D5;MATHEMATICAL BOLD SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D4D6;MATHEMATICAL BOLD SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D4D7;MATHEMATICAL BOLD SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D4D8;MATHEMATICAL BOLD SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D4D9;MATHEMATICAL BOLD SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D4DA;MATHEMATICAL BOLD SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D4DB;MATHEMATICAL BOLD SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D4DC;MATHEMATICAL BOLD SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D4DD;MATHEMATICAL BOLD SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D4DE;MATHEMATICAL BOLD SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D4DF;MATHEMATICAL BOLD SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D4E0;MATHEMATICAL BOLD SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D4E1;MATHEMATICAL BOLD SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D4E2;MATHEMATICAL BOLD SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D4E3;MATHEMATICAL BOLD SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D4E4;MATHEMATICAL BOLD SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D4E5;MATHEMATICAL BOLD SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D4E6;MATHEMATICAL BOLD SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D4E7;MATHEMATICAL BOLD SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D4E8;MATHEMATICAL BOLD SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D4E9;MATHEMATICAL BOLD SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D4EA;MATHEMATICAL BOLD SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D4EB;MATHEMATICAL BOLD SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D4EC;MATHEMATICAL BOLD SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D4ED;MATHEMATICAL BOLD SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D4EE;MATHEMATICAL BOLD SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D4EF;MATHEMATICAL BOLD SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D4F0;MATHEMATICAL BOLD SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D4F1;MATHEMATICAL BOLD SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D4F2;MATHEMATICAL BOLD SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D4F3;MATHEMATICAL BOLD SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D4F4;MATHEMATICAL BOLD SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D4F5;MATHEMATICAL BOLD SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D4F6;MATHEMATICAL BOLD SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D4F7;MATHEMATICAL BOLD SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D4F8;MATHEMATICAL BOLD SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D4F9;MATHEMATICAL BOLD SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D4FA;MATHEMATICAL BOLD SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D4FB;MATHEMATICAL BOLD SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D4FC;MATHEMATICAL BOLD SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D4FD;MATHEMATICAL BOLD SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D4FE;MATHEMATICAL BOLD SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D4FF;MATHEMATICAL BOLD SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D500;MATHEMATICAL BOLD SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D501;MATHEMATICAL BOLD SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D502;MATHEMATICAL BOLD SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D503;MATHEMATICAL BOLD SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D504;MATHEMATICAL FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D505;MATHEMATICAL FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D507;MATHEMATICAL FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D508;MATHEMATICAL FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D509;MATHEMATICAL FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D50A;MATHEMATICAL FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D50D;MATHEMATICAL FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D50E;MATHEMATICAL FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D50F;MATHEMATICAL FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D510;MATHEMATICAL FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D511;MATHEMATICAL FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D512;MATHEMATICAL FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D513;MATHEMATICAL FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D514;MATHEMATICAL FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D516;MATHEMATICAL FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D517;MATHEMATICAL FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D518;MATHEMATICAL FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D519;MATHEMATICAL FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D51A;MATHEMATICAL FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D51B;MATHEMATICAL FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D51C;MATHEMATICAL FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D51E;MATHEMATICAL FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D51F;MATHEMATICAL FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D520;MATHEMATICAL FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D521;MATHEMATICAL FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D522;MATHEMATICAL FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D523;MATHEMATICAL FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D524;MATHEMATICAL FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D525;MATHEMATICAL FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D526;MATHEMATICAL FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D527;MATHEMATICAL FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D528;MATHEMATICAL FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D529;MATHEMATICAL FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D52A;MATHEMATICAL FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D52B;MATHEMATICAL FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D52C;MATHEMATICAL FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D52D;MATHEMATICAL FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D52E;MATHEMATICAL FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D52F;MATHEMATICAL FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D530;MATHEMATICAL FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D531;MATHEMATICAL FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D532;MATHEMATICAL FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D533;MATHEMATICAL FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D534;MATHEMATICAL FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D535;MATHEMATICAL FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D536;MATHEMATICAL FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D537;MATHEMATICAL FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D538;MATHEMATICAL DOUBLE-STRUCK CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D539;MATHEMATICAL DOUBLE-STRUCK CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D53B;MATHEMATICAL DOUBLE-STRUCK CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D53C;MATHEMATICAL DOUBLE-STRUCK CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D53D;MATHEMATICAL DOUBLE-STRUCK CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D53E;MATHEMATICAL DOUBLE-STRUCK CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D540;MATHEMATICAL DOUBLE-STRUCK CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D541;MATHEMATICAL DOUBLE-STRUCK CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D542;MATHEMATICAL DOUBLE-STRUCK CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D543;MATHEMATICAL DOUBLE-STRUCK CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D544;MATHEMATICAL DOUBLE-STRUCK CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D546;MATHEMATICAL DOUBLE-STRUCK CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D54A;MATHEMATICAL DOUBLE-STRUCK CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D54B;MATHEMATICAL DOUBLE-STRUCK CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D54C;MATHEMATICAL DOUBLE-STRUCK CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D54D;MATHEMATICAL DOUBLE-STRUCK CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D54E;MATHEMATICAL DOUBLE-STRUCK CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D54F;MATHEMATICAL DOUBLE-STRUCK CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D550;MATHEMATICAL DOUBLE-STRUCK CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D552;MATHEMATICAL DOUBLE-STRUCK SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D553;MATHEMATICAL DOUBLE-STRUCK SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D554;MATHEMATICAL DOUBLE-STRUCK SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D555;MATHEMATICAL DOUBLE-STRUCK SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D556;MATHEMATICAL DOUBLE-STRUCK SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D557;MATHEMATICAL DOUBLE-STRUCK SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D558;MATHEMATICAL DOUBLE-STRUCK SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D559;MATHEMATICAL DOUBLE-STRUCK SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D55A;MATHEMATICAL DOUBLE-STRUCK SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D55B;MATHEMATICAL DOUBLE-STRUCK SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D55C;MATHEMATICAL DOUBLE-STRUCK SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D55D;MATHEMATICAL DOUBLE-STRUCK SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D55E;MATHEMATICAL DOUBLE-STRUCK SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D55F;MATHEMATICAL DOUBLE-STRUCK SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D560;MATHEMATICAL DOUBLE-STRUCK SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D561;MATHEMATICAL DOUBLE-STRUCK SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D562;MATHEMATICAL DOUBLE-STRUCK SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D563;MATHEMATICAL DOUBLE-STRUCK SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D564;MATHEMATICAL DOUBLE-STRUCK SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D565;MATHEMATICAL DOUBLE-STRUCK SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D566;MATHEMATICAL DOUBLE-STRUCK SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D567;MATHEMATICAL DOUBLE-STRUCK SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D568;MATHEMATICAL DOUBLE-STRUCK SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D569;MATHEMATICAL DOUBLE-STRUCK SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D56A;MATHEMATICAL DOUBLE-STRUCK SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D56B;MATHEMATICAL DOUBLE-STRUCK SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D56C;MATHEMATICAL BOLD FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D56D;MATHEMATICAL BOLD FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D56E;MATHEMATICAL BOLD FRAKTUR CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D56F;MATHEMATICAL BOLD FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D570;MATHEMATICAL BOLD FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D571;MATHEMATICAL BOLD FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D572;MATHEMATICAL BOLD FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D573;MATHEMATICAL BOLD FRAKTUR CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D574;MATHEMATICAL BOLD FRAKTUR CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D575;MATHEMATICAL BOLD FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D576;MATHEMATICAL BOLD FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D577;MATHEMATICAL BOLD FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D578;MATHEMATICAL BOLD FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D579;MATHEMATICAL BOLD FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D57A;MATHEMATICAL BOLD FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D57B;MATHEMATICAL BOLD FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D57C;MATHEMATICAL BOLD FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D57D;MATHEMATICAL BOLD FRAKTUR CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D57E;MATHEMATICAL BOLD FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D57F;MATHEMATICAL BOLD FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D580;MATHEMATICAL BOLD FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D581;MATHEMATICAL BOLD FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D582;MATHEMATICAL BOLD FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D583;MATHEMATICAL BOLD FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D584;MATHEMATICAL BOLD FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D585;MATHEMATICAL BOLD FRAKTUR CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D586;MATHEMATICAL BOLD FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D587;MATHEMATICAL BOLD FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D588;MATHEMATICAL BOLD FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D589;MATHEMATICAL BOLD FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D58A;MATHEMATICAL BOLD FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D58B;MATHEMATICAL BOLD FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D58C;MATHEMATICAL BOLD FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D58D;MATHEMATICAL BOLD FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D58E;MATHEMATICAL BOLD FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D58F;MATHEMATICAL BOLD FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D590;MATHEMATICAL BOLD FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D591;MATHEMATICAL BOLD FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D592;MATHEMATICAL BOLD FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D593;MATHEMATICAL BOLD FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D594;MATHEMATICAL BOLD FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D595;MATHEMATICAL BOLD FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D596;MATHEMATICAL BOLD FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D597;MATHEMATICAL BOLD FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D598;MATHEMATICAL BOLD FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D599;MATHEMATICAL BOLD FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D59A;MATHEMATICAL BOLD FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D59B;MATHEMATICAL BOLD FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D59C;MATHEMATICAL BOLD FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D59D;MATHEMATICAL BOLD FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D59E;MATHEMATICAL BOLD FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D59F;MATHEMATICAL BOLD FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D5A0;MATHEMATICAL SANS-SERIF CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D5A1;MATHEMATICAL SANS-SERIF CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D5A2;MATHEMATICAL SANS-SERIF CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D5A3;MATHEMATICAL SANS-SERIF CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D5A4;MATHEMATICAL SANS-SERIF CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D5A5;MATHEMATICAL SANS-SERIF CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D5A6;MATHEMATICAL SANS-SERIF CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D5A7;MATHEMATICAL SANS-SERIF CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D5A8;MATHEMATICAL SANS-SERIF CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D5A9;MATHEMATICAL SANS-SERIF CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D5AA;MATHEMATICAL SANS-SERIF CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D5AB;MATHEMATICAL SANS-SERIF CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D5AC;MATHEMATICAL SANS-SERIF CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D5AD;MATHEMATICAL SANS-SERIF CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D5AE;MATHEMATICAL SANS-SERIF CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D5AF;MATHEMATICAL SANS-SERIF CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D5B0;MATHEMATICAL SANS-SERIF CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D5B1;MATHEMATICAL SANS-SERIF CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D5B2;MATHEMATICAL SANS-SERIF CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D5B3;MATHEMATICAL SANS-SERIF CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D5B4;MATHEMATICAL SANS-SERIF CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D5B5;MATHEMATICAL SANS-SERIF CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D5B6;MATHEMATICAL SANS-SERIF CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D5B7;MATHEMATICAL SANS-SERIF CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D5B8;MATHEMATICAL SANS-SERIF CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D5B9;MATHEMATICAL SANS-SERIF CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D5BA;MATHEMATICAL SANS-SERIF SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D5BB;MATHEMATICAL SANS-SERIF SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D5BC;MATHEMATICAL SANS-SERIF SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D5BD;MATHEMATICAL SANS-SERIF SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D5BE;MATHEMATICAL SANS-SERIF SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D5BF;MATHEMATICAL SANS-SERIF SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D5C0;MATHEMATICAL SANS-SERIF SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D5C1;MATHEMATICAL SANS-SERIF SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D5C2;MATHEMATICAL SANS-SERIF SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D5C3;MATHEMATICAL SANS-SERIF SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D5C4;MATHEMATICAL SANS-SERIF SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D5C5;MATHEMATICAL SANS-SERIF SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D5C6;MATHEMATICAL SANS-SERIF SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D5C7;MATHEMATICAL SANS-SERIF SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D5C8;MATHEMATICAL SANS-SERIF SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D5C9;MATHEMATICAL SANS-SERIF SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D5CA;MATHEMATICAL SANS-SERIF SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D5CB;MATHEMATICAL SANS-SERIF SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D5CC;MATHEMATICAL SANS-SERIF SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D5CD;MATHEMATICAL SANS-SERIF SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D5CE;MATHEMATICAL SANS-SERIF SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D5CF;MATHEMATICAL SANS-SERIF SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D5D0;MATHEMATICAL SANS-SERIF SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D5D1;MATHEMATICAL SANS-SERIF SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D5D2;MATHEMATICAL SANS-SERIF SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D5D3;MATHEMATICAL SANS-SERIF SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D5D4;MATHEMATICAL SANS-SERIF BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D5D5;MATHEMATICAL SANS-SERIF BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D5D6;MATHEMATICAL SANS-SERIF BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D5D7;MATHEMATICAL SANS-SERIF BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D5D8;MATHEMATICAL SANS-SERIF BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D5D9;MATHEMATICAL SANS-SERIF BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D5DA;MATHEMATICAL SANS-SERIF BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D5DB;MATHEMATICAL SANS-SERIF BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D5DC;MATHEMATICAL SANS-SERIF BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D5DD;MATHEMATICAL SANS-SERIF BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D5DE;MATHEMATICAL SANS-SERIF BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D5DF;MATHEMATICAL SANS-SERIF BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D5E0;MATHEMATICAL SANS-SERIF BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D5E1;MATHEMATICAL SANS-SERIF BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D5E2;MATHEMATICAL SANS-SERIF BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D5E3;MATHEMATICAL SANS-SERIF BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D5E4;MATHEMATICAL SANS-SERIF BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D5E5;MATHEMATICAL SANS-SERIF BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D5E6;MATHEMATICAL SANS-SERIF BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D5E7;MATHEMATICAL SANS-SERIF BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D5E8;MATHEMATICAL SANS-SERIF BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D5E9;MATHEMATICAL SANS-SERIF BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D5EA;MATHEMATICAL SANS-SERIF BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D5EB;MATHEMATICAL SANS-SERIF BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D5EC;MATHEMATICAL SANS-SERIF BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D5ED;MATHEMATICAL SANS-SERIF BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D5EE;MATHEMATICAL SANS-SERIF BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D5EF;MATHEMATICAL SANS-SERIF BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D5F0;MATHEMATICAL SANS-SERIF BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D5F1;MATHEMATICAL SANS-SERIF BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D5F2;MATHEMATICAL SANS-SERIF BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D5F3;MATHEMATICAL SANS-SERIF BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D5F4;MATHEMATICAL SANS-SERIF BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D5F5;MATHEMATICAL SANS-SERIF BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D5F6;MATHEMATICAL SANS-SERIF BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D5F7;MATHEMATICAL SANS-SERIF BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D5F8;MATHEMATICAL SANS-SERIF BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D5F9;MATHEMATICAL SANS-SERIF BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D5FA;MATHEMATICAL SANS-SERIF BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D5FB;MATHEMATICAL SANS-SERIF BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D5FC;MATHEMATICAL SANS-SERIF BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D5FD;MATHEMATICAL SANS-SERIF BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D5FE;MATHEMATICAL SANS-SERIF BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D5FF;MATHEMATICAL SANS-SERIF BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D600;MATHEMATICAL SANS-SERIF BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D601;MATHEMATICAL SANS-SERIF BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D602;MATHEMATICAL SANS-SERIF BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D603;MATHEMATICAL SANS-SERIF BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D604;MATHEMATICAL SANS-SERIF BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D605;MATHEMATICAL SANS-SERIF BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D606;MATHEMATICAL SANS-SERIF BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D607;MATHEMATICAL SANS-SERIF BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D608;MATHEMATICAL SANS-SERIF ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D609;MATHEMATICAL SANS-SERIF ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D60A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D60B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D60C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D60D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D60E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D60F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D610;MATHEMATICAL SANS-SERIF ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D611;MATHEMATICAL SANS-SERIF ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D612;MATHEMATICAL SANS-SERIF ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D613;MATHEMATICAL SANS-SERIF ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D614;MATHEMATICAL SANS-SERIF ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D615;MATHEMATICAL SANS-SERIF ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D616;MATHEMATICAL SANS-SERIF ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D617;MATHEMATICAL SANS-SERIF ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D618;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D619;MATHEMATICAL SANS-SERIF ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D61A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D61B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D61C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D61D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D61E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D61F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D620;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D621;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D622;MATHEMATICAL SANS-SERIF ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D623;MATHEMATICAL SANS-SERIF ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D624;MATHEMATICAL SANS-SERIF ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D625;MATHEMATICAL SANS-SERIF ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D626;MATHEMATICAL SANS-SERIF ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D627;MATHEMATICAL SANS-SERIF ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D628;MATHEMATICAL SANS-SERIF ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D629;MATHEMATICAL SANS-SERIF ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D62A;MATHEMATICAL SANS-SERIF ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D62B;MATHEMATICAL SANS-SERIF ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D62C;MATHEMATICAL SANS-SERIF ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D62D;MATHEMATICAL SANS-SERIF ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D62E;MATHEMATICAL SANS-SERIF ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D62F;MATHEMATICAL SANS-SERIF ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D630;MATHEMATICAL SANS-SERIF ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D631;MATHEMATICAL SANS-SERIF ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D632;MATHEMATICAL SANS-SERIF ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D633;MATHEMATICAL SANS-SERIF ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D634;MATHEMATICAL SANS-SERIF ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D635;MATHEMATICAL SANS-SERIF ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D636;MATHEMATICAL SANS-SERIF ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D637;MATHEMATICAL SANS-SERIF ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D638;MATHEMATICAL SANS-SERIF ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D639;MATHEMATICAL SANS-SERIF ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D63A;MATHEMATICAL SANS-SERIF ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D63B;MATHEMATICAL SANS-SERIF ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D63C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D63D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D63E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D63F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D640;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D641;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D642;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D643;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D644;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D645;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D646;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D647;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D648;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D649;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D64A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D64B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D64C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D64D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D64E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D64F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D650;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D651;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D652;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D653;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D654;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D655;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D656;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D657;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D658;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D659;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D65A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D65B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D65C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D65D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D65E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D65F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D660;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D661;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D662;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D663;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D664;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D665;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D666;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D667;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D668;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D669;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D66A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D66B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D66C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D66D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D66E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D66F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D670;MATHEMATICAL MONOSPACE CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D671;MATHEMATICAL MONOSPACE CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D672;MATHEMATICAL MONOSPACE CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D673;MATHEMATICAL MONOSPACE CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D674;MATHEMATICAL MONOSPACE CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D675;MATHEMATICAL MONOSPACE CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D676;MATHEMATICAL MONOSPACE CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D677;MATHEMATICAL MONOSPACE CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D678;MATHEMATICAL MONOSPACE CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D679;MATHEMATICAL MONOSPACE CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D67A;MATHEMATICAL MONOSPACE CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D67B;MATHEMATICAL MONOSPACE CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D67C;MATHEMATICAL MONOSPACE CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D67D;MATHEMATICAL MONOSPACE CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D67E;MATHEMATICAL MONOSPACE CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D67F;MATHEMATICAL MONOSPACE CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D680;MATHEMATICAL MONOSPACE CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D681;MATHEMATICAL MONOSPACE CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D682;MATHEMATICAL MONOSPACE CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D683;MATHEMATICAL MONOSPACE CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D684;MATHEMATICAL MONOSPACE CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D685;MATHEMATICAL MONOSPACE CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D686;MATHEMATICAL MONOSPACE CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D687;MATHEMATICAL MONOSPACE CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D688;MATHEMATICAL MONOSPACE CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D689;MATHEMATICAL MONOSPACE CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D68A;MATHEMATICAL MONOSPACE SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D68B;MATHEMATICAL MONOSPACE SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D68C;MATHEMATICAL MONOSPACE SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D68D;MATHEMATICAL MONOSPACE SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D68E;MATHEMATICAL MONOSPACE SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D68F;MATHEMATICAL MONOSPACE SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D690;MATHEMATICAL MONOSPACE SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D691;MATHEMATICAL MONOSPACE SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D692;MATHEMATICAL MONOSPACE SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D693;MATHEMATICAL MONOSPACE SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D694;MATHEMATICAL MONOSPACE SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D695;MATHEMATICAL MONOSPACE SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D696;MATHEMATICAL MONOSPACE SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D697;MATHEMATICAL MONOSPACE SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D698;MATHEMATICAL MONOSPACE SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D699;MATHEMATICAL MONOSPACE SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D69A;MATHEMATICAL MONOSPACE SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D69B;MATHEMATICAL MONOSPACE SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D69C;MATHEMATICAL MONOSPACE SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D69D;MATHEMATICAL MONOSPACE SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D69E;MATHEMATICAL MONOSPACE SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D69F;MATHEMATICAL MONOSPACE SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D6A0;MATHEMATICAL MONOSPACE SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D6A1;MATHEMATICAL MONOSPACE SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D6A2;MATHEMATICAL MONOSPACE SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D6A3;MATHEMATICAL MONOSPACE SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D6A4;MATHEMATICAL ITALIC SMALL DOTLESS I;Ll;0;L;<font> 0131;;;;N;;;;;
+1D6A5;MATHEMATICAL ITALIC SMALL DOTLESS J;Ll;0;L;<font> 0237;;;;N;;;;;
+1D6A8;MATHEMATICAL BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D6A9;MATHEMATICAL BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D6AA;MATHEMATICAL BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D6AB;MATHEMATICAL BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D6AC;MATHEMATICAL BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D6AD;MATHEMATICAL BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D6AE;MATHEMATICAL BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D6AF;MATHEMATICAL BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D6B0;MATHEMATICAL BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D6B1;MATHEMATICAL BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D6B2;MATHEMATICAL BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D6B3;MATHEMATICAL BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D6B4;MATHEMATICAL BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D6B5;MATHEMATICAL BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D6B6;MATHEMATICAL BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D6B7;MATHEMATICAL BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D6B8;MATHEMATICAL BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D6B9;MATHEMATICAL BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D6BA;MATHEMATICAL BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D6BB;MATHEMATICAL BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D6BC;MATHEMATICAL BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D6BD;MATHEMATICAL BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D6C5;MATHEMATICAL BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D6C6;MATHEMATICAL BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D6C7;MATHEMATICAL BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D6C8;MATHEMATICAL BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D6C9;MATHEMATICAL BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D6CA;MATHEMATICAL BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D6CB;MATHEMATICAL BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D6CC;MATHEMATICAL BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D6CD;MATHEMATICAL BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D6CE;MATHEMATICAL BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D6CF;MATHEMATICAL BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D6D0;MATHEMATICAL BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D6D1;MATHEMATICAL BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D6D2;MATHEMATICAL BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D6D3;MATHEMATICAL BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D6D4;MATHEMATICAL BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D6D5;MATHEMATICAL BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D6D6;MATHEMATICAL BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D6D7;MATHEMATICAL BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D6D8;MATHEMATICAL BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D6D9;MATHEMATICAL BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D6DA;MATHEMATICAL BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D6DC;MATHEMATICAL BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D6DD;MATHEMATICAL BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D6DE;MATHEMATICAL BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D6DF;MATHEMATICAL BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D6E0;MATHEMATICAL BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D6E1;MATHEMATICAL BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D6E2;MATHEMATICAL ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D6E3;MATHEMATICAL ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D6E4;MATHEMATICAL ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D6E5;MATHEMATICAL ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D6E6;MATHEMATICAL ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D6E7;MATHEMATICAL ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D6E8;MATHEMATICAL ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D6E9;MATHEMATICAL ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D6EA;MATHEMATICAL ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D6EB;MATHEMATICAL ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D6EC;MATHEMATICAL ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D6ED;MATHEMATICAL ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D6EE;MATHEMATICAL ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D6EF;MATHEMATICAL ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D6F0;MATHEMATICAL ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D6F1;MATHEMATICAL ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D6F2;MATHEMATICAL ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D6F3;MATHEMATICAL ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D6F4;MATHEMATICAL ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D6F5;MATHEMATICAL ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D6F6;MATHEMATICAL ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D6F7;MATHEMATICAL ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D6FF;MATHEMATICAL ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D700;MATHEMATICAL ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D701;MATHEMATICAL ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D702;MATHEMATICAL ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D703;MATHEMATICAL ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D704;MATHEMATICAL ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D705;MATHEMATICAL ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D706;MATHEMATICAL ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D707;MATHEMATICAL ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D708;MATHEMATICAL ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D709;MATHEMATICAL ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D70A;MATHEMATICAL ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D70B;MATHEMATICAL ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D70C;MATHEMATICAL ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D70D;MATHEMATICAL ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D70E;MATHEMATICAL ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D70F;MATHEMATICAL ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D710;MATHEMATICAL ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D711;MATHEMATICAL ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D712;MATHEMATICAL ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D713;MATHEMATICAL ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D714;MATHEMATICAL ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D716;MATHEMATICAL ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D717;MATHEMATICAL ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D718;MATHEMATICAL ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D719;MATHEMATICAL ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D71A;MATHEMATICAL ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D71B;MATHEMATICAL ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D71C;MATHEMATICAL BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D71D;MATHEMATICAL BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D71E;MATHEMATICAL BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D71F;MATHEMATICAL BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D720;MATHEMATICAL BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D721;MATHEMATICAL BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D722;MATHEMATICAL BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D723;MATHEMATICAL BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D724;MATHEMATICAL BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D725;MATHEMATICAL BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D726;MATHEMATICAL BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D727;MATHEMATICAL BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D728;MATHEMATICAL BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D729;MATHEMATICAL BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D72A;MATHEMATICAL BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D72B;MATHEMATICAL BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D72C;MATHEMATICAL BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D72D;MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D72E;MATHEMATICAL BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D72F;MATHEMATICAL BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D730;MATHEMATICAL BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D731;MATHEMATICAL BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D739;MATHEMATICAL BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D73A;MATHEMATICAL BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D73B;MATHEMATICAL BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D73C;MATHEMATICAL BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D73D;MATHEMATICAL BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D73E;MATHEMATICAL BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D73F;MATHEMATICAL BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D740;MATHEMATICAL BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D741;MATHEMATICAL BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D742;MATHEMATICAL BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D743;MATHEMATICAL BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D744;MATHEMATICAL BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D745;MATHEMATICAL BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D746;MATHEMATICAL BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D747;MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D748;MATHEMATICAL BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D749;MATHEMATICAL BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D74A;MATHEMATICAL BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D74B;MATHEMATICAL BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D74C;MATHEMATICAL BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D74D;MATHEMATICAL BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D74E;MATHEMATICAL BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D750;MATHEMATICAL BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D751;MATHEMATICAL BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D752;MATHEMATICAL BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D753;MATHEMATICAL BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D754;MATHEMATICAL BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D755;MATHEMATICAL BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D756;MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D757;MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D758;MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D759;MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D75A;MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D75B;MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D75C;MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D75D;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D75E;MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D75F;MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D760;MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D761;MATHEMATICAL SANS-SERIF BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D762;MATHEMATICAL SANS-SERIF BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D763;MATHEMATICAL SANS-SERIF BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D764;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D765;MATHEMATICAL SANS-SERIF BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D766;MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D767;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D768;MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D769;MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D76A;MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D76B;MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D773;MATHEMATICAL SANS-SERIF BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D774;MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D775;MATHEMATICAL SANS-SERIF BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D776;MATHEMATICAL SANS-SERIF BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D777;MATHEMATICAL SANS-SERIF BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D778;MATHEMATICAL SANS-SERIF BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D779;MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D77A;MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D77B;MATHEMATICAL SANS-SERIF BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D77C;MATHEMATICAL SANS-SERIF BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D77D;MATHEMATICAL SANS-SERIF BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D77E;MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D77F;MATHEMATICAL SANS-SERIF BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D780;MATHEMATICAL SANS-SERIF BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D781;MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D782;MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D783;MATHEMATICAL SANS-SERIF BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D784;MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D785;MATHEMATICAL SANS-SERIF BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D786;MATHEMATICAL SANS-SERIF BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D787;MATHEMATICAL SANS-SERIF BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D788;MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D78A;MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D78B;MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D78C;MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D78D;MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D78E;MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D78F;MATHEMATICAL SANS-SERIF BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D790;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D791;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D792;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D793;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D794;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D795;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D796;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D797;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D798;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D799;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D79A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D79B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D79C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D79D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D79E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D79F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D7A0;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D7A1;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D7A2;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D7A3;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D7A4;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D7A5;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D7AD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D7AE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D7AF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D7B0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D7B1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D7B2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D7B3;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D7B4;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D7B5;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D7B6;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D7B7;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D7B8;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D7B9;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D7BA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D7BB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D7BC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D7BD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D7BE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D7BF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D7C0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D7C1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D7C2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D7C4;MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D7C5;MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D7C6;MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D7C7;MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D7C8;MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D7C9;MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D7CA;MATHEMATICAL BOLD CAPITAL DIGAMMA;Lu;0;L;<font> 03DC;;;;N;;;;;
+1D7CB;MATHEMATICAL BOLD SMALL DIGAMMA;Ll;0;L;<font> 03DD;;;;N;;;;;
+1D7CE;MATHEMATICAL BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7CF;MATHEMATICAL BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7D0;MATHEMATICAL BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7D1;MATHEMATICAL BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7D2;MATHEMATICAL BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7D3;MATHEMATICAL BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7D4;MATHEMATICAL BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7D5;MATHEMATICAL BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7D6;MATHEMATICAL BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7D7;MATHEMATICAL BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7D8;MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7D9;MATHEMATICAL DOUBLE-STRUCK DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7DA;MATHEMATICAL DOUBLE-STRUCK DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7DB;MATHEMATICAL DOUBLE-STRUCK DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7DC;MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7DD;MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7DE;MATHEMATICAL DOUBLE-STRUCK DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7DF;MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7E0;MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7E1;MATHEMATICAL DOUBLE-STRUCK DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7E2;MATHEMATICAL SANS-SERIF DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7E3;MATHEMATICAL SANS-SERIF DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7E4;MATHEMATICAL SANS-SERIF DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7E5;MATHEMATICAL SANS-SERIF DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7E6;MATHEMATICAL SANS-SERIF DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7E7;MATHEMATICAL SANS-SERIF DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7E8;MATHEMATICAL SANS-SERIF DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7E9;MATHEMATICAL SANS-SERIF DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7EA;MATHEMATICAL SANS-SERIF DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7EB;MATHEMATICAL SANS-SERIF DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7EC;MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7ED;MATHEMATICAL SANS-SERIF BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7EE;MATHEMATICAL SANS-SERIF BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7EF;MATHEMATICAL SANS-SERIF BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7F0;MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7F1;MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7F2;MATHEMATICAL SANS-SERIF BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7F3;MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7F4;MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7F5;MATHEMATICAL SANS-SERIF BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7F6;MATHEMATICAL MONOSPACE DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7F7;MATHEMATICAL MONOSPACE DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7F8;MATHEMATICAL MONOSPACE DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7F9;MATHEMATICAL MONOSPACE DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7FA;MATHEMATICAL MONOSPACE DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7FB;MATHEMATICAL MONOSPACE DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7FC;MATHEMATICAL MONOSPACE DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7FD;MATHEMATICAL MONOSPACE DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7FE;MATHEMATICAL MONOSPACE DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7FF;MATHEMATICAL MONOSPACE DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D800;SIGNWRITING HAND-FIST INDEX;So;0;L;;;;;N;;;;;
+1D801;SIGNWRITING HAND-CIRCLE INDEX;So;0;L;;;;;N;;;;;
+1D802;SIGNWRITING HAND-CUP INDEX;So;0;L;;;;;N;;;;;
+1D803;SIGNWRITING HAND-OVAL INDEX;So;0;L;;;;;N;;;;;
+1D804;SIGNWRITING HAND-HINGE INDEX;So;0;L;;;;;N;;;;;
+1D805;SIGNWRITING HAND-ANGLE INDEX;So;0;L;;;;;N;;;;;
+1D806;SIGNWRITING HAND-FIST INDEX BENT;So;0;L;;;;;N;;;;;
+1D807;SIGNWRITING HAND-CIRCLE INDEX BENT;So;0;L;;;;;N;;;;;
+1D808;SIGNWRITING HAND-FIST THUMB UNDER INDEX BENT;So;0;L;;;;;N;;;;;
+1D809;SIGNWRITING HAND-FIST INDEX RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D80A;SIGNWRITING HAND-FIST INDEX CUPPED;So;0;L;;;;;N;;;;;
+1D80B;SIGNWRITING HAND-FIST INDEX HINGED;So;0;L;;;;;N;;;;;
+1D80C;SIGNWRITING HAND-FIST INDEX HINGED LOW;So;0;L;;;;;N;;;;;
+1D80D;SIGNWRITING HAND-CIRCLE INDEX HINGE;So;0;L;;;;;N;;;;;
+1D80E;SIGNWRITING HAND-FIST INDEX MIDDLE;So;0;L;;;;;N;;;;;
+1D80F;SIGNWRITING HAND-CIRCLE INDEX MIDDLE;So;0;L;;;;;N;;;;;
+1D810;SIGNWRITING HAND-FIST INDEX MIDDLE BENT;So;0;L;;;;;N;;;;;
+1D811;SIGNWRITING HAND-FIST INDEX MIDDLE RAISED KNUCKLES;So;0;L;;;;;N;;;;;
+1D812;SIGNWRITING HAND-FIST INDEX MIDDLE HINGED;So;0;L;;;;;N;;;;;
+1D813;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED;So;0;L;;;;;N;;;;;
+1D814;SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D815;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED;So;0;L;;;;;N;;;;;
+1D816;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED INDEX BENT;So;0;L;;;;;N;;;;;
+1D817;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED MIDDLE BENT;So;0;L;;;;;N;;;;;
+1D818;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED;So;0;L;;;;;N;;;;;
+1D819;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED;So;0;L;;;;;N;;;;;
+1D81A;SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED;So;0;L;;;;;N;;;;;
+1D81B;SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSSED;So;0;L;;;;;N;;;;;
+1D81C;SIGNWRITING HAND-FIST MIDDLE BENT OVER INDEX;So;0;L;;;;;N;;;;;
+1D81D;SIGNWRITING HAND-FIST INDEX BENT OVER MIDDLE;So;0;L;;;;;N;;;;;
+1D81E;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB;So;0;L;;;;;N;;;;;
+1D81F;SIGNWRITING HAND-CIRCLE INDEX MIDDLE THUMB;So;0;L;;;;;N;;;;;
+1D820;SIGNWRITING HAND-FIST INDEX MIDDLE STRAIGHT THUMB BENT;So;0;L;;;;;N;;;;;
+1D821;SIGNWRITING HAND-FIST INDEX MIDDLE BENT THUMB STRAIGHT;So;0;L;;;;;N;;;;;
+1D822;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB BENT;So;0;L;;;;;N;;;;;
+1D823;SIGNWRITING HAND-FIST INDEX MIDDLE HINGED SPREAD THUMB SIDE;So;0;L;;;;;N;;;;;
+1D824;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D825;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB CONJOINED;So;0;L;;;;;N;;;;;
+1D826;SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP THUMB SIDE;So;0;L;;;;;N;;;;;
+1D827;SIGNWRITING HAND-FIST INDEX MIDDLE UP SPREAD THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D828;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CUPPED;So;0;L;;;;;N;;;;;
+1D829;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CIRCLED;So;0;L;;;;;N;;;;;
+1D82A;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HOOKED;So;0;L;;;;;N;;;;;
+1D82B;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HINGED;So;0;L;;;;;N;;;;;
+1D82C;SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D82D;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D82E;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE CONJOINED;So;0;L;;;;;N;;;;;
+1D82F;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE BENT;So;0;L;;;;;N;;;;;
+1D830;SIGNWRITING HAND-FIST MIDDLE THUMB HOOKED INDEX UP;So;0;L;;;;;N;;;;;
+1D831;SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D832;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D833;SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D834;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D835;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D836;SIGNWRITING HAND-FIST MIDDLE THUMB CUPPED INDEX UP;So;0;L;;;;;N;;;;;
+1D837;SIGNWRITING HAND-FIST INDEX THUMB CUPPED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D838;SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX UP;So;0;L;;;;;N;;;;;
+1D839;SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX HINGED;So;0;L;;;;;N;;;;;
+1D83A;SIGNWRITING HAND-FIST INDEX THUMB ANGLED OUT MIDDLE UP;So;0;L;;;;;N;;;;;
+1D83B;SIGNWRITING HAND-FIST INDEX THUMB ANGLED IN MIDDLE UP;So;0;L;;;;;N;;;;;
+1D83C;SIGNWRITING HAND-FIST INDEX THUMB CIRCLED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D83D;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CONJOINED HINGED;So;0;L;;;;;N;;;;;
+1D83E;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED OUT;So;0;L;;;;;N;;;;;
+1D83F;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED;So;0;L;;;;;N;;;;;
+1D840;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX UP;So;0;L;;;;;N;;;;;
+1D841;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX CROSSED;So;0;L;;;;;N;;;;;
+1D842;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED INDEX UP;So;0;L;;;;;N;;;;;
+1D843;SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE HINGED;So;0;L;;;;;N;;;;;
+1D844;SIGNWRITING HAND-FLAT FOUR FINGERS;So;0;L;;;;;N;;;;;
+1D845;SIGNWRITING HAND-FLAT FOUR FINGERS BENT;So;0;L;;;;;N;;;;;
+1D846;SIGNWRITING HAND-FLAT FOUR FINGERS HINGED;So;0;L;;;;;N;;;;;
+1D847;SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;;
+1D848;SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED SPLIT;So;0;L;;;;;N;;;;;
+1D849;SIGNWRITING HAND-CLAW FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;;
+1D84A;SIGNWRITING HAND-FIST FOUR FINGERS CONJOINED BENT;So;0;L;;;;;N;;;;;
+1D84B;SIGNWRITING HAND-HINGE FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;;
+1D84C;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D84D;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D84E;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD FOUR BENT;So;0;L;;;;;N;;;;;
+1D84F;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD FOUR BENT;So;0;L;;;;;N;;;;;
+1D850;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD BENT;So;0;L;;;;;N;;;;;
+1D851;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD BENT;So;0;L;;;;;N;;;;;
+1D852;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D853;SIGNWRITING HAND-CUP FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D854;SIGNWRITING HAND-CUP FIVE FINGERS SPREAD OPEN;So;0;L;;;;;N;;;;;
+1D855;SIGNWRITING HAND-HINGE FIVE FINGERS SPREAD OPEN;So;0;L;;;;;N;;;;;
+1D856;SIGNWRITING HAND-OVAL FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D857;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED;So;0;L;;;;;N;;;;;
+1D858;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D859;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED NO THUMB;So;0;L;;;;;N;;;;;
+1D85A;SIGNWRITING HAND-FLAT;So;0;L;;;;;N;;;;;
+1D85B;SIGNWRITING HAND-FLAT BETWEEN PALM FACINGS;So;0;L;;;;;N;;;;;
+1D85C;SIGNWRITING HAND-FLAT HEEL;So;0;L;;;;;N;;;;;
+1D85D;SIGNWRITING HAND-FLAT THUMB SIDE;So;0;L;;;;;N;;;;;
+1D85E;SIGNWRITING HAND-FLAT HEEL THUMB SIDE;So;0;L;;;;;N;;;;;
+1D85F;SIGNWRITING HAND-FLAT THUMB BENT;So;0;L;;;;;N;;;;;
+1D860;SIGNWRITING HAND-FLAT THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D861;SIGNWRITING HAND-FLAT SPLIT INDEX THUMB SIDE;So;0;L;;;;;N;;;;;
+1D862;SIGNWRITING HAND-FLAT SPLIT CENTRE;So;0;L;;;;;N;;;;;
+1D863;SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE;So;0;L;;;;;N;;;;;
+1D864;SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE BENT;So;0;L;;;;;N;;;;;
+1D865;SIGNWRITING HAND-FLAT SPLIT LITTLE;So;0;L;;;;;N;;;;;
+1D866;SIGNWRITING HAND-CLAW;So;0;L;;;;;N;;;;;
+1D867;SIGNWRITING HAND-CLAW THUMB SIDE;So;0;L;;;;;N;;;;;
+1D868;SIGNWRITING HAND-CLAW NO THUMB;So;0;L;;;;;N;;;;;
+1D869;SIGNWRITING HAND-CLAW THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D86A;SIGNWRITING HAND-HOOK CURLICUE;So;0;L;;;;;N;;;;;
+1D86B;SIGNWRITING HAND-HOOK;So;0;L;;;;;N;;;;;
+1D86C;SIGNWRITING HAND-CUP OPEN;So;0;L;;;;;N;;;;;
+1D86D;SIGNWRITING HAND-CUP;So;0;L;;;;;N;;;;;
+1D86E;SIGNWRITING HAND-CUP OPEN THUMB SIDE;So;0;L;;;;;N;;;;;
+1D86F;SIGNWRITING HAND-CUP THUMB SIDE;So;0;L;;;;;N;;;;;
+1D870;SIGNWRITING HAND-CUP OPEN NO THUMB;So;0;L;;;;;N;;;;;
+1D871;SIGNWRITING HAND-CUP NO THUMB;So;0;L;;;;;N;;;;;
+1D872;SIGNWRITING HAND-CUP OPEN THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D873;SIGNWRITING HAND-CUP THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D874;SIGNWRITING HAND-CURLICUE OPEN;So;0;L;;;;;N;;;;;
+1D875;SIGNWRITING HAND-CURLICUE;So;0;L;;;;;N;;;;;
+1D876;SIGNWRITING HAND-CIRCLE;So;0;L;;;;;N;;;;;
+1D877;SIGNWRITING HAND-OVAL;So;0;L;;;;;N;;;;;
+1D878;SIGNWRITING HAND-OVAL THUMB SIDE;So;0;L;;;;;N;;;;;
+1D879;SIGNWRITING HAND-OVAL NO THUMB;So;0;L;;;;;N;;;;;
+1D87A;SIGNWRITING HAND-OVAL THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D87B;SIGNWRITING HAND-HINGE OPEN;So;0;L;;;;;N;;;;;
+1D87C;SIGNWRITING HAND-HINGE OPEN THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D87D;SIGNWRITING HAND-HINGE;So;0;L;;;;;N;;;;;
+1D87E;SIGNWRITING HAND-HINGE SMALL;So;0;L;;;;;N;;;;;
+1D87F;SIGNWRITING HAND-HINGE OPEN THUMB SIDE;So;0;L;;;;;N;;;;;
+1D880;SIGNWRITING HAND-HINGE THUMB SIDE;So;0;L;;;;;N;;;;;
+1D881;SIGNWRITING HAND-HINGE OPEN NO THUMB;So;0;L;;;;;N;;;;;
+1D882;SIGNWRITING HAND-HINGE NO THUMB;So;0;L;;;;;N;;;;;
+1D883;SIGNWRITING HAND-HINGE THUMB SIDE TOUCHING INDEX;So;0;L;;;;;N;;;;;
+1D884;SIGNWRITING HAND-HINGE THUMB BETWEEN MIDDLE RING;So;0;L;;;;;N;;;;;
+1D885;SIGNWRITING HAND-ANGLE;So;0;L;;;;;N;;;;;
+1D886;SIGNWRITING HAND-FIST INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D887;SIGNWRITING HAND-CIRCLE INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D888;SIGNWRITING HAND-HINGE INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D889;SIGNWRITING HAND-ANGLE INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D88A;SIGNWRITING HAND-HINGE LITTLE;So;0;L;;;;;N;;;;;
+1D88B;SIGNWRITING HAND-FIST INDEX MIDDLE RING BENT;So;0;L;;;;;N;;;;;
+1D88C;SIGNWRITING HAND-FIST INDEX MIDDLE RING CONJOINED;So;0;L;;;;;N;;;;;
+1D88D;SIGNWRITING HAND-HINGE INDEX MIDDLE RING CONJOINED;So;0;L;;;;;N;;;;;
+1D88E;SIGNWRITING HAND-FIST LITTLE DOWN;So;0;L;;;;;N;;;;;
+1D88F;SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D890;SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE CURVED;So;0;L;;;;;N;;;;;
+1D891;SIGNWRITING HAND-FIST LITTLE DOWN OTHERS CIRCLED;So;0;L;;;;;N;;;;;
+1D892;SIGNWRITING HAND-FIST LITTLE UP;So;0;L;;;;;N;;;;;
+1D893;SIGNWRITING HAND-FIST THUMB UNDER LITTLE UP;So;0;L;;;;;N;;;;;
+1D894;SIGNWRITING HAND-CIRCLE LITTLE UP;So;0;L;;;;;N;;;;;
+1D895;SIGNWRITING HAND-OVAL LITTLE UP;So;0;L;;;;;N;;;;;
+1D896;SIGNWRITING HAND-ANGLE LITTLE UP;So;0;L;;;;;N;;;;;
+1D897;SIGNWRITING HAND-FIST LITTLE RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D898;SIGNWRITING HAND-FIST LITTLE BENT;So;0;L;;;;;N;;;;;
+1D899;SIGNWRITING HAND-FIST LITTLE TOUCHES THUMB;So;0;L;;;;;N;;;;;
+1D89A;SIGNWRITING HAND-FIST LITTLE THUMB;So;0;L;;;;;N;;;;;
+1D89B;SIGNWRITING HAND-HINGE LITTLE THUMB;So;0;L;;;;;N;;;;;
+1D89C;SIGNWRITING HAND-FIST LITTLE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D89D;SIGNWRITING HAND-HINGE LITTLE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D89E;SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB OUT;So;0;L;;;;;N;;;;;
+1D89F;SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8A0;SIGNWRITING HAND-FIST LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A1;SIGNWRITING HAND-CIRCLE LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A2;SIGNWRITING HAND-HINGE LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A3;SIGNWRITING HAND-ANGLE LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A4;SIGNWRITING HAND-FIST INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A5;SIGNWRITING HAND-CIRCLE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A6;SIGNWRITING HAND-HINGE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A7;SIGNWRITING HAND-HINGE RING;So;0;L;;;;;N;;;;;
+1D8A8;SIGNWRITING HAND-ANGLE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A9;SIGNWRITING HAND-FIST INDEX MIDDLE CROSS LITTLE;So;0;L;;;;;N;;;;;
+1D8AA;SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSS LITTLE;So;0;L;;;;;N;;;;;
+1D8AB;SIGNWRITING HAND-FIST RING DOWN;So;0;L;;;;;N;;;;;
+1D8AC;SIGNWRITING HAND-HINGE RING DOWN INDEX THUMB HOOK MIDDLE;So;0;L;;;;;N;;;;;
+1D8AD;SIGNWRITING HAND-ANGLE RING DOWN MIDDLE THUMB INDEX CROSS;So;0;L;;;;;N;;;;;
+1D8AE;SIGNWRITING HAND-FIST RING UP;So;0;L;;;;;N;;;;;
+1D8AF;SIGNWRITING HAND-FIST RING RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D8B0;SIGNWRITING HAND-FIST RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B1;SIGNWRITING HAND-CIRCLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B2;SIGNWRITING HAND-OVAL RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B3;SIGNWRITING HAND-ANGLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B4;SIGNWRITING HAND-FIST RING MIDDLE;So;0;L;;;;;N;;;;;
+1D8B5;SIGNWRITING HAND-FIST RING MIDDLE CONJOINED;So;0;L;;;;;N;;;;;
+1D8B6;SIGNWRITING HAND-FIST RING MIDDLE RAISED KNUCKLES;So;0;L;;;;;N;;;;;
+1D8B7;SIGNWRITING HAND-FIST RING INDEX;So;0;L;;;;;N;;;;;
+1D8B8;SIGNWRITING HAND-FIST RING THUMB;So;0;L;;;;;N;;;;;
+1D8B9;SIGNWRITING HAND-HOOK RING THUMB;So;0;L;;;;;N;;;;;
+1D8BA;SIGNWRITING HAND-FIST INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8BB;SIGNWRITING HAND-CIRCLE INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8BC;SIGNWRITING HAND-CURLICUE INDEX RING LITTLE ON;So;0;L;;;;;N;;;;;
+1D8BD;SIGNWRITING HAND-HOOK INDEX RING LITTLE OUT;So;0;L;;;;;N;;;;;
+1D8BE;SIGNWRITING HAND-HOOK INDEX RING LITTLE IN;So;0;L;;;;;N;;;;;
+1D8BF;SIGNWRITING HAND-HOOK INDEX RING LITTLE UNDER;So;0;L;;;;;N;;;;;
+1D8C0;SIGNWRITING HAND-CUP INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8C1;SIGNWRITING HAND-HINGE INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8C2;SIGNWRITING HAND-ANGLE INDEX RING LITTLE OUT;So;0;L;;;;;N;;;;;
+1D8C3;SIGNWRITING HAND-ANGLE INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8C4;SIGNWRITING HAND-FIST MIDDLE DOWN;So;0;L;;;;;N;;;;;
+1D8C5;SIGNWRITING HAND-HINGE MIDDLE;So;0;L;;;;;N;;;;;
+1D8C6;SIGNWRITING HAND-FIST MIDDLE UP;So;0;L;;;;;N;;;;;
+1D8C7;SIGNWRITING HAND-CIRCLE MIDDLE UP;So;0;L;;;;;N;;;;;
+1D8C8;SIGNWRITING HAND-FIST MIDDLE RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D8C9;SIGNWRITING HAND-FIST MIDDLE UP THUMB SIDE;So;0;L;;;;;N;;;;;
+1D8CA;SIGNWRITING HAND-HOOK MIDDLE THUMB;So;0;L;;;;;N;;;;;
+1D8CB;SIGNWRITING HAND-FIST MIDDLE THUMB LITTLE;So;0;L;;;;;N;;;;;
+1D8CC;SIGNWRITING HAND-FIST MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8CD;SIGNWRITING HAND-FIST MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8CE;SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8CF;SIGNWRITING HAND-CURLICUE MIDDLE RING LITTLE ON;So;0;L;;;;;N;;;;;
+1D8D0;SIGNWRITING HAND-CUP MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8D1;SIGNWRITING HAND-HINGE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8D2;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE OUT;So;0;L;;;;;N;;;;;
+1D8D3;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE IN;So;0;L;;;;;N;;;;;
+1D8D4;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8D5;SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE BENT;So;0;L;;;;;N;;;;;
+1D8D6;SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED;So;0;L;;;;;N;;;;;
+1D8D7;SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED SIDE;So;0;L;;;;;N;;;;;
+1D8D8;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED OUT;So;0;L;;;;;N;;;;;
+1D8D9;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED IN;So;0;L;;;;;N;;;;;
+1D8DA;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED;So;0;L;;;;;N;;;;;
+1D8DB;SIGNWRITING HAND-HINGE INDEX HINGED;So;0;L;;;;;N;;;;;
+1D8DC;SIGNWRITING HAND-FIST INDEX THUMB SIDE;So;0;L;;;;;N;;;;;
+1D8DD;SIGNWRITING HAND-HINGE INDEX THUMB SIDE;So;0;L;;;;;N;;;;;
+1D8DE;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB DIAGONAL;So;0;L;;;;;N;;;;;
+1D8DF;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB CONJOINED;So;0;L;;;;;N;;;;;
+1D8E0;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB BENT;So;0;L;;;;;N;;;;;
+1D8E1;SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX BENT;So;0;L;;;;;N;;;;;
+1D8E2;SIGNWRITING HAND-FIST INDEX THUMB SIDE BOTH BENT;So;0;L;;;;;N;;;;;
+1D8E3;SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX HINGE;So;0;L;;;;;N;;;;;
+1D8E4;SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX STRAIGHT;So;0;L;;;;;N;;;;;
+1D8E5;SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX BENT;So;0;L;;;;;N;;;;;
+1D8E6;SIGNWRITING HAND-FIST INDEX THUMB HOOK;So;0;L;;;;;N;;;;;
+1D8E7;SIGNWRITING HAND-FIST INDEX THUMB CURLICUE;So;0;L;;;;;N;;;;;
+1D8E8;SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB INSIDE;So;0;L;;;;;N;;;;;
+1D8E9;SIGNWRITING HAND-CLAW INDEX THUMB CURVE THUMB INSIDE;So;0;L;;;;;N;;;;;
+1D8EA;SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB UNDER;So;0;L;;;;;N;;;;;
+1D8EB;SIGNWRITING HAND-FIST INDEX THUMB CIRCLE;So;0;L;;;;;N;;;;;
+1D8EC;SIGNWRITING HAND-CUP INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8ED;SIGNWRITING HAND-CUP INDEX THUMB OPEN;So;0;L;;;;;N;;;;;
+1D8EE;SIGNWRITING HAND-HINGE INDEX THUMB OPEN;So;0;L;;;;;N;;;;;
+1D8EF;SIGNWRITING HAND-HINGE INDEX THUMB LARGE;So;0;L;;;;;N;;;;;
+1D8F0;SIGNWRITING HAND-HINGE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8F1;SIGNWRITING HAND-HINGE INDEX THUMB SMALL;So;0;L;;;;;N;;;;;
+1D8F2;SIGNWRITING HAND-ANGLE INDEX THUMB OUT;So;0;L;;;;;N;;;;;
+1D8F3;SIGNWRITING HAND-ANGLE INDEX THUMB IN;So;0;L;;;;;N;;;;;
+1D8F4;SIGNWRITING HAND-ANGLE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8F5;SIGNWRITING HAND-FIST THUMB;So;0;L;;;;;N;;;;;
+1D8F6;SIGNWRITING HAND-FIST THUMB HEEL;So;0;L;;;;;N;;;;;
+1D8F7;SIGNWRITING HAND-FIST THUMB SIDE DIAGONAL;So;0;L;;;;;N;;;;;
+1D8F8;SIGNWRITING HAND-FIST THUMB SIDE CONJOINED;So;0;L;;;;;N;;;;;
+1D8F9;SIGNWRITING HAND-FIST THUMB SIDE BENT;So;0;L;;;;;N;;;;;
+1D8FA;SIGNWRITING HAND-FIST THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D8FB;SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE;So;0;L;;;;;N;;;;;
+1D8FC;SIGNWRITING HAND-FIST THUMB BETWEEN MIDDLE RING;So;0;L;;;;;N;;;;;
+1D8FD;SIGNWRITING HAND-FIST THUMB BETWEEN RING LITTLE;So;0;L;;;;;N;;;;;
+1D8FE;SIGNWRITING HAND-FIST THUMB UNDER TWO FINGERS;So;0;L;;;;;N;;;;;
+1D8FF;SIGNWRITING HAND-FIST THUMB OVER TWO FINGERS;So;0;L;;;;;N;;;;;
+1D900;SIGNWRITING HAND-FIST THUMB UNDER THREE FINGERS;So;0;L;;;;;N;;;;;
+1D901;SIGNWRITING HAND-FIST THUMB UNDER FOUR FINGERS;So;0;L;;;;;N;;;;;
+1D902;SIGNWRITING HAND-FIST THUMB OVER FOUR RAISED KNUCKLES;So;0;L;;;;;N;;;;;
+1D903;SIGNWRITING HAND-FIST;So;0;L;;;;;N;;;;;
+1D904;SIGNWRITING HAND-FIST HEEL;So;0;L;;;;;N;;;;;
+1D905;SIGNWRITING TOUCH SINGLE;So;0;L;;;;;N;;;;;
+1D906;SIGNWRITING TOUCH MULTIPLE;So;0;L;;;;;N;;;;;
+1D907;SIGNWRITING TOUCH BETWEEN;So;0;L;;;;;N;;;;;
+1D908;SIGNWRITING GRASP SINGLE;So;0;L;;;;;N;;;;;
+1D909;SIGNWRITING GRASP MULTIPLE;So;0;L;;;;;N;;;;;
+1D90A;SIGNWRITING GRASP BETWEEN;So;0;L;;;;;N;;;;;
+1D90B;SIGNWRITING STRIKE SINGLE;So;0;L;;;;;N;;;;;
+1D90C;SIGNWRITING STRIKE MULTIPLE;So;0;L;;;;;N;;;;;
+1D90D;SIGNWRITING STRIKE BETWEEN;So;0;L;;;;;N;;;;;
+1D90E;SIGNWRITING BRUSH SINGLE;So;0;L;;;;;N;;;;;
+1D90F;SIGNWRITING BRUSH MULTIPLE;So;0;L;;;;;N;;;;;
+1D910;SIGNWRITING BRUSH BETWEEN;So;0;L;;;;;N;;;;;
+1D911;SIGNWRITING RUB SINGLE;So;0;L;;;;;N;;;;;
+1D912;SIGNWRITING RUB MULTIPLE;So;0;L;;;;;N;;;;;
+1D913;SIGNWRITING RUB BETWEEN;So;0;L;;;;;N;;;;;
+1D914;SIGNWRITING SURFACE SYMBOLS;So;0;L;;;;;N;;;;;
+1D915;SIGNWRITING SURFACE BETWEEN;So;0;L;;;;;N;;;;;
+1D916;SIGNWRITING SQUEEZE LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D917;SIGNWRITING SQUEEZE SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D918;SIGNWRITING SQUEEZE LARGE MULTIPLE;So;0;L;;;;;N;;;;;
+1D919;SIGNWRITING SQUEEZE SMALL MULTIPLE;So;0;L;;;;;N;;;;;
+1D91A;SIGNWRITING SQUEEZE SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D91B;SIGNWRITING FLICK LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D91C;SIGNWRITING FLICK SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D91D;SIGNWRITING FLICK LARGE MULTIPLE;So;0;L;;;;;N;;;;;
+1D91E;SIGNWRITING FLICK SMALL MULTIPLE;So;0;L;;;;;N;;;;;
+1D91F;SIGNWRITING FLICK SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D920;SIGNWRITING SQUEEZE FLICK ALTERNATING;So;0;L;;;;;N;;;;;
+1D921;SIGNWRITING MOVEMENT-HINGE UP DOWN LARGE;So;0;L;;;;;N;;;;;
+1D922;SIGNWRITING MOVEMENT-HINGE UP DOWN SMALL;So;0;L;;;;;N;;;;;
+1D923;SIGNWRITING MOVEMENT-HINGE UP SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D924;SIGNWRITING MOVEMENT-HINGE DOWN SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D925;SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING LARGE;So;0;L;;;;;N;;;;;
+1D926;SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING SMALL;So;0;L;;;;;N;;;;;
+1D927;SIGNWRITING MOVEMENT-HINGE SIDE TO SIDE SCISSORS;So;0;L;;;;;N;;;;;
+1D928;SIGNWRITING MOVEMENT-WALLPLANE FINGER CONTACT;So;0;L;;;;;N;;;;;
+1D929;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CONTACT;So;0;L;;;;;N;;;;;
+1D92A;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT SMALL;So;0;L;;;;;N;;;;;
+1D92B;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT MEDIUM;So;0;L;;;;;N;;;;;
+1D92C;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGE;So;0;L;;;;;N;;;;;
+1D92D;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGEST;So;0;L;;;;;N;;;;;
+1D92E;SIGNWRITING MOVEMENT-WALLPLANE SINGLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D92F;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D930;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D931;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING;So;0;L;;;;;N;;;;;
+1D932;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D933;SIGNWRITING MOVEMENT-WALLPLANE CROSS;So;0;L;;;;;N;;;;;
+1D934;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE STRAIGHT MOVEMENT;So;0;L;;;;;N;;;;;
+1D935;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D936;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING;So;0;L;;;;;N;;;;;
+1D937;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D938;SIGNWRITING MOVEMENT-WALLPLANE BEND SMALL;So;0;L;;;;;N;;;;;
+1D939;SIGNWRITING MOVEMENT-WALLPLANE BEND MEDIUM;So;0;L;;;;;N;;;;;
+1D93A;SIGNWRITING MOVEMENT-WALLPLANE BEND LARGE;So;0;L;;;;;N;;;;;
+1D93B;SIGNWRITING MOVEMENT-WALLPLANE CORNER SMALL;So;0;L;;;;;N;;;;;
+1D93C;SIGNWRITING MOVEMENT-WALLPLANE CORNER MEDIUM;So;0;L;;;;;N;;;;;
+1D93D;SIGNWRITING MOVEMENT-WALLPLANE CORNER LARGE;So;0;L;;;;;N;;;;;
+1D93E;SIGNWRITING MOVEMENT-WALLPLANE CORNER ROTATION;So;0;L;;;;;N;;;;;
+1D93F;SIGNWRITING MOVEMENT-WALLPLANE CHECK SMALL;So;0;L;;;;;N;;;;;
+1D940;SIGNWRITING MOVEMENT-WALLPLANE CHECK MEDIUM;So;0;L;;;;;N;;;;;
+1D941;SIGNWRITING MOVEMENT-WALLPLANE CHECK LARGE;So;0;L;;;;;N;;;;;
+1D942;SIGNWRITING MOVEMENT-WALLPLANE BOX SMALL;So;0;L;;;;;N;;;;;
+1D943;SIGNWRITING MOVEMENT-WALLPLANE BOX MEDIUM;So;0;L;;;;;N;;;;;
+1D944;SIGNWRITING MOVEMENT-WALLPLANE BOX LARGE;So;0;L;;;;;N;;;;;
+1D945;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG SMALL;So;0;L;;;;;N;;;;;
+1D946;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG MEDIUM;So;0;L;;;;;N;;;;;
+1D947;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG LARGE;So;0;L;;;;;N;;;;;
+1D948;SIGNWRITING MOVEMENT-WALLPLANE PEAKS SMALL;So;0;L;;;;;N;;;;;
+1D949;SIGNWRITING MOVEMENT-WALLPLANE PEAKS MEDIUM;So;0;L;;;;;N;;;;;
+1D94A;SIGNWRITING MOVEMENT-WALLPLANE PEAKS LARGE;So;0;L;;;;;N;;;;;
+1D94B;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D94C;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D94D;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D94E;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D94F;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D950;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D951;SIGNWRITING TRAVEL-WALLPLANE SHAKING;So;0;L;;;;;N;;;;;
+1D952;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL SINGLE;So;0;L;;;;;N;;;;;
+1D953;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL DOUBLE;So;0;L;;;;;N;;;;;
+1D954;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL TRIPLE;So;0;L;;;;;N;;;;;
+1D955;SIGNWRITING MOVEMENT-DIAGONAL AWAY SMALL;So;0;L;;;;;N;;;;;
+1D956;SIGNWRITING MOVEMENT-DIAGONAL AWAY MEDIUM;So;0;L;;;;;N;;;;;
+1D957;SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGE;So;0;L;;;;;N;;;;;
+1D958;SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGEST;So;0;L;;;;;N;;;;;
+1D959;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS SMALL;So;0;L;;;;;N;;;;;
+1D95A;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS MEDIUM;So;0;L;;;;;N;;;;;
+1D95B;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGE;So;0;L;;;;;N;;;;;
+1D95C;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGEST;So;0;L;;;;;N;;;;;
+1D95D;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY SMALL;So;0;L;;;;;N;;;;;
+1D95E;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY MEDIUM;So;0;L;;;;;N;;;;;
+1D95F;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGE;So;0;L;;;;;N;;;;;
+1D960;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGEST;So;0;L;;;;;N;;;;;
+1D961;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS SMALL;So;0;L;;;;;N;;;;;
+1D962;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS MEDIUM;So;0;L;;;;;N;;;;;
+1D963;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGE;So;0;L;;;;;N;;;;;
+1D964;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGEST;So;0;L;;;;;N;;;;;
+1D965;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT SMALL;So;0;L;;;;;N;;;;;
+1D966;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT MEDIUM;So;0;L;;;;;N;;;;;
+1D967;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGE;So;0;L;;;;;N;;;;;
+1D968;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGEST;So;0;L;;;;;N;;;;;
+1D969;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D96A;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D96B;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D96C;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING;So;0;L;;;;;N;;;;;
+1D96D;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D96E;SIGNWRITING MOVEMENT-FLOORPLANE CROSS;So;0;L;;;;;N;;;;;
+1D96F;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE STRAIGHT MOVEMENT;So;0;L;;;;;N;;;;;
+1D970;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D971;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING MOVEMENT;So;0;L;;;;;N;;;;;
+1D972;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D973;SIGNWRITING MOVEMENT-FLOORPLANE BEND;So;0;L;;;;;N;;;;;
+1D974;SIGNWRITING MOVEMENT-FLOORPLANE CORNER SMALL;So;0;L;;;;;N;;;;;
+1D975;SIGNWRITING MOVEMENT-FLOORPLANE CORNER MEDIUM;So;0;L;;;;;N;;;;;
+1D976;SIGNWRITING MOVEMENT-FLOORPLANE CORNER LARGE;So;0;L;;;;;N;;;;;
+1D977;SIGNWRITING MOVEMENT-FLOORPLANE CHECK;So;0;L;;;;;N;;;;;
+1D978;SIGNWRITING MOVEMENT-FLOORPLANE BOX SMALL;So;0;L;;;;;N;;;;;
+1D979;SIGNWRITING MOVEMENT-FLOORPLANE BOX MEDIUM;So;0;L;;;;;N;;;;;
+1D97A;SIGNWRITING MOVEMENT-FLOORPLANE BOX LARGE;So;0;L;;;;;N;;;;;
+1D97B;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG SMALL;So;0;L;;;;;N;;;;;
+1D97C;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG MEDIUM;So;0;L;;;;;N;;;;;
+1D97D;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG LARGE;So;0;L;;;;;N;;;;;
+1D97E;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS SMALL;So;0;L;;;;;N;;;;;
+1D97F;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS MEDIUM;So;0;L;;;;;N;;;;;
+1D980;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS LARGE;So;0;L;;;;;N;;;;;
+1D981;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D982;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D983;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D984;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D985;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D986;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D987;SIGNWRITING TRAVEL-FLOORPLANE SHAKING;So;0;L;;;;;N;;;;;
+1D988;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER SMALL;So;0;L;;;;;N;;;;;
+1D989;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER MEDIUM;So;0;L;;;;;N;;;;;
+1D98A;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGE;So;0;L;;;;;N;;;;;
+1D98B;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGEST;So;0;L;;;;;N;;;;;
+1D98C;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE SMALL;So;0;L;;;;;N;;;;;
+1D98D;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE MEDIUM;So;0;L;;;;;N;;;;;
+1D98E;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGE;So;0;L;;;;;N;;;;;
+1D98F;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGEST;So;0;L;;;;;N;;;;;
+1D990;SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE SMALL;So;0;L;;;;;N;;;;;
+1D991;SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE MEDIUM;So;0;L;;;;;N;;;;;
+1D992;SIGNWRITING MOVEMENT-WALLPLANE HUMP SMALL;So;0;L;;;;;N;;;;;
+1D993;SIGNWRITING MOVEMENT-WALLPLANE HUMP MEDIUM;So;0;L;;;;;N;;;;;
+1D994;SIGNWRITING MOVEMENT-WALLPLANE HUMP LARGE;So;0;L;;;;;N;;;;;
+1D995;SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL;So;0;L;;;;;N;;;;;
+1D996;SIGNWRITING MOVEMENT-WALLPLANE LOOP MEDIUM;So;0;L;;;;;N;;;;;
+1D997;SIGNWRITING MOVEMENT-WALLPLANE LOOP LARGE;So;0;L;;;;;N;;;;;
+1D998;SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D999;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE SMALL;So;0;L;;;;;N;;;;;
+1D99A;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE MEDIUM;So;0;L;;;;;N;;;;;
+1D99B;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE LARGE;So;0;L;;;;;N;;;;;
+1D99C;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE SMALL;So;0;L;;;;;N;;;;;
+1D99D;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE MEDIUM;So;0;L;;;;;N;;;;;
+1D99E;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE LARGE;So;0;L;;;;;N;;;;;
+1D99F;SIGNWRITING MOVEMENT-WALLPLANE CURVE THEN STRAIGHT;So;0;L;;;;;N;;;;;
+1D9A0;SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS SMALL;So;0;L;;;;;N;;;;;
+1D9A1;SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS MEDIUM;So;0;L;;;;;N;;;;;
+1D9A2;SIGNWRITING ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D9A3;SIGNWRITING ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D9A4;SIGNWRITING ROTATION-WALLPLANE ALTERNATE;So;0;L;;;;;N;;;;;
+1D9A5;SIGNWRITING MOVEMENT-WALLPLANE SHAKING;So;0;L;;;;;N;;;;;
+1D9A6;SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9A7;SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9A8;SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9A9;SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AA;SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AB;SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AC;SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AD;SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9AE;SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9AF;SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B0;SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B1;SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B2;SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B3;SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B4;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH SMALL;So;0;L;;;;;N;;;;;
+1D9B5;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH MEDIUM;So;0;L;;;;;N;;;;;
+1D9B6;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH LARGE;So;0;L;;;;;N;;;;;
+1D9B7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING SMALL;So;0;L;;;;;N;;;;;
+1D9B8;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING LARGE;So;0;L;;;;;N;;;;;
+1D9B9;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9BA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9BB;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL TRIPLE;So;0;L;;;;;N;;;;;
+1D9BC;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE TRIPLE;So;0;L;;;;;N;;;;;
+1D9BD;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9BE;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D9BF;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9C0;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9C1;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING SMALL;So;0;L;;;;;N;;;;;
+1D9C2;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING LARGE;So;0;L;;;;;N;;;;;
+1D9C3;SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING CEILING;So;0;L;;;;;N;;;;;
+1D9C4;SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING CEILING;So;0;L;;;;;N;;;;;
+1D9C5;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING CEILING;So;0;L;;;;;N;;;;;
+1D9C6;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR SMALL;So;0;L;;;;;N;;;;;
+1D9C7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR LARGE;So;0;L;;;;;N;;;;;
+1D9C8;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9C9;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9CA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE SMALL TRIPLE;So;0;L;;;;;N;;;;;
+1D9CB;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE LARGE TRIPLE;So;0;L;;;;;N;;;;;
+1D9CC;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9CD;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D9CE;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9CF;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9D0;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR SMALL;So;0;L;;;;;N;;;;;
+1D9D1;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR LARGE;So;0;L;;;;;N;;;;;
+1D9D2;SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING FLOOR;So;0;L;;;;;N;;;;;
+1D9D3;SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING FLOOR;So;0;L;;;;;N;;;;;
+1D9D4;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING FLOOR;So;0;L;;;;;N;;;;;
+1D9D5;SIGNWRITING MOVEMENT-FLOORPLANE CURVE SMALL;So;0;L;;;;;N;;;;;
+1D9D6;SIGNWRITING MOVEMENT-FLOORPLANE CURVE MEDIUM;So;0;L;;;;;N;;;;;
+1D9D7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGE;So;0;L;;;;;N;;;;;
+1D9D8;SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGEST;So;0;L;;;;;N;;;;;
+1D9D9;SIGNWRITING MOVEMENT-FLOORPLANE CURVE COMBINED;So;0;L;;;;;N;;;;;
+1D9DA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP SMALL;So;0;L;;;;;N;;;;;
+1D9DB;SIGNWRITING MOVEMENT-FLOORPLANE LOOP SMALL;So;0;L;;;;;N;;;;;
+1D9DC;SIGNWRITING MOVEMENT-FLOORPLANE WAVE SNAKE;So;0;L;;;;;N;;;;;
+1D9DD;SIGNWRITING MOVEMENT-FLOORPLANE WAVE SMALL;So;0;L;;;;;N;;;;;
+1D9DE;SIGNWRITING MOVEMENT-FLOORPLANE WAVE LARGE;So;0;L;;;;;N;;;;;
+1D9DF;SIGNWRITING ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D9E0;SIGNWRITING ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D9E1;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D9E2;SIGNWRITING MOVEMENT-FLOORPLANE SHAKING PARALLEL;So;0;L;;;;;N;;;;;
+1D9E3;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9E4;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM SINGLE;So;0;L;;;;;N;;;;;
+1D9E5;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9E6;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM DOUBLE;So;0;L;;;;;N;;;;;
+1D9E7;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9E8;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM SINGLE;So;0;L;;;;;N;;;;;
+1D9E9;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D9EA;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9EB;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM DOUBLE;So;0;L;;;;;N;;;;;
+1D9EC;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9ED;SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT SINGLE;So;0;L;;;;;N;;;;;
+1D9EE;SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT DOUBLE;So;0;L;;;;;N;;;;;
+1D9EF;SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL SINGLE;So;0;L;;;;;N;;;;;
+1D9F0;SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9F1;SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES SINGLE;So;0;L;;;;;N;;;;;
+1D9F2;SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES DOUBLE;So;0;L;;;;;N;;;;;
+1D9F3;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL SINGLE;So;0;L;;;;;N;;;;;
+1D9F4;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9F5;SIGNWRITING DYNAMIC ARROWHEAD SMALL;So;0;L;;;;;N;;;;;
+1D9F6;SIGNWRITING DYNAMIC ARROWHEAD LARGE;So;0;L;;;;;N;;;;;
+1D9F7;SIGNWRITING DYNAMIC FAST;So;0;L;;;;;N;;;;;
+1D9F8;SIGNWRITING DYNAMIC SLOW;So;0;L;;;;;N;;;;;
+1D9F9;SIGNWRITING DYNAMIC TENSE;So;0;L;;;;;N;;;;;
+1D9FA;SIGNWRITING DYNAMIC RELAXED;So;0;L;;;;;N;;;;;
+1D9FB;SIGNWRITING DYNAMIC SIMULTANEOUS;So;0;L;;;;;N;;;;;
+1D9FC;SIGNWRITING DYNAMIC SIMULTANEOUS ALTERNATING;So;0;L;;;;;N;;;;;
+1D9FD;SIGNWRITING DYNAMIC EVERY OTHER TIME;So;0;L;;;;;N;;;;;
+1D9FE;SIGNWRITING DYNAMIC GRADUAL;So;0;L;;;;;N;;;;;
+1D9FF;SIGNWRITING HEAD;So;0;L;;;;;N;;;;;
+1DA00;SIGNWRITING HEAD RIM;Mn;0;NSM;;;;;N;;;;;
+1DA01;SIGNWRITING HEAD MOVEMENT-WALLPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA02;SIGNWRITING HEAD MOVEMENT-WALLPLANE TILT;Mn;0;NSM;;;;;N;;;;;
+1DA03;SIGNWRITING HEAD MOVEMENT-FLOORPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA04;SIGNWRITING HEAD MOVEMENT-WALLPLANE CURVE;Mn;0;NSM;;;;;N;;;;;
+1DA05;SIGNWRITING HEAD MOVEMENT-FLOORPLANE CURVE;Mn;0;NSM;;;;;N;;;;;
+1DA06;SIGNWRITING HEAD MOVEMENT CIRCLE;Mn;0;NSM;;;;;N;;;;;
+1DA07;SIGNWRITING FACE DIRECTION POSITION NOSE FORWARD TILTING;Mn;0;NSM;;;;;N;;;;;
+1DA08;SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA09;SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN TILTING;Mn;0;NSM;;;;;N;;;;;
+1DA0A;SIGNWRITING EYEBROWS STRAIGHT UP;Mn;0;NSM;;;;;N;;;;;
+1DA0B;SIGNWRITING EYEBROWS STRAIGHT NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA0C;SIGNWRITING EYEBROWS STRAIGHT DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA0D;SIGNWRITING DREAMY EYEBROWS NEUTRAL DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA0E;SIGNWRITING DREAMY EYEBROWS DOWN NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA0F;SIGNWRITING DREAMY EYEBROWS UP NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA10;SIGNWRITING DREAMY EYEBROWS NEUTRAL UP;Mn;0;NSM;;;;;N;;;;;
+1DA11;SIGNWRITING FOREHEAD NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA12;SIGNWRITING FOREHEAD CONTACT;Mn;0;NSM;;;;;N;;;;;
+1DA13;SIGNWRITING FOREHEAD WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA14;SIGNWRITING EYES OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA15;SIGNWRITING EYES SQUEEZED;Mn;0;NSM;;;;;N;;;;;
+1DA16;SIGNWRITING EYES CLOSED;Mn;0;NSM;;;;;N;;;;;
+1DA17;SIGNWRITING EYE BLINK SINGLE;Mn;0;NSM;;;;;N;;;;;
+1DA18;SIGNWRITING EYE BLINK MULTIPLE;Mn;0;NSM;;;;;N;;;;;
+1DA19;SIGNWRITING EYES HALF OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA1A;SIGNWRITING EYES WIDE OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA1B;SIGNWRITING EYES HALF CLOSED;Mn;0;NSM;;;;;N;;;;;
+1DA1C;SIGNWRITING EYES WIDENING MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA1D;SIGNWRITING EYE WINK;Mn;0;NSM;;;;;N;;;;;
+1DA1E;SIGNWRITING EYELASHES UP;Mn;0;NSM;;;;;N;;;;;
+1DA1F;SIGNWRITING EYELASHES DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA20;SIGNWRITING EYELASHES FLUTTERING;Mn;0;NSM;;;;;N;;;;;
+1DA21;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA22;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT DOUBLE;Mn;0;NSM;;;;;N;;;;;
+1DA23;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT ALTERNATING;Mn;0;NSM;;;;;N;;;;;
+1DA24;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA25;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT DOUBLE;Mn;0;NSM;;;;;N;;;;;
+1DA26;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT ALTERNATING;Mn;0;NSM;;;;;N;;;;;
+1DA27;SIGNWRITING EYEGAZE-WALLPLANE CURVED;Mn;0;NSM;;;;;N;;;;;
+1DA28;SIGNWRITING EYEGAZE-FLOORPLANE CURVED;Mn;0;NSM;;;;;N;;;;;
+1DA29;SIGNWRITING EYEGAZE-WALLPLANE CIRCLING;Mn;0;NSM;;;;;N;;;;;
+1DA2A;SIGNWRITING CHEEKS PUFFED;Mn;0;NSM;;;;;N;;;;;
+1DA2B;SIGNWRITING CHEEKS NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA2C;SIGNWRITING CHEEKS SUCKED;Mn;0;NSM;;;;;N;;;;;
+1DA2D;SIGNWRITING TENSE CHEEKS HIGH;Mn;0;NSM;;;;;N;;;;;
+1DA2E;SIGNWRITING TENSE CHEEKS MIDDLE;Mn;0;NSM;;;;;N;;;;;
+1DA2F;SIGNWRITING TENSE CHEEKS LOW;Mn;0;NSM;;;;;N;;;;;
+1DA30;SIGNWRITING EARS;Mn;0;NSM;;;;;N;;;;;
+1DA31;SIGNWRITING NOSE NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA32;SIGNWRITING NOSE CONTACT;Mn;0;NSM;;;;;N;;;;;
+1DA33;SIGNWRITING NOSE WRINKLES;Mn;0;NSM;;;;;N;;;;;
+1DA34;SIGNWRITING NOSE WIGGLES;Mn;0;NSM;;;;;N;;;;;
+1DA35;SIGNWRITING AIR BLOWING OUT;Mn;0;NSM;;;;;N;;;;;
+1DA36;SIGNWRITING AIR SUCKING IN;Mn;0;NSM;;;;;N;;;;;
+1DA37;SIGNWRITING AIR BLOW SMALL ROTATIONS;So;0;L;;;;;N;;;;;
+1DA38;SIGNWRITING AIR SUCK SMALL ROTATIONS;So;0;L;;;;;N;;;;;
+1DA39;SIGNWRITING BREATH INHALE;So;0;L;;;;;N;;;;;
+1DA3A;SIGNWRITING BREATH EXHALE;So;0;L;;;;;N;;;;;
+1DA3B;SIGNWRITING MOUTH CLOSED NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA3C;SIGNWRITING MOUTH CLOSED FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA3D;SIGNWRITING MOUTH CLOSED CONTACT;Mn;0;NSM;;;;;N;;;;;
+1DA3E;SIGNWRITING MOUTH SMILE;Mn;0;NSM;;;;;N;;;;;
+1DA3F;SIGNWRITING MOUTH SMILE WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA40;SIGNWRITING MOUTH SMILE OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA41;SIGNWRITING MOUTH FROWN;Mn;0;NSM;;;;;N;;;;;
+1DA42;SIGNWRITING MOUTH FROWN WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA43;SIGNWRITING MOUTH FROWN OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA44;SIGNWRITING MOUTH OPEN CIRCLE;Mn;0;NSM;;;;;N;;;;;
+1DA45;SIGNWRITING MOUTH OPEN FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA46;SIGNWRITING MOUTH OPEN WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA47;SIGNWRITING MOUTH OPEN OVAL;Mn;0;NSM;;;;;N;;;;;
+1DA48;SIGNWRITING MOUTH OPEN OVAL WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA49;SIGNWRITING MOUTH OPEN OVAL YAWN;Mn;0;NSM;;;;;N;;;;;
+1DA4A;SIGNWRITING MOUTH OPEN RECTANGLE;Mn;0;NSM;;;;;N;;;;;
+1DA4B;SIGNWRITING MOUTH OPEN RECTANGLE WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA4C;SIGNWRITING MOUTH OPEN RECTANGLE YAWN;Mn;0;NSM;;;;;N;;;;;
+1DA4D;SIGNWRITING MOUTH KISS;Mn;0;NSM;;;;;N;;;;;
+1DA4E;SIGNWRITING MOUTH KISS FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA4F;SIGNWRITING MOUTH KISS WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA50;SIGNWRITING MOUTH TENSE;Mn;0;NSM;;;;;N;;;;;
+1DA51;SIGNWRITING MOUTH TENSE FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA52;SIGNWRITING MOUTH TENSE SUCKED;Mn;0;NSM;;;;;N;;;;;
+1DA53;SIGNWRITING LIPS PRESSED TOGETHER;Mn;0;NSM;;;;;N;;;;;
+1DA54;SIGNWRITING LIP LOWER OVER UPPER;Mn;0;NSM;;;;;N;;;;;
+1DA55;SIGNWRITING LIP UPPER OVER LOWER;Mn;0;NSM;;;;;N;;;;;
+1DA56;SIGNWRITING MOUTH CORNERS;Mn;0;NSM;;;;;N;;;;;
+1DA57;SIGNWRITING MOUTH WRINKLES SINGLE;Mn;0;NSM;;;;;N;;;;;
+1DA58;SIGNWRITING MOUTH WRINKLES DOUBLE;Mn;0;NSM;;;;;N;;;;;
+1DA59;SIGNWRITING TONGUE STICKING OUT FAR;Mn;0;NSM;;;;;N;;;;;
+1DA5A;SIGNWRITING TONGUE LICKING LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA5B;SIGNWRITING TONGUE TIP BETWEEN LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA5C;SIGNWRITING TONGUE TIP TOUCHING INSIDE MOUTH;Mn;0;NSM;;;;;N;;;;;
+1DA5D;SIGNWRITING TONGUE INSIDE MOUTH RELAXED;Mn;0;NSM;;;;;N;;;;;
+1DA5E;SIGNWRITING TONGUE MOVES AGAINST CHEEK;Mn;0;NSM;;;;;N;;;;;
+1DA5F;SIGNWRITING TONGUE CENTRE STICKING OUT;Mn;0;NSM;;;;;N;;;;;
+1DA60;SIGNWRITING TONGUE CENTRE INSIDE MOUTH;Mn;0;NSM;;;;;N;;;;;
+1DA61;SIGNWRITING TEETH;Mn;0;NSM;;;;;N;;;;;
+1DA62;SIGNWRITING TEETH MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA63;SIGNWRITING TEETH ON TONGUE;Mn;0;NSM;;;;;N;;;;;
+1DA64;SIGNWRITING TEETH ON TONGUE MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA65;SIGNWRITING TEETH ON LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA66;SIGNWRITING TEETH ON LIPS MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA67;SIGNWRITING TEETH BITE LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA68;SIGNWRITING MOVEMENT-WALLPLANE JAW;Mn;0;NSM;;;;;N;;;;;
+1DA69;SIGNWRITING MOVEMENT-FLOORPLANE JAW;Mn;0;NSM;;;;;N;;;;;
+1DA6A;SIGNWRITING NECK;Mn;0;NSM;;;;;N;;;;;
+1DA6B;SIGNWRITING HAIR;Mn;0;NSM;;;;;N;;;;;
+1DA6C;SIGNWRITING EXCITEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA6D;SIGNWRITING SHOULDER HIP SPINE;So;0;L;;;;;N;;;;;
+1DA6E;SIGNWRITING SHOULDER HIP POSITIONS;So;0;L;;;;;N;;;;;
+1DA6F;SIGNWRITING WALLPLANE SHOULDER HIP MOVE;So;0;L;;;;;N;;;;;
+1DA70;SIGNWRITING FLOORPLANE SHOULDER HIP MOVE;So;0;L;;;;;N;;;;;
+1DA71;SIGNWRITING SHOULDER TILTING FROM WAIST;So;0;L;;;;;N;;;;;
+1DA72;SIGNWRITING TORSO-WALLPLANE STRAIGHT STRETCH;So;0;L;;;;;N;;;;;
+1DA73;SIGNWRITING TORSO-WALLPLANE CURVED BEND;So;0;L;;;;;N;;;;;
+1DA74;SIGNWRITING TORSO-FLOORPLANE TWISTING;So;0;L;;;;;N;;;;;
+1DA75;SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS;Mn;0;NSM;;;;;N;;;;;
+1DA76;SIGNWRITING LIMB COMBINATION;So;0;L;;;;;N;;;;;
+1DA77;SIGNWRITING LIMB LENGTH-1;So;0;L;;;;;N;;;;;
+1DA78;SIGNWRITING LIMB LENGTH-2;So;0;L;;;;;N;;;;;
+1DA79;SIGNWRITING LIMB LENGTH-3;So;0;L;;;;;N;;;;;
+1DA7A;SIGNWRITING LIMB LENGTH-4;So;0;L;;;;;N;;;;;
+1DA7B;SIGNWRITING LIMB LENGTH-5;So;0;L;;;;;N;;;;;
+1DA7C;SIGNWRITING LIMB LENGTH-6;So;0;L;;;;;N;;;;;
+1DA7D;SIGNWRITING LIMB LENGTH-7;So;0;L;;;;;N;;;;;
+1DA7E;SIGNWRITING FINGER;So;0;L;;;;;N;;;;;
+1DA7F;SIGNWRITING LOCATION-WALLPLANE SPACE;So;0;L;;;;;N;;;;;
+1DA80;SIGNWRITING LOCATION-FLOORPLANE SPACE;So;0;L;;;;;N;;;;;
+1DA81;SIGNWRITING LOCATION HEIGHT;So;0;L;;;;;N;;;;;
+1DA82;SIGNWRITING LOCATION WIDTH;So;0;L;;;;;N;;;;;
+1DA83;SIGNWRITING LOCATION DEPTH;So;0;L;;;;;N;;;;;
+1DA84;SIGNWRITING LOCATION HEAD NECK;Mn;0;NSM;;;;;N;;;;;
+1DA85;SIGNWRITING LOCATION TORSO;So;0;L;;;;;N;;;;;
+1DA86;SIGNWRITING LOCATION LIMBS DIGITS;So;0;L;;;;;N;;;;;
+1DA87;SIGNWRITING COMMA;Po;0;L;;;;;N;;;;;
+1DA88;SIGNWRITING FULL STOP;Po;0;L;;;;;N;;;;;
+1DA89;SIGNWRITING SEMICOLON;Po;0;L;;;;;N;;;;;
+1DA8A;SIGNWRITING COLON;Po;0;L;;;;;N;;;;;
+1DA8B;SIGNWRITING PARENTHESIS;Po;0;L;;;;;N;;;;;
+1DA9B;SIGNWRITING FILL MODIFIER-2;Mn;0;NSM;;;;;N;;;;;
+1DA9C;SIGNWRITING FILL MODIFIER-3;Mn;0;NSM;;;;;N;;;;;
+1DA9D;SIGNWRITING FILL MODIFIER-4;Mn;0;NSM;;;;;N;;;;;
+1DA9E;SIGNWRITING FILL MODIFIER-5;Mn;0;NSM;;;;;N;;;;;
+1DA9F;SIGNWRITING FILL MODIFIER-6;Mn;0;NSM;;;;;N;;;;;
+1DAA1;SIGNWRITING ROTATION MODIFIER-2;Mn;0;NSM;;;;;N;;;;;
+1DAA2;SIGNWRITING ROTATION MODIFIER-3;Mn;0;NSM;;;;;N;;;;;
+1DAA3;SIGNWRITING ROTATION MODIFIER-4;Mn;0;NSM;;;;;N;;;;;
+1DAA4;SIGNWRITING ROTATION MODIFIER-5;Mn;0;NSM;;;;;N;;;;;
+1DAA5;SIGNWRITING ROTATION MODIFIER-6;Mn;0;NSM;;;;;N;;;;;
+1DAA6;SIGNWRITING ROTATION MODIFIER-7;Mn;0;NSM;;;;;N;;;;;
+1DAA7;SIGNWRITING ROTATION MODIFIER-8;Mn;0;NSM;;;;;N;;;;;
+1DAA8;SIGNWRITING ROTATION MODIFIER-9;Mn;0;NSM;;;;;N;;;;;
+1DAA9;SIGNWRITING ROTATION MODIFIER-10;Mn;0;NSM;;;;;N;;;;;
+1DAAA;SIGNWRITING ROTATION MODIFIER-11;Mn;0;NSM;;;;;N;;;;;
+1DAAB;SIGNWRITING ROTATION MODIFIER-12;Mn;0;NSM;;;;;N;;;;;
+1DAAC;SIGNWRITING ROTATION MODIFIER-13;Mn;0;NSM;;;;;N;;;;;
+1DAAD;SIGNWRITING ROTATION MODIFIER-14;Mn;0;NSM;;;;;N;;;;;
+1DAAE;SIGNWRITING ROTATION MODIFIER-15;Mn;0;NSM;;;;;N;;;;;
+1DAAF;SIGNWRITING ROTATION MODIFIER-16;Mn;0;NSM;;;;;N;;;;;
+1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;;
+1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;;
+1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;;
+1E003;COMBINING GLAGOLITIC LETTER GLAGOLI;Mn;230;NSM;;;;;N;;;;;
+1E004;COMBINING GLAGOLITIC LETTER DOBRO;Mn;230;NSM;;;;;N;;;;;
+1E005;COMBINING GLAGOLITIC LETTER YESTU;Mn;230;NSM;;;;;N;;;;;
+1E006;COMBINING GLAGOLITIC LETTER ZHIVETE;Mn;230;NSM;;;;;N;;;;;
+1E008;COMBINING GLAGOLITIC LETTER ZEMLJA;Mn;230;NSM;;;;;N;;;;;
+1E009;COMBINING GLAGOLITIC LETTER IZHE;Mn;230;NSM;;;;;N;;;;;
+1E00A;COMBINING GLAGOLITIC LETTER INITIAL IZHE;Mn;230;NSM;;;;;N;;;;;
+1E00B;COMBINING GLAGOLITIC LETTER I;Mn;230;NSM;;;;;N;;;;;
+1E00C;COMBINING GLAGOLITIC LETTER DJERVI;Mn;230;NSM;;;;;N;;;;;
+1E00D;COMBINING GLAGOLITIC LETTER KAKO;Mn;230;NSM;;;;;N;;;;;
+1E00E;COMBINING GLAGOLITIC LETTER LJUDIJE;Mn;230;NSM;;;;;N;;;;;
+1E00F;COMBINING GLAGOLITIC LETTER MYSLITE;Mn;230;NSM;;;;;N;;;;;
+1E010;COMBINING GLAGOLITIC LETTER NASHI;Mn;230;NSM;;;;;N;;;;;
+1E011;COMBINING GLAGOLITIC LETTER ONU;Mn;230;NSM;;;;;N;;;;;
+1E012;COMBINING GLAGOLITIC LETTER POKOJI;Mn;230;NSM;;;;;N;;;;;
+1E013;COMBINING GLAGOLITIC LETTER RITSI;Mn;230;NSM;;;;;N;;;;;
+1E014;COMBINING GLAGOLITIC LETTER SLOVO;Mn;230;NSM;;;;;N;;;;;
+1E015;COMBINING GLAGOLITIC LETTER TVRIDO;Mn;230;NSM;;;;;N;;;;;
+1E016;COMBINING GLAGOLITIC LETTER UKU;Mn;230;NSM;;;;;N;;;;;
+1E017;COMBINING GLAGOLITIC LETTER FRITU;Mn;230;NSM;;;;;N;;;;;
+1E018;COMBINING GLAGOLITIC LETTER HERU;Mn;230;NSM;;;;;N;;;;;
+1E01B;COMBINING GLAGOLITIC LETTER SHTA;Mn;230;NSM;;;;;N;;;;;
+1E01C;COMBINING GLAGOLITIC LETTER TSI;Mn;230;NSM;;;;;N;;;;;
+1E01D;COMBINING GLAGOLITIC LETTER CHRIVI;Mn;230;NSM;;;;;N;;;;;
+1E01E;COMBINING GLAGOLITIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
+1E01F;COMBINING GLAGOLITIC LETTER YERU;Mn;230;NSM;;;;;N;;;;;
+1E020;COMBINING GLAGOLITIC LETTER YERI;Mn;230;NSM;;;;;N;;;;;
+1E021;COMBINING GLAGOLITIC LETTER YATI;Mn;230;NSM;;;;;N;;;;;
+1E023;COMBINING GLAGOLITIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
+1E024;COMBINING GLAGOLITIC LETTER SMALL YUS;Mn;230;NSM;;;;;N;;;;;
+1E026;COMBINING GLAGOLITIC LETTER YO;Mn;230;NSM;;;;;N;;;;;
+1E027;COMBINING GLAGOLITIC LETTER IOTATED SMALL YUS;Mn;230;NSM;;;;;N;;;;;
+1E028;COMBINING GLAGOLITIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
+1E029;COMBINING GLAGOLITIC LETTER IOTATED BIG YUS;Mn;230;NSM;;;;;N;;;;;
+1E02A;COMBINING GLAGOLITIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
+1E100;NYIAKENG PUACHUE HMONG LETTER MA;Lo;0;L;;;;;N;;;;;
+1E101;NYIAKENG PUACHUE HMONG LETTER TSA;Lo;0;L;;;;;N;;;;;
+1E102;NYIAKENG PUACHUE HMONG LETTER NTA;Lo;0;L;;;;;N;;;;;
+1E103;NYIAKENG PUACHUE HMONG LETTER TA;Lo;0;L;;;;;N;;;;;
+1E104;NYIAKENG PUACHUE HMONG LETTER HA;Lo;0;L;;;;;N;;;;;
+1E105;NYIAKENG PUACHUE HMONG LETTER NA;Lo;0;L;;;;;N;;;;;
+1E106;NYIAKENG PUACHUE HMONG LETTER XA;Lo;0;L;;;;;N;;;;;
+1E107;NYIAKENG PUACHUE HMONG LETTER NKA;Lo;0;L;;;;;N;;;;;
+1E108;NYIAKENG PUACHUE HMONG LETTER CA;Lo;0;L;;;;;N;;;;;
+1E109;NYIAKENG PUACHUE HMONG LETTER LA;Lo;0;L;;;;;N;;;;;
+1E10A;NYIAKENG PUACHUE HMONG LETTER SA;Lo;0;L;;;;;N;;;;;
+1E10B;NYIAKENG PUACHUE HMONG LETTER ZA;Lo;0;L;;;;;N;;;;;
+1E10C;NYIAKENG PUACHUE HMONG LETTER NCA;Lo;0;L;;;;;N;;;;;
+1E10D;NYIAKENG PUACHUE HMONG LETTER NTSA;Lo;0;L;;;;;N;;;;;
+1E10E;NYIAKENG PUACHUE HMONG LETTER KA;Lo;0;L;;;;;N;;;;;
+1E10F;NYIAKENG PUACHUE HMONG LETTER DA;Lo;0;L;;;;;N;;;;;
+1E110;NYIAKENG PUACHUE HMONG LETTER NYA;Lo;0;L;;;;;N;;;;;
+1E111;NYIAKENG PUACHUE HMONG LETTER NRA;Lo;0;L;;;;;N;;;;;
+1E112;NYIAKENG PUACHUE HMONG LETTER VA;Lo;0;L;;;;;N;;;;;
+1E113;NYIAKENG PUACHUE HMONG LETTER NTXA;Lo;0;L;;;;;N;;;;;
+1E114;NYIAKENG PUACHUE HMONG LETTER TXA;Lo;0;L;;;;;N;;;;;
+1E115;NYIAKENG PUACHUE HMONG LETTER FA;Lo;0;L;;;;;N;;;;;
+1E116;NYIAKENG PUACHUE HMONG LETTER RA;Lo;0;L;;;;;N;;;;;
+1E117;NYIAKENG PUACHUE HMONG LETTER QA;Lo;0;L;;;;;N;;;;;
+1E118;NYIAKENG PUACHUE HMONG LETTER YA;Lo;0;L;;;;;N;;;;;
+1E119;NYIAKENG PUACHUE HMONG LETTER NQA;Lo;0;L;;;;;N;;;;;
+1E11A;NYIAKENG PUACHUE HMONG LETTER PA;Lo;0;L;;;;;N;;;;;
+1E11B;NYIAKENG PUACHUE HMONG LETTER XYA;Lo;0;L;;;;;N;;;;;
+1E11C;NYIAKENG PUACHUE HMONG LETTER NPA;Lo;0;L;;;;;N;;;;;
+1E11D;NYIAKENG PUACHUE HMONG LETTER DLA;Lo;0;L;;;;;N;;;;;
+1E11E;NYIAKENG PUACHUE HMONG LETTER NPLA;Lo;0;L;;;;;N;;;;;
+1E11F;NYIAKENG PUACHUE HMONG LETTER HAH;Lo;0;L;;;;;N;;;;;
+1E120;NYIAKENG PUACHUE HMONG LETTER MLA;Lo;0;L;;;;;N;;;;;
+1E121;NYIAKENG PUACHUE HMONG LETTER PLA;Lo;0;L;;;;;N;;;;;
+1E122;NYIAKENG PUACHUE HMONG LETTER GA;Lo;0;L;;;;;N;;;;;
+1E123;NYIAKENG PUACHUE HMONG LETTER RRA;Lo;0;L;;;;;N;;;;;
+1E124;NYIAKENG PUACHUE HMONG LETTER A;Lo;0;L;;;;;N;;;;;
+1E125;NYIAKENG PUACHUE HMONG LETTER AA;Lo;0;L;;;;;N;;;;;
+1E126;NYIAKENG PUACHUE HMONG LETTER I;Lo;0;L;;;;;N;;;;;
+1E127;NYIAKENG PUACHUE HMONG LETTER U;Lo;0;L;;;;;N;;;;;
+1E128;NYIAKENG PUACHUE HMONG LETTER O;Lo;0;L;;;;;N;;;;;
+1E129;NYIAKENG PUACHUE HMONG LETTER OO;Lo;0;L;;;;;N;;;;;
+1E12A;NYIAKENG PUACHUE HMONG LETTER E;Lo;0;L;;;;;N;;;;;
+1E12B;NYIAKENG PUACHUE HMONG LETTER EE;Lo;0;L;;;;;N;;;;;
+1E12C;NYIAKENG PUACHUE HMONG LETTER W;Lo;0;L;;;;;N;;;;;
+1E130;NYIAKENG PUACHUE HMONG TONE-B;Mn;230;NSM;;;;;N;;;;;
+1E131;NYIAKENG PUACHUE HMONG TONE-M;Mn;230;NSM;;;;;N;;;;;
+1E132;NYIAKENG PUACHUE HMONG TONE-J;Mn;230;NSM;;;;;N;;;;;
+1E133;NYIAKENG PUACHUE HMONG TONE-V;Mn;230;NSM;;;;;N;;;;;
+1E134;NYIAKENG PUACHUE HMONG TONE-S;Mn;230;NSM;;;;;N;;;;;
+1E135;NYIAKENG PUACHUE HMONG TONE-G;Mn;230;NSM;;;;;N;;;;;
+1E136;NYIAKENG PUACHUE HMONG TONE-D;Mn;230;NSM;;;;;N;;;;;
+1E137;NYIAKENG PUACHUE HMONG SIGN FOR PERSON;Lm;0;L;;;;;N;;;;;
+1E138;NYIAKENG PUACHUE HMONG SIGN FOR THING;Lm;0;L;;;;;N;;;;;
+1E139;NYIAKENG PUACHUE HMONG SIGN FOR LOCATION;Lm;0;L;;;;;N;;;;;
+1E13A;NYIAKENG PUACHUE HMONG SIGN FOR ANIMAL;Lm;0;L;;;;;N;;;;;
+1E13B;NYIAKENG PUACHUE HMONG SIGN FOR INVERTEBRATE;Lm;0;L;;;;;N;;;;;
+1E13C;NYIAKENG PUACHUE HMONG SIGN XW XW;Lm;0;L;;;;;N;;;;;
+1E13D;NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;;
+1E140;NYIAKENG PUACHUE HMONG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1E141;NYIAKENG PUACHUE HMONG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1E142;NYIAKENG PUACHUE HMONG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1E143;NYIAKENG PUACHUE HMONG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1E144;NYIAKENG PUACHUE HMONG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1E145;NYIAKENG PUACHUE HMONG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1E146;NYIAKENG PUACHUE HMONG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1E147;NYIAKENG PUACHUE HMONG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1E148;NYIAKENG PUACHUE HMONG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1E149;NYIAKENG PUACHUE HMONG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1E14E;NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ;Lo;0;L;;;;;N;;;;;
+1E14F;NYIAKENG PUACHUE HMONG CIRCLED CA;So;0;L;;;;;N;;;;;
+1E2C0;WANCHO LETTER AA;Lo;0;L;;;;;N;;;;;
+1E2C1;WANCHO LETTER A;Lo;0;L;;;;;N;;;;;
+1E2C2;WANCHO LETTER BA;Lo;0;L;;;;;N;;;;;
+1E2C3;WANCHO LETTER CA;Lo;0;L;;;;;N;;;;;
+1E2C4;WANCHO LETTER DA;Lo;0;L;;;;;N;;;;;
+1E2C5;WANCHO LETTER GA;Lo;0;L;;;;;N;;;;;
+1E2C6;WANCHO LETTER YA;Lo;0;L;;;;;N;;;;;
+1E2C7;WANCHO LETTER PHA;Lo;0;L;;;;;N;;;;;
+1E2C8;WANCHO LETTER LA;Lo;0;L;;;;;N;;;;;
+1E2C9;WANCHO LETTER NA;Lo;0;L;;;;;N;;;;;
+1E2CA;WANCHO LETTER PA;Lo;0;L;;;;;N;;;;;
+1E2CB;WANCHO LETTER TA;Lo;0;L;;;;;N;;;;;
+1E2CC;WANCHO LETTER THA;Lo;0;L;;;;;N;;;;;
+1E2CD;WANCHO LETTER FA;Lo;0;L;;;;;N;;;;;
+1E2CE;WANCHO LETTER SA;Lo;0;L;;;;;N;;;;;
+1E2CF;WANCHO LETTER SHA;Lo;0;L;;;;;N;;;;;
+1E2D0;WANCHO LETTER JA;Lo;0;L;;;;;N;;;;;
+1E2D1;WANCHO LETTER ZA;Lo;0;L;;;;;N;;;;;
+1E2D2;WANCHO LETTER WA;Lo;0;L;;;;;N;;;;;
+1E2D3;WANCHO LETTER VA;Lo;0;L;;;;;N;;;;;
+1E2D4;WANCHO LETTER KA;Lo;0;L;;;;;N;;;;;
+1E2D5;WANCHO LETTER O;Lo;0;L;;;;;N;;;;;
+1E2D6;WANCHO LETTER AU;Lo;0;L;;;;;N;;;;;
+1E2D7;WANCHO LETTER RA;Lo;0;L;;;;;N;;;;;
+1E2D8;WANCHO LETTER MA;Lo;0;L;;;;;N;;;;;
+1E2D9;WANCHO LETTER KHA;Lo;0;L;;;;;N;;;;;
+1E2DA;WANCHO LETTER HA;Lo;0;L;;;;;N;;;;;
+1E2DB;WANCHO LETTER E;Lo;0;L;;;;;N;;;;;
+1E2DC;WANCHO LETTER I;Lo;0;L;;;;;N;;;;;
+1E2DD;WANCHO LETTER NGA;Lo;0;L;;;;;N;;;;;
+1E2DE;WANCHO LETTER U;Lo;0;L;;;;;N;;;;;
+1E2DF;WANCHO LETTER LLHA;Lo;0;L;;;;;N;;;;;
+1E2E0;WANCHO LETTER TSA;Lo;0;L;;;;;N;;;;;
+1E2E1;WANCHO LETTER TRA;Lo;0;L;;;;;N;;;;;
+1E2E2;WANCHO LETTER ONG;Lo;0;L;;;;;N;;;;;
+1E2E3;WANCHO LETTER AANG;Lo;0;L;;;;;N;;;;;
+1E2E4;WANCHO LETTER ANG;Lo;0;L;;;;;N;;;;;
+1E2E5;WANCHO LETTER ING;Lo;0;L;;;;;N;;;;;
+1E2E6;WANCHO LETTER ON;Lo;0;L;;;;;N;;;;;
+1E2E7;WANCHO LETTER EN;Lo;0;L;;;;;N;;;;;
+1E2E8;WANCHO LETTER AAN;Lo;0;L;;;;;N;;;;;
+1E2E9;WANCHO LETTER NYA;Lo;0;L;;;;;N;;;;;
+1E2EA;WANCHO LETTER UEN;Lo;0;L;;;;;N;;;;;
+1E2EB;WANCHO LETTER YIH;Lo;0;L;;;;;N;;;;;
+1E2EC;WANCHO TONE TUP;Mn;230;NSM;;;;;N;;;;;
+1E2ED;WANCHO TONE TUPNI;Mn;230;NSM;;;;;N;;;;;
+1E2EE;WANCHO TONE KOI;Mn;230;NSM;;;;;N;;;;;
+1E2EF;WANCHO TONE KOINI;Mn;230;NSM;;;;;N;;;;;
+1E2F0;WANCHO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1E2F1;WANCHO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1E2F2;WANCHO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1E2F3;WANCHO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1E2F4;WANCHO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1E2F5;WANCHO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1E2F6;WANCHO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1E2F7;WANCHO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1E2F8;WANCHO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1E2F9;WANCHO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1E2FF;WANCHO NGUN SIGN;Sc;0;ET;;;;;N;;;;;
+1E800;MENDE KIKAKUI SYLLABLE M001 KI;Lo;0;R;;;;;N;;;;;
+1E801;MENDE KIKAKUI SYLLABLE M002 KA;Lo;0;R;;;;;N;;;;;
+1E802;MENDE KIKAKUI SYLLABLE M003 KU;Lo;0;R;;;;;N;;;;;
+1E803;MENDE KIKAKUI SYLLABLE M065 KEE;Lo;0;R;;;;;N;;;;;
+1E804;MENDE KIKAKUI SYLLABLE M095 KE;Lo;0;R;;;;;N;;;;;
+1E805;MENDE KIKAKUI SYLLABLE M076 KOO;Lo;0;R;;;;;N;;;;;
+1E806;MENDE KIKAKUI SYLLABLE M048 KO;Lo;0;R;;;;;N;;;;;
+1E807;MENDE KIKAKUI SYLLABLE M179 KUA;Lo;0;R;;;;;N;;;;;
+1E808;MENDE KIKAKUI SYLLABLE M004 WI;Lo;0;R;;;;;N;;;;;
+1E809;MENDE KIKAKUI SYLLABLE M005 WA;Lo;0;R;;;;;N;;;;;
+1E80A;MENDE KIKAKUI SYLLABLE M006 WU;Lo;0;R;;;;;N;;;;;
+1E80B;MENDE KIKAKUI SYLLABLE M126 WEE;Lo;0;R;;;;;N;;;;;
+1E80C;MENDE KIKAKUI SYLLABLE M118 WE;Lo;0;R;;;;;N;;;;;
+1E80D;MENDE KIKAKUI SYLLABLE M114 WOO;Lo;0;R;;;;;N;;;;;
+1E80E;MENDE KIKAKUI SYLLABLE M045 WO;Lo;0;R;;;;;N;;;;;
+1E80F;MENDE KIKAKUI SYLLABLE M194 WUI;Lo;0;R;;;;;N;;;;;
+1E810;MENDE KIKAKUI SYLLABLE M143 WEI;Lo;0;R;;;;;N;;;;;
+1E811;MENDE KIKAKUI SYLLABLE M061 WVI;Lo;0;R;;;;;N;;;;;
+1E812;MENDE KIKAKUI SYLLABLE M049 WVA;Lo;0;R;;;;;N;;;;;
+1E813;MENDE KIKAKUI SYLLABLE M139 WVE;Lo;0;R;;;;;N;;;;;
+1E814;MENDE KIKAKUI SYLLABLE M007 MIN;Lo;0;R;;;;;N;;;;;
+1E815;MENDE KIKAKUI SYLLABLE M008 MAN;Lo;0;R;;;;;N;;;;;
+1E816;MENDE KIKAKUI SYLLABLE M009 MUN;Lo;0;R;;;;;N;;;;;
+1E817;MENDE KIKAKUI SYLLABLE M059 MEN;Lo;0;R;;;;;N;;;;;
+1E818;MENDE KIKAKUI SYLLABLE M094 MON;Lo;0;R;;;;;N;;;;;
+1E819;MENDE KIKAKUI SYLLABLE M154 MUAN;Lo;0;R;;;;;N;;;;;
+1E81A;MENDE KIKAKUI SYLLABLE M189 MUEN;Lo;0;R;;;;;N;;;;;
+1E81B;MENDE KIKAKUI SYLLABLE M010 BI;Lo;0;R;;;;;N;;;;;
+1E81C;MENDE KIKAKUI SYLLABLE M011 BA;Lo;0;R;;;;;N;;;;;
+1E81D;MENDE KIKAKUI SYLLABLE M012 BU;Lo;0;R;;;;;N;;;;;
+1E81E;MENDE KIKAKUI SYLLABLE M150 BEE;Lo;0;R;;;;;N;;;;;
+1E81F;MENDE KIKAKUI SYLLABLE M097 BE;Lo;0;R;;;;;N;;;;;
+1E820;MENDE KIKAKUI SYLLABLE M103 BOO;Lo;0;R;;;;;N;;;;;
+1E821;MENDE KIKAKUI SYLLABLE M138 BO;Lo;0;R;;;;;N;;;;;
+1E822;MENDE KIKAKUI SYLLABLE M013 I;Lo;0;R;;;;;N;;;;;
+1E823;MENDE KIKAKUI SYLLABLE M014 A;Lo;0;R;;;;;N;;;;;
+1E824;MENDE KIKAKUI SYLLABLE M015 U;Lo;0;R;;;;;N;;;;;
+1E825;MENDE KIKAKUI SYLLABLE M163 EE;Lo;0;R;;;;;N;;;;;
+1E826;MENDE KIKAKUI SYLLABLE M100 E;Lo;0;R;;;;;N;;;;;
+1E827;MENDE KIKAKUI SYLLABLE M165 OO;Lo;0;R;;;;;N;;;;;
+1E828;MENDE KIKAKUI SYLLABLE M147 O;Lo;0;R;;;;;N;;;;;
+1E829;MENDE KIKAKUI SYLLABLE M137 EI;Lo;0;R;;;;;N;;;;;
+1E82A;MENDE KIKAKUI SYLLABLE M131 IN;Lo;0;R;;;;;N;;;;;
+1E82B;MENDE KIKAKUI SYLLABLE M135 IN;Lo;0;R;;;;;N;;;;;
+1E82C;MENDE KIKAKUI SYLLABLE M195 AN;Lo;0;R;;;;;N;;;;;
+1E82D;MENDE KIKAKUI SYLLABLE M178 EN;Lo;0;R;;;;;N;;;;;
+1E82E;MENDE KIKAKUI SYLLABLE M019 SI;Lo;0;R;;;;;N;;;;;
+1E82F;MENDE KIKAKUI SYLLABLE M020 SA;Lo;0;R;;;;;N;;;;;
+1E830;MENDE KIKAKUI SYLLABLE M021 SU;Lo;0;R;;;;;N;;;;;
+1E831;MENDE KIKAKUI SYLLABLE M162 SEE;Lo;0;R;;;;;N;;;;;
+1E832;MENDE KIKAKUI SYLLABLE M116 SE;Lo;0;R;;;;;N;;;;;
+1E833;MENDE KIKAKUI SYLLABLE M136 SOO;Lo;0;R;;;;;N;;;;;
+1E834;MENDE KIKAKUI SYLLABLE M079 SO;Lo;0;R;;;;;N;;;;;
+1E835;MENDE KIKAKUI SYLLABLE M196 SIA;Lo;0;R;;;;;N;;;;;
+1E836;MENDE KIKAKUI SYLLABLE M025 LI;Lo;0;R;;;;;N;;;;;
+1E837;MENDE KIKAKUI SYLLABLE M026 LA;Lo;0;R;;;;;N;;;;;
+1E838;MENDE KIKAKUI SYLLABLE M027 LU;Lo;0;R;;;;;N;;;;;
+1E839;MENDE KIKAKUI SYLLABLE M084 LEE;Lo;0;R;;;;;N;;;;;
+1E83A;MENDE KIKAKUI SYLLABLE M073 LE;Lo;0;R;;;;;N;;;;;
+1E83B;MENDE KIKAKUI SYLLABLE M054 LOO;Lo;0;R;;;;;N;;;;;
+1E83C;MENDE KIKAKUI SYLLABLE M153 LO;Lo;0;R;;;;;N;;;;;
+1E83D;MENDE KIKAKUI SYLLABLE M110 LONG LE;Lo;0;R;;;;;N;;;;;
+1E83E;MENDE KIKAKUI SYLLABLE M016 DI;Lo;0;R;;;;;N;;;;;
+1E83F;MENDE KIKAKUI SYLLABLE M017 DA;Lo;0;R;;;;;N;;;;;
+1E840;MENDE KIKAKUI SYLLABLE M018 DU;Lo;0;R;;;;;N;;;;;
+1E841;MENDE KIKAKUI SYLLABLE M089 DEE;Lo;0;R;;;;;N;;;;;
+1E842;MENDE KIKAKUI SYLLABLE M180 DOO;Lo;0;R;;;;;N;;;;;
+1E843;MENDE KIKAKUI SYLLABLE M181 DO;Lo;0;R;;;;;N;;;;;
+1E844;MENDE KIKAKUI SYLLABLE M022 TI;Lo;0;R;;;;;N;;;;;
+1E845;MENDE KIKAKUI SYLLABLE M023 TA;Lo;0;R;;;;;N;;;;;
+1E846;MENDE KIKAKUI SYLLABLE M024 TU;Lo;0;R;;;;;N;;;;;
+1E847;MENDE KIKAKUI SYLLABLE M091 TEE;Lo;0;R;;;;;N;;;;;
+1E848;MENDE KIKAKUI SYLLABLE M055 TE;Lo;0;R;;;;;N;;;;;
+1E849;MENDE KIKAKUI SYLLABLE M104 TOO;Lo;0;R;;;;;N;;;;;
+1E84A;MENDE KIKAKUI SYLLABLE M069 TO;Lo;0;R;;;;;N;;;;;
+1E84B;MENDE KIKAKUI SYLLABLE M028 JI;Lo;0;R;;;;;N;;;;;
+1E84C;MENDE KIKAKUI SYLLABLE M029 JA;Lo;0;R;;;;;N;;;;;
+1E84D;MENDE KIKAKUI SYLLABLE M030 JU;Lo;0;R;;;;;N;;;;;
+1E84E;MENDE KIKAKUI SYLLABLE M157 JEE;Lo;0;R;;;;;N;;;;;
+1E84F;MENDE KIKAKUI SYLLABLE M113 JE;Lo;0;R;;;;;N;;;;;
+1E850;MENDE KIKAKUI SYLLABLE M160 JOO;Lo;0;R;;;;;N;;;;;
+1E851;MENDE KIKAKUI SYLLABLE M063 JO;Lo;0;R;;;;;N;;;;;
+1E852;MENDE KIKAKUI SYLLABLE M175 LONG JO;Lo;0;R;;;;;N;;;;;
+1E853;MENDE KIKAKUI SYLLABLE M031 YI;Lo;0;R;;;;;N;;;;;
+1E854;MENDE KIKAKUI SYLLABLE M032 YA;Lo;0;R;;;;;N;;;;;
+1E855;MENDE KIKAKUI SYLLABLE M033 YU;Lo;0;R;;;;;N;;;;;
+1E856;MENDE KIKAKUI SYLLABLE M109 YEE;Lo;0;R;;;;;N;;;;;
+1E857;MENDE KIKAKUI SYLLABLE M080 YE;Lo;0;R;;;;;N;;;;;
+1E858;MENDE KIKAKUI SYLLABLE M141 YOO;Lo;0;R;;;;;N;;;;;
+1E859;MENDE KIKAKUI SYLLABLE M121 YO;Lo;0;R;;;;;N;;;;;
+1E85A;MENDE KIKAKUI SYLLABLE M034 FI;Lo;0;R;;;;;N;;;;;
+1E85B;MENDE KIKAKUI SYLLABLE M035 FA;Lo;0;R;;;;;N;;;;;
+1E85C;MENDE KIKAKUI SYLLABLE M036 FU;Lo;0;R;;;;;N;;;;;
+1E85D;MENDE KIKAKUI SYLLABLE M078 FEE;Lo;0;R;;;;;N;;;;;
+1E85E;MENDE KIKAKUI SYLLABLE M075 FE;Lo;0;R;;;;;N;;;;;
+1E85F;MENDE KIKAKUI SYLLABLE M133 FOO;Lo;0;R;;;;;N;;;;;
+1E860;MENDE KIKAKUI SYLLABLE M088 FO;Lo;0;R;;;;;N;;;;;
+1E861;MENDE KIKAKUI SYLLABLE M197 FUA;Lo;0;R;;;;;N;;;;;
+1E862;MENDE KIKAKUI SYLLABLE M101 FAN;Lo;0;R;;;;;N;;;;;
+1E863;MENDE KIKAKUI SYLLABLE M037 NIN;Lo;0;R;;;;;N;;;;;
+1E864;MENDE KIKAKUI SYLLABLE M038 NAN;Lo;0;R;;;;;N;;;;;
+1E865;MENDE KIKAKUI SYLLABLE M039 NUN;Lo;0;R;;;;;N;;;;;
+1E866;MENDE KIKAKUI SYLLABLE M117 NEN;Lo;0;R;;;;;N;;;;;
+1E867;MENDE KIKAKUI SYLLABLE M169 NON;Lo;0;R;;;;;N;;;;;
+1E868;MENDE KIKAKUI SYLLABLE M176 HI;Lo;0;R;;;;;N;;;;;
+1E869;MENDE KIKAKUI SYLLABLE M041 HA;Lo;0;R;;;;;N;;;;;
+1E86A;MENDE KIKAKUI SYLLABLE M186 HU;Lo;0;R;;;;;N;;;;;
+1E86B;MENDE KIKAKUI SYLLABLE M040 HEE;Lo;0;R;;;;;N;;;;;
+1E86C;MENDE KIKAKUI SYLLABLE M096 HE;Lo;0;R;;;;;N;;;;;
+1E86D;MENDE KIKAKUI SYLLABLE M042 HOO;Lo;0;R;;;;;N;;;;;
+1E86E;MENDE KIKAKUI SYLLABLE M140 HO;Lo;0;R;;;;;N;;;;;
+1E86F;MENDE KIKAKUI SYLLABLE M083 HEEI;Lo;0;R;;;;;N;;;;;
+1E870;MENDE KIKAKUI SYLLABLE M128 HOOU;Lo;0;R;;;;;N;;;;;
+1E871;MENDE KIKAKUI SYLLABLE M053 HIN;Lo;0;R;;;;;N;;;;;
+1E872;MENDE KIKAKUI SYLLABLE M130 HAN;Lo;0;R;;;;;N;;;;;
+1E873;MENDE KIKAKUI SYLLABLE M087 HUN;Lo;0;R;;;;;N;;;;;
+1E874;MENDE KIKAKUI SYLLABLE M052 HEN;Lo;0;R;;;;;N;;;;;
+1E875;MENDE KIKAKUI SYLLABLE M193 HON;Lo;0;R;;;;;N;;;;;
+1E876;MENDE KIKAKUI SYLLABLE M046 HUAN;Lo;0;R;;;;;N;;;;;
+1E877;MENDE KIKAKUI SYLLABLE M090 NGGI;Lo;0;R;;;;;N;;;;;
+1E878;MENDE KIKAKUI SYLLABLE M043 NGGA;Lo;0;R;;;;;N;;;;;
+1E879;MENDE KIKAKUI SYLLABLE M082 NGGU;Lo;0;R;;;;;N;;;;;
+1E87A;MENDE KIKAKUI SYLLABLE M115 NGGEE;Lo;0;R;;;;;N;;;;;
+1E87B;MENDE KIKAKUI SYLLABLE M146 NGGE;Lo;0;R;;;;;N;;;;;
+1E87C;MENDE KIKAKUI SYLLABLE M156 NGGOO;Lo;0;R;;;;;N;;;;;
+1E87D;MENDE KIKAKUI SYLLABLE M120 NGGO;Lo;0;R;;;;;N;;;;;
+1E87E;MENDE KIKAKUI SYLLABLE M159 NGGAA;Lo;0;R;;;;;N;;;;;
+1E87F;MENDE KIKAKUI SYLLABLE M127 NGGUA;Lo;0;R;;;;;N;;;;;
+1E880;MENDE KIKAKUI SYLLABLE M086 LONG NGGE;Lo;0;R;;;;;N;;;;;
+1E881;MENDE KIKAKUI SYLLABLE M106 LONG NGGOO;Lo;0;R;;;;;N;;;;;
+1E882;MENDE KIKAKUI SYLLABLE M183 LONG NGGO;Lo;0;R;;;;;N;;;;;
+1E883;MENDE KIKAKUI SYLLABLE M155 GI;Lo;0;R;;;;;N;;;;;
+1E884;MENDE KIKAKUI SYLLABLE M111 GA;Lo;0;R;;;;;N;;;;;
+1E885;MENDE KIKAKUI SYLLABLE M168 GU;Lo;0;R;;;;;N;;;;;
+1E886;MENDE KIKAKUI SYLLABLE M190 GEE;Lo;0;R;;;;;N;;;;;
+1E887;MENDE KIKAKUI SYLLABLE M166 GUEI;Lo;0;R;;;;;N;;;;;
+1E888;MENDE KIKAKUI SYLLABLE M167 GUAN;Lo;0;R;;;;;N;;;;;
+1E889;MENDE KIKAKUI SYLLABLE M184 NGEN;Lo;0;R;;;;;N;;;;;
+1E88A;MENDE KIKAKUI SYLLABLE M057 NGON;Lo;0;R;;;;;N;;;;;
+1E88B;MENDE KIKAKUI SYLLABLE M177 NGUAN;Lo;0;R;;;;;N;;;;;
+1E88C;MENDE KIKAKUI SYLLABLE M068 PI;Lo;0;R;;;;;N;;;;;
+1E88D;MENDE KIKAKUI SYLLABLE M099 PA;Lo;0;R;;;;;N;;;;;
+1E88E;MENDE KIKAKUI SYLLABLE M050 PU;Lo;0;R;;;;;N;;;;;
+1E88F;MENDE KIKAKUI SYLLABLE M081 PEE;Lo;0;R;;;;;N;;;;;
+1E890;MENDE KIKAKUI SYLLABLE M051 PE;Lo;0;R;;;;;N;;;;;
+1E891;MENDE KIKAKUI SYLLABLE M102 POO;Lo;0;R;;;;;N;;;;;
+1E892;MENDE KIKAKUI SYLLABLE M066 PO;Lo;0;R;;;;;N;;;;;
+1E893;MENDE KIKAKUI SYLLABLE M145 MBI;Lo;0;R;;;;;N;;;;;
+1E894;MENDE KIKAKUI SYLLABLE M062 MBA;Lo;0;R;;;;;N;;;;;
+1E895;MENDE KIKAKUI SYLLABLE M122 MBU;Lo;0;R;;;;;N;;;;;
+1E896;MENDE KIKAKUI SYLLABLE M047 MBEE;Lo;0;R;;;;;N;;;;;
+1E897;MENDE KIKAKUI SYLLABLE M188 MBEE;Lo;0;R;;;;;N;;;;;
+1E898;MENDE KIKAKUI SYLLABLE M072 MBE;Lo;0;R;;;;;N;;;;;
+1E899;MENDE KIKAKUI SYLLABLE M172 MBOO;Lo;0;R;;;;;N;;;;;
+1E89A;MENDE KIKAKUI SYLLABLE M174 MBO;Lo;0;R;;;;;N;;;;;
+1E89B;MENDE KIKAKUI SYLLABLE M187 MBUU;Lo;0;R;;;;;N;;;;;
+1E89C;MENDE KIKAKUI SYLLABLE M161 LONG MBE;Lo;0;R;;;;;N;;;;;
+1E89D;MENDE KIKAKUI SYLLABLE M105 LONG MBOO;Lo;0;R;;;;;N;;;;;
+1E89E;MENDE KIKAKUI SYLLABLE M142 LONG MBO;Lo;0;R;;;;;N;;;;;
+1E89F;MENDE KIKAKUI SYLLABLE M132 KPI;Lo;0;R;;;;;N;;;;;
+1E8A0;MENDE KIKAKUI SYLLABLE M092 KPA;Lo;0;R;;;;;N;;;;;
+1E8A1;MENDE KIKAKUI SYLLABLE M074 KPU;Lo;0;R;;;;;N;;;;;
+1E8A2;MENDE KIKAKUI SYLLABLE M044 KPEE;Lo;0;R;;;;;N;;;;;
+1E8A3;MENDE KIKAKUI SYLLABLE M108 KPE;Lo;0;R;;;;;N;;;;;
+1E8A4;MENDE KIKAKUI SYLLABLE M112 KPOO;Lo;0;R;;;;;N;;;;;
+1E8A5;MENDE KIKAKUI SYLLABLE M158 KPO;Lo;0;R;;;;;N;;;;;
+1E8A6;MENDE KIKAKUI SYLLABLE M124 GBI;Lo;0;R;;;;;N;;;;;
+1E8A7;MENDE KIKAKUI SYLLABLE M056 GBA;Lo;0;R;;;;;N;;;;;
+1E8A8;MENDE KIKAKUI SYLLABLE M148 GBU;Lo;0;R;;;;;N;;;;;
+1E8A9;MENDE KIKAKUI SYLLABLE M093 GBEE;Lo;0;R;;;;;N;;;;;
+1E8AA;MENDE KIKAKUI SYLLABLE M107 GBE;Lo;0;R;;;;;N;;;;;
+1E8AB;MENDE KIKAKUI SYLLABLE M071 GBOO;Lo;0;R;;;;;N;;;;;
+1E8AC;MENDE KIKAKUI SYLLABLE M070 GBO;Lo;0;R;;;;;N;;;;;
+1E8AD;MENDE KIKAKUI SYLLABLE M171 RA;Lo;0;R;;;;;N;;;;;
+1E8AE;MENDE KIKAKUI SYLLABLE M123 NDI;Lo;0;R;;;;;N;;;;;
+1E8AF;MENDE KIKAKUI SYLLABLE M129 NDA;Lo;0;R;;;;;N;;;;;
+1E8B0;MENDE KIKAKUI SYLLABLE M125 NDU;Lo;0;R;;;;;N;;;;;
+1E8B1;MENDE KIKAKUI SYLLABLE M191 NDEE;Lo;0;R;;;;;N;;;;;
+1E8B2;MENDE KIKAKUI SYLLABLE M119 NDE;Lo;0;R;;;;;N;;;;;
+1E8B3;MENDE KIKAKUI SYLLABLE M067 NDOO;Lo;0;R;;;;;N;;;;;
+1E8B4;MENDE KIKAKUI SYLLABLE M064 NDO;Lo;0;R;;;;;N;;;;;
+1E8B5;MENDE KIKAKUI SYLLABLE M152 NJA;Lo;0;R;;;;;N;;;;;
+1E8B6;MENDE KIKAKUI SYLLABLE M192 NJU;Lo;0;R;;;;;N;;;;;
+1E8B7;MENDE KIKAKUI SYLLABLE M149 NJEE;Lo;0;R;;;;;N;;;;;
+1E8B8;MENDE KIKAKUI SYLLABLE M134 NJOO;Lo;0;R;;;;;N;;;;;
+1E8B9;MENDE KIKAKUI SYLLABLE M182 VI;Lo;0;R;;;;;N;;;;;
+1E8BA;MENDE KIKAKUI SYLLABLE M185 VA;Lo;0;R;;;;;N;;;;;
+1E8BB;MENDE KIKAKUI SYLLABLE M151 VU;Lo;0;R;;;;;N;;;;;
+1E8BC;MENDE KIKAKUI SYLLABLE M173 VEE;Lo;0;R;;;;;N;;;;;
+1E8BD;MENDE KIKAKUI SYLLABLE M085 VE;Lo;0;R;;;;;N;;;;;
+1E8BE;MENDE KIKAKUI SYLLABLE M144 VOO;Lo;0;R;;;;;N;;;;;
+1E8BF;MENDE KIKAKUI SYLLABLE M077 VO;Lo;0;R;;;;;N;;;;;
+1E8C0;MENDE KIKAKUI SYLLABLE M164 NYIN;Lo;0;R;;;;;N;;;;;
+1E8C1;MENDE KIKAKUI SYLLABLE M058 NYAN;Lo;0;R;;;;;N;;;;;
+1E8C2;MENDE KIKAKUI SYLLABLE M170 NYUN;Lo;0;R;;;;;N;;;;;
+1E8C3;MENDE KIKAKUI SYLLABLE M098 NYEN;Lo;0;R;;;;;N;;;;;
+1E8C4;MENDE KIKAKUI SYLLABLE M060 NYON;Lo;0;R;;;;;N;;;;;
+1E8C7;MENDE KIKAKUI DIGIT ONE;No;0;R;;;;1;N;;;;;
+1E8C8;MENDE KIKAKUI DIGIT TWO;No;0;R;;;;2;N;;;;;
+1E8C9;MENDE KIKAKUI DIGIT THREE;No;0;R;;;;3;N;;;;;
+1E8CA;MENDE KIKAKUI DIGIT FOUR;No;0;R;;;;4;N;;;;;
+1E8CB;MENDE KIKAKUI DIGIT FIVE;No;0;R;;;;5;N;;;;;
+1E8CC;MENDE KIKAKUI DIGIT SIX;No;0;R;;;;6;N;;;;;
+1E8CD;MENDE KIKAKUI DIGIT SEVEN;No;0;R;;;;7;N;;;;;
+1E8CE;MENDE KIKAKUI DIGIT EIGHT;No;0;R;;;;8;N;;;;;
+1E8CF;MENDE KIKAKUI DIGIT NINE;No;0;R;;;;9;N;;;;;
+1E8D0;MENDE KIKAKUI COMBINING NUMBER TEENS;Mn;220;NSM;;;;;N;;;;;
+1E8D1;MENDE KIKAKUI COMBINING NUMBER TENS;Mn;220;NSM;;;;;N;;;;;
+1E8D2;MENDE KIKAKUI COMBINING NUMBER HUNDREDS;Mn;220;NSM;;;;;N;;;;;
+1E8D3;MENDE KIKAKUI COMBINING NUMBER THOUSANDS;Mn;220;NSM;;;;;N;;;;;
+1E8D4;MENDE KIKAKUI COMBINING NUMBER TEN THOUSANDS;Mn;220;NSM;;;;;N;;;;;
+1E8D5;MENDE KIKAKUI COMBINING NUMBER HUNDRED THOUSANDS;Mn;220;NSM;;;;;N;;;;;
+1E8D6;MENDE KIKAKUI COMBINING NUMBER MILLIONS;Mn;220;NSM;;;;;N;;;;;
+1E900;ADLAM CAPITAL LETTER ALIF;Lu;0;R;;;;;N;;;;1E922;
+1E901;ADLAM CAPITAL LETTER DAALI;Lu;0;R;;;;;N;;;;1E923;
+1E902;ADLAM CAPITAL LETTER LAAM;Lu;0;R;;;;;N;;;;1E924;
+1E903;ADLAM CAPITAL LETTER MIIM;Lu;0;R;;;;;N;;;;1E925;
+1E904;ADLAM CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;1E926;
+1E905;ADLAM CAPITAL LETTER SINNYIIYHE;Lu;0;R;;;;;N;;;;1E927;
+1E906;ADLAM CAPITAL LETTER PE;Lu;0;R;;;;;N;;;;1E928;
+1E907;ADLAM CAPITAL LETTER BHE;Lu;0;R;;;;;N;;;;1E929;
+1E908;ADLAM CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;1E92A;
+1E909;ADLAM CAPITAL LETTER E;Lu;0;R;;;;;N;;;;1E92B;
+1E90A;ADLAM CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;1E92C;
+1E90B;ADLAM CAPITAL LETTER I;Lu;0;R;;;;;N;;;;1E92D;
+1E90C;ADLAM CAPITAL LETTER O;Lu;0;R;;;;;N;;;;1E92E;
+1E90D;ADLAM CAPITAL LETTER DHA;Lu;0;R;;;;;N;;;;1E92F;
+1E90E;ADLAM CAPITAL LETTER YHE;Lu;0;R;;;;;N;;;;1E930;
+1E90F;ADLAM CAPITAL LETTER WAW;Lu;0;R;;;;;N;;;;1E931;
+1E910;ADLAM CAPITAL LETTER NUN;Lu;0;R;;;;;N;;;;1E932;
+1E911;ADLAM CAPITAL LETTER KAF;Lu;0;R;;;;;N;;;;1E933;
+1E912;ADLAM CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;1E934;
+1E913;ADLAM CAPITAL LETTER U;Lu;0;R;;;;;N;;;;1E935;
+1E914;ADLAM CAPITAL LETTER JIIM;Lu;0;R;;;;;N;;;;1E936;
+1E915;ADLAM CAPITAL LETTER CHI;Lu;0;R;;;;;N;;;;1E937;
+1E916;ADLAM CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;1E938;
+1E917;ADLAM CAPITAL LETTER QAAF;Lu;0;R;;;;;N;;;;1E939;
+1E918;ADLAM CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;1E93A;
+1E919;ADLAM CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;1E93B;
+1E91A;ADLAM CAPITAL LETTER TU;Lu;0;R;;;;;N;;;;1E93C;
+1E91B;ADLAM CAPITAL LETTER NHA;Lu;0;R;;;;;N;;;;1E93D;
+1E91C;ADLAM CAPITAL LETTER VA;Lu;0;R;;;;;N;;;;1E93E;
+1E91D;ADLAM CAPITAL LETTER KHA;Lu;0;R;;;;;N;;;;1E93F;
+1E91E;ADLAM CAPITAL LETTER GBE;Lu;0;R;;;;;N;;;;1E940;
+1E91F;ADLAM CAPITAL LETTER ZAL;Lu;0;R;;;;;N;;;;1E941;
+1E920;ADLAM CAPITAL LETTER KPO;Lu;0;R;;;;;N;;;;1E942;
+1E921;ADLAM CAPITAL LETTER SHA;Lu;0;R;;;;;N;;;;1E943;
+1E922;ADLAM SMALL LETTER ALIF;Ll;0;R;;;;;N;;;1E900;;1E900
+1E923;ADLAM SMALL LETTER DAALI;Ll;0;R;;;;;N;;;1E901;;1E901
+1E924;ADLAM SMALL LETTER LAAM;Ll;0;R;;;;;N;;;1E902;;1E902
+1E925;ADLAM SMALL LETTER MIIM;Ll;0;R;;;;;N;;;1E903;;1E903
+1E926;ADLAM SMALL LETTER BA;Ll;0;R;;;;;N;;;1E904;;1E904
+1E927;ADLAM SMALL LETTER SINNYIIYHE;Ll;0;R;;;;;N;;;1E905;;1E905
+1E928;ADLAM SMALL LETTER PE;Ll;0;R;;;;;N;;;1E906;;1E906
+1E929;ADLAM SMALL LETTER BHE;Ll;0;R;;;;;N;;;1E907;;1E907
+1E92A;ADLAM SMALL LETTER RA;Ll;0;R;;;;;N;;;1E908;;1E908
+1E92B;ADLAM SMALL LETTER E;Ll;0;R;;;;;N;;;1E909;;1E909
+1E92C;ADLAM SMALL LETTER FA;Ll;0;R;;;;;N;;;1E90A;;1E90A
+1E92D;ADLAM SMALL LETTER I;Ll;0;R;;;;;N;;;1E90B;;1E90B
+1E92E;ADLAM SMALL LETTER O;Ll;0;R;;;;;N;;;1E90C;;1E90C
+1E92F;ADLAM SMALL LETTER DHA;Ll;0;R;;;;;N;;;1E90D;;1E90D
+1E930;ADLAM SMALL LETTER YHE;Ll;0;R;;;;;N;;;1E90E;;1E90E
+1E931;ADLAM SMALL LETTER WAW;Ll;0;R;;;;;N;;;1E90F;;1E90F
+1E932;ADLAM SMALL LETTER NUN;Ll;0;R;;;;;N;;;1E910;;1E910
+1E933;ADLAM SMALL LETTER KAF;Ll;0;R;;;;;N;;;1E911;;1E911
+1E934;ADLAM SMALL LETTER YA;Ll;0;R;;;;;N;;;1E912;;1E912
+1E935;ADLAM SMALL LETTER U;Ll;0;R;;;;;N;;;1E913;;1E913
+1E936;ADLAM SMALL LETTER JIIM;Ll;0;R;;;;;N;;;1E914;;1E914
+1E937;ADLAM SMALL LETTER CHI;Ll;0;R;;;;;N;;;1E915;;1E915
+1E938;ADLAM SMALL LETTER HA;Ll;0;R;;;;;N;;;1E916;;1E916
+1E939;ADLAM SMALL LETTER QAAF;Ll;0;R;;;;;N;;;1E917;;1E917
+1E93A;ADLAM SMALL LETTER GA;Ll;0;R;;;;;N;;;1E918;;1E918
+1E93B;ADLAM SMALL LETTER NYA;Ll;0;R;;;;;N;;;1E919;;1E919
+1E93C;ADLAM SMALL LETTER TU;Ll;0;R;;;;;N;;;1E91A;;1E91A
+1E93D;ADLAM SMALL LETTER NHA;Ll;0;R;;;;;N;;;1E91B;;1E91B
+1E93E;ADLAM SMALL LETTER VA;Ll;0;R;;;;;N;;;1E91C;;1E91C
+1E93F;ADLAM SMALL LETTER KHA;Ll;0;R;;;;;N;;;1E91D;;1E91D
+1E940;ADLAM SMALL LETTER GBE;Ll;0;R;;;;;N;;;1E91E;;1E91E
+1E941;ADLAM SMALL LETTER ZAL;Ll;0;R;;;;;N;;;1E91F;;1E91F
+1E942;ADLAM SMALL LETTER KPO;Ll;0;R;;;;;N;;;1E920;;1E920
+1E943;ADLAM SMALL LETTER SHA;Ll;0;R;;;;;N;;;1E921;;1E921
+1E944;ADLAM ALIF LENGTHENER;Mn;230;NSM;;;;;N;;;;;
+1E945;ADLAM VOWEL LENGTHENER;Mn;230;NSM;;;;;N;;;;;
+1E946;ADLAM GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
+1E947;ADLAM HAMZA;Mn;230;NSM;;;;;N;;;;;
+1E948;ADLAM CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;;
+1E949;ADLAM GEMINATE CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;;
+1E94A;ADLAM NUKTA;Mn;7;NSM;;;;;N;;;;;
+1E94B;ADLAM NASALIZATION MARK;Lm;0;R;;;;;N;;;;;
+1E950;ADLAM DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
+1E951;ADLAM DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
+1E952;ADLAM DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
+1E953;ADLAM DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
+1E954;ADLAM DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
+1E955;ADLAM DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
+1E956;ADLAM DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
+1E957;ADLAM DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
+1E958;ADLAM DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
+1E959;ADLAM DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
+1E95E;ADLAM INITIAL EXCLAMATION MARK;Po;0;R;;;;;N;;;;;
+1E95F;ADLAM INITIAL QUESTION MARK;Po;0;R;;;;;N;;;;;
+1EC71;INDIC SIYAQ NUMBER ONE;No;0;AL;;;;1;N;;;;;
+1EC72;INDIC SIYAQ NUMBER TWO;No;0;AL;;;;2;N;;;;;
+1EC73;INDIC SIYAQ NUMBER THREE;No;0;AL;;;;3;N;;;;;
+1EC74;INDIC SIYAQ NUMBER FOUR;No;0;AL;;;;4;N;;;;;
+1EC75;INDIC SIYAQ NUMBER FIVE;No;0;AL;;;;5;N;;;;;
+1EC76;INDIC SIYAQ NUMBER SIX;No;0;AL;;;;6;N;;;;;
+1EC77;INDIC SIYAQ NUMBER SEVEN;No;0;AL;;;;7;N;;;;;
+1EC78;INDIC SIYAQ NUMBER EIGHT;No;0;AL;;;;8;N;;;;;
+1EC79;INDIC SIYAQ NUMBER NINE;No;0;AL;;;;9;N;;;;;
+1EC7A;INDIC SIYAQ NUMBER TEN;No;0;AL;;;;10;N;;;;;
+1EC7B;INDIC SIYAQ NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+1EC7C;INDIC SIYAQ NUMBER THIRTY;No;0;AL;;;;30;N;;;;;
+1EC7D;INDIC SIYAQ NUMBER FORTY;No;0;AL;;;;40;N;;;;;
+1EC7E;INDIC SIYAQ NUMBER FIFTY;No;0;AL;;;;50;N;;;;;
+1EC7F;INDIC SIYAQ NUMBER SIXTY;No;0;AL;;;;60;N;;;;;
+1EC80;INDIC SIYAQ NUMBER SEVENTY;No;0;AL;;;;70;N;;;;;
+1EC81;INDIC SIYAQ NUMBER EIGHTY;No;0;AL;;;;80;N;;;;;
+1EC82;INDIC SIYAQ NUMBER NINETY;No;0;AL;;;;90;N;;;;;
+1EC83;INDIC SIYAQ NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+1EC84;INDIC SIYAQ NUMBER TWO HUNDRED;No;0;AL;;;;200;N;;;;;
+1EC85;INDIC SIYAQ NUMBER THREE HUNDRED;No;0;AL;;;;300;N;;;;;
+1EC86;INDIC SIYAQ NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;;
+1EC87;INDIC SIYAQ NUMBER FIVE HUNDRED;No;0;AL;;;;500;N;;;;;
+1EC88;INDIC SIYAQ NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;;
+1EC89;INDIC SIYAQ NUMBER SEVEN HUNDRED;No;0;AL;;;;700;N;;;;;
+1EC8A;INDIC SIYAQ NUMBER EIGHT HUNDRED;No;0;AL;;;;800;N;;;;;
+1EC8B;INDIC SIYAQ NUMBER NINE HUNDRED;No;0;AL;;;;900;N;;;;;
+1EC8C;INDIC SIYAQ NUMBER ONE THOUSAND;No;0;AL;;;;1000;N;;;;;
+1EC8D;INDIC SIYAQ NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;;
+1EC8E;INDIC SIYAQ NUMBER THREE THOUSAND;No;0;AL;;;;3000;N;;;;;
+1EC8F;INDIC SIYAQ NUMBER FOUR THOUSAND;No;0;AL;;;;4000;N;;;;;
+1EC90;INDIC SIYAQ NUMBER FIVE THOUSAND;No;0;AL;;;;5000;N;;;;;
+1EC91;INDIC SIYAQ NUMBER SIX THOUSAND;No;0;AL;;;;6000;N;;;;;
+1EC92;INDIC SIYAQ NUMBER SEVEN THOUSAND;No;0;AL;;;;7000;N;;;;;
+1EC93;INDIC SIYAQ NUMBER EIGHT THOUSAND;No;0;AL;;;;8000;N;;;;;
+1EC94;INDIC SIYAQ NUMBER NINE THOUSAND;No;0;AL;;;;9000;N;;;;;
+1EC95;INDIC SIYAQ NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1EC96;INDIC SIYAQ NUMBER TWENTY THOUSAND;No;0;AL;;;;20000;N;;;;;
+1EC97;INDIC SIYAQ NUMBER THIRTY THOUSAND;No;0;AL;;;;30000;N;;;;;
+1EC98;INDIC SIYAQ NUMBER FORTY THOUSAND;No;0;AL;;;;40000;N;;;;;
+1EC99;INDIC SIYAQ NUMBER FIFTY THOUSAND;No;0;AL;;;;50000;N;;;;;
+1EC9A;INDIC SIYAQ NUMBER SIXTY THOUSAND;No;0;AL;;;;60000;N;;;;;
+1EC9B;INDIC SIYAQ NUMBER SEVENTY THOUSAND;No;0;AL;;;;70000;N;;;;;
+1EC9C;INDIC SIYAQ NUMBER EIGHTY THOUSAND;No;0;AL;;;;80000;N;;;;;
+1EC9D;INDIC SIYAQ NUMBER NINETY THOUSAND;No;0;AL;;;;90000;N;;;;;
+1EC9E;INDIC SIYAQ NUMBER LAKH;No;0;AL;;;;100000;N;;;;;
+1EC9F;INDIC SIYAQ NUMBER LAKHAN;No;0;AL;;;;200000;N;;;;;
+1ECA0;INDIC SIYAQ LAKH MARK;No;0;AL;;;;100000;N;;;;;
+1ECA1;INDIC SIYAQ NUMBER KAROR;No;0;AL;;;;10000000;N;;;;;
+1ECA2;INDIC SIYAQ NUMBER KARORAN;No;0;AL;;;;20000000;N;;;;;
+1ECA3;INDIC SIYAQ NUMBER PREFIXED ONE;No;0;AL;;;;1;N;;;;;
+1ECA4;INDIC SIYAQ NUMBER PREFIXED TWO;No;0;AL;;;;2;N;;;;;
+1ECA5;INDIC SIYAQ NUMBER PREFIXED THREE;No;0;AL;;;;3;N;;;;;
+1ECA6;INDIC SIYAQ NUMBER PREFIXED FOUR;No;0;AL;;;;4;N;;;;;
+1ECA7;INDIC SIYAQ NUMBER PREFIXED FIVE;No;0;AL;;;;5;N;;;;;
+1ECA8;INDIC SIYAQ NUMBER PREFIXED SIX;No;0;AL;;;;6;N;;;;;
+1ECA9;INDIC SIYAQ NUMBER PREFIXED SEVEN;No;0;AL;;;;7;N;;;;;
+1ECAA;INDIC SIYAQ NUMBER PREFIXED EIGHT;No;0;AL;;;;8;N;;;;;
+1ECAB;INDIC SIYAQ NUMBER PREFIXED NINE;No;0;AL;;;;9;N;;;;;
+1ECAC;INDIC SIYAQ PLACEHOLDER;So;0;AL;;;;;N;;;;;
+1ECAD;INDIC SIYAQ FRACTION ONE QUARTER;No;0;AL;;;;1/4;N;;;;;
+1ECAE;INDIC SIYAQ FRACTION ONE HALF;No;0;AL;;;;1/2;N;;;;;
+1ECAF;INDIC SIYAQ FRACTION THREE QUARTERS;No;0;AL;;;;3/4;N;;;;;
+1ECB0;INDIC SIYAQ RUPEE MARK;Sc;0;AL;;;;;N;;;;;
+1ECB1;INDIC SIYAQ NUMBER ALTERNATE ONE;No;0;AL;;;;1;N;;;;;
+1ECB2;INDIC SIYAQ NUMBER ALTERNATE TWO;No;0;AL;;;;2;N;;;;;
+1ECB3;INDIC SIYAQ NUMBER ALTERNATE TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1ECB4;INDIC SIYAQ ALTERNATE LAKH MARK;No;0;AL;;;;100000;N;;;;;
+1ED01;OTTOMAN SIYAQ NUMBER ONE;No;0;AL;;;;1;N;;;;;
+1ED02;OTTOMAN SIYAQ NUMBER TWO;No;0;AL;;;;2;N;;;;;
+1ED03;OTTOMAN SIYAQ NUMBER THREE;No;0;AL;;;;3;N;;;;;
+1ED04;OTTOMAN SIYAQ NUMBER FOUR;No;0;AL;;;;4;N;;;;;
+1ED05;OTTOMAN SIYAQ NUMBER FIVE;No;0;AL;;;;5;N;;;;;
+1ED06;OTTOMAN SIYAQ NUMBER SIX;No;0;AL;;;;6;N;;;;;
+1ED07;OTTOMAN SIYAQ NUMBER SEVEN;No;0;AL;;;;7;N;;;;;
+1ED08;OTTOMAN SIYAQ NUMBER EIGHT;No;0;AL;;;;8;N;;;;;
+1ED09;OTTOMAN SIYAQ NUMBER NINE;No;0;AL;;;;9;N;;;;;
+1ED0A;OTTOMAN SIYAQ NUMBER TEN;No;0;AL;;;;10;N;;;;;
+1ED0B;OTTOMAN SIYAQ NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+1ED0C;OTTOMAN SIYAQ NUMBER THIRTY;No;0;AL;;;;30;N;;;;;
+1ED0D;OTTOMAN SIYAQ NUMBER FORTY;No;0;AL;;;;40;N;;;;;
+1ED0E;OTTOMAN SIYAQ NUMBER FIFTY;No;0;AL;;;;50;N;;;;;
+1ED0F;OTTOMAN SIYAQ NUMBER SIXTY;No;0;AL;;;;60;N;;;;;
+1ED10;OTTOMAN SIYAQ NUMBER SEVENTY;No;0;AL;;;;70;N;;;;;
+1ED11;OTTOMAN SIYAQ NUMBER EIGHTY;No;0;AL;;;;80;N;;;;;
+1ED12;OTTOMAN SIYAQ NUMBER NINETY;No;0;AL;;;;90;N;;;;;
+1ED13;OTTOMAN SIYAQ NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+1ED14;OTTOMAN SIYAQ NUMBER TWO HUNDRED;No;0;AL;;;;200;N;;;;;
+1ED15;OTTOMAN SIYAQ NUMBER THREE HUNDRED;No;0;AL;;;;300;N;;;;;
+1ED16;OTTOMAN SIYAQ NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;;
+1ED17;OTTOMAN SIYAQ NUMBER FIVE HUNDRED;No;0;AL;;;;500;N;;;;;
+1ED18;OTTOMAN SIYAQ NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;;
+1ED19;OTTOMAN SIYAQ NUMBER SEVEN HUNDRED;No;0;AL;;;;700;N;;;;;
+1ED1A;OTTOMAN SIYAQ NUMBER EIGHT HUNDRED;No;0;AL;;;;800;N;;;;;
+1ED1B;OTTOMAN SIYAQ NUMBER NINE HUNDRED;No;0;AL;;;;900;N;;;;;
+1ED1C;OTTOMAN SIYAQ NUMBER ONE THOUSAND;No;0;AL;;;;1000;N;;;;;
+1ED1D;OTTOMAN SIYAQ NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;;
+1ED1E;OTTOMAN SIYAQ NUMBER THREE THOUSAND;No;0;AL;;;;3000;N;;;;;
+1ED1F;OTTOMAN SIYAQ NUMBER FOUR THOUSAND;No;0;AL;;;;4000;N;;;;;
+1ED20;OTTOMAN SIYAQ NUMBER FIVE THOUSAND;No;0;AL;;;;5000;N;;;;;
+1ED21;OTTOMAN SIYAQ NUMBER SIX THOUSAND;No;0;AL;;;;6000;N;;;;;
+1ED22;OTTOMAN SIYAQ NUMBER SEVEN THOUSAND;No;0;AL;;;;7000;N;;;;;
+1ED23;OTTOMAN SIYAQ NUMBER EIGHT THOUSAND;No;0;AL;;;;8000;N;;;;;
+1ED24;OTTOMAN SIYAQ NUMBER NINE THOUSAND;No;0;AL;;;;9000;N;;;;;
+1ED25;OTTOMAN SIYAQ NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1ED26;OTTOMAN SIYAQ NUMBER TWENTY THOUSAND;No;0;AL;;;;20000;N;;;;;
+1ED27;OTTOMAN SIYAQ NUMBER THIRTY THOUSAND;No;0;AL;;;;30000;N;;;;;
+1ED28;OTTOMAN SIYAQ NUMBER FORTY THOUSAND;No;0;AL;;;;40000;N;;;;;
+1ED29;OTTOMAN SIYAQ NUMBER FIFTY THOUSAND;No;0;AL;;;;50000;N;;;;;
+1ED2A;OTTOMAN SIYAQ NUMBER SIXTY THOUSAND;No;0;AL;;;;60000;N;;;;;
+1ED2B;OTTOMAN SIYAQ NUMBER SEVENTY THOUSAND;No;0;AL;;;;70000;N;;;;;
+1ED2C;OTTOMAN SIYAQ NUMBER EIGHTY THOUSAND;No;0;AL;;;;80000;N;;;;;
+1ED2D;OTTOMAN SIYAQ NUMBER NINETY THOUSAND;No;0;AL;;;;90000;N;;;;;
+1ED2E;OTTOMAN SIYAQ MARRATAN;So;0;AL;;;;;N;;;;;
+1ED2F;OTTOMAN SIYAQ ALTERNATE NUMBER TWO;No;0;AL;;;;2;N;;;;;
+1ED30;OTTOMAN SIYAQ ALTERNATE NUMBER THREE;No;0;AL;;;;3;N;;;;;
+1ED31;OTTOMAN SIYAQ ALTERNATE NUMBER FOUR;No;0;AL;;;;4;N;;;;;
+1ED32;OTTOMAN SIYAQ ALTERNATE NUMBER FIVE;No;0;AL;;;;5;N;;;;;
+1ED33;OTTOMAN SIYAQ ALTERNATE NUMBER SIX;No;0;AL;;;;6;N;;;;;
+1ED34;OTTOMAN SIYAQ ALTERNATE NUMBER SEVEN;No;0;AL;;;;7;N;;;;;
+1ED35;OTTOMAN SIYAQ ALTERNATE NUMBER EIGHT;No;0;AL;;;;8;N;;;;;
+1ED36;OTTOMAN SIYAQ ALTERNATE NUMBER NINE;No;0;AL;;;;9;N;;;;;
+1ED37;OTTOMAN SIYAQ ALTERNATE NUMBER TEN;No;0;AL;;;;10;N;;;;;
+1ED38;OTTOMAN SIYAQ ALTERNATE NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;;
+1ED39;OTTOMAN SIYAQ ALTERNATE NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;;
+1ED3A;OTTOMAN SIYAQ ALTERNATE NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;;
+1ED3B;OTTOMAN SIYAQ ALTERNATE NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1ED3C;OTTOMAN SIYAQ FRACTION ONE HALF;No;0;AL;;;;1/2;N;;;;;
+1ED3D;OTTOMAN SIYAQ FRACTION ONE SIXTH;No;0;AL;;;;1/6;N;;;;;
+1EE00;ARABIC MATHEMATICAL ALEF;Lo;0;AL;<font> 0627;;;;N;;;;;
+1EE01;ARABIC MATHEMATICAL BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE02;ARABIC MATHEMATICAL JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE03;ARABIC MATHEMATICAL DAL;Lo;0;AL;<font> 062F;;;;N;;;;;
+1EE05;ARABIC MATHEMATICAL WAW;Lo;0;AL;<font> 0648;;;;N;;;;;
+1EE06;ARABIC MATHEMATICAL ZAIN;Lo;0;AL;<font> 0632;;;;N;;;;;
+1EE07;ARABIC MATHEMATICAL HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE08;ARABIC MATHEMATICAL TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EE09;ARABIC MATHEMATICAL YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE0A;ARABIC MATHEMATICAL KAF;Lo;0;AL;<font> 0643;;;;N;;;;;
+1EE0B;ARABIC MATHEMATICAL LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE0C;ARABIC MATHEMATICAL MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE0D;ARABIC MATHEMATICAL NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE0E;ARABIC MATHEMATICAL SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE0F;ARABIC MATHEMATICAL AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE10;ARABIC MATHEMATICAL FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE11;ARABIC MATHEMATICAL SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE12;ARABIC MATHEMATICAL QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE13;ARABIC MATHEMATICAL REH;Lo;0;AL;<font> 0631;;;;N;;;;;
+1EE14;ARABIC MATHEMATICAL SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE15;ARABIC MATHEMATICAL TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE16;ARABIC MATHEMATICAL THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE17;ARABIC MATHEMATICAL KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE18;ARABIC MATHEMATICAL THAL;Lo;0;AL;<font> 0630;;;;N;;;;;
+1EE19;ARABIC MATHEMATICAL DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE1A;ARABIC MATHEMATICAL ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EE1B;ARABIC MATHEMATICAL GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE1C;ARABIC MATHEMATICAL DOTLESS BEH;Lo;0;AL;<font> 066E;;;;N;;;;;
+1EE1D;ARABIC MATHEMATICAL DOTLESS NOON;Lo;0;AL;<font> 06BA;;;;N;;;;;
+1EE1E;ARABIC MATHEMATICAL DOTLESS FEH;Lo;0;AL;<font> 06A1;;;;N;;;;;
+1EE1F;ARABIC MATHEMATICAL DOTLESS QAF;Lo;0;AL;<font> 066F;;;;N;;;;;
+1EE21;ARABIC MATHEMATICAL INITIAL BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE22;ARABIC MATHEMATICAL INITIAL JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE24;ARABIC MATHEMATICAL INITIAL HEH;Lo;0;AL;<font> 0647;;;;N;;;;;
+1EE27;ARABIC MATHEMATICAL INITIAL HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE29;ARABIC MATHEMATICAL INITIAL YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE2A;ARABIC MATHEMATICAL INITIAL KAF;Lo;0;AL;<font> 0643;;;;N;;;;;
+1EE2B;ARABIC MATHEMATICAL INITIAL LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE2C;ARABIC MATHEMATICAL INITIAL MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE2D;ARABIC MATHEMATICAL INITIAL NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE2E;ARABIC MATHEMATICAL INITIAL SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE2F;ARABIC MATHEMATICAL INITIAL AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE30;ARABIC MATHEMATICAL INITIAL FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE31;ARABIC MATHEMATICAL INITIAL SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE32;ARABIC MATHEMATICAL INITIAL QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE34;ARABIC MATHEMATICAL INITIAL SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE35;ARABIC MATHEMATICAL INITIAL TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE36;ARABIC MATHEMATICAL INITIAL THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE37;ARABIC MATHEMATICAL INITIAL KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE39;ARABIC MATHEMATICAL INITIAL DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE3B;ARABIC MATHEMATICAL INITIAL GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE42;ARABIC MATHEMATICAL TAILED JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE47;ARABIC MATHEMATICAL TAILED HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE49;ARABIC MATHEMATICAL TAILED YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE4B;ARABIC MATHEMATICAL TAILED LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE4D;ARABIC MATHEMATICAL TAILED NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE4E;ARABIC MATHEMATICAL TAILED SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE4F;ARABIC MATHEMATICAL TAILED AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE51;ARABIC MATHEMATICAL TAILED SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE52;ARABIC MATHEMATICAL TAILED QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE54;ARABIC MATHEMATICAL TAILED SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE57;ARABIC MATHEMATICAL TAILED KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE59;ARABIC MATHEMATICAL TAILED DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE5B;ARABIC MATHEMATICAL TAILED GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE5D;ARABIC MATHEMATICAL TAILED DOTLESS NOON;Lo;0;AL;<font> 06BA;;;;N;;;;;
+1EE5F;ARABIC MATHEMATICAL TAILED DOTLESS QAF;Lo;0;AL;<font> 066F;;;;N;;;;;
+1EE61;ARABIC MATHEMATICAL STRETCHED BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE62;ARABIC MATHEMATICAL STRETCHED JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE64;ARABIC MATHEMATICAL STRETCHED HEH;Lo;0;AL;<font> 0647;;;;N;;;;;
+1EE67;ARABIC MATHEMATICAL STRETCHED HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE68;ARABIC MATHEMATICAL STRETCHED TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EE69;ARABIC MATHEMATICAL STRETCHED YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE6A;ARABIC MATHEMATICAL STRETCHED KAF;Lo;0;AL;<font> 0643;;;;N;;;;;
+1EE6C;ARABIC MATHEMATICAL STRETCHED MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE6D;ARABIC MATHEMATICAL STRETCHED NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE6E;ARABIC MATHEMATICAL STRETCHED SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE6F;ARABIC MATHEMATICAL STRETCHED AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE70;ARABIC MATHEMATICAL STRETCHED FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE71;ARABIC MATHEMATICAL STRETCHED SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE72;ARABIC MATHEMATICAL STRETCHED QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE74;ARABIC MATHEMATICAL STRETCHED SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE75;ARABIC MATHEMATICAL STRETCHED TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE76;ARABIC MATHEMATICAL STRETCHED THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE77;ARABIC MATHEMATICAL STRETCHED KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE79;ARABIC MATHEMATICAL STRETCHED DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE7A;ARABIC MATHEMATICAL STRETCHED ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EE7B;ARABIC MATHEMATICAL STRETCHED GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE7C;ARABIC MATHEMATICAL STRETCHED DOTLESS BEH;Lo;0;AL;<font> 066E;;;;N;;;;;
+1EE7E;ARABIC MATHEMATICAL STRETCHED DOTLESS FEH;Lo;0;AL;<font> 06A1;;;;N;;;;;
+1EE80;ARABIC MATHEMATICAL LOOPED ALEF;Lo;0;AL;<font> 0627;;;;N;;;;;
+1EE81;ARABIC MATHEMATICAL LOOPED BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE82;ARABIC MATHEMATICAL LOOPED JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE83;ARABIC MATHEMATICAL LOOPED DAL;Lo;0;AL;<font> 062F;;;;N;;;;;
+1EE84;ARABIC MATHEMATICAL LOOPED HEH;Lo;0;AL;<font> 0647;;;;N;;;;;
+1EE85;ARABIC MATHEMATICAL LOOPED WAW;Lo;0;AL;<font> 0648;;;;N;;;;;
+1EE86;ARABIC MATHEMATICAL LOOPED ZAIN;Lo;0;AL;<font> 0632;;;;N;;;;;
+1EE87;ARABIC MATHEMATICAL LOOPED HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE88;ARABIC MATHEMATICAL LOOPED TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EE89;ARABIC MATHEMATICAL LOOPED YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE8B;ARABIC MATHEMATICAL LOOPED LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE8C;ARABIC MATHEMATICAL LOOPED MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE8D;ARABIC MATHEMATICAL LOOPED NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE8E;ARABIC MATHEMATICAL LOOPED SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE8F;ARABIC MATHEMATICAL LOOPED AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE90;ARABIC MATHEMATICAL LOOPED FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE91;ARABIC MATHEMATICAL LOOPED SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE92;ARABIC MATHEMATICAL LOOPED QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE93;ARABIC MATHEMATICAL LOOPED REH;Lo;0;AL;<font> 0631;;;;N;;;;;
+1EE94;ARABIC MATHEMATICAL LOOPED SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE95;ARABIC MATHEMATICAL LOOPED TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE96;ARABIC MATHEMATICAL LOOPED THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE97;ARABIC MATHEMATICAL LOOPED KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE98;ARABIC MATHEMATICAL LOOPED THAL;Lo;0;AL;<font> 0630;;;;N;;;;;
+1EE99;ARABIC MATHEMATICAL LOOPED DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE9A;ARABIC MATHEMATICAL LOOPED ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EE9B;ARABIC MATHEMATICAL LOOPED GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EEA1;ARABIC MATHEMATICAL DOUBLE-STRUCK BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EEA2;ARABIC MATHEMATICAL DOUBLE-STRUCK JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EEA3;ARABIC MATHEMATICAL DOUBLE-STRUCK DAL;Lo;0;AL;<font> 062F;;;;N;;;;;
+1EEA5;ARABIC MATHEMATICAL DOUBLE-STRUCK WAW;Lo;0;AL;<font> 0648;;;;N;;;;;
+1EEA6;ARABIC MATHEMATICAL DOUBLE-STRUCK ZAIN;Lo;0;AL;<font> 0632;;;;N;;;;;
+1EEA7;ARABIC MATHEMATICAL DOUBLE-STRUCK HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EEA8;ARABIC MATHEMATICAL DOUBLE-STRUCK TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EEA9;ARABIC MATHEMATICAL DOUBLE-STRUCK YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EEAB;ARABIC MATHEMATICAL DOUBLE-STRUCK LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EEAC;ARABIC MATHEMATICAL DOUBLE-STRUCK MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EEAD;ARABIC MATHEMATICAL DOUBLE-STRUCK NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EEAE;ARABIC MATHEMATICAL DOUBLE-STRUCK SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EEAF;ARABIC MATHEMATICAL DOUBLE-STRUCK AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EEB0;ARABIC MATHEMATICAL DOUBLE-STRUCK FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EEB1;ARABIC MATHEMATICAL DOUBLE-STRUCK SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EEB2;ARABIC MATHEMATICAL DOUBLE-STRUCK QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EEB3;ARABIC MATHEMATICAL DOUBLE-STRUCK REH;Lo;0;AL;<font> 0631;;;;N;;;;;
+1EEB4;ARABIC MATHEMATICAL DOUBLE-STRUCK SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EEB5;ARABIC MATHEMATICAL DOUBLE-STRUCK TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EEB6;ARABIC MATHEMATICAL DOUBLE-STRUCK THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EEB7;ARABIC MATHEMATICAL DOUBLE-STRUCK KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EEB8;ARABIC MATHEMATICAL DOUBLE-STRUCK THAL;Lo;0;AL;<font> 0630;;;;N;;;;;
+1EEB9;ARABIC MATHEMATICAL DOUBLE-STRUCK DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EEBA;ARABIC MATHEMATICAL DOUBLE-STRUCK ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EEBB;ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EEF0;ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL;Sm;0;ON;;;;;N;;;;;
+1EEF1;ARABIC MATHEMATICAL OPERATOR HAH WITH DAL;Sm;0;ON;;;;;N;;;;;
+1F000;MAHJONG TILE EAST WIND;So;0;ON;;;;;N;;;;;
+1F001;MAHJONG TILE SOUTH WIND;So;0;ON;;;;;N;;;;;
+1F002;MAHJONG TILE WEST WIND;So;0;ON;;;;;N;;;;;
+1F003;MAHJONG TILE NORTH WIND;So;0;ON;;;;;N;;;;;
+1F004;MAHJONG TILE RED DRAGON;So;0;ON;;;;;N;;;;;
+1F005;MAHJONG TILE GREEN DRAGON;So;0;ON;;;;;N;;;;;
+1F006;MAHJONG TILE WHITE DRAGON;So;0;ON;;;;;N;;;;;
+1F007;MAHJONG TILE ONE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F008;MAHJONG TILE TWO OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F009;MAHJONG TILE THREE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00A;MAHJONG TILE FOUR OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00B;MAHJONG TILE FIVE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00C;MAHJONG TILE SIX OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00D;MAHJONG TILE SEVEN OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00E;MAHJONG TILE EIGHT OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00F;MAHJONG TILE NINE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F010;MAHJONG TILE ONE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F011;MAHJONG TILE TWO OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F012;MAHJONG TILE THREE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F013;MAHJONG TILE FOUR OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F014;MAHJONG TILE FIVE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F015;MAHJONG TILE SIX OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F016;MAHJONG TILE SEVEN OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F017;MAHJONG TILE EIGHT OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F018;MAHJONG TILE NINE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F019;MAHJONG TILE ONE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01A;MAHJONG TILE TWO OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01B;MAHJONG TILE THREE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01C;MAHJONG TILE FOUR OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01D;MAHJONG TILE FIVE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01E;MAHJONG TILE SIX OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01F;MAHJONG TILE SEVEN OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F020;MAHJONG TILE EIGHT OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F021;MAHJONG TILE NINE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F022;MAHJONG TILE PLUM;So;0;ON;;;;;N;;;;;
+1F023;MAHJONG TILE ORCHID;So;0;ON;;;;;N;;;;;
+1F024;MAHJONG TILE BAMBOO;So;0;ON;;;;;N;;;;;
+1F025;MAHJONG TILE CHRYSANTHEMUM;So;0;ON;;;;;N;;;;;
+1F026;MAHJONG TILE SPRING;So;0;ON;;;;;N;;;;;
+1F027;MAHJONG TILE SUMMER;So;0;ON;;;;;N;;;;;
+1F028;MAHJONG TILE AUTUMN;So;0;ON;;;;;N;;;;;
+1F029;MAHJONG TILE WINTER;So;0;ON;;;;;N;;;;;
+1F02A;MAHJONG TILE JOKER;So;0;ON;;;;;N;;;;;
+1F02B;MAHJONG TILE BACK;So;0;ON;;;;;N;;;;;
+1F030;DOMINO TILE HORIZONTAL BACK;So;0;ON;;;;;N;;;;;
+1F031;DOMINO TILE HORIZONTAL-00-00;So;0;ON;;;;;N;;;;;
+1F032;DOMINO TILE HORIZONTAL-00-01;So;0;ON;;;;;N;;;;;
+1F033;DOMINO TILE HORIZONTAL-00-02;So;0;ON;;;;;N;;;;;
+1F034;DOMINO TILE HORIZONTAL-00-03;So;0;ON;;;;;N;;;;;
+1F035;DOMINO TILE HORIZONTAL-00-04;So;0;ON;;;;;N;;;;;
+1F036;DOMINO TILE HORIZONTAL-00-05;So;0;ON;;;;;N;;;;;
+1F037;DOMINO TILE HORIZONTAL-00-06;So;0;ON;;;;;N;;;;;
+1F038;DOMINO TILE HORIZONTAL-01-00;So;0;ON;;;;;N;;;;;
+1F039;DOMINO TILE HORIZONTAL-01-01;So;0;ON;;;;;N;;;;;
+1F03A;DOMINO TILE HORIZONTAL-01-02;So;0;ON;;;;;N;;;;;
+1F03B;DOMINO TILE HORIZONTAL-01-03;So;0;ON;;;;;N;;;;;
+1F03C;DOMINO TILE HORIZONTAL-01-04;So;0;ON;;;;;N;;;;;
+1F03D;DOMINO TILE HORIZONTAL-01-05;So;0;ON;;;;;N;;;;;
+1F03E;DOMINO TILE HORIZONTAL-01-06;So;0;ON;;;;;N;;;;;
+1F03F;DOMINO TILE HORIZONTAL-02-00;So;0;ON;;;;;N;;;;;
+1F040;DOMINO TILE HORIZONTAL-02-01;So;0;ON;;;;;N;;;;;
+1F041;DOMINO TILE HORIZONTAL-02-02;So;0;ON;;;;;N;;;;;
+1F042;DOMINO TILE HORIZONTAL-02-03;So;0;ON;;;;;N;;;;;
+1F043;DOMINO TILE HORIZONTAL-02-04;So;0;ON;;;;;N;;;;;
+1F044;DOMINO TILE HORIZONTAL-02-05;So;0;ON;;;;;N;;;;;
+1F045;DOMINO TILE HORIZONTAL-02-06;So;0;ON;;;;;N;;;;;
+1F046;DOMINO TILE HORIZONTAL-03-00;So;0;ON;;;;;N;;;;;
+1F047;DOMINO TILE HORIZONTAL-03-01;So;0;ON;;;;;N;;;;;
+1F048;DOMINO TILE HORIZONTAL-03-02;So;0;ON;;;;;N;;;;;
+1F049;DOMINO TILE HORIZONTAL-03-03;So;0;ON;;;;;N;;;;;
+1F04A;DOMINO TILE HORIZONTAL-03-04;So;0;ON;;;;;N;;;;;
+1F04B;DOMINO TILE HORIZONTAL-03-05;So;0;ON;;;;;N;;;;;
+1F04C;DOMINO TILE HORIZONTAL-03-06;So;0;ON;;;;;N;;;;;
+1F04D;DOMINO TILE HORIZONTAL-04-00;So;0;ON;;;;;N;;;;;
+1F04E;DOMINO TILE HORIZONTAL-04-01;So;0;ON;;;;;N;;;;;
+1F04F;DOMINO TILE HORIZONTAL-04-02;So;0;ON;;;;;N;;;;;
+1F050;DOMINO TILE HORIZONTAL-04-03;So;0;ON;;;;;N;;;;;
+1F051;DOMINO TILE HORIZONTAL-04-04;So;0;ON;;;;;N;;;;;
+1F052;DOMINO TILE HORIZONTAL-04-05;So;0;ON;;;;;N;;;;;
+1F053;DOMINO TILE HORIZONTAL-04-06;So;0;ON;;;;;N;;;;;
+1F054;DOMINO TILE HORIZONTAL-05-00;So;0;ON;;;;;N;;;;;
+1F055;DOMINO TILE HORIZONTAL-05-01;So;0;ON;;;;;N;;;;;
+1F056;DOMINO TILE HORIZONTAL-05-02;So;0;ON;;;;;N;;;;;
+1F057;DOMINO TILE HORIZONTAL-05-03;So;0;ON;;;;;N;;;;;
+1F058;DOMINO TILE HORIZONTAL-05-04;So;0;ON;;;;;N;;;;;
+1F059;DOMINO TILE HORIZONTAL-05-05;So;0;ON;;;;;N;;;;;
+1F05A;DOMINO TILE HORIZONTAL-05-06;So;0;ON;;;;;N;;;;;
+1F05B;DOMINO TILE HORIZONTAL-06-00;So;0;ON;;;;;N;;;;;
+1F05C;DOMINO TILE HORIZONTAL-06-01;So;0;ON;;;;;N;;;;;
+1F05D;DOMINO TILE HORIZONTAL-06-02;So;0;ON;;;;;N;;;;;
+1F05E;DOMINO TILE HORIZONTAL-06-03;So;0;ON;;;;;N;;;;;
+1F05F;DOMINO TILE HORIZONTAL-06-04;So;0;ON;;;;;N;;;;;
+1F060;DOMINO TILE HORIZONTAL-06-05;So;0;ON;;;;;N;;;;;
+1F061;DOMINO TILE HORIZONTAL-06-06;So;0;ON;;;;;N;;;;;
+1F062;DOMINO TILE VERTICAL BACK;So;0;ON;;;;;N;;;;;
+1F063;DOMINO TILE VERTICAL-00-00;So;0;ON;;;;;N;;;;;
+1F064;DOMINO TILE VERTICAL-00-01;So;0;ON;;;;;N;;;;;
+1F065;DOMINO TILE VERTICAL-00-02;So;0;ON;;;;;N;;;;;
+1F066;DOMINO TILE VERTICAL-00-03;So;0;ON;;;;;N;;;;;
+1F067;DOMINO TILE VERTICAL-00-04;So;0;ON;;;;;N;;;;;
+1F068;DOMINO TILE VERTICAL-00-05;So;0;ON;;;;;N;;;;;
+1F069;DOMINO TILE VERTICAL-00-06;So;0;ON;;;;;N;;;;;
+1F06A;DOMINO TILE VERTICAL-01-00;So;0;ON;;;;;N;;;;;
+1F06B;DOMINO TILE VERTICAL-01-01;So;0;ON;;;;;N;;;;;
+1F06C;DOMINO TILE VERTICAL-01-02;So;0;ON;;;;;N;;;;;
+1F06D;DOMINO TILE VERTICAL-01-03;So;0;ON;;;;;N;;;;;
+1F06E;DOMINO TILE VERTICAL-01-04;So;0;ON;;;;;N;;;;;
+1F06F;DOMINO TILE VERTICAL-01-05;So;0;ON;;;;;N;;;;;
+1F070;DOMINO TILE VERTICAL-01-06;So;0;ON;;;;;N;;;;;
+1F071;DOMINO TILE VERTICAL-02-00;So;0;ON;;;;;N;;;;;
+1F072;DOMINO TILE VERTICAL-02-01;So;0;ON;;;;;N;;;;;
+1F073;DOMINO TILE VERTICAL-02-02;So;0;ON;;;;;N;;;;;
+1F074;DOMINO TILE VERTICAL-02-03;So;0;ON;;;;;N;;;;;
+1F075;DOMINO TILE VERTICAL-02-04;So;0;ON;;;;;N;;;;;
+1F076;DOMINO TILE VERTICAL-02-05;So;0;ON;;;;;N;;;;;
+1F077;DOMINO TILE VERTICAL-02-06;So;0;ON;;;;;N;;;;;
+1F078;DOMINO TILE VERTICAL-03-00;So;0;ON;;;;;N;;;;;
+1F079;DOMINO TILE VERTICAL-03-01;So;0;ON;;;;;N;;;;;
+1F07A;DOMINO TILE VERTICAL-03-02;So;0;ON;;;;;N;;;;;
+1F07B;DOMINO TILE VERTICAL-03-03;So;0;ON;;;;;N;;;;;
+1F07C;DOMINO TILE VERTICAL-03-04;So;0;ON;;;;;N;;;;;
+1F07D;DOMINO TILE VERTICAL-03-05;So;0;ON;;;;;N;;;;;
+1F07E;DOMINO TILE VERTICAL-03-06;So;0;ON;;;;;N;;;;;
+1F07F;DOMINO TILE VERTICAL-04-00;So;0;ON;;;;;N;;;;;
+1F080;DOMINO TILE VERTICAL-04-01;So;0;ON;;;;;N;;;;;
+1F081;DOMINO TILE VERTICAL-04-02;So;0;ON;;;;;N;;;;;
+1F082;DOMINO TILE VERTICAL-04-03;So;0;ON;;;;;N;;;;;
+1F083;DOMINO TILE VERTICAL-04-04;So;0;ON;;;;;N;;;;;
+1F084;DOMINO TILE VERTICAL-04-05;So;0;ON;;;;;N;;;;;
+1F085;DOMINO TILE VERTICAL-04-06;So;0;ON;;;;;N;;;;;
+1F086;DOMINO TILE VERTICAL-05-00;So;0;ON;;;;;N;;;;;
+1F087;DOMINO TILE VERTICAL-05-01;So;0;ON;;;;;N;;;;;
+1F088;DOMINO TILE VERTICAL-05-02;So;0;ON;;;;;N;;;;;
+1F089;DOMINO TILE VERTICAL-05-03;So;0;ON;;;;;N;;;;;
+1F08A;DOMINO TILE VERTICAL-05-04;So;0;ON;;;;;N;;;;;
+1F08B;DOMINO TILE VERTICAL-05-05;So;0;ON;;;;;N;;;;;
+1F08C;DOMINO TILE VERTICAL-05-06;So;0;ON;;;;;N;;;;;
+1F08D;DOMINO TILE VERTICAL-06-00;So;0;ON;;;;;N;;;;;
+1F08E;DOMINO TILE VERTICAL-06-01;So;0;ON;;;;;N;;;;;
+1F08F;DOMINO TILE VERTICAL-06-02;So;0;ON;;;;;N;;;;;
+1F090;DOMINO TILE VERTICAL-06-03;So;0;ON;;;;;N;;;;;
+1F091;DOMINO TILE VERTICAL-06-04;So;0;ON;;;;;N;;;;;
+1F092;DOMINO TILE VERTICAL-06-05;So;0;ON;;;;;N;;;;;
+1F093;DOMINO TILE VERTICAL-06-06;So;0;ON;;;;;N;;;;;
+1F0A0;PLAYING CARD BACK;So;0;ON;;;;;N;;;;;
+1F0A1;PLAYING CARD ACE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A2;PLAYING CARD TWO OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A3;PLAYING CARD THREE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A4;PLAYING CARD FOUR OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A5;PLAYING CARD FIVE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A6;PLAYING CARD SIX OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A7;PLAYING CARD SEVEN OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A8;PLAYING CARD EIGHT OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A9;PLAYING CARD NINE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AA;PLAYING CARD TEN OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AB;PLAYING CARD JACK OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AC;PLAYING CARD KNIGHT OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AD;PLAYING CARD QUEEN OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AE;PLAYING CARD KING OF SPADES;So;0;ON;;;;;N;;;;;
+1F0B1;PLAYING CARD ACE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B2;PLAYING CARD TWO OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B3;PLAYING CARD THREE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B4;PLAYING CARD FOUR OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B5;PLAYING CARD FIVE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B6;PLAYING CARD SIX OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B7;PLAYING CARD SEVEN OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B8;PLAYING CARD EIGHT OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B9;PLAYING CARD NINE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BA;PLAYING CARD TEN OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BB;PLAYING CARD JACK OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BC;PLAYING CARD KNIGHT OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BD;PLAYING CARD QUEEN OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BE;PLAYING CARD KING OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BF;PLAYING CARD RED JOKER;So;0;ON;;;;;N;;;;;
+1F0C1;PLAYING CARD ACE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C2;PLAYING CARD TWO OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C3;PLAYING CARD THREE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C4;PLAYING CARD FOUR OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C5;PLAYING CARD FIVE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C6;PLAYING CARD SIX OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C7;PLAYING CARD SEVEN OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C8;PLAYING CARD EIGHT OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C9;PLAYING CARD NINE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CA;PLAYING CARD TEN OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CB;PLAYING CARD JACK OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CC;PLAYING CARD KNIGHT OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CD;PLAYING CARD QUEEN OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CE;PLAYING CARD KING OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CF;PLAYING CARD BLACK JOKER;So;0;ON;;;;;N;;;;;
+1F0D1;PLAYING CARD ACE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D2;PLAYING CARD TWO OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D3;PLAYING CARD THREE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D4;PLAYING CARD FOUR OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D5;PLAYING CARD FIVE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D6;PLAYING CARD SIX OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D7;PLAYING CARD SEVEN OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D8;PLAYING CARD EIGHT OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D9;PLAYING CARD NINE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DA;PLAYING CARD TEN OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DB;PLAYING CARD JACK OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DC;PLAYING CARD KNIGHT OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DD;PLAYING CARD QUEEN OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DE;PLAYING CARD KING OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DF;PLAYING CARD WHITE JOKER;So;0;ON;;;;;N;;;;;
+1F0E0;PLAYING CARD FOOL;So;0;ON;;;;;N;;;;;
+1F0E1;PLAYING CARD TRUMP-1;So;0;ON;;;;;N;;;;;
+1F0E2;PLAYING CARD TRUMP-2;So;0;ON;;;;;N;;;;;
+1F0E3;PLAYING CARD TRUMP-3;So;0;ON;;;;;N;;;;;
+1F0E4;PLAYING CARD TRUMP-4;So;0;ON;;;;;N;;;;;
+1F0E5;PLAYING CARD TRUMP-5;So;0;ON;;;;;N;;;;;
+1F0E6;PLAYING CARD TRUMP-6;So;0;ON;;;;;N;;;;;
+1F0E7;PLAYING CARD TRUMP-7;So;0;ON;;;;;N;;;;;
+1F0E8;PLAYING CARD TRUMP-8;So;0;ON;;;;;N;;;;;
+1F0E9;PLAYING CARD TRUMP-9;So;0;ON;;;;;N;;;;;
+1F0EA;PLAYING CARD TRUMP-10;So;0;ON;;;;;N;;;;;
+1F0EB;PLAYING CARD TRUMP-11;So;0;ON;;;;;N;;;;;
+1F0EC;PLAYING CARD TRUMP-12;So;0;ON;;;;;N;;;;;
+1F0ED;PLAYING CARD TRUMP-13;So;0;ON;;;;;N;;;;;
+1F0EE;PLAYING CARD TRUMP-14;So;0;ON;;;;;N;;;;;
+1F0EF;PLAYING CARD TRUMP-15;So;0;ON;;;;;N;;;;;
+1F0F0;PLAYING CARD TRUMP-16;So;0;ON;;;;;N;;;;;
+1F0F1;PLAYING CARD TRUMP-17;So;0;ON;;;;;N;;;;;
+1F0F2;PLAYING CARD TRUMP-18;So;0;ON;;;;;N;;;;;
+1F0F3;PLAYING CARD TRUMP-19;So;0;ON;;;;;N;;;;;
+1F0F4;PLAYING CARD TRUMP-20;So;0;ON;;;;;N;;;;;
+1F0F5;PLAYING CARD TRUMP-21;So;0;ON;;;;;N;;;;;
+1F100;DIGIT ZERO FULL STOP;No;0;EN;<compat> 0030 002E;;0;0;N;;;;;
+1F101;DIGIT ZERO COMMA;No;0;EN;<compat> 0030 002C;;0;0;N;;;;;
+1F102;DIGIT ONE COMMA;No;0;EN;<compat> 0031 002C;;1;1;N;;;;;
+1F103;DIGIT TWO COMMA;No;0;EN;<compat> 0032 002C;;2;2;N;;;;;
+1F104;DIGIT THREE COMMA;No;0;EN;<compat> 0033 002C;;3;3;N;;;;;
+1F105;DIGIT FOUR COMMA;No;0;EN;<compat> 0034 002C;;4;4;N;;;;;
+1F106;DIGIT FIVE COMMA;No;0;EN;<compat> 0035 002C;;5;5;N;;;;;
+1F107;DIGIT SIX COMMA;No;0;EN;<compat> 0036 002C;;6;6;N;;;;;
+1F108;DIGIT SEVEN COMMA;No;0;EN;<compat> 0037 002C;;7;7;N;;;;;
+1F109;DIGIT EIGHT COMMA;No;0;EN;<compat> 0038 002C;;8;8;N;;;;;
+1F10A;DIGIT NINE COMMA;No;0;EN;<compat> 0039 002C;;9;9;N;;;;;
+1F10B;DINGBAT CIRCLED SANS-SERIF DIGIT ZERO;No;0;ON;;;;0;N;;;;;
+1F10C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO;No;0;ON;;;;0;N;;;;;
+1F10D;CIRCLED ZERO WITH SLASH;So;0;ON;;;;;N;;;;;
+1F10E;CIRCLED ANTICLOCKWISE ARROW;So;0;ON;;;;;N;;;;;
+1F10F;CIRCLED DOLLAR SIGN WITH OVERLAID BACKSLASH;So;0;ON;;;;;N;;;;;
+1F110;PARENTHESIZED LATIN CAPITAL LETTER A;So;0;L;<compat> 0028 0041 0029;;;;N;;;;;
+1F111;PARENTHESIZED LATIN CAPITAL LETTER B;So;0;L;<compat> 0028 0042 0029;;;;N;;;;;
+1F112;PARENTHESIZED LATIN CAPITAL LETTER C;So;0;L;<compat> 0028 0043 0029;;;;N;;;;;
+1F113;PARENTHESIZED LATIN CAPITAL LETTER D;So;0;L;<compat> 0028 0044 0029;;;;N;;;;;
+1F114;PARENTHESIZED LATIN CAPITAL LETTER E;So;0;L;<compat> 0028 0045 0029;;;;N;;;;;
+1F115;PARENTHESIZED LATIN CAPITAL LETTER F;So;0;L;<compat> 0028 0046 0029;;;;N;;;;;
+1F116;PARENTHESIZED LATIN CAPITAL LETTER G;So;0;L;<compat> 0028 0047 0029;;;;N;;;;;
+1F117;PARENTHESIZED LATIN CAPITAL LETTER H;So;0;L;<compat> 0028 0048 0029;;;;N;;;;;
+1F118;PARENTHESIZED LATIN CAPITAL LETTER I;So;0;L;<compat> 0028 0049 0029;;;;N;;;;;
+1F119;PARENTHESIZED LATIN CAPITAL LETTER J;So;0;L;<compat> 0028 004A 0029;;;;N;;;;;
+1F11A;PARENTHESIZED LATIN CAPITAL LETTER K;So;0;L;<compat> 0028 004B 0029;;;;N;;;;;
+1F11B;PARENTHESIZED LATIN CAPITAL LETTER L;So;0;L;<compat> 0028 004C 0029;;;;N;;;;;
+1F11C;PARENTHESIZED LATIN CAPITAL LETTER M;So;0;L;<compat> 0028 004D 0029;;;;N;;;;;
+1F11D;PARENTHESIZED LATIN CAPITAL LETTER N;So;0;L;<compat> 0028 004E 0029;;;;N;;;;;
+1F11E;PARENTHESIZED LATIN CAPITAL LETTER O;So;0;L;<compat> 0028 004F 0029;;;;N;;;;;
+1F11F;PARENTHESIZED LATIN CAPITAL LETTER P;So;0;L;<compat> 0028 0050 0029;;;;N;;;;;
+1F120;PARENTHESIZED LATIN CAPITAL LETTER Q;So;0;L;<compat> 0028 0051 0029;;;;N;;;;;
+1F121;PARENTHESIZED LATIN CAPITAL LETTER R;So;0;L;<compat> 0028 0052 0029;;;;N;;;;;
+1F122;PARENTHESIZED LATIN CAPITAL LETTER S;So;0;L;<compat> 0028 0053 0029;;;;N;;;;;
+1F123;PARENTHESIZED LATIN CAPITAL LETTER T;So;0;L;<compat> 0028 0054 0029;;;;N;;;;;
+1F124;PARENTHESIZED LATIN CAPITAL LETTER U;So;0;L;<compat> 0028 0055 0029;;;;N;;;;;
+1F125;PARENTHESIZED LATIN CAPITAL LETTER V;So;0;L;<compat> 0028 0056 0029;;;;N;;;;;
+1F126;PARENTHESIZED LATIN CAPITAL LETTER W;So;0;L;<compat> 0028 0057 0029;;;;N;;;;;
+1F127;PARENTHESIZED LATIN CAPITAL LETTER X;So;0;L;<compat> 0028 0058 0029;;;;N;;;;;
+1F128;PARENTHESIZED LATIN CAPITAL LETTER Y;So;0;L;<compat> 0028 0059 0029;;;;N;;;;;
+1F129;PARENTHESIZED LATIN CAPITAL LETTER Z;So;0;L;<compat> 0028 005A 0029;;;;N;;;;;
+1F12A;TORTOISE SHELL BRACKETED LATIN CAPITAL LETTER S;So;0;L;<compat> 3014 0053 3015;;;;N;;;;;
+1F12B;CIRCLED ITALIC LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;;
+1F12C;CIRCLED ITALIC LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;;
+1F12D;CIRCLED CD;So;0;L;<circle> 0043 0044;;;;N;;;;;
+1F12E;CIRCLED WZ;So;0;L;<circle> 0057 005A;;;;N;;;;;
+1F12F;COPYLEFT SYMBOL;So;0;ON;;;;;N;;;;;
+1F130;SQUARED LATIN CAPITAL LETTER A;So;0;L;<square> 0041;;;;N;;;;;
+1F131;SQUARED LATIN CAPITAL LETTER B;So;0;L;<square> 0042;;;;N;;;;;
+1F132;SQUARED LATIN CAPITAL LETTER C;So;0;L;<square> 0043;;;;N;;;;;
+1F133;SQUARED LATIN CAPITAL LETTER D;So;0;L;<square> 0044;;;;N;;;;;
+1F134;SQUARED LATIN CAPITAL LETTER E;So;0;L;<square> 0045;;;;N;;;;;
+1F135;SQUARED LATIN CAPITAL LETTER F;So;0;L;<square> 0046;;;;N;;;;;
+1F136;SQUARED LATIN CAPITAL LETTER G;So;0;L;<square> 0047;;;;N;;;;;
+1F137;SQUARED LATIN CAPITAL LETTER H;So;0;L;<square> 0048;;;;N;;;;;
+1F138;SQUARED LATIN CAPITAL LETTER I;So;0;L;<square> 0049;;;;N;;;;;
+1F139;SQUARED LATIN CAPITAL LETTER J;So;0;L;<square> 004A;;;;N;;;;;
+1F13A;SQUARED LATIN CAPITAL LETTER K;So;0;L;<square> 004B;;;;N;;;;;
+1F13B;SQUARED LATIN CAPITAL LETTER L;So;0;L;<square> 004C;;;;N;;;;;
+1F13C;SQUARED LATIN CAPITAL LETTER M;So;0;L;<square> 004D;;;;N;;;;;
+1F13D;SQUARED LATIN CAPITAL LETTER N;So;0;L;<square> 004E;;;;N;;;;;
+1F13E;SQUARED LATIN CAPITAL LETTER O;So;0;L;<square> 004F;;;;N;;;;;
+1F13F;SQUARED LATIN CAPITAL LETTER P;So;0;L;<square> 0050;;;;N;;;;;
+1F140;SQUARED LATIN CAPITAL LETTER Q;So;0;L;<square> 0051;;;;N;;;;;
+1F141;SQUARED LATIN CAPITAL LETTER R;So;0;L;<square> 0052;;;;N;;;;;
+1F142;SQUARED LATIN CAPITAL LETTER S;So;0;L;<square> 0053;;;;N;;;;;
+1F143;SQUARED LATIN CAPITAL LETTER T;So;0;L;<square> 0054;;;;N;;;;;
+1F144;SQUARED LATIN CAPITAL LETTER U;So;0;L;<square> 0055;;;;N;;;;;
+1F145;SQUARED LATIN CAPITAL LETTER V;So;0;L;<square> 0056;;;;N;;;;;
+1F146;SQUARED LATIN CAPITAL LETTER W;So;0;L;<square> 0057;;;;N;;;;;
+1F147;SQUARED LATIN CAPITAL LETTER X;So;0;L;<square> 0058;;;;N;;;;;
+1F148;SQUARED LATIN CAPITAL LETTER Y;So;0;L;<square> 0059;;;;N;;;;;
+1F149;SQUARED LATIN CAPITAL LETTER Z;So;0;L;<square> 005A;;;;N;;;;;
+1F14A;SQUARED HV;So;0;L;<square> 0048 0056;;;;N;;;;;
+1F14B;SQUARED MV;So;0;L;<square> 004D 0056;;;;N;;;;;
+1F14C;SQUARED SD;So;0;L;<square> 0053 0044;;;;N;;;;;
+1F14D;SQUARED SS;So;0;L;<square> 0053 0053;;;;N;;;;;
+1F14E;SQUARED PPV;So;0;L;<square> 0050 0050 0056;;;;N;;;;;
+1F14F;SQUARED WC;So;0;L;<square> 0057 0043;;;;N;;;;;
+1F150;NEGATIVE CIRCLED LATIN CAPITAL LETTER A;So;0;L;;;;;N;;;;;
+1F151;NEGATIVE CIRCLED LATIN CAPITAL LETTER B;So;0;L;;;;;N;;;;;
+1F152;NEGATIVE CIRCLED LATIN CAPITAL LETTER C;So;0;L;;;;;N;;;;;
+1F153;NEGATIVE CIRCLED LATIN CAPITAL LETTER D;So;0;L;;;;;N;;;;;
+1F154;NEGATIVE CIRCLED LATIN CAPITAL LETTER E;So;0;L;;;;;N;;;;;
+1F155;NEGATIVE CIRCLED LATIN CAPITAL LETTER F;So;0;L;;;;;N;;;;;
+1F156;NEGATIVE CIRCLED LATIN CAPITAL LETTER G;So;0;L;;;;;N;;;;;
+1F157;NEGATIVE CIRCLED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;;
+1F158;NEGATIVE CIRCLED LATIN CAPITAL LETTER I;So;0;L;;;;;N;;;;;
+1F159;NEGATIVE CIRCLED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;;
+1F15A;NEGATIVE CIRCLED LATIN CAPITAL LETTER K;So;0;L;;;;;N;;;;;
+1F15B;NEGATIVE CIRCLED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;;
+1F15C;NEGATIVE CIRCLED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;;
+1F15D;NEGATIVE CIRCLED LATIN CAPITAL LETTER N;So;0;L;;;;;N;;;;;
+1F15E;NEGATIVE CIRCLED LATIN CAPITAL LETTER O;So;0;L;;;;;N;;;;;
+1F15F;NEGATIVE CIRCLED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F160;NEGATIVE CIRCLED LATIN CAPITAL LETTER Q;So;0;L;;;;;N;;;;;
+1F161;NEGATIVE CIRCLED LATIN CAPITAL LETTER R;So;0;L;;;;;N;;;;;
+1F162;NEGATIVE CIRCLED LATIN CAPITAL LETTER S;So;0;L;;;;;N;;;;;
+1F163;NEGATIVE CIRCLED LATIN CAPITAL LETTER T;So;0;L;;;;;N;;;;;
+1F164;NEGATIVE CIRCLED LATIN CAPITAL LETTER U;So;0;L;;;;;N;;;;;
+1F165;NEGATIVE CIRCLED LATIN CAPITAL LETTER V;So;0;L;;;;;N;;;;;
+1F166;NEGATIVE CIRCLED LATIN CAPITAL LETTER W;So;0;L;;;;;N;;;;;
+1F167;NEGATIVE CIRCLED LATIN CAPITAL LETTER X;So;0;L;;;;;N;;;;;
+1F168;NEGATIVE CIRCLED LATIN CAPITAL LETTER Y;So;0;L;;;;;N;;;;;
+1F169;NEGATIVE CIRCLED LATIN CAPITAL LETTER Z;So;0;L;;;;;N;;;;;
+1F16A;RAISED MC SIGN;So;0;ON;<super> 004D 0043;;;;N;;;;;
+1F16B;RAISED MD SIGN;So;0;ON;<super> 004D 0044;;;;N;;;;;
+1F16C;RAISED MR SIGN;So;0;ON;<super> 004D 0052;;;;N;;;;;
+1F16D;CIRCLED CC;So;0;ON;;;;;N;;;;;
+1F16E;CIRCLED C WITH OVERLAID BACKSLASH;So;0;ON;;;;;N;;;;;
+1F16F;CIRCLED HUMAN FIGURE;So;0;ON;;;;;N;;;;;
+1F170;NEGATIVE SQUARED LATIN CAPITAL LETTER A;So;0;L;;;;;N;;;;;
+1F171;NEGATIVE SQUARED LATIN CAPITAL LETTER B;So;0;L;;;;;N;;;;;
+1F172;NEGATIVE SQUARED LATIN CAPITAL LETTER C;So;0;L;;;;;N;;;;;
+1F173;NEGATIVE SQUARED LATIN CAPITAL LETTER D;So;0;L;;;;;N;;;;;
+1F174;NEGATIVE SQUARED LATIN CAPITAL LETTER E;So;0;L;;;;;N;;;;;
+1F175;NEGATIVE SQUARED LATIN CAPITAL LETTER F;So;0;L;;;;;N;;;;;
+1F176;NEGATIVE SQUARED LATIN CAPITAL LETTER G;So;0;L;;;;;N;;;;;
+1F177;NEGATIVE SQUARED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;;
+1F178;NEGATIVE SQUARED LATIN CAPITAL LETTER I;So;0;L;;;;;N;;;;;
+1F179;NEGATIVE SQUARED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;;
+1F17A;NEGATIVE SQUARED LATIN CAPITAL LETTER K;So;0;L;;;;;N;;;;;
+1F17B;NEGATIVE SQUARED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;;
+1F17C;NEGATIVE SQUARED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;;
+1F17D;NEGATIVE SQUARED LATIN CAPITAL LETTER N;So;0;L;;;;;N;;;;;
+1F17E;NEGATIVE SQUARED LATIN CAPITAL LETTER O;So;0;L;;;;;N;;;;;
+1F17F;NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F180;NEGATIVE SQUARED LATIN CAPITAL LETTER Q;So;0;L;;;;;N;;;;;
+1F181;NEGATIVE SQUARED LATIN CAPITAL LETTER R;So;0;L;;;;;N;;;;;
+1F182;NEGATIVE SQUARED LATIN CAPITAL LETTER S;So;0;L;;;;;N;;;;;
+1F183;NEGATIVE SQUARED LATIN CAPITAL LETTER T;So;0;L;;;;;N;;;;;
+1F184;NEGATIVE SQUARED LATIN CAPITAL LETTER U;So;0;L;;;;;N;;;;;
+1F185;NEGATIVE SQUARED LATIN CAPITAL LETTER V;So;0;L;;;;;N;;;;;
+1F186;NEGATIVE SQUARED LATIN CAPITAL LETTER W;So;0;L;;;;;N;;;;;
+1F187;NEGATIVE SQUARED LATIN CAPITAL LETTER X;So;0;L;;;;;N;;;;;
+1F188;NEGATIVE SQUARED LATIN CAPITAL LETTER Y;So;0;L;;;;;N;;;;;
+1F189;NEGATIVE SQUARED LATIN CAPITAL LETTER Z;So;0;L;;;;;N;;;;;
+1F18A;CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F18B;NEGATIVE SQUARED IC;So;0;L;;;;;N;;;;;
+1F18C;NEGATIVE SQUARED PA;So;0;L;;;;;N;;;;;
+1F18D;NEGATIVE SQUARED SA;So;0;L;;;;;N;;;;;
+1F18E;NEGATIVE SQUARED AB;So;0;L;;;;;N;;;;;
+1F18F;NEGATIVE SQUARED WC;So;0;L;;;;;N;;;;;
+1F190;SQUARE DJ;So;0;L;<square> 0044 004A;;;;N;;;;;
+1F191;SQUARED CL;So;0;L;;;;;N;;;;;
+1F192;SQUARED COOL;So;0;L;;;;;N;;;;;
+1F193;SQUARED FREE;So;0;L;;;;;N;;;;;
+1F194;SQUARED ID;So;0;L;;;;;N;;;;;
+1F195;SQUARED NEW;So;0;L;;;;;N;;;;;
+1F196;SQUARED NG;So;0;L;;;;;N;;;;;
+1F197;SQUARED OK;So;0;L;;;;;N;;;;;
+1F198;SQUARED SOS;So;0;L;;;;;N;;;;;
+1F199;SQUARED UP WITH EXCLAMATION MARK;So;0;L;;;;;N;;;;;
+1F19A;SQUARED VS;So;0;L;;;;;N;;;;;
+1F19B;SQUARED THREE D;So;0;L;;;;;N;;;;;
+1F19C;SQUARED SECOND SCREEN;So;0;L;;;;;N;;;;;
+1F19D;SQUARED TWO K;So;0;L;;;;;N;;;;;
+1F19E;SQUARED FOUR K;So;0;L;;;;;N;;;;;
+1F19F;SQUARED EIGHT K;So;0;L;;;;;N;;;;;
+1F1A0;SQUARED FIVE POINT ONE;So;0;L;;;;;N;;;;;
+1F1A1;SQUARED SEVEN POINT ONE;So;0;L;;;;;N;;;;;
+1F1A2;SQUARED TWENTY-TWO POINT TWO;So;0;L;;;;;N;;;;;
+1F1A3;SQUARED SIXTY P;So;0;L;;;;;N;;;;;
+1F1A4;SQUARED ONE HUNDRED TWENTY P;So;0;L;;;;;N;;;;;
+1F1A5;SQUARED LATIN SMALL LETTER D;So;0;L;;;;;N;;;;;
+1F1A6;SQUARED HC;So;0;L;;;;;N;;;;;
+1F1A7;SQUARED HDR;So;0;L;;;;;N;;;;;
+1F1A8;SQUARED HI-RES;So;0;L;;;;;N;;;;;
+1F1A9;SQUARED LOSSLESS;So;0;L;;;;;N;;;;;
+1F1AA;SQUARED SHV;So;0;L;;;;;N;;;;;
+1F1AB;SQUARED UHD;So;0;L;;;;;N;;;;;
+1F1AC;SQUARED VOD;So;0;L;;;;;N;;;;;
+1F1AD;MASK WORK SYMBOL;So;0;ON;;;;;N;;;;;
+1F1E6;REGIONAL INDICATOR SYMBOL LETTER A;So;0;L;;;;;N;;;;;
+1F1E7;REGIONAL INDICATOR SYMBOL LETTER B;So;0;L;;;;;N;;;;;
+1F1E8;REGIONAL INDICATOR SYMBOL LETTER C;So;0;L;;;;;N;;;;;
+1F1E9;REGIONAL INDICATOR SYMBOL LETTER D;So;0;L;;;;;N;;;;;
+1F1EA;REGIONAL INDICATOR SYMBOL LETTER E;So;0;L;;;;;N;;;;;
+1F1EB;REGIONAL INDICATOR SYMBOL LETTER F;So;0;L;;;;;N;;;;;
+1F1EC;REGIONAL INDICATOR SYMBOL LETTER G;So;0;L;;;;;N;;;;;
+1F1ED;REGIONAL INDICATOR SYMBOL LETTER H;So;0;L;;;;;N;;;;;
+1F1EE;REGIONAL INDICATOR SYMBOL LETTER I;So;0;L;;;;;N;;;;;
+1F1EF;REGIONAL INDICATOR SYMBOL LETTER J;So;0;L;;;;;N;;;;;
+1F1F0;REGIONAL INDICATOR SYMBOL LETTER K;So;0;L;;;;;N;;;;;
+1F1F1;REGIONAL INDICATOR SYMBOL LETTER L;So;0;L;;;;;N;;;;;
+1F1F2;REGIONAL INDICATOR SYMBOL LETTER M;So;0;L;;;;;N;;;;;
+1F1F3;REGIONAL INDICATOR SYMBOL LETTER N;So;0;L;;;;;N;;;;;
+1F1F4;REGIONAL INDICATOR SYMBOL LETTER O;So;0;L;;;;;N;;;;;
+1F1F5;REGIONAL INDICATOR SYMBOL LETTER P;So;0;L;;;;;N;;;;;
+1F1F6;REGIONAL INDICATOR SYMBOL LETTER Q;So;0;L;;;;;N;;;;;
+1F1F7;REGIONAL INDICATOR SYMBOL LETTER R;So;0;L;;;;;N;;;;;
+1F1F8;REGIONAL INDICATOR SYMBOL LETTER S;So;0;L;;;;;N;;;;;
+1F1F9;REGIONAL INDICATOR SYMBOL LETTER T;So;0;L;;;;;N;;;;;
+1F1FA;REGIONAL INDICATOR SYMBOL LETTER U;So;0;L;;;;;N;;;;;
+1F1FB;REGIONAL INDICATOR SYMBOL LETTER V;So;0;L;;;;;N;;;;;
+1F1FC;REGIONAL INDICATOR SYMBOL LETTER W;So;0;L;;;;;N;;;;;
+1F1FD;REGIONAL INDICATOR SYMBOL LETTER X;So;0;L;;;;;N;;;;;
+1F1FE;REGIONAL INDICATOR SYMBOL LETTER Y;So;0;L;;;;;N;;;;;
+1F1FF;REGIONAL INDICATOR SYMBOL LETTER Z;So;0;L;;;;;N;;;;;
+1F200;SQUARE HIRAGANA HOKA;So;0;L;<square> 307B 304B;;;;N;;;;;
+1F201;SQUARED KATAKANA KOKO;So;0;L;<square> 30B3 30B3;;;;N;;;;;
+1F202;SQUARED KATAKANA SA;So;0;L;<square> 30B5;;;;N;;;;;
+1F210;SQUARED CJK UNIFIED IDEOGRAPH-624B;So;0;L;<square> 624B;;;;N;;;;;
+1F211;SQUARED CJK UNIFIED IDEOGRAPH-5B57;So;0;L;<square> 5B57;;;;N;;;;;
+1F212;SQUARED CJK UNIFIED IDEOGRAPH-53CC;So;0;L;<square> 53CC;;;;N;;;;;
+1F213;SQUARED KATAKANA DE;So;0;L;<square> 30C7;;;;N;;;;;
+1F214;SQUARED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<square> 4E8C;;;;N;;;;;
+1F215;SQUARED CJK UNIFIED IDEOGRAPH-591A;So;0;L;<square> 591A;;;;N;;;;;
+1F216;SQUARED CJK UNIFIED IDEOGRAPH-89E3;So;0;L;<square> 89E3;;;;N;;;;;
+1F217;SQUARED CJK UNIFIED IDEOGRAPH-5929;So;0;L;<square> 5929;;;;N;;;;;
+1F218;SQUARED CJK UNIFIED IDEOGRAPH-4EA4;So;0;L;<square> 4EA4;;;;N;;;;;
+1F219;SQUARED CJK UNIFIED IDEOGRAPH-6620;So;0;L;<square> 6620;;;;N;;;;;
+1F21A;SQUARED CJK UNIFIED IDEOGRAPH-7121;So;0;L;<square> 7121;;;;N;;;;;
+1F21B;SQUARED CJK UNIFIED IDEOGRAPH-6599;So;0;L;<square> 6599;;;;N;;;;;
+1F21C;SQUARED CJK UNIFIED IDEOGRAPH-524D;So;0;L;<square> 524D;;;;N;;;;;
+1F21D;SQUARED CJK UNIFIED IDEOGRAPH-5F8C;So;0;L;<square> 5F8C;;;;N;;;;;
+1F21E;SQUARED CJK UNIFIED IDEOGRAPH-518D;So;0;L;<square> 518D;;;;N;;;;;
+1F21F;SQUARED CJK UNIFIED IDEOGRAPH-65B0;So;0;L;<square> 65B0;;;;N;;;;;
+1F220;SQUARED CJK UNIFIED IDEOGRAPH-521D;So;0;L;<square> 521D;;;;N;;;;;
+1F221;SQUARED CJK UNIFIED IDEOGRAPH-7D42;So;0;L;<square> 7D42;;;;N;;;;;
+1F222;SQUARED CJK UNIFIED IDEOGRAPH-751F;So;0;L;<square> 751F;;;;N;;;;;
+1F223;SQUARED CJK UNIFIED IDEOGRAPH-8CA9;So;0;L;<square> 8CA9;;;;N;;;;;
+1F224;SQUARED CJK UNIFIED IDEOGRAPH-58F0;So;0;L;<square> 58F0;;;;N;;;;;
+1F225;SQUARED CJK UNIFIED IDEOGRAPH-5439;So;0;L;<square> 5439;;;;N;;;;;
+1F226;SQUARED CJK UNIFIED IDEOGRAPH-6F14;So;0;L;<square> 6F14;;;;N;;;;;
+1F227;SQUARED CJK UNIFIED IDEOGRAPH-6295;So;0;L;<square> 6295;;;;N;;;;;
+1F228;SQUARED CJK UNIFIED IDEOGRAPH-6355;So;0;L;<square> 6355;;;;N;;;;;
+1F229;SQUARED CJK UNIFIED IDEOGRAPH-4E00;So;0;L;<square> 4E00;;;;N;;;;;
+1F22A;SQUARED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<square> 4E09;;;;N;;;;;
+1F22B;SQUARED CJK UNIFIED IDEOGRAPH-904A;So;0;L;<square> 904A;;;;N;;;;;
+1F22C;SQUARED CJK UNIFIED IDEOGRAPH-5DE6;So;0;L;<square> 5DE6;;;;N;;;;;
+1F22D;SQUARED CJK UNIFIED IDEOGRAPH-4E2D;So;0;L;<square> 4E2D;;;;N;;;;;
+1F22E;SQUARED CJK UNIFIED IDEOGRAPH-53F3;So;0;L;<square> 53F3;;;;N;;;;;
+1F22F;SQUARED CJK UNIFIED IDEOGRAPH-6307;So;0;L;<square> 6307;;;;N;;;;;
+1F230;SQUARED CJK UNIFIED IDEOGRAPH-8D70;So;0;L;<square> 8D70;;;;N;;;;;
+1F231;SQUARED CJK UNIFIED IDEOGRAPH-6253;So;0;L;<square> 6253;;;;N;;;;;
+1F232;SQUARED CJK UNIFIED IDEOGRAPH-7981;So;0;L;<square> 7981;;;;N;;;;;
+1F233;SQUARED CJK UNIFIED IDEOGRAPH-7A7A;So;0;L;<square> 7A7A;;;;N;;;;;
+1F234;SQUARED CJK UNIFIED IDEOGRAPH-5408;So;0;L;<square> 5408;;;;N;;;;;
+1F235;SQUARED CJK UNIFIED IDEOGRAPH-6E80;So;0;L;<square> 6E80;;;;N;;;;;
+1F236;SQUARED CJK UNIFIED IDEOGRAPH-6709;So;0;L;<square> 6709;;;;N;;;;;
+1F237;SQUARED CJK UNIFIED IDEOGRAPH-6708;So;0;L;<square> 6708;;;;N;;;;;
+1F238;SQUARED CJK UNIFIED IDEOGRAPH-7533;So;0;L;<square> 7533;;;;N;;;;;
+1F239;SQUARED CJK UNIFIED IDEOGRAPH-5272;So;0;L;<square> 5272;;;;N;;;;;
+1F23A;SQUARED CJK UNIFIED IDEOGRAPH-55B6;So;0;L;<square> 55B6;;;;N;;;;;
+1F23B;SQUARED CJK UNIFIED IDEOGRAPH-914D;So;0;L;<square> 914D;;;;N;;;;;
+1F240;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C;So;0;L;<compat> 3014 672C 3015;;;;N;;;;;
+1F241;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<compat> 3014 4E09 3015;;;;N;;;;;
+1F242;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<compat> 3014 4E8C 3015;;;;N;;;;;
+1F243;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-5B89;So;0;L;<compat> 3014 5B89 3015;;;;N;;;;;
+1F244;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-70B9;So;0;L;<compat> 3014 70B9 3015;;;;N;;;;;
+1F245;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6253;So;0;L;<compat> 3014 6253 3015;;;;N;;;;;
+1F246;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-76D7;So;0;L;<compat> 3014 76D7 3015;;;;N;;;;;
+1F247;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-52DD;So;0;L;<compat> 3014 52DD 3015;;;;N;;;;;
+1F248;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557;So;0;L;<compat> 3014 6557 3015;;;;N;;;;;
+1F250;CIRCLED IDEOGRAPH ADVANTAGE;So;0;L;<circle> 5F97;;;;N;;;;;
+1F251;CIRCLED IDEOGRAPH ACCEPT;So;0;L;<circle> 53EF;;;;N;;;;;
+1F260;ROUNDED SYMBOL FOR FU;So;0;ON;;;;;N;;;;;
+1F261;ROUNDED SYMBOL FOR LU;So;0;ON;;;;;N;;;;;
+1F262;ROUNDED SYMBOL FOR SHOU;So;0;ON;;;;;N;;;;;
+1F263;ROUNDED SYMBOL FOR XI;So;0;ON;;;;;N;;;;;
+1F264;ROUNDED SYMBOL FOR SHUANGXI;So;0;ON;;;;;N;;;;;
+1F265;ROUNDED SYMBOL FOR CAI;So;0;ON;;;;;N;;;;;
+1F300;CYCLONE;So;0;ON;;;;;N;;;;;
+1F301;FOGGY;So;0;ON;;;;;N;;;;;
+1F302;CLOSED UMBRELLA;So;0;ON;;;;;N;;;;;
+1F303;NIGHT WITH STARS;So;0;ON;;;;;N;;;;;
+1F304;SUNRISE OVER MOUNTAINS;So;0;ON;;;;;N;;;;;
+1F305;SUNRISE;So;0;ON;;;;;N;;;;;
+1F306;CITYSCAPE AT DUSK;So;0;ON;;;;;N;;;;;
+1F307;SUNSET OVER BUILDINGS;So;0;ON;;;;;N;;;;;
+1F308;RAINBOW;So;0;ON;;;;;N;;;;;
+1F309;BRIDGE AT NIGHT;So;0;ON;;;;;N;;;;;
+1F30A;WATER WAVE;So;0;ON;;;;;N;;;;;
+1F30B;VOLCANO;So;0;ON;;;;;N;;;;;
+1F30C;MILKY WAY;So;0;ON;;;;;N;;;;;
+1F30D;EARTH GLOBE EUROPE-AFRICA;So;0;ON;;;;;N;;;;;
+1F30E;EARTH GLOBE AMERICAS;So;0;ON;;;;;N;;;;;
+1F30F;EARTH GLOBE ASIA-AUSTRALIA;So;0;ON;;;;;N;;;;;
+1F310;GLOBE WITH MERIDIANS;So;0;ON;;;;;N;;;;;
+1F311;NEW MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F312;WAXING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F313;FIRST QUARTER MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F314;WAXING GIBBOUS MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F315;FULL MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F316;WANING GIBBOUS MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F317;LAST QUARTER MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F318;WANING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F319;CRESCENT MOON;So;0;ON;;;;;N;;;;;
+1F31A;NEW MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31B;FIRST QUARTER MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31C;LAST QUARTER MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31D;FULL MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31E;SUN WITH FACE;So;0;ON;;;;;N;;;;;
+1F31F;GLOWING STAR;So;0;ON;;;;;N;;;;;
+1F320;SHOOTING STAR;So;0;ON;;;;;N;;;;;
+1F321;THERMOMETER;So;0;ON;;;;;N;;;;;
+1F322;BLACK DROPLET;So;0;ON;;;;;N;;;;;
+1F323;WHITE SUN;So;0;ON;;;;;N;;;;;
+1F324;WHITE SUN WITH SMALL CLOUD;So;0;ON;;;;;N;;;;;
+1F325;WHITE SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;;
+1F326;WHITE SUN BEHIND CLOUD WITH RAIN;So;0;ON;;;;;N;;;;;
+1F327;CLOUD WITH RAIN;So;0;ON;;;;;N;;;;;
+1F328;CLOUD WITH SNOW;So;0;ON;;;;;N;;;;;
+1F329;CLOUD WITH LIGHTNING;So;0;ON;;;;;N;;;;;
+1F32A;CLOUD WITH TORNADO;So;0;ON;;;;;N;;;;;
+1F32B;FOG;So;0;ON;;;;;N;;;;;
+1F32C;WIND BLOWING FACE;So;0;ON;;;;;N;;;;;
+1F32D;HOT DOG;So;0;ON;;;;;N;;;;;
+1F32E;TACO;So;0;ON;;;;;N;;;;;
+1F32F;BURRITO;So;0;ON;;;;;N;;;;;
+1F330;CHESTNUT;So;0;ON;;;;;N;;;;;
+1F331;SEEDLING;So;0;ON;;;;;N;;;;;
+1F332;EVERGREEN TREE;So;0;ON;;;;;N;;;;;
+1F333;DECIDUOUS TREE;So;0;ON;;;;;N;;;;;
+1F334;PALM TREE;So;0;ON;;;;;N;;;;;
+1F335;CACTUS;So;0;ON;;;;;N;;;;;
+1F336;HOT PEPPER;So;0;ON;;;;;N;;;;;
+1F337;TULIP;So;0;ON;;;;;N;;;;;
+1F338;CHERRY BLOSSOM;So;0;ON;;;;;N;;;;;
+1F339;ROSE;So;0;ON;;;;;N;;;;;
+1F33A;HIBISCUS;So;0;ON;;;;;N;;;;;
+1F33B;SUNFLOWER;So;0;ON;;;;;N;;;;;
+1F33C;BLOSSOM;So;0;ON;;;;;N;;;;;
+1F33D;EAR OF MAIZE;So;0;ON;;;;;N;;;;;
+1F33E;EAR OF RICE;So;0;ON;;;;;N;;;;;
+1F33F;HERB;So;0;ON;;;;;N;;;;;
+1F340;FOUR LEAF CLOVER;So;0;ON;;;;;N;;;;;
+1F341;MAPLE LEAF;So;0;ON;;;;;N;;;;;
+1F342;FALLEN LEAF;So;0;ON;;;;;N;;;;;
+1F343;LEAF FLUTTERING IN WIND;So;0;ON;;;;;N;;;;;
+1F344;MUSHROOM;So;0;ON;;;;;N;;;;;
+1F345;TOMATO;So;0;ON;;;;;N;;;;;
+1F346;AUBERGINE;So;0;ON;;;;;N;;;;;
+1F347;GRAPES;So;0;ON;;;;;N;;;;;
+1F348;MELON;So;0;ON;;;;;N;;;;;
+1F349;WATERMELON;So;0;ON;;;;;N;;;;;
+1F34A;TANGERINE;So;0;ON;;;;;N;;;;;
+1F34B;LEMON;So;0;ON;;;;;N;;;;;
+1F34C;BANANA;So;0;ON;;;;;N;;;;;
+1F34D;PINEAPPLE;So;0;ON;;;;;N;;;;;
+1F34E;RED APPLE;So;0;ON;;;;;N;;;;;
+1F34F;GREEN APPLE;So;0;ON;;;;;N;;;;;
+1F350;PEAR;So;0;ON;;;;;N;;;;;
+1F351;PEACH;So;0;ON;;;;;N;;;;;
+1F352;CHERRIES;So;0;ON;;;;;N;;;;;
+1F353;STRAWBERRY;So;0;ON;;;;;N;;;;;
+1F354;HAMBURGER;So;0;ON;;;;;N;;;;;
+1F355;SLICE OF PIZZA;So;0;ON;;;;;N;;;;;
+1F356;MEAT ON BONE;So;0;ON;;;;;N;;;;;
+1F357;POULTRY LEG;So;0;ON;;;;;N;;;;;
+1F358;RICE CRACKER;So;0;ON;;;;;N;;;;;
+1F359;RICE BALL;So;0;ON;;;;;N;;;;;
+1F35A;COOKED RICE;So;0;ON;;;;;N;;;;;
+1F35B;CURRY AND RICE;So;0;ON;;;;;N;;;;;
+1F35C;STEAMING BOWL;So;0;ON;;;;;N;;;;;
+1F35D;SPAGHETTI;So;0;ON;;;;;N;;;;;
+1F35E;BREAD;So;0;ON;;;;;N;;;;;
+1F35F;FRENCH FRIES;So;0;ON;;;;;N;;;;;
+1F360;ROASTED SWEET POTATO;So;0;ON;;;;;N;;;;;
+1F361;DANGO;So;0;ON;;;;;N;;;;;
+1F362;ODEN;So;0;ON;;;;;N;;;;;
+1F363;SUSHI;So;0;ON;;;;;N;;;;;
+1F364;FRIED SHRIMP;So;0;ON;;;;;N;;;;;
+1F365;FISH CAKE WITH SWIRL DESIGN;So;0;ON;;;;;N;;;;;
+1F366;SOFT ICE CREAM;So;0;ON;;;;;N;;;;;
+1F367;SHAVED ICE;So;0;ON;;;;;N;;;;;
+1F368;ICE CREAM;So;0;ON;;;;;N;;;;;
+1F369;DOUGHNUT;So;0;ON;;;;;N;;;;;
+1F36A;COOKIE;So;0;ON;;;;;N;;;;;
+1F36B;CHOCOLATE BAR;So;0;ON;;;;;N;;;;;
+1F36C;CANDY;So;0;ON;;;;;N;;;;;
+1F36D;LOLLIPOP;So;0;ON;;;;;N;;;;;
+1F36E;CUSTARD;So;0;ON;;;;;N;;;;;
+1F36F;HONEY POT;So;0;ON;;;;;N;;;;;
+1F370;SHORTCAKE;So;0;ON;;;;;N;;;;;
+1F371;BENTO BOX;So;0;ON;;;;;N;;;;;
+1F372;POT OF FOOD;So;0;ON;;;;;N;;;;;
+1F373;COOKING;So;0;ON;;;;;N;;;;;
+1F374;FORK AND KNIFE;So;0;ON;;;;;N;;;;;
+1F375;TEACUP WITHOUT HANDLE;So;0;ON;;;;;N;;;;;
+1F376;SAKE BOTTLE AND CUP;So;0;ON;;;;;N;;;;;
+1F377;WINE GLASS;So;0;ON;;;;;N;;;;;
+1F378;COCKTAIL GLASS;So;0;ON;;;;;N;;;;;
+1F379;TROPICAL DRINK;So;0;ON;;;;;N;;;;;
+1F37A;BEER MUG;So;0;ON;;;;;N;;;;;
+1F37B;CLINKING BEER MUGS;So;0;ON;;;;;N;;;;;
+1F37C;BABY BOTTLE;So;0;ON;;;;;N;;;;;
+1F37D;FORK AND KNIFE WITH PLATE;So;0;ON;;;;;N;;;;;
+1F37E;BOTTLE WITH POPPING CORK;So;0;ON;;;;;N;;;;;
+1F37F;POPCORN;So;0;ON;;;;;N;;;;;
+1F380;RIBBON;So;0;ON;;;;;N;;;;;
+1F381;WRAPPED PRESENT;So;0;ON;;;;;N;;;;;
+1F382;BIRTHDAY CAKE;So;0;ON;;;;;N;;;;;
+1F383;JACK-O-LANTERN;So;0;ON;;;;;N;;;;;
+1F384;CHRISTMAS TREE;So;0;ON;;;;;N;;;;;
+1F385;FATHER CHRISTMAS;So;0;ON;;;;;N;;;;;
+1F386;FIREWORKS;So;0;ON;;;;;N;;;;;
+1F387;FIREWORK SPARKLER;So;0;ON;;;;;N;;;;;
+1F388;BALLOON;So;0;ON;;;;;N;;;;;
+1F389;PARTY POPPER;So;0;ON;;;;;N;;;;;
+1F38A;CONFETTI BALL;So;0;ON;;;;;N;;;;;
+1F38B;TANABATA TREE;So;0;ON;;;;;N;;;;;
+1F38C;CROSSED FLAGS;So;0;ON;;;;;N;;;;;
+1F38D;PINE DECORATION;So;0;ON;;;;;N;;;;;
+1F38E;JAPANESE DOLLS;So;0;ON;;;;;N;;;;;
+1F38F;CARP STREAMER;So;0;ON;;;;;N;;;;;
+1F390;WIND CHIME;So;0;ON;;;;;N;;;;;
+1F391;MOON VIEWING CEREMONY;So;0;ON;;;;;N;;;;;
+1F392;SCHOOL SATCHEL;So;0;ON;;;;;N;;;;;
+1F393;GRADUATION CAP;So;0;ON;;;;;N;;;;;
+1F394;HEART WITH TIP ON THE LEFT;So;0;ON;;;;;N;;;;;
+1F395;BOUQUET OF FLOWERS;So;0;ON;;;;;N;;;;;
+1F396;MILITARY MEDAL;So;0;ON;;;;;N;;;;;
+1F397;REMINDER RIBBON;So;0;ON;;;;;N;;;;;
+1F398;MUSICAL KEYBOARD WITH JACKS;So;0;ON;;;;;N;;;;;
+1F399;STUDIO MICROPHONE;So;0;ON;;;;;N;;;;;
+1F39A;LEVEL SLIDER;So;0;ON;;;;;N;;;;;
+1F39B;CONTROL KNOBS;So;0;ON;;;;;N;;;;;
+1F39C;BEAMED ASCENDING MUSICAL NOTES;So;0;ON;;;;;N;;;;;
+1F39D;BEAMED DESCENDING MUSICAL NOTES;So;0;ON;;;;;N;;;;;
+1F39E;FILM FRAMES;So;0;ON;;;;;N;;;;;
+1F39F;ADMISSION TICKETS;So;0;ON;;;;;N;;;;;
+1F3A0;CAROUSEL HORSE;So;0;ON;;;;;N;;;;;
+1F3A1;FERRIS WHEEL;So;0;ON;;;;;N;;;;;
+1F3A2;ROLLER COASTER;So;0;ON;;;;;N;;;;;
+1F3A3;FISHING POLE AND FISH;So;0;ON;;;;;N;;;;;
+1F3A4;MICROPHONE;So;0;ON;;;;;N;;;;;
+1F3A5;MOVIE CAMERA;So;0;ON;;;;;N;;;;;
+1F3A6;CINEMA;So;0;ON;;;;;N;;;;;
+1F3A7;HEADPHONE;So;0;ON;;;;;N;;;;;
+1F3A8;ARTIST PALETTE;So;0;ON;;;;;N;;;;;
+1F3A9;TOP HAT;So;0;ON;;;;;N;;;;;
+1F3AA;CIRCUS TENT;So;0;ON;;;;;N;;;;;
+1F3AB;TICKET;So;0;ON;;;;;N;;;;;
+1F3AC;CLAPPER BOARD;So;0;ON;;;;;N;;;;;
+1F3AD;PERFORMING ARTS;So;0;ON;;;;;N;;;;;
+1F3AE;VIDEO GAME;So;0;ON;;;;;N;;;;;
+1F3AF;DIRECT HIT;So;0;ON;;;;;N;;;;;
+1F3B0;SLOT MACHINE;So;0;ON;;;;;N;;;;;
+1F3B1;BILLIARDS;So;0;ON;;;;;N;;;;;
+1F3B2;GAME DIE;So;0;ON;;;;;N;;;;;
+1F3B3;BOWLING;So;0;ON;;;;;N;;;;;
+1F3B4;FLOWER PLAYING CARDS;So;0;ON;;;;;N;;;;;
+1F3B5;MUSICAL NOTE;So;0;ON;;;;;N;;;;;
+1F3B6;MULTIPLE MUSICAL NOTES;So;0;ON;;;;;N;;;;;
+1F3B7;SAXOPHONE;So;0;ON;;;;;N;;;;;
+1F3B8;GUITAR;So;0;ON;;;;;N;;;;;
+1F3B9;MUSICAL KEYBOARD;So;0;ON;;;;;N;;;;;
+1F3BA;TRUMPET;So;0;ON;;;;;N;;;;;
+1F3BB;VIOLIN;So;0;ON;;;;;N;;;;;
+1F3BC;MUSICAL SCORE;So;0;ON;;;;;N;;;;;
+1F3BD;RUNNING SHIRT WITH SASH;So;0;ON;;;;;N;;;;;
+1F3BE;TENNIS RACQUET AND BALL;So;0;ON;;;;;N;;;;;
+1F3BF;SKI AND SKI BOOT;So;0;ON;;;;;N;;;;;
+1F3C0;BASKETBALL AND HOOP;So;0;ON;;;;;N;;;;;
+1F3C1;CHEQUERED FLAG;So;0;ON;;;;;N;;;;;
+1F3C2;SNOWBOARDER;So;0;ON;;;;;N;;;;;
+1F3C3;RUNNER;So;0;ON;;;;;N;;;;;
+1F3C4;SURFER;So;0;ON;;;;;N;;;;;
+1F3C5;SPORTS MEDAL;So;0;ON;;;;;N;;;;;
+1F3C6;TROPHY;So;0;ON;;;;;N;;;;;
+1F3C7;HORSE RACING;So;0;ON;;;;;N;;;;;
+1F3C8;AMERICAN FOOTBALL;So;0;ON;;;;;N;;;;;
+1F3C9;RUGBY FOOTBALL;So;0;ON;;;;;N;;;;;
+1F3CA;SWIMMER;So;0;ON;;;;;N;;;;;
+1F3CB;WEIGHT LIFTER;So;0;ON;;;;;N;;;;;
+1F3CC;GOLFER;So;0;ON;;;;;N;;;;;
+1F3CD;RACING MOTORCYCLE;So;0;ON;;;;;N;;;;;
+1F3CE;RACING CAR;So;0;ON;;;;;N;;;;;
+1F3CF;CRICKET BAT AND BALL;So;0;ON;;;;;N;;;;;
+1F3D0;VOLLEYBALL;So;0;ON;;;;;N;;;;;
+1F3D1;FIELD HOCKEY STICK AND BALL;So;0;ON;;;;;N;;;;;
+1F3D2;ICE HOCKEY STICK AND PUCK;So;0;ON;;;;;N;;;;;
+1F3D3;TABLE TENNIS PADDLE AND BALL;So;0;ON;;;;;N;;;;;
+1F3D4;SNOW CAPPED MOUNTAIN;So;0;ON;;;;;N;;;;;
+1F3D5;CAMPING;So;0;ON;;;;;N;;;;;
+1F3D6;BEACH WITH UMBRELLA;So;0;ON;;;;;N;;;;;
+1F3D7;BUILDING CONSTRUCTION;So;0;ON;;;;;N;;;;;
+1F3D8;HOUSE BUILDINGS;So;0;ON;;;;;N;;;;;
+1F3D9;CITYSCAPE;So;0;ON;;;;;N;;;;;
+1F3DA;DERELICT HOUSE BUILDING;So;0;ON;;;;;N;;;;;
+1F3DB;CLASSICAL BUILDING;So;0;ON;;;;;N;;;;;
+1F3DC;DESERT;So;0;ON;;;;;N;;;;;
+1F3DD;DESERT ISLAND;So;0;ON;;;;;N;;;;;
+1F3DE;NATIONAL PARK;So;0;ON;;;;;N;;;;;
+1F3DF;STADIUM;So;0;ON;;;;;N;;;;;
+1F3E0;HOUSE BUILDING;So;0;ON;;;;;N;;;;;
+1F3E1;HOUSE WITH GARDEN;So;0;ON;;;;;N;;;;;
+1F3E2;OFFICE BUILDING;So;0;ON;;;;;N;;;;;
+1F3E3;JAPANESE POST OFFICE;So;0;ON;;;;;N;;;;;
+1F3E4;EUROPEAN POST OFFICE;So;0;ON;;;;;N;;;;;
+1F3E5;HOSPITAL;So;0;ON;;;;;N;;;;;
+1F3E6;BANK;So;0;ON;;;;;N;;;;;
+1F3E7;AUTOMATED TELLER MACHINE;So;0;ON;;;;;N;;;;;
+1F3E8;HOTEL;So;0;ON;;;;;N;;;;;
+1F3E9;LOVE HOTEL;So;0;ON;;;;;N;;;;;
+1F3EA;CONVENIENCE STORE;So;0;ON;;;;;N;;;;;
+1F3EB;SCHOOL;So;0;ON;;;;;N;;;;;
+1F3EC;DEPARTMENT STORE;So;0;ON;;;;;N;;;;;
+1F3ED;FACTORY;So;0;ON;;;;;N;;;;;
+1F3EE;IZAKAYA LANTERN;So;0;ON;;;;;N;;;;;
+1F3EF;JAPANESE CASTLE;So;0;ON;;;;;N;;;;;
+1F3F0;EUROPEAN CASTLE;So;0;ON;;;;;N;;;;;
+1F3F1;WHITE PENNANT;So;0;ON;;;;;N;;;;;
+1F3F2;BLACK PENNANT;So;0;ON;;;;;N;;;;;
+1F3F3;WAVING WHITE FLAG;So;0;ON;;;;;N;;;;;
+1F3F4;WAVING BLACK FLAG;So;0;ON;;;;;N;;;;;
+1F3F5;ROSETTE;So;0;ON;;;;;N;;;;;
+1F3F6;BLACK ROSETTE;So;0;ON;;;;;N;;;;;
+1F3F7;LABEL;So;0;ON;;;;;N;;;;;
+1F3F8;BADMINTON RACQUET AND SHUTTLECOCK;So;0;ON;;;;;N;;;;;
+1F3F9;BOW AND ARROW;So;0;ON;;;;;N;;;;;
+1F3FA;AMPHORA;So;0;ON;;;;;N;;;;;
+1F3FB;EMOJI MODIFIER FITZPATRICK TYPE-1-2;Sk;0;ON;;;;;N;;;;;
+1F3FC;EMOJI MODIFIER FITZPATRICK TYPE-3;Sk;0;ON;;;;;N;;;;;
+1F3FD;EMOJI MODIFIER FITZPATRICK TYPE-4;Sk;0;ON;;;;;N;;;;;
+1F3FE;EMOJI MODIFIER FITZPATRICK TYPE-5;Sk;0;ON;;;;;N;;;;;
+1F3FF;EMOJI MODIFIER FITZPATRICK TYPE-6;Sk;0;ON;;;;;N;;;;;
+1F400;RAT;So;0;ON;;;;;N;;;;;
+1F401;MOUSE;So;0;ON;;;;;N;;;;;
+1F402;OX;So;0;ON;;;;;N;;;;;
+1F403;WATER BUFFALO;So;0;ON;;;;;N;;;;;
+1F404;COW;So;0;ON;;;;;N;;;;;
+1F405;TIGER;So;0;ON;;;;;N;;;;;
+1F406;LEOPARD;So;0;ON;;;;;N;;;;;
+1F407;RABBIT;So;0;ON;;;;;N;;;;;
+1F408;CAT;So;0;ON;;;;;N;;;;;
+1F409;DRAGON;So;0;ON;;;;;N;;;;;
+1F40A;CROCODILE;So;0;ON;;;;;N;;;;;
+1F40B;WHALE;So;0;ON;;;;;N;;;;;
+1F40C;SNAIL;So;0;ON;;;;;N;;;;;
+1F40D;SNAKE;So;0;ON;;;;;N;;;;;
+1F40E;HORSE;So;0;ON;;;;;N;;;;;
+1F40F;RAM;So;0;ON;;;;;N;;;;;
+1F410;GOAT;So;0;ON;;;;;N;;;;;
+1F411;SHEEP;So;0;ON;;;;;N;;;;;
+1F412;MONKEY;So;0;ON;;;;;N;;;;;
+1F413;ROOSTER;So;0;ON;;;;;N;;;;;
+1F414;CHICKEN;So;0;ON;;;;;N;;;;;
+1F415;DOG;So;0;ON;;;;;N;;;;;
+1F416;PIG;So;0;ON;;;;;N;;;;;
+1F417;BOAR;So;0;ON;;;;;N;;;;;
+1F418;ELEPHANT;So;0;ON;;;;;N;;;;;
+1F419;OCTOPUS;So;0;ON;;;;;N;;;;;
+1F41A;SPIRAL SHELL;So;0;ON;;;;;N;;;;;
+1F41B;BUG;So;0;ON;;;;;N;;;;;
+1F41C;ANT;So;0;ON;;;;;N;;;;;
+1F41D;HONEYBEE;So;0;ON;;;;;N;;;;;
+1F41E;LADY BEETLE;So;0;ON;;;;;N;;;;;
+1F41F;FISH;So;0;ON;;;;;N;;;;;
+1F420;TROPICAL FISH;So;0;ON;;;;;N;;;;;
+1F421;BLOWFISH;So;0;ON;;;;;N;;;;;
+1F422;TURTLE;So;0;ON;;;;;N;;;;;
+1F423;HATCHING CHICK;So;0;ON;;;;;N;;;;;
+1F424;BABY CHICK;So;0;ON;;;;;N;;;;;
+1F425;FRONT-FACING BABY CHICK;So;0;ON;;;;;N;;;;;
+1F426;BIRD;So;0;ON;;;;;N;;;;;
+1F427;PENGUIN;So;0;ON;;;;;N;;;;;
+1F428;KOALA;So;0;ON;;;;;N;;;;;
+1F429;POODLE;So;0;ON;;;;;N;;;;;
+1F42A;DROMEDARY CAMEL;So;0;ON;;;;;N;;;;;
+1F42B;BACTRIAN CAMEL;So;0;ON;;;;;N;;;;;
+1F42C;DOLPHIN;So;0;ON;;;;;N;;;;;
+1F42D;MOUSE FACE;So;0;ON;;;;;N;;;;;
+1F42E;COW FACE;So;0;ON;;;;;N;;;;;
+1F42F;TIGER FACE;So;0;ON;;;;;N;;;;;
+1F430;RABBIT FACE;So;0;ON;;;;;N;;;;;
+1F431;CAT FACE;So;0;ON;;;;;N;;;;;
+1F432;DRAGON FACE;So;0;ON;;;;;N;;;;;
+1F433;SPOUTING WHALE;So;0;ON;;;;;N;;;;;
+1F434;HORSE FACE;So;0;ON;;;;;N;;;;;
+1F435;MONKEY FACE;So;0;ON;;;;;N;;;;;
+1F436;DOG FACE;So;0;ON;;;;;N;;;;;
+1F437;PIG FACE;So;0;ON;;;;;N;;;;;
+1F438;FROG FACE;So;0;ON;;;;;N;;;;;
+1F439;HAMSTER FACE;So;0;ON;;;;;N;;;;;
+1F43A;WOLF FACE;So;0;ON;;;;;N;;;;;
+1F43B;BEAR FACE;So;0;ON;;;;;N;;;;;
+1F43C;PANDA FACE;So;0;ON;;;;;N;;;;;
+1F43D;PIG NOSE;So;0;ON;;;;;N;;;;;
+1F43E;PAW PRINTS;So;0;ON;;;;;N;;;;;
+1F43F;CHIPMUNK;So;0;ON;;;;;N;;;;;
+1F440;EYES;So;0;ON;;;;;N;;;;;
+1F441;EYE;So;0;ON;;;;;N;;;;;
+1F442;EAR;So;0;ON;;;;;N;;;;;
+1F443;NOSE;So;0;ON;;;;;N;;;;;
+1F444;MOUTH;So;0;ON;;;;;N;;;;;
+1F445;TONGUE;So;0;ON;;;;;N;;;;;
+1F446;WHITE UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F447;WHITE DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F448;WHITE LEFT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F449;WHITE RIGHT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F44A;FISTED HAND SIGN;So;0;ON;;;;;N;;;;;
+1F44B;WAVING HAND SIGN;So;0;ON;;;;;N;;;;;
+1F44C;OK HAND SIGN;So;0;ON;;;;;N;;;;;
+1F44D;THUMBS UP SIGN;So;0;ON;;;;;N;;;;;
+1F44E;THUMBS DOWN SIGN;So;0;ON;;;;;N;;;;;
+1F44F;CLAPPING HANDS SIGN;So;0;ON;;;;;N;;;;;
+1F450;OPEN HANDS SIGN;So;0;ON;;;;;N;;;;;
+1F451;CROWN;So;0;ON;;;;;N;;;;;
+1F452;WOMANS HAT;So;0;ON;;;;;N;;;;;
+1F453;EYEGLASSES;So;0;ON;;;;;N;;;;;
+1F454;NECKTIE;So;0;ON;;;;;N;;;;;
+1F455;T-SHIRT;So;0;ON;;;;;N;;;;;
+1F456;JEANS;So;0;ON;;;;;N;;;;;
+1F457;DRESS;So;0;ON;;;;;N;;;;;
+1F458;KIMONO;So;0;ON;;;;;N;;;;;
+1F459;BIKINI;So;0;ON;;;;;N;;;;;
+1F45A;WOMANS CLOTHES;So;0;ON;;;;;N;;;;;
+1F45B;PURSE;So;0;ON;;;;;N;;;;;
+1F45C;HANDBAG;So;0;ON;;;;;N;;;;;
+1F45D;POUCH;So;0;ON;;;;;N;;;;;
+1F45E;MANS SHOE;So;0;ON;;;;;N;;;;;
+1F45F;ATHLETIC SHOE;So;0;ON;;;;;N;;;;;
+1F460;HIGH-HEELED SHOE;So;0;ON;;;;;N;;;;;
+1F461;WOMANS SANDAL;So;0;ON;;;;;N;;;;;
+1F462;WOMANS BOOTS;So;0;ON;;;;;N;;;;;
+1F463;FOOTPRINTS;So;0;ON;;;;;N;;;;;
+1F464;BUST IN SILHOUETTE;So;0;ON;;;;;N;;;;;
+1F465;BUSTS IN SILHOUETTE;So;0;ON;;;;;N;;;;;
+1F466;BOY;So;0;ON;;;;;N;;;;;
+1F467;GIRL;So;0;ON;;;;;N;;;;;
+1F468;MAN;So;0;ON;;;;;N;;;;;
+1F469;WOMAN;So;0;ON;;;;;N;;;;;
+1F46A;FAMILY;So;0;ON;;;;;N;;;;;
+1F46B;MAN AND WOMAN HOLDING HANDS;So;0;ON;;;;;N;;;;;
+1F46C;TWO MEN HOLDING HANDS;So;0;ON;;;;;N;;;;;
+1F46D;TWO WOMEN HOLDING HANDS;So;0;ON;;;;;N;;;;;
+1F46E;POLICE OFFICER;So;0;ON;;;;;N;;;;;
+1F46F;WOMAN WITH BUNNY EARS;So;0;ON;;;;;N;;;;;
+1F470;BRIDE WITH VEIL;So;0;ON;;;;;N;;;;;
+1F471;PERSON WITH BLOND HAIR;So;0;ON;;;;;N;;;;;
+1F472;MAN WITH GUA PI MAO;So;0;ON;;;;;N;;;;;
+1F473;MAN WITH TURBAN;So;0;ON;;;;;N;;;;;
+1F474;OLDER MAN;So;0;ON;;;;;N;;;;;
+1F475;OLDER WOMAN;So;0;ON;;;;;N;;;;;
+1F476;BABY;So;0;ON;;;;;N;;;;;
+1F477;CONSTRUCTION WORKER;So;0;ON;;;;;N;;;;;
+1F478;PRINCESS;So;0;ON;;;;;N;;;;;
+1F479;JAPANESE OGRE;So;0;ON;;;;;N;;;;;
+1F47A;JAPANESE GOBLIN;So;0;ON;;;;;N;;;;;
+1F47B;GHOST;So;0;ON;;;;;N;;;;;
+1F47C;BABY ANGEL;So;0;ON;;;;;N;;;;;
+1F47D;EXTRATERRESTRIAL ALIEN;So;0;ON;;;;;N;;;;;
+1F47E;ALIEN MONSTER;So;0;ON;;;;;N;;;;;
+1F47F;IMP;So;0;ON;;;;;N;;;;;
+1F480;SKULL;So;0;ON;;;;;N;;;;;
+1F481;INFORMATION DESK PERSON;So;0;ON;;;;;N;;;;;
+1F482;GUARDSMAN;So;0;ON;;;;;N;;;;;
+1F483;DANCER;So;0;ON;;;;;N;;;;;
+1F484;LIPSTICK;So;0;ON;;;;;N;;;;;
+1F485;NAIL POLISH;So;0;ON;;;;;N;;;;;
+1F486;FACE MASSAGE;So;0;ON;;;;;N;;;;;
+1F487;HAIRCUT;So;0;ON;;;;;N;;;;;
+1F488;BARBER POLE;So;0;ON;;;;;N;;;;;
+1F489;SYRINGE;So;0;ON;;;;;N;;;;;
+1F48A;PILL;So;0;ON;;;;;N;;;;;
+1F48B;KISS MARK;So;0;ON;;;;;N;;;;;
+1F48C;LOVE LETTER;So;0;ON;;;;;N;;;;;
+1F48D;RING;So;0;ON;;;;;N;;;;;
+1F48E;GEM STONE;So;0;ON;;;;;N;;;;;
+1F48F;KISS;So;0;ON;;;;;N;;;;;
+1F490;BOUQUET;So;0;ON;;;;;N;;;;;
+1F491;COUPLE WITH HEART;So;0;ON;;;;;N;;;;;
+1F492;WEDDING;So;0;ON;;;;;N;;;;;
+1F493;BEATING HEART;So;0;ON;;;;;N;;;;;
+1F494;BROKEN HEART;So;0;ON;;;;;N;;;;;
+1F495;TWO HEARTS;So;0;ON;;;;;N;;;;;
+1F496;SPARKLING HEART;So;0;ON;;;;;N;;;;;
+1F497;GROWING HEART;So;0;ON;;;;;N;;;;;
+1F498;HEART WITH ARROW;So;0;ON;;;;;N;;;;;
+1F499;BLUE HEART;So;0;ON;;;;;N;;;;;
+1F49A;GREEN HEART;So;0;ON;;;;;N;;;;;
+1F49B;YELLOW HEART;So;0;ON;;;;;N;;;;;
+1F49C;PURPLE HEART;So;0;ON;;;;;N;;;;;
+1F49D;HEART WITH RIBBON;So;0;ON;;;;;N;;;;;
+1F49E;REVOLVING HEARTS;So;0;ON;;;;;N;;;;;
+1F49F;HEART DECORATION;So;0;ON;;;;;N;;;;;
+1F4A0;DIAMOND SHAPE WITH A DOT INSIDE;So;0;ON;;;;;N;;;;;
+1F4A1;ELECTRIC LIGHT BULB;So;0;ON;;;;;N;;;;;
+1F4A2;ANGER SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A3;BOMB;So;0;ON;;;;;N;;;;;
+1F4A4;SLEEPING SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A5;COLLISION SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A6;SPLASHING SWEAT SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A7;DROPLET;So;0;ON;;;;;N;;;;;
+1F4A8;DASH SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A9;PILE OF POO;So;0;ON;;;;;N;;;;;
+1F4AA;FLEXED BICEPS;So;0;ON;;;;;N;;;;;
+1F4AB;DIZZY SYMBOL;So;0;ON;;;;;N;;;;;
+1F4AC;SPEECH BALLOON;So;0;ON;;;;;N;;;;;
+1F4AD;THOUGHT BALLOON;So;0;ON;;;;;N;;;;;
+1F4AE;WHITE FLOWER;So;0;ON;;;;;N;;;;;
+1F4AF;HUNDRED POINTS SYMBOL;So;0;ON;;;;;N;;;;;
+1F4B0;MONEY BAG;So;0;ON;;;;;N;;;;;
+1F4B1;CURRENCY EXCHANGE;So;0;ON;;;;;N;;;;;
+1F4B2;HEAVY DOLLAR SIGN;So;0;ON;;;;;N;;;;;
+1F4B3;CREDIT CARD;So;0;ON;;;;;N;;;;;
+1F4B4;BANKNOTE WITH YEN SIGN;So;0;ON;;;;;N;;;;;
+1F4B5;BANKNOTE WITH DOLLAR SIGN;So;0;ON;;;;;N;;;;;
+1F4B6;BANKNOTE WITH EURO SIGN;So;0;ON;;;;;N;;;;;
+1F4B7;BANKNOTE WITH POUND SIGN;So;0;ON;;;;;N;;;;;
+1F4B8;MONEY WITH WINGS;So;0;ON;;;;;N;;;;;
+1F4B9;CHART WITH UPWARDS TREND AND YEN SIGN;So;0;ON;;;;;N;;;;;
+1F4BA;SEAT;So;0;ON;;;;;N;;;;;
+1F4BB;PERSONAL COMPUTER;So;0;ON;;;;;N;;;;;
+1F4BC;BRIEFCASE;So;0;ON;;;;;N;;;;;
+1F4BD;MINIDISC;So;0;ON;;;;;N;;;;;
+1F4BE;FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F4BF;OPTICAL DISC;So;0;ON;;;;;N;;;;;
+1F4C0;DVD;So;0;ON;;;;;N;;;;;
+1F4C1;FILE FOLDER;So;0;ON;;;;;N;;;;;
+1F4C2;OPEN FILE FOLDER;So;0;ON;;;;;N;;;;;
+1F4C3;PAGE WITH CURL;So;0;ON;;;;;N;;;;;
+1F4C4;PAGE FACING UP;So;0;ON;;;;;N;;;;;
+1F4C5;CALENDAR;So;0;ON;;;;;N;;;;;
+1F4C6;TEAR-OFF CALENDAR;So;0;ON;;;;;N;;;;;
+1F4C7;CARD INDEX;So;0;ON;;;;;N;;;;;
+1F4C8;CHART WITH UPWARDS TREND;So;0;ON;;;;;N;;;;;
+1F4C9;CHART WITH DOWNWARDS TREND;So;0;ON;;;;;N;;;;;
+1F4CA;BAR CHART;So;0;ON;;;;;N;;;;;
+1F4CB;CLIPBOARD;So;0;ON;;;;;N;;;;;
+1F4CC;PUSHPIN;So;0;ON;;;;;N;;;;;
+1F4CD;ROUND PUSHPIN;So;0;ON;;;;;N;;;;;
+1F4CE;PAPERCLIP;So;0;ON;;;;;N;;;;;
+1F4CF;STRAIGHT RULER;So;0;ON;;;;;N;;;;;
+1F4D0;TRIANGULAR RULER;So;0;ON;;;;;N;;;;;
+1F4D1;BOOKMARK TABS;So;0;ON;;;;;N;;;;;
+1F4D2;LEDGER;So;0;ON;;;;;N;;;;;
+1F4D3;NOTEBOOK;So;0;ON;;;;;N;;;;;
+1F4D4;NOTEBOOK WITH DECORATIVE COVER;So;0;ON;;;;;N;;;;;
+1F4D5;CLOSED BOOK;So;0;ON;;;;;N;;;;;
+1F4D6;OPEN BOOK;So;0;ON;;;;;N;;;;;
+1F4D7;GREEN BOOK;So;0;ON;;;;;N;;;;;
+1F4D8;BLUE BOOK;So;0;ON;;;;;N;;;;;
+1F4D9;ORANGE BOOK;So;0;ON;;;;;N;;;;;
+1F4DA;BOOKS;So;0;ON;;;;;N;;;;;
+1F4DB;NAME BADGE;So;0;ON;;;;;N;;;;;
+1F4DC;SCROLL;So;0;ON;;;;;N;;;;;
+1F4DD;MEMO;So;0;ON;;;;;N;;;;;
+1F4DE;TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
+1F4DF;PAGER;So;0;ON;;;;;N;;;;;
+1F4E0;FAX MACHINE;So;0;ON;;;;;N;;;;;
+1F4E1;SATELLITE ANTENNA;So;0;ON;;;;;N;;;;;
+1F4E2;PUBLIC ADDRESS LOUDSPEAKER;So;0;ON;;;;;N;;;;;
+1F4E3;CHEERING MEGAPHONE;So;0;ON;;;;;N;;;;;
+1F4E4;OUTBOX TRAY;So;0;ON;;;;;N;;;;;
+1F4E5;INBOX TRAY;So;0;ON;;;;;N;;;;;
+1F4E6;PACKAGE;So;0;ON;;;;;N;;;;;
+1F4E7;E-MAIL SYMBOL;So;0;ON;;;;;N;;;;;
+1F4E8;INCOMING ENVELOPE;So;0;ON;;;;;N;;;;;
+1F4E9;ENVELOPE WITH DOWNWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F4EA;CLOSED MAILBOX WITH LOWERED FLAG;So;0;ON;;;;;N;;;;;
+1F4EB;CLOSED MAILBOX WITH RAISED FLAG;So;0;ON;;;;;N;;;;;
+1F4EC;OPEN MAILBOX WITH RAISED FLAG;So;0;ON;;;;;N;;;;;
+1F4ED;OPEN MAILBOX WITH LOWERED FLAG;So;0;ON;;;;;N;;;;;
+1F4EE;POSTBOX;So;0;ON;;;;;N;;;;;
+1F4EF;POSTAL HORN;So;0;ON;;;;;N;;;;;
+1F4F0;NEWSPAPER;So;0;ON;;;;;N;;;;;
+1F4F1;MOBILE PHONE;So;0;ON;;;;;N;;;;;
+1F4F2;MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT;So;0;ON;;;;;N;;;;;
+1F4F3;VIBRATION MODE;So;0;ON;;;;;N;;;;;
+1F4F4;MOBILE PHONE OFF;So;0;ON;;;;;N;;;;;
+1F4F5;NO MOBILE PHONES;So;0;ON;;;;;N;;;;;
+1F4F6;ANTENNA WITH BARS;So;0;ON;;;;;N;;;;;
+1F4F7;CAMERA;So;0;ON;;;;;N;;;;;
+1F4F8;CAMERA WITH FLASH;So;0;ON;;;;;N;;;;;
+1F4F9;VIDEO CAMERA;So;0;ON;;;;;N;;;;;
+1F4FA;TELEVISION;So;0;ON;;;;;N;;;;;
+1F4FB;RADIO;So;0;ON;;;;;N;;;;;
+1F4FC;VIDEOCASSETTE;So;0;ON;;;;;N;;;;;
+1F4FD;FILM PROJECTOR;So;0;ON;;;;;N;;;;;
+1F4FE;PORTABLE STEREO;So;0;ON;;;;;N;;;;;
+1F4FF;PRAYER BEADS;So;0;ON;;;;;N;;;;;
+1F500;TWISTED RIGHTWARDS ARROWS;So;0;ON;;;;;N;;;;;
+1F501;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F502;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY;So;0;ON;;;;;N;;;;;
+1F503;CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F504;ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F505;LOW BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;;
+1F506;HIGH BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;;
+1F507;SPEAKER WITH CANCELLATION STROKE;So;0;ON;;;;;N;;;;;
+1F508;SPEAKER;So;0;ON;;;;;N;;;;;
+1F509;SPEAKER WITH ONE SOUND WAVE;So;0;ON;;;;;N;;;;;
+1F50A;SPEAKER WITH THREE SOUND WAVES;So;0;ON;;;;;N;;;;;
+1F50B;BATTERY;So;0;ON;;;;;N;;;;;
+1F50C;ELECTRIC PLUG;So;0;ON;;;;;N;;;;;
+1F50D;LEFT-POINTING MAGNIFYING GLASS;So;0;ON;;;;;N;;;;;
+1F50E;RIGHT-POINTING MAGNIFYING GLASS;So;0;ON;;;;;N;;;;;
+1F50F;LOCK WITH INK PEN;So;0;ON;;;;;N;;;;;
+1F510;CLOSED LOCK WITH KEY;So;0;ON;;;;;N;;;;;
+1F511;KEY;So;0;ON;;;;;N;;;;;
+1F512;LOCK;So;0;ON;;;;;N;;;;;
+1F513;OPEN LOCK;So;0;ON;;;;;N;;;;;
+1F514;BELL;So;0;ON;;;;;N;;;;;
+1F515;BELL WITH CANCELLATION STROKE;So;0;ON;;;;;N;;;;;
+1F516;BOOKMARK;So;0;ON;;;;;N;;;;;
+1F517;LINK SYMBOL;So;0;ON;;;;;N;;;;;
+1F518;RADIO BUTTON;So;0;ON;;;;;N;;;;;
+1F519;BACK WITH LEFTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51A;END WITH LEFTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51B;ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51C;SOON WITH RIGHTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51D;TOP WITH UPWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51E;NO ONE UNDER EIGHTEEN SYMBOL;So;0;ON;;;;;N;;;;;
+1F51F;KEYCAP TEN;So;0;ON;;;;;N;;;;;
+1F520;INPUT SYMBOL FOR LATIN CAPITAL LETTERS;So;0;ON;;;;;N;;;;;
+1F521;INPUT SYMBOL FOR LATIN SMALL LETTERS;So;0;ON;;;;;N;;;;;
+1F522;INPUT SYMBOL FOR NUMBERS;So;0;ON;;;;;N;;;;;
+1F523;INPUT SYMBOL FOR SYMBOLS;So;0;ON;;;;;N;;;;;
+1F524;INPUT SYMBOL FOR LATIN LETTERS;So;0;ON;;;;;N;;;;;
+1F525;FIRE;So;0;ON;;;;;N;;;;;
+1F526;ELECTRIC TORCH;So;0;ON;;;;;N;;;;;
+1F527;WRENCH;So;0;ON;;;;;N;;;;;
+1F528;HAMMER;So;0;ON;;;;;N;;;;;
+1F529;NUT AND BOLT;So;0;ON;;;;;N;;;;;
+1F52A;HOCHO;So;0;ON;;;;;N;;;;;
+1F52B;PISTOL;So;0;ON;;;;;N;;;;;
+1F52C;MICROSCOPE;So;0;ON;;;;;N;;;;;
+1F52D;TELESCOPE;So;0;ON;;;;;N;;;;;
+1F52E;CRYSTAL BALL;So;0;ON;;;;;N;;;;;
+1F52F;SIX POINTED STAR WITH MIDDLE DOT;So;0;ON;;;;;N;;;;;
+1F530;JAPANESE SYMBOL FOR BEGINNER;So;0;ON;;;;;N;;;;;
+1F531;TRIDENT EMBLEM;So;0;ON;;;;;N;;;;;
+1F532;BLACK SQUARE BUTTON;So;0;ON;;;;;N;;;;;
+1F533;WHITE SQUARE BUTTON;So;0;ON;;;;;N;;;;;
+1F534;LARGE RED CIRCLE;So;0;ON;;;;;N;;;;;
+1F535;LARGE BLUE CIRCLE;So;0;ON;;;;;N;;;;;
+1F536;LARGE ORANGE DIAMOND;So;0;ON;;;;;N;;;;;
+1F537;LARGE BLUE DIAMOND;So;0;ON;;;;;N;;;;;
+1F538;SMALL ORANGE DIAMOND;So;0;ON;;;;;N;;;;;
+1F539;SMALL BLUE DIAMOND;So;0;ON;;;;;N;;;;;
+1F53A;UP-POINTING RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53B;DOWN-POINTING RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53C;UP-POINTING SMALL RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53D;DOWN-POINTING SMALL RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53E;LOWER RIGHT SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F53F;UPPER RIGHT SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F540;CIRCLED CROSS POMMEE;So;0;ON;;;;;N;;;;;
+1F541;CROSS POMMEE WITH HALF-CIRCLE BELOW;So;0;ON;;;;;N;;;;;
+1F542;CROSS POMMEE;So;0;ON;;;;;N;;;;;
+1F543;NOTCHED LEFT SEMICIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F544;NOTCHED RIGHT SEMICIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F545;SYMBOL FOR MARKS CHAPTER;So;0;ON;;;;;N;;;;;
+1F546;WHITE LATIN CROSS;So;0;ON;;;;;N;;;;;
+1F547;HEAVY LATIN CROSS;So;0;ON;;;;;N;;;;;
+1F548;CELTIC CROSS;So;0;ON;;;;;N;;;;;
+1F549;OM SYMBOL;So;0;ON;;;;;N;;;;;
+1F54A;DOVE OF PEACE;So;0;ON;;;;;N;;;;;
+1F54B;KAABA;So;0;ON;;;;;N;;;;;
+1F54C;MOSQUE;So;0;ON;;;;;N;;;;;
+1F54D;SYNAGOGUE;So;0;ON;;;;;N;;;;;
+1F54E;MENORAH WITH NINE BRANCHES;So;0;ON;;;;;N;;;;;
+1F54F;BOWL OF HYGIEIA;So;0;ON;;;;;N;;;;;
+1F550;CLOCK FACE ONE OCLOCK;So;0;ON;;;;;N;;;;;
+1F551;CLOCK FACE TWO OCLOCK;So;0;ON;;;;;N;;;;;
+1F552;CLOCK FACE THREE OCLOCK;So;0;ON;;;;;N;;;;;
+1F553;CLOCK FACE FOUR OCLOCK;So;0;ON;;;;;N;;;;;
+1F554;CLOCK FACE FIVE OCLOCK;So;0;ON;;;;;N;;;;;
+1F555;CLOCK FACE SIX OCLOCK;So;0;ON;;;;;N;;;;;
+1F556;CLOCK FACE SEVEN OCLOCK;So;0;ON;;;;;N;;;;;
+1F557;CLOCK FACE EIGHT OCLOCK;So;0;ON;;;;;N;;;;;
+1F558;CLOCK FACE NINE OCLOCK;So;0;ON;;;;;N;;;;;
+1F559;CLOCK FACE TEN OCLOCK;So;0;ON;;;;;N;;;;;
+1F55A;CLOCK FACE ELEVEN OCLOCK;So;0;ON;;;;;N;;;;;
+1F55B;CLOCK FACE TWELVE OCLOCK;So;0;ON;;;;;N;;;;;
+1F55C;CLOCK FACE ONE-THIRTY;So;0;ON;;;;;N;;;;;
+1F55D;CLOCK FACE TWO-THIRTY;So;0;ON;;;;;N;;;;;
+1F55E;CLOCK FACE THREE-THIRTY;So;0;ON;;;;;N;;;;;
+1F55F;CLOCK FACE FOUR-THIRTY;So;0;ON;;;;;N;;;;;
+1F560;CLOCK FACE FIVE-THIRTY;So;0;ON;;;;;N;;;;;
+1F561;CLOCK FACE SIX-THIRTY;So;0;ON;;;;;N;;;;;
+1F562;CLOCK FACE SEVEN-THIRTY;So;0;ON;;;;;N;;;;;
+1F563;CLOCK FACE EIGHT-THIRTY;So;0;ON;;;;;N;;;;;
+1F564;CLOCK FACE NINE-THIRTY;So;0;ON;;;;;N;;;;;
+1F565;CLOCK FACE TEN-THIRTY;So;0;ON;;;;;N;;;;;
+1F566;CLOCK FACE ELEVEN-THIRTY;So;0;ON;;;;;N;;;;;
+1F567;CLOCK FACE TWELVE-THIRTY;So;0;ON;;;;;N;;;;;
+1F568;RIGHT SPEAKER;So;0;ON;;;;;N;;;;;
+1F569;RIGHT SPEAKER WITH ONE SOUND WAVE;So;0;ON;;;;;N;;;;;
+1F56A;RIGHT SPEAKER WITH THREE SOUND WAVES;So;0;ON;;;;;N;;;;;
+1F56B;BULLHORN;So;0;ON;;;;;N;;;;;
+1F56C;BULLHORN WITH SOUND WAVES;So;0;ON;;;;;N;;;;;
+1F56D;RINGING BELL;So;0;ON;;;;;N;;;;;
+1F56E;BOOK;So;0;ON;;;;;N;;;;;
+1F56F;CANDLE;So;0;ON;;;;;N;;;;;
+1F570;MANTELPIECE CLOCK;So;0;ON;;;;;N;;;;;
+1F571;BLACK SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;;
+1F572;NO PIRACY;So;0;ON;;;;;N;;;;;
+1F573;HOLE;So;0;ON;;;;;N;;;;;
+1F574;MAN IN BUSINESS SUIT LEVITATING;So;0;ON;;;;;N;;;;;
+1F575;SLEUTH OR SPY;So;0;ON;;;;;N;;;;;
+1F576;DARK SUNGLASSES;So;0;ON;;;;;N;;;;;
+1F577;SPIDER;So;0;ON;;;;;N;;;;;
+1F578;SPIDER WEB;So;0;ON;;;;;N;;;;;
+1F579;JOYSTICK;So;0;ON;;;;;N;;;;;
+1F57A;MAN DANCING;So;0;ON;;;;;N;;;;;
+1F57B;LEFT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
+1F57C;TELEPHONE RECEIVER WITH PAGE;So;0;ON;;;;;N;;;;;
+1F57D;RIGHT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
+1F57E;WHITE TOUCHTONE TELEPHONE;So;0;ON;;;;;N;;;;;
+1F57F;BLACK TOUCHTONE TELEPHONE;So;0;ON;;;;;N;;;;;
+1F580;TELEPHONE ON TOP OF MODEM;So;0;ON;;;;;N;;;;;
+1F581;CLAMSHELL MOBILE PHONE;So;0;ON;;;;;N;;;;;
+1F582;BACK OF ENVELOPE;So;0;ON;;;;;N;;;;;
+1F583;STAMPED ENVELOPE;So;0;ON;;;;;N;;;;;
+1F584;ENVELOPE WITH LIGHTNING;So;0;ON;;;;;N;;;;;
+1F585;FLYING ENVELOPE;So;0;ON;;;;;N;;;;;
+1F586;PEN OVER STAMPED ENVELOPE;So;0;ON;;;;;N;;;;;
+1F587;LINKED PAPERCLIPS;So;0;ON;;;;;N;;;;;
+1F588;BLACK PUSHPIN;So;0;ON;;;;;N;;;;;
+1F589;LOWER LEFT PENCIL;So;0;ON;;;;;N;;;;;
+1F58A;LOWER LEFT BALLPOINT PEN;So;0;ON;;;;;N;;;;;
+1F58B;LOWER LEFT FOUNTAIN PEN;So;0;ON;;;;;N;;;;;
+1F58C;LOWER LEFT PAINTBRUSH;So;0;ON;;;;;N;;;;;
+1F58D;LOWER LEFT CRAYON;So;0;ON;;;;;N;;;;;
+1F58E;LEFT WRITING HAND;So;0;ON;;;;;N;;;;;
+1F58F;TURNED OK HAND SIGN;So;0;ON;;;;;N;;;;;
+1F590;RAISED HAND WITH FINGERS SPLAYED;So;0;ON;;;;;N;;;;;
+1F591;REVERSED RAISED HAND WITH FINGERS SPLAYED;So;0;ON;;;;;N;;;;;
+1F592;REVERSED THUMBS UP SIGN;So;0;ON;;;;;N;;;;;
+1F593;REVERSED THUMBS DOWN SIGN;So;0;ON;;;;;N;;;;;
+1F594;REVERSED VICTORY HAND;So;0;ON;;;;;N;;;;;
+1F595;REVERSED HAND WITH MIDDLE FINGER EXTENDED;So;0;ON;;;;;N;;;;;
+1F596;RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS;So;0;ON;;;;;N;;;;;
+1F597;WHITE DOWN POINTING LEFT HAND INDEX;So;0;ON;;;;;N;;;;;
+1F598;SIDEWAYS WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F599;SIDEWAYS WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59A;SIDEWAYS BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59B;SIDEWAYS BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59C;BLACK LEFT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F59D;BLACK RIGHT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F59E;SIDEWAYS WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59F;SIDEWAYS WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F5A0;SIDEWAYS BLACK UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F5A1;SIDEWAYS BLACK DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F5A2;BLACK UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F5A3;BLACK DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F5A4;BLACK HEART;So;0;ON;;;;;N;;;;;
+1F5A5;DESKTOP COMPUTER;So;0;ON;;;;;N;;;;;
+1F5A6;KEYBOARD AND MOUSE;So;0;ON;;;;;N;;;;;
+1F5A7;THREE NETWORKED COMPUTERS;So;0;ON;;;;;N;;;;;
+1F5A8;PRINTER;So;0;ON;;;;;N;;;;;
+1F5A9;POCKET CALCULATOR;So;0;ON;;;;;N;;;;;
+1F5AA;BLACK HARD SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F5AB;WHITE HARD SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F5AC;SOFT SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F5AD;TAPE CARTRIDGE;So;0;ON;;;;;N;;;;;
+1F5AE;WIRED KEYBOARD;So;0;ON;;;;;N;;;;;
+1F5AF;ONE BUTTON MOUSE;So;0;ON;;;;;N;;;;;
+1F5B0;TWO BUTTON MOUSE;So;0;ON;;;;;N;;;;;
+1F5B1;THREE BUTTON MOUSE;So;0;ON;;;;;N;;;;;
+1F5B2;TRACKBALL;So;0;ON;;;;;N;;;;;
+1F5B3;OLD PERSONAL COMPUTER;So;0;ON;;;;;N;;;;;
+1F5B4;HARD DISK;So;0;ON;;;;;N;;;;;
+1F5B5;SCREEN;So;0;ON;;;;;N;;;;;
+1F5B6;PRINTER ICON;So;0;ON;;;;;N;;;;;
+1F5B7;FAX ICON;So;0;ON;;;;;N;;;;;
+1F5B8;OPTICAL DISC ICON;So;0;ON;;;;;N;;;;;
+1F5B9;DOCUMENT WITH TEXT;So;0;ON;;;;;N;;;;;
+1F5BA;DOCUMENT WITH TEXT AND PICTURE;So;0;ON;;;;;N;;;;;
+1F5BB;DOCUMENT WITH PICTURE;So;0;ON;;;;;N;;;;;
+1F5BC;FRAME WITH PICTURE;So;0;ON;;;;;N;;;;;
+1F5BD;FRAME WITH TILES;So;0;ON;;;;;N;;;;;
+1F5BE;FRAME WITH AN X;So;0;ON;;;;;N;;;;;
+1F5BF;BLACK FOLDER;So;0;ON;;;;;N;;;;;
+1F5C0;FOLDER;So;0;ON;;;;;N;;;;;
+1F5C1;OPEN FOLDER;So;0;ON;;;;;N;;;;;
+1F5C2;CARD INDEX DIVIDERS;So;0;ON;;;;;N;;;;;
+1F5C3;CARD FILE BOX;So;0;ON;;;;;N;;;;;
+1F5C4;FILE CABINET;So;0;ON;;;;;N;;;;;
+1F5C5;EMPTY NOTE;So;0;ON;;;;;N;;;;;
+1F5C6;EMPTY NOTE PAGE;So;0;ON;;;;;N;;;;;
+1F5C7;EMPTY NOTE PAD;So;0;ON;;;;;N;;;;;
+1F5C8;NOTE;So;0;ON;;;;;N;;;;;
+1F5C9;NOTE PAGE;So;0;ON;;;;;N;;;;;
+1F5CA;NOTE PAD;So;0;ON;;;;;N;;;;;
+1F5CB;EMPTY DOCUMENT;So;0;ON;;;;;N;;;;;
+1F5CC;EMPTY PAGE;So;0;ON;;;;;N;;;;;
+1F5CD;EMPTY PAGES;So;0;ON;;;;;N;;;;;
+1F5CE;DOCUMENT;So;0;ON;;;;;N;;;;;
+1F5CF;PAGE;So;0;ON;;;;;N;;;;;
+1F5D0;PAGES;So;0;ON;;;;;N;;;;;
+1F5D1;WASTEBASKET;So;0;ON;;;;;N;;;;;
+1F5D2;SPIRAL NOTE PAD;So;0;ON;;;;;N;;;;;
+1F5D3;SPIRAL CALENDAR PAD;So;0;ON;;;;;N;;;;;
+1F5D4;DESKTOP WINDOW;So;0;ON;;;;;N;;;;;
+1F5D5;MINIMIZE;So;0;ON;;;;;N;;;;;
+1F5D6;MAXIMIZE;So;0;ON;;;;;N;;;;;
+1F5D7;OVERLAP;So;0;ON;;;;;N;;;;;
+1F5D8;CLOCKWISE RIGHT AND LEFT SEMICIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F5D9;CANCELLATION X;So;0;ON;;;;;N;;;;;
+1F5DA;INCREASE FONT SIZE SYMBOL;So;0;ON;;;;;N;;;;;
+1F5DB;DECREASE FONT SIZE SYMBOL;So;0;ON;;;;;N;;;;;
+1F5DC;COMPRESSION;So;0;ON;;;;;N;;;;;
+1F5DD;OLD KEY;So;0;ON;;;;;N;;;;;
+1F5DE;ROLLED-UP NEWSPAPER;So;0;ON;;;;;N;;;;;
+1F5DF;PAGE WITH CIRCLED TEXT;So;0;ON;;;;;N;;;;;
+1F5E0;STOCK CHART;So;0;ON;;;;;N;;;;;
+1F5E1;DAGGER KNIFE;So;0;ON;;;;;N;;;;;
+1F5E2;LIPS;So;0;ON;;;;;N;;;;;
+1F5E3;SPEAKING HEAD IN SILHOUETTE;So;0;ON;;;;;N;;;;;
+1F5E4;THREE RAYS ABOVE;So;0;ON;;;;;N;;;;;
+1F5E5;THREE RAYS BELOW;So;0;ON;;;;;N;;;;;
+1F5E6;THREE RAYS LEFT;So;0;ON;;;;;N;;;;;
+1F5E7;THREE RAYS RIGHT;So;0;ON;;;;;N;;;;;
+1F5E8;LEFT SPEECH BUBBLE;So;0;ON;;;;;N;;;;;
+1F5E9;RIGHT SPEECH BUBBLE;So;0;ON;;;;;N;;;;;
+1F5EA;TWO SPEECH BUBBLES;So;0;ON;;;;;N;;;;;
+1F5EB;THREE SPEECH BUBBLES;So;0;ON;;;;;N;;;;;
+1F5EC;LEFT THOUGHT BUBBLE;So;0;ON;;;;;N;;;;;
+1F5ED;RIGHT THOUGHT BUBBLE;So;0;ON;;;;;N;;;;;
+1F5EE;LEFT ANGER BUBBLE;So;0;ON;;;;;N;;;;;
+1F5EF;RIGHT ANGER BUBBLE;So;0;ON;;;;;N;;;;;
+1F5F0;MOOD BUBBLE;So;0;ON;;;;;N;;;;;
+1F5F1;LIGHTNING MOOD BUBBLE;So;0;ON;;;;;N;;;;;
+1F5F2;LIGHTNING MOOD;So;0;ON;;;;;N;;;;;
+1F5F3;BALLOT BOX WITH BALLOT;So;0;ON;;;;;N;;;;;
+1F5F4;BALLOT SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F5;BALLOT BOX WITH SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F6;BALLOT BOLD SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F7;BALLOT BOX WITH BOLD SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F8;LIGHT CHECK MARK;So;0;ON;;;;;N;;;;;
+1F5F9;BALLOT BOX WITH BOLD CHECK;So;0;ON;;;;;N;;;;;
+1F5FA;WORLD MAP;So;0;ON;;;;;N;;;;;
+1F5FB;MOUNT FUJI;So;0;ON;;;;;N;;;;;
+1F5FC;TOKYO TOWER;So;0;ON;;;;;N;;;;;
+1F5FD;STATUE OF LIBERTY;So;0;ON;;;;;N;;;;;
+1F5FE;SILHOUETTE OF JAPAN;So;0;ON;;;;;N;;;;;
+1F5FF;MOYAI;So;0;ON;;;;;N;;;;;
+1F600;GRINNING FACE;So;0;ON;;;;;N;;;;;
+1F601;GRINNING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F602;FACE WITH TEARS OF JOY;So;0;ON;;;;;N;;;;;
+1F603;SMILING FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F604;SMILING FACE WITH OPEN MOUTH AND SMILING EYES;So;0;ON;;;;;N;;;;;
+1F605;SMILING FACE WITH OPEN MOUTH AND COLD SWEAT;So;0;ON;;;;;N;;;;;
+1F606;SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F607;SMILING FACE WITH HALO;So;0;ON;;;;;N;;;;;
+1F608;SMILING FACE WITH HORNS;So;0;ON;;;;;N;;;;;
+1F609;WINKING FACE;So;0;ON;;;;;N;;;;;
+1F60A;SMILING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F60B;FACE SAVOURING DELICIOUS FOOD;So;0;ON;;;;;N;;;;;
+1F60C;RELIEVED FACE;So;0;ON;;;;;N;;;;;
+1F60D;SMILING FACE WITH HEART-SHAPED EYES;So;0;ON;;;;;N;;;;;
+1F60E;SMILING FACE WITH SUNGLASSES;So;0;ON;;;;;N;;;;;
+1F60F;SMIRKING FACE;So;0;ON;;;;;N;;;;;
+1F610;NEUTRAL FACE;So;0;ON;;;;;N;;;;;
+1F611;EXPRESSIONLESS FACE;So;0;ON;;;;;N;;;;;
+1F612;UNAMUSED FACE;So;0;ON;;;;;N;;;;;
+1F613;FACE WITH COLD SWEAT;So;0;ON;;;;;N;;;;;
+1F614;PENSIVE FACE;So;0;ON;;;;;N;;;;;
+1F615;CONFUSED FACE;So;0;ON;;;;;N;;;;;
+1F616;CONFOUNDED FACE;So;0;ON;;;;;N;;;;;
+1F617;KISSING FACE;So;0;ON;;;;;N;;;;;
+1F618;FACE THROWING A KISS;So;0;ON;;;;;N;;;;;
+1F619;KISSING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F61A;KISSING FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F61B;FACE WITH STUCK-OUT TONGUE;So;0;ON;;;;;N;;;;;
+1F61C;FACE WITH STUCK-OUT TONGUE AND WINKING EYE;So;0;ON;;;;;N;;;;;
+1F61D;FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F61E;DISAPPOINTED FACE;So;0;ON;;;;;N;;;;;
+1F61F;WORRIED FACE;So;0;ON;;;;;N;;;;;
+1F620;ANGRY FACE;So;0;ON;;;;;N;;;;;
+1F621;POUTING FACE;So;0;ON;;;;;N;;;;;
+1F622;CRYING FACE;So;0;ON;;;;;N;;;;;
+1F623;PERSEVERING FACE;So;0;ON;;;;;N;;;;;
+1F624;FACE WITH LOOK OF TRIUMPH;So;0;ON;;;;;N;;;;;
+1F625;DISAPPOINTED BUT RELIEVED FACE;So;0;ON;;;;;N;;;;;
+1F626;FROWNING FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F627;ANGUISHED FACE;So;0;ON;;;;;N;;;;;
+1F628;FEARFUL FACE;So;0;ON;;;;;N;;;;;
+1F629;WEARY FACE;So;0;ON;;;;;N;;;;;
+1F62A;SLEEPY FACE;So;0;ON;;;;;N;;;;;
+1F62B;TIRED FACE;So;0;ON;;;;;N;;;;;
+1F62C;GRIMACING FACE;So;0;ON;;;;;N;;;;;
+1F62D;LOUDLY CRYING FACE;So;0;ON;;;;;N;;;;;
+1F62E;FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F62F;HUSHED FACE;So;0;ON;;;;;N;;;;;
+1F630;FACE WITH OPEN MOUTH AND COLD SWEAT;So;0;ON;;;;;N;;;;;
+1F631;FACE SCREAMING IN FEAR;So;0;ON;;;;;N;;;;;
+1F632;ASTONISHED FACE;So;0;ON;;;;;N;;;;;
+1F633;FLUSHED FACE;So;0;ON;;;;;N;;;;;
+1F634;SLEEPING FACE;So;0;ON;;;;;N;;;;;
+1F635;DIZZY FACE;So;0;ON;;;;;N;;;;;
+1F636;FACE WITHOUT MOUTH;So;0;ON;;;;;N;;;;;
+1F637;FACE WITH MEDICAL MASK;So;0;ON;;;;;N;;;;;
+1F638;GRINNING CAT FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F639;CAT FACE WITH TEARS OF JOY;So;0;ON;;;;;N;;;;;
+1F63A;SMILING CAT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F63B;SMILING CAT FACE WITH HEART-SHAPED EYES;So;0;ON;;;;;N;;;;;
+1F63C;CAT FACE WITH WRY SMILE;So;0;ON;;;;;N;;;;;
+1F63D;KISSING CAT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F63E;POUTING CAT FACE;So;0;ON;;;;;N;;;;;
+1F63F;CRYING CAT FACE;So;0;ON;;;;;N;;;;;
+1F640;WEARY CAT FACE;So;0;ON;;;;;N;;;;;
+1F641;SLIGHTLY FROWNING FACE;So;0;ON;;;;;N;;;;;
+1F642;SLIGHTLY SMILING FACE;So;0;ON;;;;;N;;;;;
+1F643;UPSIDE-DOWN FACE;So;0;ON;;;;;N;;;;;
+1F644;FACE WITH ROLLING EYES;So;0;ON;;;;;N;;;;;
+1F645;FACE WITH NO GOOD GESTURE;So;0;ON;;;;;N;;;;;
+1F646;FACE WITH OK GESTURE;So;0;ON;;;;;N;;;;;
+1F647;PERSON BOWING DEEPLY;So;0;ON;;;;;N;;;;;
+1F648;SEE-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;;
+1F649;HEAR-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;;
+1F64A;SPEAK-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;;
+1F64B;HAPPY PERSON RAISING ONE HAND;So;0;ON;;;;;N;;;;;
+1F64C;PERSON RAISING BOTH HANDS IN CELEBRATION;So;0;ON;;;;;N;;;;;
+1F64D;PERSON FROWNING;So;0;ON;;;;;N;;;;;
+1F64E;PERSON WITH POUTING FACE;So;0;ON;;;;;N;;;;;
+1F64F;PERSON WITH FOLDED HANDS;So;0;ON;;;;;N;;;;;
+1F650;NORTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F651;SOUTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F652;NORTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F653;SOUTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F654;TURNED NORTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F655;TURNED SOUTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F656;TURNED NORTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F657;TURNED SOUTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F658;NORTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F659;SOUTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65A;NORTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65B;SOUTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65C;HEAVY NORTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65D;HEAVY SOUTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65E;HEAVY NORTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65F;HEAVY SOUTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F660;NORTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F661;SOUTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F662;NORTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F663;SOUTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F664;HEAVY NORTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F665;HEAVY SOUTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F666;HEAVY NORTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F667;HEAVY SOUTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F668;HOLLOW QUILT SQUARE ORNAMENT;So;0;ON;;;;;N;;;;;
+1F669;HOLLOW QUILT SQUARE ORNAMENT IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+1F66A;SOLID QUILT SQUARE ORNAMENT;So;0;ON;;;;;N;;;;;
+1F66B;SOLID QUILT SQUARE ORNAMENT IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+1F66C;LEFTWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F66D;UPWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F66E;RIGHTWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F66F;DOWNWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F670;SCRIPT LIGATURE ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F671;HEAVY SCRIPT LIGATURE ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F672;LIGATURE OPEN ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F673;HEAVY LIGATURE OPEN ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F674;HEAVY AMPERSAND ORNAMENT;So;0;ON;;;;;N;;;;;
+1F675;SWASH AMPERSAND ORNAMENT;So;0;ON;;;;;N;;;;;
+1F676;SANS-SERIF HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+1F677;SANS-SERIF HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+1F678;SANS-SERIF HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+1F679;HEAVY INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;;
+1F67A;SANS-SERIF INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;;
+1F67B;HEAVY SANS-SERIF INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;;
+1F67C;VERY HEAVY SOLIDUS;So;0;ON;;;;;N;;;;;
+1F67D;VERY HEAVY REVERSE SOLIDUS;So;0;ON;;;;;N;;;;;
+1F67E;CHECKER BOARD;So;0;ON;;;;;N;;;;;
+1F67F;REVERSE CHECKER BOARD;So;0;ON;;;;;N;;;;;
+1F680;ROCKET;So;0;ON;;;;;N;;;;;
+1F681;HELICOPTER;So;0;ON;;;;;N;;;;;
+1F682;STEAM LOCOMOTIVE;So;0;ON;;;;;N;;;;;
+1F683;RAILWAY CAR;So;0;ON;;;;;N;;;;;
+1F684;HIGH-SPEED TRAIN;So;0;ON;;;;;N;;;;;
+1F685;HIGH-SPEED TRAIN WITH BULLET NOSE;So;0;ON;;;;;N;;;;;
+1F686;TRAIN;So;0;ON;;;;;N;;;;;
+1F687;METRO;So;0;ON;;;;;N;;;;;
+1F688;LIGHT RAIL;So;0;ON;;;;;N;;;;;
+1F689;STATION;So;0;ON;;;;;N;;;;;
+1F68A;TRAM;So;0;ON;;;;;N;;;;;
+1F68B;TRAM CAR;So;0;ON;;;;;N;;;;;
+1F68C;BUS;So;0;ON;;;;;N;;;;;
+1F68D;ONCOMING BUS;So;0;ON;;;;;N;;;;;
+1F68E;TROLLEYBUS;So;0;ON;;;;;N;;;;;
+1F68F;BUS STOP;So;0;ON;;;;;N;;;;;
+1F690;MINIBUS;So;0;ON;;;;;N;;;;;
+1F691;AMBULANCE;So;0;ON;;;;;N;;;;;
+1F692;FIRE ENGINE;So;0;ON;;;;;N;;;;;
+1F693;POLICE CAR;So;0;ON;;;;;N;;;;;
+1F694;ONCOMING POLICE CAR;So;0;ON;;;;;N;;;;;
+1F695;TAXI;So;0;ON;;;;;N;;;;;
+1F696;ONCOMING TAXI;So;0;ON;;;;;N;;;;;
+1F697;AUTOMOBILE;So;0;ON;;;;;N;;;;;
+1F698;ONCOMING AUTOMOBILE;So;0;ON;;;;;N;;;;;
+1F699;RECREATIONAL VEHICLE;So;0;ON;;;;;N;;;;;
+1F69A;DELIVERY TRUCK;So;0;ON;;;;;N;;;;;
+1F69B;ARTICULATED LORRY;So;0;ON;;;;;N;;;;;
+1F69C;TRACTOR;So;0;ON;;;;;N;;;;;
+1F69D;MONORAIL;So;0;ON;;;;;N;;;;;
+1F69E;MOUNTAIN RAILWAY;So;0;ON;;;;;N;;;;;
+1F69F;SUSPENSION RAILWAY;So;0;ON;;;;;N;;;;;
+1F6A0;MOUNTAIN CABLEWAY;So;0;ON;;;;;N;;;;;
+1F6A1;AERIAL TRAMWAY;So;0;ON;;;;;N;;;;;
+1F6A2;SHIP;So;0;ON;;;;;N;;;;;
+1F6A3;ROWBOAT;So;0;ON;;;;;N;;;;;
+1F6A4;SPEEDBOAT;So;0;ON;;;;;N;;;;;
+1F6A5;HORIZONTAL TRAFFIC LIGHT;So;0;ON;;;;;N;;;;;
+1F6A6;VERTICAL TRAFFIC LIGHT;So;0;ON;;;;;N;;;;;
+1F6A7;CONSTRUCTION SIGN;So;0;ON;;;;;N;;;;;
+1F6A8;POLICE CARS REVOLVING LIGHT;So;0;ON;;;;;N;;;;;
+1F6A9;TRIANGULAR FLAG ON POST;So;0;ON;;;;;N;;;;;
+1F6AA;DOOR;So;0;ON;;;;;N;;;;;
+1F6AB;NO ENTRY SIGN;So;0;ON;;;;;N;;;;;
+1F6AC;SMOKING SYMBOL;So;0;ON;;;;;N;;;;;
+1F6AD;NO SMOKING SYMBOL;So;0;ON;;;;;N;;;;;
+1F6AE;PUT LITTER IN ITS PLACE SYMBOL;So;0;ON;;;;;N;;;;;
+1F6AF;DO NOT LITTER SYMBOL;So;0;ON;;;;;N;;;;;
+1F6B0;POTABLE WATER SYMBOL;So;0;ON;;;;;N;;;;;
+1F6B1;NON-POTABLE WATER SYMBOL;So;0;ON;;;;;N;;;;;
+1F6B2;BICYCLE;So;0;ON;;;;;N;;;;;
+1F6B3;NO BICYCLES;So;0;ON;;;;;N;;;;;
+1F6B4;BICYCLIST;So;0;ON;;;;;N;;;;;
+1F6B5;MOUNTAIN BICYCLIST;So;0;ON;;;;;N;;;;;
+1F6B6;PEDESTRIAN;So;0;ON;;;;;N;;;;;
+1F6B7;NO PEDESTRIANS;So;0;ON;;;;;N;;;;;
+1F6B8;CHILDREN CROSSING;So;0;ON;;;;;N;;;;;
+1F6B9;MENS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6BA;WOMENS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6BB;RESTROOM;So;0;ON;;;;;N;;;;;
+1F6BC;BABY SYMBOL;So;0;ON;;;;;N;;;;;
+1F6BD;TOILET;So;0;ON;;;;;N;;;;;
+1F6BE;WATER CLOSET;So;0;ON;;;;;N;;;;;
+1F6BF;SHOWER;So;0;ON;;;;;N;;;;;
+1F6C0;BATH;So;0;ON;;;;;N;;;;;
+1F6C1;BATHTUB;So;0;ON;;;;;N;;;;;
+1F6C2;PASSPORT CONTROL;So;0;ON;;;;;N;;;;;
+1F6C3;CUSTOMS;So;0;ON;;;;;N;;;;;
+1F6C4;BAGGAGE CLAIM;So;0;ON;;;;;N;;;;;
+1F6C5;LEFT LUGGAGE;So;0;ON;;;;;N;;;;;
+1F6C6;TRIANGLE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
+1F6C7;PROHIBITED SIGN;So;0;ON;;;;;N;;;;;
+1F6C8;CIRCLED INFORMATION SOURCE;So;0;ON;;;;;N;;;;;
+1F6C9;BOYS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6CA;GIRLS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6CB;COUCH AND LAMP;So;0;ON;;;;;N;;;;;
+1F6CC;SLEEPING ACCOMMODATION;So;0;ON;;;;;N;;;;;
+1F6CD;SHOPPING BAGS;So;0;ON;;;;;N;;;;;
+1F6CE;BELLHOP BELL;So;0;ON;;;;;N;;;;;
+1F6CF;BED;So;0;ON;;;;;N;;;;;
+1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;;
+1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;;
+1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;;
+1F6D3;STUPA;So;0;ON;;;;;N;;;;;
+1F6D4;PAGODA;So;0;ON;;;;;N;;;;;
+1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;;
+1F6D6;HUT;So;0;ON;;;;;N;;;;;
+1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;;
+1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;;
+1F6E1;SHIELD;So;0;ON;;;;;N;;;;;
+1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;;
+1F6E3;MOTORWAY;So;0;ON;;;;;N;;;;;
+1F6E4;RAILWAY TRACK;So;0;ON;;;;;N;;;;;
+1F6E5;MOTOR BOAT;So;0;ON;;;;;N;;;;;
+1F6E6;UP-POINTING MILITARY AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6E7;UP-POINTING AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6E8;UP-POINTING SMALL AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6E9;SMALL AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6EA;NORTHEAST-POINTING AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6EB;AIRPLANE DEPARTURE;So;0;ON;;;;;N;;;;;
+1F6EC;AIRPLANE ARRIVING;So;0;ON;;;;;N;;;;;
+1F6F0;SATELLITE;So;0;ON;;;;;N;;;;;
+1F6F1;ONCOMING FIRE ENGINE;So;0;ON;;;;;N;;;;;
+1F6F2;DIESEL LOCOMOTIVE;So;0;ON;;;;;N;;;;;
+1F6F3;PASSENGER SHIP;So;0;ON;;;;;N;;;;;
+1F6F4;SCOOTER;So;0;ON;;;;;N;;;;;
+1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;;
+1F6F6;CANOE;So;0;ON;;;;;N;;;;;
+1F6F7;SLED;So;0;ON;;;;;N;;;;;
+1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;;
+1F6F9;SKATEBOARD;So;0;ON;;;;;N;;;;;
+1F6FA;AUTO RICKSHAW;So;0;ON;;;;;N;;;;;
+1F6FB;PICKUP TRUCK;So;0;ON;;;;;N;;;;;
+1F6FC;ROLLER SKATE;So;0;ON;;;;;N;;;;;
+1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
+1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
+1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
+1F703;ALCHEMICAL SYMBOL FOR EARTH;So;0;ON;;;;;N;;;;;
+1F704;ALCHEMICAL SYMBOL FOR WATER;So;0;ON;;;;;N;;;;;
+1F705;ALCHEMICAL SYMBOL FOR AQUAFORTIS;So;0;ON;;;;;N;;;;;
+1F706;ALCHEMICAL SYMBOL FOR AQUA REGIA;So;0;ON;;;;;N;;;;;
+1F707;ALCHEMICAL SYMBOL FOR AQUA REGIA-2;So;0;ON;;;;;N;;;;;
+1F708;ALCHEMICAL SYMBOL FOR AQUA VITAE;So;0;ON;;;;;N;;;;;
+1F709;ALCHEMICAL SYMBOL FOR AQUA VITAE-2;So;0;ON;;;;;N;;;;;
+1F70A;ALCHEMICAL SYMBOL FOR VINEGAR;So;0;ON;;;;;N;;;;;
+1F70B;ALCHEMICAL SYMBOL FOR VINEGAR-2;So;0;ON;;;;;N;;;;;
+1F70C;ALCHEMICAL SYMBOL FOR VINEGAR-3;So;0;ON;;;;;N;;;;;
+1F70D;ALCHEMICAL SYMBOL FOR SULFUR;So;0;ON;;;;;N;;;;;
+1F70E;ALCHEMICAL SYMBOL FOR PHILOSOPHERS SULFUR;So;0;ON;;;;;N;;;;;
+1F70F;ALCHEMICAL SYMBOL FOR BLACK SULFUR;So;0;ON;;;;;N;;;;;
+1F710;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE;So;0;ON;;;;;N;;;;;
+1F711;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE-2;So;0;ON;;;;;N;;;;;
+1F712;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE-3;So;0;ON;;;;;N;;;;;
+1F713;ALCHEMICAL SYMBOL FOR CINNABAR;So;0;ON;;;;;N;;;;;
+1F714;ALCHEMICAL SYMBOL FOR SALT;So;0;ON;;;;;N;;;;;
+1F715;ALCHEMICAL SYMBOL FOR NITRE;So;0;ON;;;;;N;;;;;
+1F716;ALCHEMICAL SYMBOL FOR VITRIOL;So;0;ON;;;;;N;;;;;
+1F717;ALCHEMICAL SYMBOL FOR VITRIOL-2;So;0;ON;;;;;N;;;;;
+1F718;ALCHEMICAL SYMBOL FOR ROCK SALT;So;0;ON;;;;;N;;;;;
+1F719;ALCHEMICAL SYMBOL FOR ROCK SALT-2;So;0;ON;;;;;N;;;;;
+1F71A;ALCHEMICAL SYMBOL FOR GOLD;So;0;ON;;;;;N;;;;;
+1F71B;ALCHEMICAL SYMBOL FOR SILVER;So;0;ON;;;;;N;;;;;
+1F71C;ALCHEMICAL SYMBOL FOR IRON ORE;So;0;ON;;;;;N;;;;;
+1F71D;ALCHEMICAL SYMBOL FOR IRON ORE-2;So;0;ON;;;;;N;;;;;
+1F71E;ALCHEMICAL SYMBOL FOR CROCUS OF IRON;So;0;ON;;;;;N;;;;;
+1F71F;ALCHEMICAL SYMBOL FOR REGULUS OF IRON;So;0;ON;;;;;N;;;;;
+1F720;ALCHEMICAL SYMBOL FOR COPPER ORE;So;0;ON;;;;;N;;;;;
+1F721;ALCHEMICAL SYMBOL FOR IRON-COPPER ORE;So;0;ON;;;;;N;;;;;
+1F722;ALCHEMICAL SYMBOL FOR SUBLIMATE OF COPPER;So;0;ON;;;;;N;;;;;
+1F723;ALCHEMICAL SYMBOL FOR CROCUS OF COPPER;So;0;ON;;;;;N;;;;;
+1F724;ALCHEMICAL SYMBOL FOR CROCUS OF COPPER-2;So;0;ON;;;;;N;;;;;
+1F725;ALCHEMICAL SYMBOL FOR COPPER ANTIMONIATE;So;0;ON;;;;;N;;;;;
+1F726;ALCHEMICAL SYMBOL FOR SALT OF COPPER ANTIMONIATE;So;0;ON;;;;;N;;;;;
+1F727;ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF COPPER;So;0;ON;;;;;N;;;;;
+1F728;ALCHEMICAL SYMBOL FOR VERDIGRIS;So;0;ON;;;;;N;;;;;
+1F729;ALCHEMICAL SYMBOL FOR TIN ORE;So;0;ON;;;;;N;;;;;
+1F72A;ALCHEMICAL SYMBOL FOR LEAD ORE;So;0;ON;;;;;N;;;;;
+1F72B;ALCHEMICAL SYMBOL FOR ANTIMONY ORE;So;0;ON;;;;;N;;;;;
+1F72C;ALCHEMICAL SYMBOL FOR SUBLIMATE OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F72D;ALCHEMICAL SYMBOL FOR SALT OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F72E;ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F72F;ALCHEMICAL SYMBOL FOR VINEGAR OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F730;ALCHEMICAL SYMBOL FOR REGULUS OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F731;ALCHEMICAL SYMBOL FOR REGULUS OF ANTIMONY-2;So;0;ON;;;;;N;;;;;
+1F732;ALCHEMICAL SYMBOL FOR REGULUS;So;0;ON;;;;;N;;;;;
+1F733;ALCHEMICAL SYMBOL FOR REGULUS-2;So;0;ON;;;;;N;;;;;
+1F734;ALCHEMICAL SYMBOL FOR REGULUS-3;So;0;ON;;;;;N;;;;;
+1F735;ALCHEMICAL SYMBOL FOR REGULUS-4;So;0;ON;;;;;N;;;;;
+1F736;ALCHEMICAL SYMBOL FOR ALKALI;So;0;ON;;;;;N;;;;;
+1F737;ALCHEMICAL SYMBOL FOR ALKALI-2;So;0;ON;;;;;N;;;;;
+1F738;ALCHEMICAL SYMBOL FOR MARCASITE;So;0;ON;;;;;N;;;;;
+1F739;ALCHEMICAL SYMBOL FOR SAL-AMMONIAC;So;0;ON;;;;;N;;;;;
+1F73A;ALCHEMICAL SYMBOL FOR ARSENIC;So;0;ON;;;;;N;;;;;
+1F73B;ALCHEMICAL SYMBOL FOR REALGAR;So;0;ON;;;;;N;;;;;
+1F73C;ALCHEMICAL SYMBOL FOR REALGAR-2;So;0;ON;;;;;N;;;;;
+1F73D;ALCHEMICAL SYMBOL FOR AURIPIGMENT;So;0;ON;;;;;N;;;;;
+1F73E;ALCHEMICAL SYMBOL FOR BISMUTH ORE;So;0;ON;;;;;N;;;;;
+1F73F;ALCHEMICAL SYMBOL FOR TARTAR;So;0;ON;;;;;N;;;;;
+1F740;ALCHEMICAL SYMBOL FOR TARTAR-2;So;0;ON;;;;;N;;;;;
+1F741;ALCHEMICAL SYMBOL FOR QUICK LIME;So;0;ON;;;;;N;;;;;
+1F742;ALCHEMICAL SYMBOL FOR BORAX;So;0;ON;;;;;N;;;;;
+1F743;ALCHEMICAL SYMBOL FOR BORAX-2;So;0;ON;;;;;N;;;;;
+1F744;ALCHEMICAL SYMBOL FOR BORAX-3;So;0;ON;;;;;N;;;;;
+1F745;ALCHEMICAL SYMBOL FOR ALUM;So;0;ON;;;;;N;;;;;
+1F746;ALCHEMICAL SYMBOL FOR OIL;So;0;ON;;;;;N;;;;;
+1F747;ALCHEMICAL SYMBOL FOR SPIRIT;So;0;ON;;;;;N;;;;;
+1F748;ALCHEMICAL SYMBOL FOR TINCTURE;So;0;ON;;;;;N;;;;;
+1F749;ALCHEMICAL SYMBOL FOR GUM;So;0;ON;;;;;N;;;;;
+1F74A;ALCHEMICAL SYMBOL FOR WAX;So;0;ON;;;;;N;;;;;
+1F74B;ALCHEMICAL SYMBOL FOR POWDER;So;0;ON;;;;;N;;;;;
+1F74C;ALCHEMICAL SYMBOL FOR CALX;So;0;ON;;;;;N;;;;;
+1F74D;ALCHEMICAL SYMBOL FOR TUTTY;So;0;ON;;;;;N;;;;;
+1F74E;ALCHEMICAL SYMBOL FOR CAPUT MORTUUM;So;0;ON;;;;;N;;;;;
+1F74F;ALCHEMICAL SYMBOL FOR SCEPTER OF JOVE;So;0;ON;;;;;N;;;;;
+1F750;ALCHEMICAL SYMBOL FOR CADUCEUS;So;0;ON;;;;;N;;;;;
+1F751;ALCHEMICAL SYMBOL FOR TRIDENT;So;0;ON;;;;;N;;;;;
+1F752;ALCHEMICAL SYMBOL FOR STARRED TRIDENT;So;0;ON;;;;;N;;;;;
+1F753;ALCHEMICAL SYMBOL FOR LODESTONE;So;0;ON;;;;;N;;;;;
+1F754;ALCHEMICAL SYMBOL FOR SOAP;So;0;ON;;;;;N;;;;;
+1F755;ALCHEMICAL SYMBOL FOR URINE;So;0;ON;;;;;N;;;;;
+1F756;ALCHEMICAL SYMBOL FOR HORSE DUNG;So;0;ON;;;;;N;;;;;
+1F757;ALCHEMICAL SYMBOL FOR ASHES;So;0;ON;;;;;N;;;;;
+1F758;ALCHEMICAL SYMBOL FOR POT ASHES;So;0;ON;;;;;N;;;;;
+1F759;ALCHEMICAL SYMBOL FOR BRICK;So;0;ON;;;;;N;;;;;
+1F75A;ALCHEMICAL SYMBOL FOR POWDERED BRICK;So;0;ON;;;;;N;;;;;
+1F75B;ALCHEMICAL SYMBOL FOR AMALGAM;So;0;ON;;;;;N;;;;;
+1F75C;ALCHEMICAL SYMBOL FOR STRATUM SUPER STRATUM;So;0;ON;;;;;N;;;;;
+1F75D;ALCHEMICAL SYMBOL FOR STRATUM SUPER STRATUM-2;So;0;ON;;;;;N;;;;;
+1F75E;ALCHEMICAL SYMBOL FOR SUBLIMATION;So;0;ON;;;;;N;;;;;
+1F75F;ALCHEMICAL SYMBOL FOR PRECIPITATE;So;0;ON;;;;;N;;;;;
+1F760;ALCHEMICAL SYMBOL FOR DISTILL;So;0;ON;;;;;N;;;;;
+1F761;ALCHEMICAL SYMBOL FOR DISSOLVE;So;0;ON;;;;;N;;;;;
+1F762;ALCHEMICAL SYMBOL FOR DISSOLVE-2;So;0;ON;;;;;N;;;;;
+1F763;ALCHEMICAL SYMBOL FOR PURIFY;So;0;ON;;;;;N;;;;;
+1F764;ALCHEMICAL SYMBOL FOR PUTREFACTION;So;0;ON;;;;;N;;;;;
+1F765;ALCHEMICAL SYMBOL FOR CRUCIBLE;So;0;ON;;;;;N;;;;;
+1F766;ALCHEMICAL SYMBOL FOR CRUCIBLE-2;So;0;ON;;;;;N;;;;;
+1F767;ALCHEMICAL SYMBOL FOR CRUCIBLE-3;So;0;ON;;;;;N;;;;;
+1F768;ALCHEMICAL SYMBOL FOR CRUCIBLE-4;So;0;ON;;;;;N;;;;;
+1F769;ALCHEMICAL SYMBOL FOR CRUCIBLE-5;So;0;ON;;;;;N;;;;;
+1F76A;ALCHEMICAL SYMBOL FOR ALEMBIC;So;0;ON;;;;;N;;;;;
+1F76B;ALCHEMICAL SYMBOL FOR BATH OF MARY;So;0;ON;;;;;N;;;;;
+1F76C;ALCHEMICAL SYMBOL FOR BATH OF VAPOURS;So;0;ON;;;;;N;;;;;
+1F76D;ALCHEMICAL SYMBOL FOR RETORT;So;0;ON;;;;;N;;;;;
+1F76E;ALCHEMICAL SYMBOL FOR HOUR;So;0;ON;;;;;N;;;;;
+1F76F;ALCHEMICAL SYMBOL FOR NIGHT;So;0;ON;;;;;N;;;;;
+1F770;ALCHEMICAL SYMBOL FOR DAY-NIGHT;So;0;ON;;;;;N;;;;;
+1F771;ALCHEMICAL SYMBOL FOR MONTH;So;0;ON;;;;;N;;;;;
+1F772;ALCHEMICAL SYMBOL FOR HALF DRAM;So;0;ON;;;;;N;;;;;
+1F773;ALCHEMICAL SYMBOL FOR HALF OUNCE;So;0;ON;;;;;N;;;;;
+1F780;BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F781;BLACK UP-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F782;BLACK RIGHT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F783;BLACK DOWN-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F784;BLACK SLIGHTLY SMALL CIRCLE;So;0;ON;;;;;N;;;;;
+1F785;MEDIUM BOLD WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F786;BOLD WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F787;HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F788;VERY HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F789;EXTREMELY HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F78A;WHITE CIRCLE CONTAINING BLACK SMALL CIRCLE;So;0;ON;;;;;N;;;;;
+1F78B;ROUND TARGET;So;0;ON;;;;;N;;;;;
+1F78C;BLACK TINY SQUARE;So;0;ON;;;;;N;;;;;
+1F78D;BLACK SLIGHTLY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+1F78E;LIGHT WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F78F;MEDIUM WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F790;BOLD WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F791;HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F792;VERY HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F793;EXTREMELY HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F794;WHITE SQUARE CONTAINING BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+1F795;WHITE SQUARE CONTAINING BLACK MEDIUM SQUARE;So;0;ON;;;;;N;;;;;
+1F796;SQUARE TARGET;So;0;ON;;;;;N;;;;;
+1F797;BLACK TINY DIAMOND;So;0;ON;;;;;N;;;;;
+1F798;BLACK VERY SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+1F799;BLACK MEDIUM SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+1F79A;WHITE DIAMOND CONTAINING BLACK VERY SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+1F79B;WHITE DIAMOND CONTAINING BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+1F79C;DIAMOND TARGET;So;0;ON;;;;;N;;;;;
+1F79D;BLACK TINY LOZENGE;So;0;ON;;;;;N;;;;;
+1F79E;BLACK VERY SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+1F79F;BLACK MEDIUM SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+1F7A0;WHITE LOZENGE CONTAINING BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+1F7A1;THIN GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A2;LIGHT GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A3;MEDIUM GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A4;BOLD GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A5;VERY BOLD GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A6;VERY HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A7;EXTREMELY HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A8;THIN SALTIRE;So;0;ON;;;;;N;;;;;
+1F7A9;LIGHT SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AA;MEDIUM SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AB;BOLD SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AC;HEAVY SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AD;VERY HEAVY SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AE;EXTREMELY HEAVY SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AF;LIGHT FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B0;MEDIUM FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B1;BOLD FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B2;HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B3;VERY HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B4;EXTREMELY HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B5;LIGHT SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B6;MEDIUM SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B7;BOLD SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B8;HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B9;VERY HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BA;EXTREMELY HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BB;LIGHT EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BC;MEDIUM EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BD;BOLD EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BE;HEAVY EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BF;VERY HEAVY EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7C0;LIGHT THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C1;MEDIUM THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C2;THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C3;MEDIUM THREE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7C4;LIGHT FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C5;MEDIUM FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C6;FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C7;MEDIUM FOUR POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7C8;REVERSE LIGHT FOUR POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7C9;LIGHT FIVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CA;HEAVY FIVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CB;MEDIUM SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CC;HEAVY SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CD;SIX POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7CE;MEDIUM EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CF;HEAVY EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D0;VERY HEAVY EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D1;HEAVY EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7D2;LIGHT TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D3;HEAVY TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D4;HEAVY TWELVE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7D5;CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F7D6;NEGATIVE CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
+1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
+1F7E0;LARGE ORANGE CIRCLE;So;0;ON;;;;;N;;;;;
+1F7E1;LARGE YELLOW CIRCLE;So;0;ON;;;;;N;;;;;
+1F7E2;LARGE GREEN CIRCLE;So;0;ON;;;;;N;;;;;
+1F7E3;LARGE PURPLE CIRCLE;So;0;ON;;;;;N;;;;;
+1F7E4;LARGE BROWN CIRCLE;So;0;ON;;;;;N;;;;;
+1F7E5;LARGE RED SQUARE;So;0;ON;;;;;N;;;;;
+1F7E6;LARGE BLUE SQUARE;So;0;ON;;;;;N;;;;;
+1F7E7;LARGE ORANGE SQUARE;So;0;ON;;;;;N;;;;;
+1F7E8;LARGE YELLOW SQUARE;So;0;ON;;;;;N;;;;;
+1F7E9;LARGE GREEN SQUARE;So;0;ON;;;;;N;;;;;
+1F7EA;LARGE PURPLE SQUARE;So;0;ON;;;;;N;;;;;
+1F7EB;LARGE BROWN SQUARE;So;0;ON;;;;;N;;;;;
+1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F803;DOWNWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F804;LEFTWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F805;UPWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F806;RIGHTWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F807;DOWNWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F808;LEFTWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F809;UPWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F80A;RIGHTWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F80B;DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F810;LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F811;UPWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F812;RIGHTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F813;DOWNWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F814;LEFTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F815;UPWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F816;RIGHTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F817;DOWNWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F818;HEAVY LEFTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F819;HEAVY UPWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81A;HEAVY RIGHTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81B;HEAVY DOWNWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81C;HEAVY LEFTWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81D;HEAVY UPWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81E;HEAVY RIGHTWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81F;HEAVY DOWNWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F820;LEFTWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F821;UPWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F822;RIGHTWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F823;DOWNWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F824;LEFTWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F825;UPWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F826;RIGHTWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F827;DOWNWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F828;LEFTWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F829;UPWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F82A;RIGHTWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F82B;DOWNWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F82C;LEFTWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F82D;UPWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F82E;RIGHTWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F82F;DOWNWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F830;LEFTWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F831;UPWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F832;RIGHTWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F833;DOWNWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F834;LEFTWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F835;UPWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F836;RIGHTWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F837;DOWNWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F838;LEFTWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F839;UPWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F83A;RIGHTWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F83B;DOWNWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F83C;LEFTWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F83D;UPWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F83E;RIGHTWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F83F;DOWNWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F840;LEFTWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F841;UPWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F842;RIGHTWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F843;DOWNWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F844;LEFTWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F845;UPWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F846;RIGHTWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F847;DOWNWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F850;LEFTWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F851;UPWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F852;RIGHTWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F853;DOWNWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F854;NORTH WEST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F855;NORTH EAST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F856;SOUTH EAST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F857;SOUTH WEST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F858;LEFT RIGHT SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F859;UP DOWN SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F860;WIDE-HEADED LEFTWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F861;WIDE-HEADED UPWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F862;WIDE-HEADED RIGHTWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F863;WIDE-HEADED DOWNWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F864;WIDE-HEADED NORTH WEST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F865;WIDE-HEADED NORTH EAST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F866;WIDE-HEADED SOUTH EAST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F867;WIDE-HEADED SOUTH WEST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F868;WIDE-HEADED LEFTWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F869;WIDE-HEADED UPWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86A;WIDE-HEADED RIGHTWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86B;WIDE-HEADED DOWNWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86C;WIDE-HEADED NORTH WEST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86D;WIDE-HEADED NORTH EAST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86E;WIDE-HEADED SOUTH EAST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86F;WIDE-HEADED SOUTH WEST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F870;WIDE-HEADED LEFTWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F871;WIDE-HEADED UPWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F872;WIDE-HEADED RIGHTWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F873;WIDE-HEADED DOWNWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F874;WIDE-HEADED NORTH WEST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F875;WIDE-HEADED NORTH EAST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F876;WIDE-HEADED SOUTH EAST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F877;WIDE-HEADED SOUTH WEST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F878;WIDE-HEADED LEFTWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F879;WIDE-HEADED UPWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87A;WIDE-HEADED RIGHTWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87B;WIDE-HEADED DOWNWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87C;WIDE-HEADED NORTH WEST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87D;WIDE-HEADED NORTH EAST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87E;WIDE-HEADED SOUTH EAST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87F;WIDE-HEADED SOUTH WEST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F880;WIDE-HEADED LEFTWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F881;WIDE-HEADED UPWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F882;WIDE-HEADED RIGHTWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F883;WIDE-HEADED DOWNWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F884;WIDE-HEADED NORTH WEST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F885;WIDE-HEADED NORTH EAST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F886;WIDE-HEADED SOUTH EAST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F887;WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F890;LEFTWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F891;UPWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F892;RIGHTWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F893;DOWNWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F894;LEFTWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F895;UPWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F896;RIGHTWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F897;DOWNWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F898;LEFTWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F899;UPWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F89A;RIGHTWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F89B;DOWNWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F89C;HEAVY ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;;
+1F89D;HEAVY ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;;
+1F89E;HEAVY ARROW SHAFT WIDTH ONE HALF;So;0;ON;;;;;N;;;;;
+1F89F;HEAVY ARROW SHAFT WIDTH ONE THIRD;So;0;ON;;;;;N;;;;;
+1F8A0;LEFTWARDS BOTTOM-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A1;RIGHTWARDS BOTTOM SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A2;LEFTWARDS TOP SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A3;RIGHTWARDS TOP SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A4;LEFTWARDS LEFT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A5;RIGHTWARDS RIGHT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A6;LEFTWARDS RIGHT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A7;RIGHTWARDS LEFT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A8;LEFTWARDS BACK-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A9;RIGHTWARDS BACK-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8AA;LEFTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8AB;RIGHTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8AC;WHITE ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;;
+1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;;
+1F8B0;ARROW POINTING UPWARDS THEN NORTH WEST;So;0;ON;;;;;N;;;;;
+1F8B1;ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST;So;0;ON;;;;;N;;;;;
+1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
+1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;;
+1F903;LEFT HALF CIRCLE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
+1F904;LEFT HALF CIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F905;LEFT HALF CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+1F906;LEFT HALF CIRCLE WITH DOT;So;0;ON;;;;;N;;;;;
+1F907;LEFT HALF CIRCLE;So;0;ON;;;;;N;;;;;
+1F908;DOWNWARD FACING HOOK;So;0;ON;;;;;N;;;;;
+1F909;DOWNWARD FACING NOTCHED HOOK;So;0;ON;;;;;N;;;;;
+1F90A;DOWNWARD FACING HOOK WITH DOT;So;0;ON;;;;;N;;;;;
+1F90B;DOWNWARD FACING NOTCHED HOOK WITH DOT;So;0;ON;;;;;N;;;;;
+1F90C;PINCHED FINGERS;So;0;ON;;;;;N;;;;;
+1F90D;WHITE HEART;So;0;ON;;;;;N;;;;;
+1F90E;BROWN HEART;So;0;ON;;;;;N;;;;;
+1F90F;PINCHING HAND;So;0;ON;;;;;N;;;;;
+1F910;ZIPPER-MOUTH FACE;So;0;ON;;;;;N;;;;;
+1F911;MONEY-MOUTH FACE;So;0;ON;;;;;N;;;;;
+1F912;FACE WITH THERMOMETER;So;0;ON;;;;;N;;;;;
+1F913;NERD FACE;So;0;ON;;;;;N;;;;;
+1F914;THINKING FACE;So;0;ON;;;;;N;;;;;
+1F915;FACE WITH HEAD-BANDAGE;So;0;ON;;;;;N;;;;;
+1F916;ROBOT FACE;So;0;ON;;;;;N;;;;;
+1F917;HUGGING FACE;So;0;ON;;;;;N;;;;;
+1F918;SIGN OF THE HORNS;So;0;ON;;;;;N;;;;;
+1F919;CALL ME HAND;So;0;ON;;;;;N;;;;;
+1F91A;RAISED BACK OF HAND;So;0;ON;;;;;N;;;;;
+1F91B;LEFT-FACING FIST;So;0;ON;;;;;N;;;;;
+1F91C;RIGHT-FACING FIST;So;0;ON;;;;;N;;;;;
+1F91D;HANDSHAKE;So;0;ON;;;;;N;;;;;
+1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;;
+1F91F;I LOVE YOU HAND SIGN;So;0;ON;;;;;N;;;;;
+1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;;
+1F921;CLOWN FACE;So;0;ON;;;;;N;;;;;
+1F922;NAUSEATED FACE;So;0;ON;;;;;N;;;;;
+1F923;ROLLING ON THE FLOOR LAUGHING;So;0;ON;;;;;N;;;;;
+1F924;DROOLING FACE;So;0;ON;;;;;N;;;;;
+1F925;LYING FACE;So;0;ON;;;;;N;;;;;
+1F926;FACE PALM;So;0;ON;;;;;N;;;;;
+1F927;SNEEZING FACE;So;0;ON;;;;;N;;;;;
+1F928;FACE WITH ONE EYEBROW RAISED;So;0;ON;;;;;N;;;;;
+1F929;GRINNING FACE WITH STAR EYES;So;0;ON;;;;;N;;;;;
+1F92A;GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE;So;0;ON;;;;;N;;;;;
+1F92B;FACE WITH FINGER COVERING CLOSED LIPS;So;0;ON;;;;;N;;;;;
+1F92C;SERIOUS FACE WITH SYMBOLS COVERING MOUTH;So;0;ON;;;;;N;;;;;
+1F92D;SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH;So;0;ON;;;;;N;;;;;
+1F92E;FACE WITH OPEN MOUTH VOMITING;So;0;ON;;;;;N;;;;;
+1F92F;SHOCKED FACE WITH EXPLODING HEAD;So;0;ON;;;;;N;;;;;
+1F930;PREGNANT WOMAN;So;0;ON;;;;;N;;;;;
+1F931;BREAST-FEEDING;So;0;ON;;;;;N;;;;;
+1F932;PALMS UP TOGETHER;So;0;ON;;;;;N;;;;;
+1F933;SELFIE;So;0;ON;;;;;N;;;;;
+1F934;PRINCE;So;0;ON;;;;;N;;;;;
+1F935;MAN IN TUXEDO;So;0;ON;;;;;N;;;;;
+1F936;MOTHER CHRISTMAS;So;0;ON;;;;;N;;;;;
+1F937;SHRUG;So;0;ON;;;;;N;;;;;
+1F938;PERSON DOING CARTWHEEL;So;0;ON;;;;;N;;;;;
+1F939;JUGGLING;So;0;ON;;;;;N;;;;;
+1F93A;FENCER;So;0;ON;;;;;N;;;;;
+1F93B;MODERN PENTATHLON;So;0;ON;;;;;N;;;;;
+1F93C;WRESTLERS;So;0;ON;;;;;N;;;;;
+1F93D;WATER POLO;So;0;ON;;;;;N;;;;;
+1F93E;HANDBALL;So;0;ON;;;;;N;;;;;
+1F93F;DIVING MASK;So;0;ON;;;;;N;;;;;
+1F940;WILTED FLOWER;So;0;ON;;;;;N;;;;;
+1F941;DRUM WITH DRUMSTICKS;So;0;ON;;;;;N;;;;;
+1F942;CLINKING GLASSES;So;0;ON;;;;;N;;;;;
+1F943;TUMBLER GLASS;So;0;ON;;;;;N;;;;;
+1F944;SPOON;So;0;ON;;;;;N;;;;;
+1F945;GOAL NET;So;0;ON;;;;;N;;;;;
+1F946;RIFLE;So;0;ON;;;;;N;;;;;
+1F947;FIRST PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F948;SECOND PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F949;THIRD PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
+1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
+1F94C;CURLING STONE;So;0;ON;;;;;N;;;;;
+1F94D;LACROSSE STICK AND BALL;So;0;ON;;;;;N;;;;;
+1F94E;SOFTBALL;So;0;ON;;;;;N;;;;;
+1F94F;FLYING DISC;So;0;ON;;;;;N;;;;;
+1F950;CROISSANT;So;0;ON;;;;;N;;;;;
+1F951;AVOCADO;So;0;ON;;;;;N;;;;;
+1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
+1F953;BACON;So;0;ON;;;;;N;;;;;
+1F954;POTATO;So;0;ON;;;;;N;;;;;
+1F955;CARROT;So;0;ON;;;;;N;;;;;
+1F956;BAGUETTE BREAD;So;0;ON;;;;;N;;;;;
+1F957;GREEN SALAD;So;0;ON;;;;;N;;;;;
+1F958;SHALLOW PAN OF FOOD;So;0;ON;;;;;N;;;;;
+1F959;STUFFED FLATBREAD;So;0;ON;;;;;N;;;;;
+1F95A;EGG;So;0;ON;;;;;N;;;;;
+1F95B;GLASS OF MILK;So;0;ON;;;;;N;;;;;
+1F95C;PEANUTS;So;0;ON;;;;;N;;;;;
+1F95D;KIWIFRUIT;So;0;ON;;;;;N;;;;;
+1F95E;PANCAKES;So;0;ON;;;;;N;;;;;
+1F95F;DUMPLING;So;0;ON;;;;;N;;;;;
+1F960;FORTUNE COOKIE;So;0;ON;;;;;N;;;;;
+1F961;TAKEOUT BOX;So;0;ON;;;;;N;;;;;
+1F962;CHOPSTICKS;So;0;ON;;;;;N;;;;;
+1F963;BOWL WITH SPOON;So;0;ON;;;;;N;;;;;
+1F964;CUP WITH STRAW;So;0;ON;;;;;N;;;;;
+1F965;COCONUT;So;0;ON;;;;;N;;;;;
+1F966;BROCCOLI;So;0;ON;;;;;N;;;;;
+1F967;PIE;So;0;ON;;;;;N;;;;;
+1F968;PRETZEL;So;0;ON;;;;;N;;;;;
+1F969;CUT OF MEAT;So;0;ON;;;;;N;;;;;
+1F96A;SANDWICH;So;0;ON;;;;;N;;;;;
+1F96B;CANNED FOOD;So;0;ON;;;;;N;;;;;
+1F96C;LEAFY GREEN;So;0;ON;;;;;N;;;;;
+1F96D;MANGO;So;0;ON;;;;;N;;;;;
+1F96E;MOON CAKE;So;0;ON;;;;;N;;;;;
+1F96F;BAGEL;So;0;ON;;;;;N;;;;;
+1F970;SMILING FACE WITH SMILING EYES AND THREE HEARTS;So;0;ON;;;;;N;;;;;
+1F971;YAWNING FACE;So;0;ON;;;;;N;;;;;
+1F972;SMILING FACE WITH TEAR;So;0;ON;;;;;N;;;;;
+1F973;FACE WITH PARTY HORN AND PARTY HAT;So;0;ON;;;;;N;;;;;
+1F974;FACE WITH UNEVEN EYES AND WAVY MOUTH;So;0;ON;;;;;N;;;;;
+1F975;OVERHEATED FACE;So;0;ON;;;;;N;;;;;
+1F976;FREEZING FACE;So;0;ON;;;;;N;;;;;
+1F977;NINJA;So;0;ON;;;;;N;;;;;
+1F978;DISGUISED FACE;So;0;ON;;;;;N;;;;;
+1F97A;FACE WITH PLEADING EYES;So;0;ON;;;;;N;;;;;
+1F97B;SARI;So;0;ON;;;;;N;;;;;
+1F97C;LAB COAT;So;0;ON;;;;;N;;;;;
+1F97D;GOGGLES;So;0;ON;;;;;N;;;;;
+1F97E;HIKING BOOT;So;0;ON;;;;;N;;;;;
+1F97F;FLAT SHOE;So;0;ON;;;;;N;;;;;
+1F980;CRAB;So;0;ON;;;;;N;;;;;
+1F981;LION FACE;So;0;ON;;;;;N;;;;;
+1F982;SCORPION;So;0;ON;;;;;N;;;;;
+1F983;TURKEY;So;0;ON;;;;;N;;;;;
+1F984;UNICORN FACE;So;0;ON;;;;;N;;;;;
+1F985;EAGLE;So;0;ON;;;;;N;;;;;
+1F986;DUCK;So;0;ON;;;;;N;;;;;
+1F987;BAT;So;0;ON;;;;;N;;;;;
+1F988;SHARK;So;0;ON;;;;;N;;;;;
+1F989;OWL;So;0;ON;;;;;N;;;;;
+1F98A;FOX FACE;So;0;ON;;;;;N;;;;;
+1F98B;BUTTERFLY;So;0;ON;;;;;N;;;;;
+1F98C;DEER;So;0;ON;;;;;N;;;;;
+1F98D;GORILLA;So;0;ON;;;;;N;;;;;
+1F98E;LIZARD;So;0;ON;;;;;N;;;;;
+1F98F;RHINOCEROS;So;0;ON;;;;;N;;;;;
+1F990;SHRIMP;So;0;ON;;;;;N;;;;;
+1F991;SQUID;So;0;ON;;;;;N;;;;;
+1F992;GIRAFFE FACE;So;0;ON;;;;;N;;;;;
+1F993;ZEBRA FACE;So;0;ON;;;;;N;;;;;
+1F994;HEDGEHOG;So;0;ON;;;;;N;;;;;
+1F995;SAUROPOD;So;0;ON;;;;;N;;;;;
+1F996;T-REX;So;0;ON;;;;;N;;;;;
+1F997;CRICKET;So;0;ON;;;;;N;;;;;
+1F998;KANGAROO;So;0;ON;;;;;N;;;;;
+1F999;LLAMA;So;0;ON;;;;;N;;;;;
+1F99A;PEACOCK;So;0;ON;;;;;N;;;;;
+1F99B;HIPPOPOTAMUS;So;0;ON;;;;;N;;;;;
+1F99C;PARROT;So;0;ON;;;;;N;;;;;
+1F99D;RACCOON;So;0;ON;;;;;N;;;;;
+1F99E;LOBSTER;So;0;ON;;;;;N;;;;;
+1F99F;MOSQUITO;So;0;ON;;;;;N;;;;;
+1F9A0;MICROBE;So;0;ON;;;;;N;;;;;
+1F9A1;BADGER;So;0;ON;;;;;N;;;;;
+1F9A2;SWAN;So;0;ON;;;;;N;;;;;
+1F9A3;MAMMOTH;So;0;ON;;;;;N;;;;;
+1F9A4;DODO;So;0;ON;;;;;N;;;;;
+1F9A5;SLOTH;So;0;ON;;;;;N;;;;;
+1F9A6;OTTER;So;0;ON;;;;;N;;;;;
+1F9A7;ORANGUTAN;So;0;ON;;;;;N;;;;;
+1F9A8;SKUNK;So;0;ON;;;;;N;;;;;
+1F9A9;FLAMINGO;So;0;ON;;;;;N;;;;;
+1F9AA;OYSTER;So;0;ON;;;;;N;;;;;
+1F9AB;BEAVER;So;0;ON;;;;;N;;;;;
+1F9AC;BISON;So;0;ON;;;;;N;;;;;
+1F9AD;SEAL;So;0;ON;;;;;N;;;;;
+1F9AE;GUIDE DOG;So;0;ON;;;;;N;;;;;
+1F9AF;PROBING CANE;So;0;ON;;;;;N;;;;;
+1F9B0;EMOJI COMPONENT RED HAIR;So;0;ON;;;;;N;;;;;
+1F9B1;EMOJI COMPONENT CURLY HAIR;So;0;ON;;;;;N;;;;;
+1F9B2;EMOJI COMPONENT BALD;So;0;ON;;;;;N;;;;;
+1F9B3;EMOJI COMPONENT WHITE HAIR;So;0;ON;;;;;N;;;;;
+1F9B4;BONE;So;0;ON;;;;;N;;;;;
+1F9B5;LEG;So;0;ON;;;;;N;;;;;
+1F9B6;FOOT;So;0;ON;;;;;N;;;;;
+1F9B7;TOOTH;So;0;ON;;;;;N;;;;;
+1F9B8;SUPERHERO;So;0;ON;;;;;N;;;;;
+1F9B9;SUPERVILLAIN;So;0;ON;;;;;N;;;;;
+1F9BA;SAFETY VEST;So;0;ON;;;;;N;;;;;
+1F9BB;EAR WITH HEARING AID;So;0;ON;;;;;N;;;;;
+1F9BC;MOTORIZED WHEELCHAIR;So;0;ON;;;;;N;;;;;
+1F9BD;MANUAL WHEELCHAIR;So;0;ON;;;;;N;;;;;
+1F9BE;MECHANICAL ARM;So;0;ON;;;;;N;;;;;
+1F9BF;MECHANICAL LEG;So;0;ON;;;;;N;;;;;
+1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
+1F9C1;CUPCAKE;So;0;ON;;;;;N;;;;;
+1F9C2;SALT SHAKER;So;0;ON;;;;;N;;;;;
+1F9C3;BEVERAGE BOX;So;0;ON;;;;;N;;;;;
+1F9C4;GARLIC;So;0;ON;;;;;N;;;;;
+1F9C5;ONION;So;0;ON;;;;;N;;;;;
+1F9C6;FALAFEL;So;0;ON;;;;;N;;;;;
+1F9C7;WAFFLE;So;0;ON;;;;;N;;;;;
+1F9C8;BUTTER;So;0;ON;;;;;N;;;;;
+1F9C9;MATE DRINK;So;0;ON;;;;;N;;;;;
+1F9CA;ICE CUBE;So;0;ON;;;;;N;;;;;
+1F9CB;BUBBLE TEA;So;0;ON;;;;;N;;;;;
+1F9CD;STANDING PERSON;So;0;ON;;;;;N;;;;;
+1F9CE;KNEELING PERSON;So;0;ON;;;;;N;;;;;
+1F9CF;DEAF PERSON;So;0;ON;;;;;N;;;;;
+1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;;
+1F9D1;ADULT;So;0;ON;;;;;N;;;;;
+1F9D2;CHILD;So;0;ON;;;;;N;;;;;
+1F9D3;OLDER ADULT;So;0;ON;;;;;N;;;;;
+1F9D4;BEARDED PERSON;So;0;ON;;;;;N;;;;;
+1F9D5;PERSON WITH HEADSCARF;So;0;ON;;;;;N;;;;;
+1F9D6;PERSON IN STEAMY ROOM;So;0;ON;;;;;N;;;;;
+1F9D7;PERSON CLIMBING;So;0;ON;;;;;N;;;;;
+1F9D8;PERSON IN LOTUS POSITION;So;0;ON;;;;;N;;;;;
+1F9D9;MAGE;So;0;ON;;;;;N;;;;;
+1F9DA;FAIRY;So;0;ON;;;;;N;;;;;
+1F9DB;VAMPIRE;So;0;ON;;;;;N;;;;;
+1F9DC;MERPERSON;So;0;ON;;;;;N;;;;;
+1F9DD;ELF;So;0;ON;;;;;N;;;;;
+1F9DE;GENIE;So;0;ON;;;;;N;;;;;
+1F9DF;ZOMBIE;So;0;ON;;;;;N;;;;;
+1F9E0;BRAIN;So;0;ON;;;;;N;;;;;
+1F9E1;ORANGE HEART;So;0;ON;;;;;N;;;;;
+1F9E2;BILLED CAP;So;0;ON;;;;;N;;;;;
+1F9E3;SCARF;So;0;ON;;;;;N;;;;;
+1F9E4;GLOVES;So;0;ON;;;;;N;;;;;
+1F9E5;COAT;So;0;ON;;;;;N;;;;;
+1F9E6;SOCKS;So;0;ON;;;;;N;;;;;
+1F9E7;RED GIFT ENVELOPE;So;0;ON;;;;;N;;;;;
+1F9E8;FIRECRACKER;So;0;ON;;;;;N;;;;;
+1F9E9;JIGSAW PUZZLE PIECE;So;0;ON;;;;;N;;;;;
+1F9EA;TEST TUBE;So;0;ON;;;;;N;;;;;
+1F9EB;PETRI DISH;So;0;ON;;;;;N;;;;;
+1F9EC;DNA DOUBLE HELIX;So;0;ON;;;;;N;;;;;
+1F9ED;COMPASS;So;0;ON;;;;;N;;;;;
+1F9EE;ABACUS;So;0;ON;;;;;N;;;;;
+1F9EF;FIRE EXTINGUISHER;So;0;ON;;;;;N;;;;;
+1F9F0;TOOLBOX;So;0;ON;;;;;N;;;;;
+1F9F1;BRICK;So;0;ON;;;;;N;;;;;
+1F9F2;MAGNET;So;0;ON;;;;;N;;;;;
+1F9F3;LUGGAGE;So;0;ON;;;;;N;;;;;
+1F9F4;LOTION BOTTLE;So;0;ON;;;;;N;;;;;
+1F9F5;SPOOL OF THREAD;So;0;ON;;;;;N;;;;;
+1F9F6;BALL OF YARN;So;0;ON;;;;;N;;;;;
+1F9F7;SAFETY PIN;So;0;ON;;;;;N;;;;;
+1F9F8;TEDDY BEAR;So;0;ON;;;;;N;;;;;
+1F9F9;BROOM;So;0;ON;;;;;N;;;;;
+1F9FA;BASKET;So;0;ON;;;;;N;;;;;
+1F9FB;ROLL OF PAPER;So;0;ON;;;;;N;;;;;
+1F9FC;BAR OF SOAP;So;0;ON;;;;;N;;;;;
+1F9FD;SPONGE;So;0;ON;;;;;N;;;;;
+1F9FE;RECEIPT;So;0;ON;;;;;N;;;;;
+1F9FF;NAZAR AMULET;So;0;ON;;;;;N;;;;;
+1FA00;NEUTRAL CHESS KING;So;0;ON;;;;;N;;;;;
+1FA01;NEUTRAL CHESS QUEEN;So;0;ON;;;;;N;;;;;
+1FA02;NEUTRAL CHESS ROOK;So;0;ON;;;;;N;;;;;
+1FA03;NEUTRAL CHESS BISHOP;So;0;ON;;;;;N;;;;;
+1FA04;NEUTRAL CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+1FA05;NEUTRAL CHESS PAWN;So;0;ON;;;;;N;;;;;
+1FA06;WHITE CHESS KNIGHT ROTATED FORTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA07;BLACK CHESS KNIGHT ROTATED FORTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA08;NEUTRAL CHESS KNIGHT ROTATED FORTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA09;WHITE CHESS KING ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA0A;WHITE CHESS QUEEN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA0B;WHITE CHESS ROOK ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA0C;WHITE CHESS BISHOP ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA0D;WHITE CHESS KNIGHT ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA0E;WHITE CHESS PAWN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA0F;BLACK CHESS KING ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA10;BLACK CHESS QUEEN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA11;BLACK CHESS ROOK ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA12;BLACK CHESS BISHOP ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA13;BLACK CHESS KNIGHT ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA14;BLACK CHESS PAWN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA15;NEUTRAL CHESS KING ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA16;NEUTRAL CHESS QUEEN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA17;NEUTRAL CHESS ROOK ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA18;NEUTRAL CHESS BISHOP ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA19;NEUTRAL CHESS KNIGHT ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA1A;NEUTRAL CHESS PAWN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA1B;WHITE CHESS KNIGHT ROTATED ONE HUNDRED THIRTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA1C;BLACK CHESS KNIGHT ROTATED ONE HUNDRED THIRTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA1D;NEUTRAL CHESS KNIGHT ROTATED ONE HUNDRED THIRTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA1E;WHITE CHESS TURNED KING;So;0;ON;;;;;N;;;;;
+1FA1F;WHITE CHESS TURNED QUEEN;So;0;ON;;;;;N;;;;;
+1FA20;WHITE CHESS TURNED ROOK;So;0;ON;;;;;N;;;;;
+1FA21;WHITE CHESS TURNED BISHOP;So;0;ON;;;;;N;;;;;
+1FA22;WHITE CHESS TURNED KNIGHT;So;0;ON;;;;;N;;;;;
+1FA23;WHITE CHESS TURNED PAWN;So;0;ON;;;;;N;;;;;
+1FA24;BLACK CHESS TURNED KING;So;0;ON;;;;;N;;;;;
+1FA25;BLACK CHESS TURNED QUEEN;So;0;ON;;;;;N;;;;;
+1FA26;BLACK CHESS TURNED ROOK;So;0;ON;;;;;N;;;;;
+1FA27;BLACK CHESS TURNED BISHOP;So;0;ON;;;;;N;;;;;
+1FA28;BLACK CHESS TURNED KNIGHT;So;0;ON;;;;;N;;;;;
+1FA29;BLACK CHESS TURNED PAWN;So;0;ON;;;;;N;;;;;
+1FA2A;NEUTRAL CHESS TURNED KING;So;0;ON;;;;;N;;;;;
+1FA2B;NEUTRAL CHESS TURNED QUEEN;So;0;ON;;;;;N;;;;;
+1FA2C;NEUTRAL CHESS TURNED ROOK;So;0;ON;;;;;N;;;;;
+1FA2D;NEUTRAL CHESS TURNED BISHOP;So;0;ON;;;;;N;;;;;
+1FA2E;NEUTRAL CHESS TURNED KNIGHT;So;0;ON;;;;;N;;;;;
+1FA2F;NEUTRAL CHESS TURNED PAWN;So;0;ON;;;;;N;;;;;
+1FA30;WHITE CHESS KNIGHT ROTATED TWO HUNDRED TWENTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA31;BLACK CHESS KNIGHT ROTATED TWO HUNDRED TWENTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA32;NEUTRAL CHESS KNIGHT ROTATED TWO HUNDRED TWENTY-FIVE DEGREES;So;0;ON;;;;;N;;;;;
+1FA33;WHITE CHESS KING ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA34;WHITE CHESS QUEEN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA35;WHITE CHESS ROOK ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA36;WHITE CHESS BISHOP ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA37;WHITE CHESS KNIGHT ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA38;WHITE CHESS PAWN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA39;BLACK CHESS KING ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA3A;BLACK CHESS QUEEN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA3B;BLACK CHESS ROOK ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA3C;BLACK CHESS BISHOP ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA3D;BLACK CHESS KNIGHT ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA3E;BLACK CHESS PAWN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA3F;NEUTRAL CHESS KING ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA40;NEUTRAL CHESS QUEEN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA41;NEUTRAL CHESS ROOK ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA42;NEUTRAL CHESS BISHOP ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA43;NEUTRAL CHESS KNIGHT ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA44;NEUTRAL CHESS PAWN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;;
+1FA45;WHITE CHESS KNIGHT ROTATED THREE HUNDRED FIFTEEN DEGREES;So;0;ON;;;;;N;;;;;
+1FA46;BLACK CHESS KNIGHT ROTATED THREE HUNDRED FIFTEEN DEGREES;So;0;ON;;;;;N;;;;;
+1FA47;NEUTRAL CHESS KNIGHT ROTATED THREE HUNDRED FIFTEEN DEGREES;So;0;ON;;;;;N;;;;;
+1FA48;WHITE CHESS EQUIHOPPER;So;0;ON;;;;;N;;;;;
+1FA49;BLACK CHESS EQUIHOPPER;So;0;ON;;;;;N;;;;;
+1FA4A;NEUTRAL CHESS EQUIHOPPER;So;0;ON;;;;;N;;;;;
+1FA4B;WHITE CHESS EQUIHOPPER ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA4C;BLACK CHESS EQUIHOPPER ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA4D;NEUTRAL CHESS EQUIHOPPER ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;;
+1FA4E;WHITE CHESS KNIGHT-QUEEN;So;0;ON;;;;;N;;;;;
+1FA4F;WHITE CHESS KNIGHT-ROOK;So;0;ON;;;;;N;;;;;
+1FA50;WHITE CHESS KNIGHT-BISHOP;So;0;ON;;;;;N;;;;;
+1FA51;BLACK CHESS KNIGHT-QUEEN;So;0;ON;;;;;N;;;;;
+1FA52;BLACK CHESS KNIGHT-ROOK;So;0;ON;;;;;N;;;;;
+1FA53;BLACK CHESS KNIGHT-BISHOP;So;0;ON;;;;;N;;;;;
+1FA60;XIANGQI RED GENERAL;So;0;ON;;;;;N;;;;;
+1FA61;XIANGQI RED MANDARIN;So;0;ON;;;;;N;;;;;
+1FA62;XIANGQI RED ELEPHANT;So;0;ON;;;;;N;;;;;
+1FA63;XIANGQI RED HORSE;So;0;ON;;;;;N;;;;;
+1FA64;XIANGQI RED CHARIOT;So;0;ON;;;;;N;;;;;
+1FA65;XIANGQI RED CANNON;So;0;ON;;;;;N;;;;;
+1FA66;XIANGQI RED SOLDIER;So;0;ON;;;;;N;;;;;
+1FA67;XIANGQI BLACK GENERAL;So;0;ON;;;;;N;;;;;
+1FA68;XIANGQI BLACK MANDARIN;So;0;ON;;;;;N;;;;;
+1FA69;XIANGQI BLACK ELEPHANT;So;0;ON;;;;;N;;;;;
+1FA6A;XIANGQI BLACK HORSE;So;0;ON;;;;;N;;;;;
+1FA6B;XIANGQI BLACK CHARIOT;So;0;ON;;;;;N;;;;;
+1FA6C;XIANGQI BLACK CANNON;So;0;ON;;;;;N;;;;;
+1FA6D;XIANGQI BLACK SOLDIER;So;0;ON;;;;;N;;;;;
+1FA70;BALLET SHOES;So;0;ON;;;;;N;;;;;
+1FA71;ONE-PIECE SWIMSUIT;So;0;ON;;;;;N;;;;;
+1FA72;BRIEFS;So;0;ON;;;;;N;;;;;
+1FA73;SHORTS;So;0;ON;;;;;N;;;;;
+1FA74;THONG SANDAL;So;0;ON;;;;;N;;;;;
+1FA78;DROP OF BLOOD;So;0;ON;;;;;N;;;;;
+1FA79;ADHESIVE BANDAGE;So;0;ON;;;;;N;;;;;
+1FA7A;STETHOSCOPE;So;0;ON;;;;;N;;;;;
+1FA80;YO-YO;So;0;ON;;;;;N;;;;;
+1FA81;KITE;So;0;ON;;;;;N;;;;;
+1FA82;PARACHUTE;So;0;ON;;;;;N;;;;;
+1FA83;BOOMERANG;So;0;ON;;;;;N;;;;;
+1FA84;MAGIC WAND;So;0;ON;;;;;N;;;;;
+1FA85;PINATA;So;0;ON;;;;;N;;;;;
+1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;;
+1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;;
+1FA91;CHAIR;So;0;ON;;;;;N;;;;;
+1FA92;RAZOR;So;0;ON;;;;;N;;;;;
+1FA93;AXE;So;0;ON;;;;;N;;;;;
+1FA94;DIYA LAMP;So;0;ON;;;;;N;;;;;
+1FA95;BANJO;So;0;ON;;;;;N;;;;;
+1FA96;MILITARY HELMET;So;0;ON;;;;;N;;;;;
+1FA97;ACCORDION;So;0;ON;;;;;N;;;;;
+1FA98;LONG DRUM;So;0;ON;;;;;N;;;;;
+1FA99;COIN;So;0;ON;;;;;N;;;;;
+1FA9A;CARPENTRY SAW;So;0;ON;;;;;N;;;;;
+1FA9B;SCREWDRIVER;So;0;ON;;;;;N;;;;;
+1FA9C;LADDER;So;0;ON;;;;;N;;;;;
+1FA9D;HOOK;So;0;ON;;;;;N;;;;;
+1FA9E;MIRROR;So;0;ON;;;;;N;;;;;
+1FA9F;WINDOW;So;0;ON;;;;;N;;;;;
+1FAA0;PLUNGER;So;0;ON;;;;;N;;;;;
+1FAA1;SEWING NEEDLE;So;0;ON;;;;;N;;;;;
+1FAA2;KNOT;So;0;ON;;;;;N;;;;;
+1FAA3;BUCKET;So;0;ON;;;;;N;;;;;
+1FAA4;MOUSE TRAP;So;0;ON;;;;;N;;;;;
+1FAA5;TOOTHBRUSH;So;0;ON;;;;;N;;;;;
+1FAA6;HEADSTONE;So;0;ON;;;;;N;;;;;
+1FAA7;PLACARD;So;0;ON;;;;;N;;;;;
+1FAA8;ROCK;So;0;ON;;;;;N;;;;;
+1FAB0;FLY;So;0;ON;;;;;N;;;;;
+1FAB1;WORM;So;0;ON;;;;;N;;;;;
+1FAB2;BEETLE;So;0;ON;;;;;N;;;;;
+1FAB3;COCKROACH;So;0;ON;;;;;N;;;;;
+1FAB4;POTTED PLANT;So;0;ON;;;;;N;;;;;
+1FAB5;WOOD;So;0;ON;;;;;N;;;;;
+1FAB6;FEATHER;So;0;ON;;;;;N;;;;;
+1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;;
+1FAC1;LUNGS;So;0;ON;;;;;N;;;;;
+1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;;
+1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;;
+1FAD1;BELL PEPPER;So;0;ON;;;;;N;;;;;
+1FAD2;OLIVE;So;0;ON;;;;;N;;;;;
+1FAD3;FLATBREAD;So;0;ON;;;;;N;;;;;
+1FAD4;TAMALE;So;0;ON;;;;;N;;;;;
+1FAD5;FONDUE;So;0;ON;;;;;N;;;;;
+1FAD6;TEAPOT;So;0;ON;;;;;N;;;;;
+1FB00;BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;;
+1FB01;BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;;
+1FB02;BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;;
+1FB03;BLOCK SEXTANT-3;So;0;ON;;;;;N;;;;;
+1FB04;BLOCK SEXTANT-13;So;0;ON;;;;;N;;;;;
+1FB05;BLOCK SEXTANT-23;So;0;ON;;;;;N;;;;;
+1FB06;BLOCK SEXTANT-123;So;0;ON;;;;;N;;;;;
+1FB07;BLOCK SEXTANT-4;So;0;ON;;;;;N;;;;;
+1FB08;BLOCK SEXTANT-14;So;0;ON;;;;;N;;;;;
+1FB09;BLOCK SEXTANT-24;So;0;ON;;;;;N;;;;;
+1FB0A;BLOCK SEXTANT-124;So;0;ON;;;;;N;;;;;
+1FB0B;BLOCK SEXTANT-34;So;0;ON;;;;;N;;;;;
+1FB0C;BLOCK SEXTANT-134;So;0;ON;;;;;N;;;;;
+1FB0D;BLOCK SEXTANT-234;So;0;ON;;;;;N;;;;;
+1FB0E;BLOCK SEXTANT-1234;So;0;ON;;;;;N;;;;;
+1FB0F;BLOCK SEXTANT-5;So;0;ON;;;;;N;;;;;
+1FB10;BLOCK SEXTANT-15;So;0;ON;;;;;N;;;;;
+1FB11;BLOCK SEXTANT-25;So;0;ON;;;;;N;;;;;
+1FB12;BLOCK SEXTANT-125;So;0;ON;;;;;N;;;;;
+1FB13;BLOCK SEXTANT-35;So;0;ON;;;;;N;;;;;
+1FB14;BLOCK SEXTANT-235;So;0;ON;;;;;N;;;;;
+1FB15;BLOCK SEXTANT-1235;So;0;ON;;;;;N;;;;;
+1FB16;BLOCK SEXTANT-45;So;0;ON;;;;;N;;;;;
+1FB17;BLOCK SEXTANT-145;So;0;ON;;;;;N;;;;;
+1FB18;BLOCK SEXTANT-245;So;0;ON;;;;;N;;;;;
+1FB19;BLOCK SEXTANT-1245;So;0;ON;;;;;N;;;;;
+1FB1A;BLOCK SEXTANT-345;So;0;ON;;;;;N;;;;;
+1FB1B;BLOCK SEXTANT-1345;So;0;ON;;;;;N;;;;;
+1FB1C;BLOCK SEXTANT-2345;So;0;ON;;;;;N;;;;;
+1FB1D;BLOCK SEXTANT-12345;So;0;ON;;;;;N;;;;;
+1FB1E;BLOCK SEXTANT-6;So;0;ON;;;;;N;;;;;
+1FB1F;BLOCK SEXTANT-16;So;0;ON;;;;;N;;;;;
+1FB20;BLOCK SEXTANT-26;So;0;ON;;;;;N;;;;;
+1FB21;BLOCK SEXTANT-126;So;0;ON;;;;;N;;;;;
+1FB22;BLOCK SEXTANT-36;So;0;ON;;;;;N;;;;;
+1FB23;BLOCK SEXTANT-136;So;0;ON;;;;;N;;;;;
+1FB24;BLOCK SEXTANT-236;So;0;ON;;;;;N;;;;;
+1FB25;BLOCK SEXTANT-1236;So;0;ON;;;;;N;;;;;
+1FB26;BLOCK SEXTANT-46;So;0;ON;;;;;N;;;;;
+1FB27;BLOCK SEXTANT-146;So;0;ON;;;;;N;;;;;
+1FB28;BLOCK SEXTANT-1246;So;0;ON;;;;;N;;;;;
+1FB29;BLOCK SEXTANT-346;So;0;ON;;;;;N;;;;;
+1FB2A;BLOCK SEXTANT-1346;So;0;ON;;;;;N;;;;;
+1FB2B;BLOCK SEXTANT-2346;So;0;ON;;;;;N;;;;;
+1FB2C;BLOCK SEXTANT-12346;So;0;ON;;;;;N;;;;;
+1FB2D;BLOCK SEXTANT-56;So;0;ON;;;;;N;;;;;
+1FB2E;BLOCK SEXTANT-156;So;0;ON;;;;;N;;;;;
+1FB2F;BLOCK SEXTANT-256;So;0;ON;;;;;N;;;;;
+1FB30;BLOCK SEXTANT-1256;So;0;ON;;;;;N;;;;;
+1FB31;BLOCK SEXTANT-356;So;0;ON;;;;;N;;;;;
+1FB32;BLOCK SEXTANT-1356;So;0;ON;;;;;N;;;;;
+1FB33;BLOCK SEXTANT-2356;So;0;ON;;;;;N;;;;;
+1FB34;BLOCK SEXTANT-12356;So;0;ON;;;;;N;;;;;
+1FB35;BLOCK SEXTANT-456;So;0;ON;;;;;N;;;;;
+1FB36;BLOCK SEXTANT-1456;So;0;ON;;;;;N;;;;;
+1FB37;BLOCK SEXTANT-2456;So;0;ON;;;;;N;;;;;
+1FB38;BLOCK SEXTANT-12456;So;0;ON;;;;;N;;;;;
+1FB39;BLOCK SEXTANT-3456;So;0;ON;;;;;N;;;;;
+1FB3A;BLOCK SEXTANT-13456;So;0;ON;;;;;N;;;;;
+1FB3B;BLOCK SEXTANT-23456;So;0;ON;;;;;N;;;;;
+1FB3C;LOWER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FB3D;LOWER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;;
+1FB3E;LOWER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FB3F;LOWER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;;
+1FB40;LOWER LEFT BLOCK DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FB41;LOWER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;;
+1FB42;LOWER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;;
+1FB43;LOWER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;;
+1FB44;LOWER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;;
+1FB45;LOWER RIGHT BLOCK DIAGONAL LOWER LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;;
+1FB46;LOWER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB47;LOWER RIGHT BLOCK DIAGONAL LOWER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB48;LOWER RIGHT BLOCK DIAGONAL LOWER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB49;LOWER RIGHT BLOCK DIAGONAL LOWER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB4A;LOWER RIGHT BLOCK DIAGONAL LOWER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB4B;LOWER RIGHT BLOCK DIAGONAL LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;;
+1FB4C;LOWER LEFT BLOCK DIAGONAL UPPER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB4D;LOWER LEFT BLOCK DIAGONAL UPPER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB4E;LOWER LEFT BLOCK DIAGONAL UPPER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB4F;LOWER LEFT BLOCK DIAGONAL UPPER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB50;LOWER LEFT BLOCK DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;;
+1FB51;LOWER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB52;UPPER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FB53;UPPER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;;
+1FB54;UPPER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FB55;UPPER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;;
+1FB56;UPPER RIGHT BLOCK DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FB57;UPPER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;;
+1FB58;UPPER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;;
+1FB59;UPPER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;;
+1FB5A;UPPER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;;
+1FB5B;UPPER LEFT BLOCK DIAGONAL LOWER LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;;
+1FB5C;UPPER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB5D;UPPER LEFT BLOCK DIAGONAL LOWER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB5E;UPPER LEFT BLOCK DIAGONAL LOWER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB5F;UPPER LEFT BLOCK DIAGONAL LOWER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB60;UPPER LEFT BLOCK DIAGONAL LOWER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB61;UPPER LEFT BLOCK DIAGONAL LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;;
+1FB62;UPPER RIGHT BLOCK DIAGONAL UPPER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB63;UPPER RIGHT BLOCK DIAGONAL UPPER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB64;UPPER RIGHT BLOCK DIAGONAL UPPER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB65;UPPER RIGHT BLOCK DIAGONAL UPPER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB66;UPPER RIGHT BLOCK DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;;
+1FB67;UPPER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FB68;UPPER AND RIGHT AND LOWER TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;;
+1FB69;LEFT AND LOWER AND RIGHT TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;;
+1FB6A;UPPER AND LEFT AND LOWER TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;;
+1FB6B;LEFT AND UPPER AND RIGHT TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;;
+1FB6C;LEFT TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+1FB6D;UPPER TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+1FB6E;RIGHT TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+1FB6F;LOWER TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+1FB70;VERTICAL ONE EIGHTH BLOCK-2;So;0;ON;;;;;N;;;;;
+1FB71;VERTICAL ONE EIGHTH BLOCK-3;So;0;ON;;;;;N;;;;;
+1FB72;VERTICAL ONE EIGHTH BLOCK-4;So;0;ON;;;;;N;;;;;
+1FB73;VERTICAL ONE EIGHTH BLOCK-5;So;0;ON;;;;;N;;;;;
+1FB74;VERTICAL ONE EIGHTH BLOCK-6;So;0;ON;;;;;N;;;;;
+1FB75;VERTICAL ONE EIGHTH BLOCK-7;So;0;ON;;;;;N;;;;;
+1FB76;HORIZONTAL ONE EIGHTH BLOCK-2;So;0;ON;;;;;N;;;;;
+1FB77;HORIZONTAL ONE EIGHTH BLOCK-3;So;0;ON;;;;;N;;;;;
+1FB78;HORIZONTAL ONE EIGHTH BLOCK-4;So;0;ON;;;;;N;;;;;
+1FB79;HORIZONTAL ONE EIGHTH BLOCK-5;So;0;ON;;;;;N;;;;;
+1FB7A;HORIZONTAL ONE EIGHTH BLOCK-6;So;0;ON;;;;;N;;;;;
+1FB7B;HORIZONTAL ONE EIGHTH BLOCK-7;So;0;ON;;;;;N;;;;;
+1FB7C;LEFT AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FB7D;LEFT AND UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FB7E;RIGHT AND UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FB7F;RIGHT AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FB80;UPPER AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FB81;HORIZONTAL ONE EIGHTH BLOCK-1358;So;0;ON;;;;;N;;;;;
+1FB82;UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+1FB83;UPPER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+1FB84;UPPER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+1FB85;UPPER THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;;
+1FB86;UPPER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+1FB87;RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+1FB88;RIGHT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+1FB89;RIGHT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+1FB8A;RIGHT THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;;
+1FB8B;RIGHT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+1FB8C;LEFT HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB8D;RIGHT HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB8E;UPPER HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB8F;LOWER HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB90;INVERSE MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB91;UPPER HALF BLOCK AND LOWER HALF INVERSE MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB92;UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK;So;0;ON;;;;;N;;;;;
+1FB94;LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;;
+1FB95;CHECKER BOARD FILL;So;0;ON;;;;;N;;;;;
+1FB96;INVERSE CHECKER BOARD FILL;So;0;ON;;;;;N;;;;;
+1FB97;HEAVY HORIZONTAL FILL;So;0;ON;;;;;N;;;;;
+1FB98;UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;;
+1FB99;UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;;
+1FB9A;UPPER AND LOWER TRIANGULAR HALF BLOCK;So;0;ON;;;;;N;;;;;
+1FB9B;LEFT AND RIGHT TRIANGULAR HALF BLOCK;So;0;ON;;;;;N;;;;;
+1FB9C;UPPER LEFT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB9D;UPPER RIGHT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB9E;LOWER RIGHT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FB9F;LOWER LEFT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+1FBA0;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT;So;0;ON;;;;;N;;;;;
+1FBA1;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FBA2;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBA3;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBA4;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBA5;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBA6;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FBA7;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO UPPER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FBA8;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT AND MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBA9;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT AND MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBAA;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT TO LOWER CENTRE TO MIDDLE LEFT;So;0;ON;;;;;N;;;;;
+1FBAB;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT TO LOWER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;;
+1FBAC;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO UPPER CENTRE TO MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBAD;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO UPPER CENTRE TO MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBAE;BOX DRAWINGS LIGHT DIAGONAL DIAMOND;So;0;ON;;;;;N;;;;;
+1FBAF;BOX DRAWINGS LIGHT HORIZONTAL WITH VERTICAL STROKE;So;0;ON;;;;;N;;;;;
+1FBB0;ARROWHEAD-SHAPED POINTER;So;0;ON;;;;;N;;;;;
+1FBB1;INVERSE CHECK MARK;So;0;ON;;;;;N;;;;;
+1FBB2;LEFT HALF RUNNING MAN;So;0;ON;;;;;N;;;;;
+1FBB3;RIGHT HALF RUNNING MAN;So;0;ON;;;;;N;;;;;
+1FBB4;INVERSE DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;;;;;
+1FBB5;LEFTWARDS ARROW AND UPPER AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FBB6;RIGHTWARDS ARROW AND UPPER AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FBB7;DOWNWARDS ARROW AND RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FBB8;UPWARDS ARROW AND RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+1FBB9;LEFT HALF FOLDER;So;0;ON;;;;;N;;;;;
+1FBBA;RIGHT HALF FOLDER;So;0;ON;;;;;N;;;;;
+1FBBB;VOIDED GREEK CROSS;So;0;ON;;;;;N;;;;;
+1FBBC;RIGHT OPEN SQUARED DOT;So;0;ON;;;;;N;;;;;
+1FBBD;NEGATIVE DIAGONAL CROSS;So;0;ON;;;;;N;;;;;
+1FBBE;NEGATIVE DIAGONAL MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;;
+1FBBF;NEGATIVE DIAGONAL DIAMOND;So;0;ON;;;;;N;;;;;
+1FBC0;WHITE HEAVY SALTIRE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
+1FBC1;LEFT THIRD WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1FBC2;MIDDLE THIRD WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1FBC3;RIGHT THIRD WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1FBC4;NEGATIVE SQUARED QUESTION MARK;So;0;ON;;;;;N;;;;;
+1FBC5;STICK FIGURE;So;0;ON;;;;;N;;;;;
+1FBC6;STICK FIGURE WITH ARMS RAISED;So;0;ON;;;;;N;;;;;
+1FBC7;STICK FIGURE LEANING LEFT;So;0;ON;;;;;N;;;;;
+1FBC8;STICK FIGURE LEANING RIGHT;So;0;ON;;;;;N;;;;;
+1FBC9;STICK FIGURE WITH DRESS;So;0;ON;;;;;N;;;;;
+1FBCA;WHITE UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;;
+1FBF0;SEGMENTED DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1FBF1;SEGMENTED DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1FBF2;SEGMENTED DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1FBF3;SEGMENTED DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1FBF4;SEGMENTED DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1FBF5;SEGMENTED DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1FBF6;SEGMENTED DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1FBF7;SEGMENTED DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1FBF8;SEGMENTED DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1FBF9;SEGMENTED DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
+2A6DD;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
+2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
+2B734;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
+2B740;<CJK Ideograph Extension D, First>;Lo;0;L;;;;;N;;;;;
+2B81D;<CJK Ideograph Extension D, Last>;Lo;0;L;;;;;N;;;;;
+2B820;<CJK Ideograph Extension E, First>;Lo;0;L;;;;;N;;;;;
+2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
+2CEB0;<CJK Ideograph Extension F, First>;Lo;0;L;;;;;N;;;;;
+2EBE0;<CJK Ideograph Extension F, Last>;Lo;0;L;;;;;N;;;;;
+2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
+2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
+2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
+2F803;CJK COMPATIBILITY IDEOGRAPH-2F803;Lo;0;L;20122;;;;N;;;;;
+2F804;CJK COMPATIBILITY IDEOGRAPH-2F804;Lo;0;L;4F60;;;;N;;;;;
+2F805;CJK COMPATIBILITY IDEOGRAPH-2F805;Lo;0;L;4FAE;;;;N;;;;;
+2F806;CJK COMPATIBILITY IDEOGRAPH-2F806;Lo;0;L;4FBB;;;;N;;;;;
+2F807;CJK COMPATIBILITY IDEOGRAPH-2F807;Lo;0;L;5002;;;;N;;;;;
+2F808;CJK COMPATIBILITY IDEOGRAPH-2F808;Lo;0;L;507A;;;;N;;;;;
+2F809;CJK COMPATIBILITY IDEOGRAPH-2F809;Lo;0;L;5099;;;;N;;;;;
+2F80A;CJK COMPATIBILITY IDEOGRAPH-2F80A;Lo;0;L;50E7;;;;N;;;;;
+2F80B;CJK COMPATIBILITY IDEOGRAPH-2F80B;Lo;0;L;50CF;;;;N;;;;;
+2F80C;CJK COMPATIBILITY IDEOGRAPH-2F80C;Lo;0;L;349E;;;;N;;;;;
+2F80D;CJK COMPATIBILITY IDEOGRAPH-2F80D;Lo;0;L;2063A;;;;N;;;;;
+2F80E;CJK COMPATIBILITY IDEOGRAPH-2F80E;Lo;0;L;514D;;;;N;;;;;
+2F80F;CJK COMPATIBILITY IDEOGRAPH-2F80F;Lo;0;L;5154;;;;N;;;;;
+2F810;CJK COMPATIBILITY IDEOGRAPH-2F810;Lo;0;L;5164;;;;N;;;;;
+2F811;CJK COMPATIBILITY IDEOGRAPH-2F811;Lo;0;L;5177;;;;N;;;;;
+2F812;CJK COMPATIBILITY IDEOGRAPH-2F812;Lo;0;L;2051C;;;;N;;;;;
+2F813;CJK COMPATIBILITY IDEOGRAPH-2F813;Lo;0;L;34B9;;;;N;;;;;
+2F814;CJK COMPATIBILITY IDEOGRAPH-2F814;Lo;0;L;5167;;;;N;;;;;
+2F815;CJK COMPATIBILITY IDEOGRAPH-2F815;Lo;0;L;518D;;;;N;;;;;
+2F816;CJK COMPATIBILITY IDEOGRAPH-2F816;Lo;0;L;2054B;;;;N;;;;;
+2F817;CJK COMPATIBILITY IDEOGRAPH-2F817;Lo;0;L;5197;;;;N;;;;;
+2F818;CJK COMPATIBILITY IDEOGRAPH-2F818;Lo;0;L;51A4;;;;N;;;;;
+2F819;CJK COMPATIBILITY IDEOGRAPH-2F819;Lo;0;L;4ECC;;;;N;;;;;
+2F81A;CJK COMPATIBILITY IDEOGRAPH-2F81A;Lo;0;L;51AC;;;;N;;;;;
+2F81B;CJK COMPATIBILITY IDEOGRAPH-2F81B;Lo;0;L;51B5;;;;N;;;;;
+2F81C;CJK COMPATIBILITY IDEOGRAPH-2F81C;Lo;0;L;291DF;;;;N;;;;;
+2F81D;CJK COMPATIBILITY IDEOGRAPH-2F81D;Lo;0;L;51F5;;;;N;;;;;
+2F81E;CJK COMPATIBILITY IDEOGRAPH-2F81E;Lo;0;L;5203;;;;N;;;;;
+2F81F;CJK COMPATIBILITY IDEOGRAPH-2F81F;Lo;0;L;34DF;;;;N;;;;;
+2F820;CJK COMPATIBILITY IDEOGRAPH-2F820;Lo;0;L;523B;;;;N;;;;;
+2F821;CJK COMPATIBILITY IDEOGRAPH-2F821;Lo;0;L;5246;;;;N;;;;;
+2F822;CJK COMPATIBILITY IDEOGRAPH-2F822;Lo;0;L;5272;;;;N;;;;;
+2F823;CJK COMPATIBILITY IDEOGRAPH-2F823;Lo;0;L;5277;;;;N;;;;;
+2F824;CJK COMPATIBILITY IDEOGRAPH-2F824;Lo;0;L;3515;;;;N;;;;;
+2F825;CJK COMPATIBILITY IDEOGRAPH-2F825;Lo;0;L;52C7;;;;N;;;;;
+2F826;CJK COMPATIBILITY IDEOGRAPH-2F826;Lo;0;L;52C9;;;;N;;;;;
+2F827;CJK COMPATIBILITY IDEOGRAPH-2F827;Lo;0;L;52E4;;;;N;;;;;
+2F828;CJK COMPATIBILITY IDEOGRAPH-2F828;Lo;0;L;52FA;;;;N;;;;;
+2F829;CJK COMPATIBILITY IDEOGRAPH-2F829;Lo;0;L;5305;;;;N;;;;;
+2F82A;CJK COMPATIBILITY IDEOGRAPH-2F82A;Lo;0;L;5306;;;;N;;;;;
+2F82B;CJK COMPATIBILITY IDEOGRAPH-2F82B;Lo;0;L;5317;;;;N;;;;;
+2F82C;CJK COMPATIBILITY IDEOGRAPH-2F82C;Lo;0;L;5349;;;;N;;;;;
+2F82D;CJK COMPATIBILITY IDEOGRAPH-2F82D;Lo;0;L;5351;;;;N;;;;;
+2F82E;CJK COMPATIBILITY IDEOGRAPH-2F82E;Lo;0;L;535A;;;;N;;;;;
+2F82F;CJK COMPATIBILITY IDEOGRAPH-2F82F;Lo;0;L;5373;;;;N;;;;;
+2F830;CJK COMPATIBILITY IDEOGRAPH-2F830;Lo;0;L;537D;;;;N;;;;;
+2F831;CJK COMPATIBILITY IDEOGRAPH-2F831;Lo;0;L;537F;;;;N;;;;;
+2F832;CJK COMPATIBILITY IDEOGRAPH-2F832;Lo;0;L;537F;;;;N;;;;;
+2F833;CJK COMPATIBILITY IDEOGRAPH-2F833;Lo;0;L;537F;;;;N;;;;;
+2F834;CJK COMPATIBILITY IDEOGRAPH-2F834;Lo;0;L;20A2C;;;;N;;;;;
+2F835;CJK COMPATIBILITY IDEOGRAPH-2F835;Lo;0;L;7070;;;;N;;;;;
+2F836;CJK COMPATIBILITY IDEOGRAPH-2F836;Lo;0;L;53CA;;;;N;;;;;
+2F837;CJK COMPATIBILITY IDEOGRAPH-2F837;Lo;0;L;53DF;;;;N;;;;;
+2F838;CJK COMPATIBILITY IDEOGRAPH-2F838;Lo;0;L;20B63;;;;N;;;;;
+2F839;CJK COMPATIBILITY IDEOGRAPH-2F839;Lo;0;L;53EB;;;;N;;;;;
+2F83A;CJK COMPATIBILITY IDEOGRAPH-2F83A;Lo;0;L;53F1;;;;N;;;;;
+2F83B;CJK COMPATIBILITY IDEOGRAPH-2F83B;Lo;0;L;5406;;;;N;;;;;
+2F83C;CJK COMPATIBILITY IDEOGRAPH-2F83C;Lo;0;L;549E;;;;N;;;;;
+2F83D;CJK COMPATIBILITY IDEOGRAPH-2F83D;Lo;0;L;5438;;;;N;;;;;
+2F83E;CJK COMPATIBILITY IDEOGRAPH-2F83E;Lo;0;L;5448;;;;N;;;;;
+2F83F;CJK COMPATIBILITY IDEOGRAPH-2F83F;Lo;0;L;5468;;;;N;;;;;
+2F840;CJK COMPATIBILITY IDEOGRAPH-2F840;Lo;0;L;54A2;;;;N;;;;;
+2F841;CJK COMPATIBILITY IDEOGRAPH-2F841;Lo;0;L;54F6;;;;N;;;;;
+2F842;CJK COMPATIBILITY IDEOGRAPH-2F842;Lo;0;L;5510;;;;N;;;;;
+2F843;CJK COMPATIBILITY IDEOGRAPH-2F843;Lo;0;L;5553;;;;N;;;;;
+2F844;CJK COMPATIBILITY IDEOGRAPH-2F844;Lo;0;L;5563;;;;N;;;;;
+2F845;CJK COMPATIBILITY IDEOGRAPH-2F845;Lo;0;L;5584;;;;N;;;;;
+2F846;CJK COMPATIBILITY IDEOGRAPH-2F846;Lo;0;L;5584;;;;N;;;;;
+2F847;CJK COMPATIBILITY IDEOGRAPH-2F847;Lo;0;L;5599;;;;N;;;;;
+2F848;CJK COMPATIBILITY IDEOGRAPH-2F848;Lo;0;L;55AB;;;;N;;;;;
+2F849;CJK COMPATIBILITY IDEOGRAPH-2F849;Lo;0;L;55B3;;;;N;;;;;
+2F84A;CJK COMPATIBILITY IDEOGRAPH-2F84A;Lo;0;L;55C2;;;;N;;;;;
+2F84B;CJK COMPATIBILITY IDEOGRAPH-2F84B;Lo;0;L;5716;;;;N;;;;;
+2F84C;CJK COMPATIBILITY IDEOGRAPH-2F84C;Lo;0;L;5606;;;;N;;;;;
+2F84D;CJK COMPATIBILITY IDEOGRAPH-2F84D;Lo;0;L;5717;;;;N;;;;;
+2F84E;CJK COMPATIBILITY IDEOGRAPH-2F84E;Lo;0;L;5651;;;;N;;;;;
+2F84F;CJK COMPATIBILITY IDEOGRAPH-2F84F;Lo;0;L;5674;;;;N;;;;;
+2F850;CJK COMPATIBILITY IDEOGRAPH-2F850;Lo;0;L;5207;;;;N;;;;;
+2F851;CJK COMPATIBILITY IDEOGRAPH-2F851;Lo;0;L;58EE;;;;N;;;;;
+2F852;CJK COMPATIBILITY IDEOGRAPH-2F852;Lo;0;L;57CE;;;;N;;;;;
+2F853;CJK COMPATIBILITY IDEOGRAPH-2F853;Lo;0;L;57F4;;;;N;;;;;
+2F854;CJK COMPATIBILITY IDEOGRAPH-2F854;Lo;0;L;580D;;;;N;;;;;
+2F855;CJK COMPATIBILITY IDEOGRAPH-2F855;Lo;0;L;578B;;;;N;;;;;
+2F856;CJK COMPATIBILITY IDEOGRAPH-2F856;Lo;0;L;5832;;;;N;;;;;
+2F857;CJK COMPATIBILITY IDEOGRAPH-2F857;Lo;0;L;5831;;;;N;;;;;
+2F858;CJK COMPATIBILITY IDEOGRAPH-2F858;Lo;0;L;58AC;;;;N;;;;;
+2F859;CJK COMPATIBILITY IDEOGRAPH-2F859;Lo;0;L;214E4;;;;N;;;;;
+2F85A;CJK COMPATIBILITY IDEOGRAPH-2F85A;Lo;0;L;58F2;;;;N;;;;;
+2F85B;CJK COMPATIBILITY IDEOGRAPH-2F85B;Lo;0;L;58F7;;;;N;;;;;
+2F85C;CJK COMPATIBILITY IDEOGRAPH-2F85C;Lo;0;L;5906;;;;N;;;;;
+2F85D;CJK COMPATIBILITY IDEOGRAPH-2F85D;Lo;0;L;591A;;;;N;;;;;
+2F85E;CJK COMPATIBILITY IDEOGRAPH-2F85E;Lo;0;L;5922;;;;N;;;;;
+2F85F;CJK COMPATIBILITY IDEOGRAPH-2F85F;Lo;0;L;5962;;;;N;;;;;
+2F860;CJK COMPATIBILITY IDEOGRAPH-2F860;Lo;0;L;216A8;;;;N;;;;;
+2F861;CJK COMPATIBILITY IDEOGRAPH-2F861;Lo;0;L;216EA;;;;N;;;;;
+2F862;CJK COMPATIBILITY IDEOGRAPH-2F862;Lo;0;L;59EC;;;;N;;;;;
+2F863;CJK COMPATIBILITY IDEOGRAPH-2F863;Lo;0;L;5A1B;;;;N;;;;;
+2F864;CJK COMPATIBILITY IDEOGRAPH-2F864;Lo;0;L;5A27;;;;N;;;;;
+2F865;CJK COMPATIBILITY IDEOGRAPH-2F865;Lo;0;L;59D8;;;;N;;;;;
+2F866;CJK COMPATIBILITY IDEOGRAPH-2F866;Lo;0;L;5A66;;;;N;;;;;
+2F867;CJK COMPATIBILITY IDEOGRAPH-2F867;Lo;0;L;36EE;;;;N;;;;;
+2F868;CJK COMPATIBILITY IDEOGRAPH-2F868;Lo;0;L;36FC;;;;N;;;;;
+2F869;CJK COMPATIBILITY IDEOGRAPH-2F869;Lo;0;L;5B08;;;;N;;;;;
+2F86A;CJK COMPATIBILITY IDEOGRAPH-2F86A;Lo;0;L;5B3E;;;;N;;;;;
+2F86B;CJK COMPATIBILITY IDEOGRAPH-2F86B;Lo;0;L;5B3E;;;;N;;;;;
+2F86C;CJK COMPATIBILITY IDEOGRAPH-2F86C;Lo;0;L;219C8;;;;N;;;;;
+2F86D;CJK COMPATIBILITY IDEOGRAPH-2F86D;Lo;0;L;5BC3;;;;N;;;;;
+2F86E;CJK COMPATIBILITY IDEOGRAPH-2F86E;Lo;0;L;5BD8;;;;N;;;;;
+2F86F;CJK COMPATIBILITY IDEOGRAPH-2F86F;Lo;0;L;5BE7;;;;N;;;;;
+2F870;CJK COMPATIBILITY IDEOGRAPH-2F870;Lo;0;L;5BF3;;;;N;;;;;
+2F871;CJK COMPATIBILITY IDEOGRAPH-2F871;Lo;0;L;21B18;;;;N;;;;;
+2F872;CJK COMPATIBILITY IDEOGRAPH-2F872;Lo;0;L;5BFF;;;;N;;;;;
+2F873;CJK COMPATIBILITY IDEOGRAPH-2F873;Lo;0;L;5C06;;;;N;;;;;
+2F874;CJK COMPATIBILITY IDEOGRAPH-2F874;Lo;0;L;5F53;;;;N;;;;;
+2F875;CJK COMPATIBILITY IDEOGRAPH-2F875;Lo;0;L;5C22;;;;N;;;;;
+2F876;CJK COMPATIBILITY IDEOGRAPH-2F876;Lo;0;L;3781;;;;N;;;;;
+2F877;CJK COMPATIBILITY IDEOGRAPH-2F877;Lo;0;L;5C60;;;;N;;;;;
+2F878;CJK COMPATIBILITY IDEOGRAPH-2F878;Lo;0;L;5C6E;;;;N;;;;;
+2F879;CJK COMPATIBILITY IDEOGRAPH-2F879;Lo;0;L;5CC0;;;;N;;;;;
+2F87A;CJK COMPATIBILITY IDEOGRAPH-2F87A;Lo;0;L;5C8D;;;;N;;;;;
+2F87B;CJK COMPATIBILITY IDEOGRAPH-2F87B;Lo;0;L;21DE4;;;;N;;;;;
+2F87C;CJK COMPATIBILITY IDEOGRAPH-2F87C;Lo;0;L;5D43;;;;N;;;;;
+2F87D;CJK COMPATIBILITY IDEOGRAPH-2F87D;Lo;0;L;21DE6;;;;N;;;;;
+2F87E;CJK COMPATIBILITY IDEOGRAPH-2F87E;Lo;0;L;5D6E;;;;N;;;;;
+2F87F;CJK COMPATIBILITY IDEOGRAPH-2F87F;Lo;0;L;5D6B;;;;N;;;;;
+2F880;CJK COMPATIBILITY IDEOGRAPH-2F880;Lo;0;L;5D7C;;;;N;;;;;
+2F881;CJK COMPATIBILITY IDEOGRAPH-2F881;Lo;0;L;5DE1;;;;N;;;;;
+2F882;CJK COMPATIBILITY IDEOGRAPH-2F882;Lo;0;L;5DE2;;;;N;;;;;
+2F883;CJK COMPATIBILITY IDEOGRAPH-2F883;Lo;0;L;382F;;;;N;;;;;
+2F884;CJK COMPATIBILITY IDEOGRAPH-2F884;Lo;0;L;5DFD;;;;N;;;;;
+2F885;CJK COMPATIBILITY IDEOGRAPH-2F885;Lo;0;L;5E28;;;;N;;;;;
+2F886;CJK COMPATIBILITY IDEOGRAPH-2F886;Lo;0;L;5E3D;;;;N;;;;;
+2F887;CJK COMPATIBILITY IDEOGRAPH-2F887;Lo;0;L;5E69;;;;N;;;;;
+2F888;CJK COMPATIBILITY IDEOGRAPH-2F888;Lo;0;L;3862;;;;N;;;;;
+2F889;CJK COMPATIBILITY IDEOGRAPH-2F889;Lo;0;L;22183;;;;N;;;;;
+2F88A;CJK COMPATIBILITY IDEOGRAPH-2F88A;Lo;0;L;387C;;;;N;;;;;
+2F88B;CJK COMPATIBILITY IDEOGRAPH-2F88B;Lo;0;L;5EB0;;;;N;;;;;
+2F88C;CJK COMPATIBILITY IDEOGRAPH-2F88C;Lo;0;L;5EB3;;;;N;;;;;
+2F88D;CJK COMPATIBILITY IDEOGRAPH-2F88D;Lo;0;L;5EB6;;;;N;;;;;
+2F88E;CJK COMPATIBILITY IDEOGRAPH-2F88E;Lo;0;L;5ECA;;;;N;;;;;
+2F88F;CJK COMPATIBILITY IDEOGRAPH-2F88F;Lo;0;L;2A392;;;;N;;;;;
+2F890;CJK COMPATIBILITY IDEOGRAPH-2F890;Lo;0;L;5EFE;;;9;N;;;;;
+2F891;CJK COMPATIBILITY IDEOGRAPH-2F891;Lo;0;L;22331;;;;N;;;;;
+2F892;CJK COMPATIBILITY IDEOGRAPH-2F892;Lo;0;L;22331;;;;N;;;;;
+2F893;CJK COMPATIBILITY IDEOGRAPH-2F893;Lo;0;L;8201;;;;N;;;;;
+2F894;CJK COMPATIBILITY IDEOGRAPH-2F894;Lo;0;L;5F22;;;;N;;;;;
+2F895;CJK COMPATIBILITY IDEOGRAPH-2F895;Lo;0;L;5F22;;;;N;;;;;
+2F896;CJK COMPATIBILITY IDEOGRAPH-2F896;Lo;0;L;38C7;;;;N;;;;;
+2F897;CJK COMPATIBILITY IDEOGRAPH-2F897;Lo;0;L;232B8;;;;N;;;;;
+2F898;CJK COMPATIBILITY IDEOGRAPH-2F898;Lo;0;L;261DA;;;;N;;;;;
+2F899;CJK COMPATIBILITY IDEOGRAPH-2F899;Lo;0;L;5F62;;;;N;;;;;
+2F89A;CJK COMPATIBILITY IDEOGRAPH-2F89A;Lo;0;L;5F6B;;;;N;;;;;
+2F89B;CJK COMPATIBILITY IDEOGRAPH-2F89B;Lo;0;L;38E3;;;;N;;;;;
+2F89C;CJK COMPATIBILITY IDEOGRAPH-2F89C;Lo;0;L;5F9A;;;;N;;;;;
+2F89D;CJK COMPATIBILITY IDEOGRAPH-2F89D;Lo;0;L;5FCD;;;;N;;;;;
+2F89E;CJK COMPATIBILITY IDEOGRAPH-2F89E;Lo;0;L;5FD7;;;;N;;;;;
+2F89F;CJK COMPATIBILITY IDEOGRAPH-2F89F;Lo;0;L;5FF9;;;;N;;;;;
+2F8A0;CJK COMPATIBILITY IDEOGRAPH-2F8A0;Lo;0;L;6081;;;;N;;;;;
+2F8A1;CJK COMPATIBILITY IDEOGRAPH-2F8A1;Lo;0;L;393A;;;;N;;;;;
+2F8A2;CJK COMPATIBILITY IDEOGRAPH-2F8A2;Lo;0;L;391C;;;;N;;;;;
+2F8A3;CJK COMPATIBILITY IDEOGRAPH-2F8A3;Lo;0;L;6094;;;;N;;;;;
+2F8A4;CJK COMPATIBILITY IDEOGRAPH-2F8A4;Lo;0;L;226D4;;;;N;;;;;
+2F8A5;CJK COMPATIBILITY IDEOGRAPH-2F8A5;Lo;0;L;60C7;;;;N;;;;;
+2F8A6;CJK COMPATIBILITY IDEOGRAPH-2F8A6;Lo;0;L;6148;;;;N;;;;;
+2F8A7;CJK COMPATIBILITY IDEOGRAPH-2F8A7;Lo;0;L;614C;;;;N;;;;;
+2F8A8;CJK COMPATIBILITY IDEOGRAPH-2F8A8;Lo;0;L;614E;;;;N;;;;;
+2F8A9;CJK COMPATIBILITY IDEOGRAPH-2F8A9;Lo;0;L;614C;;;;N;;;;;
+2F8AA;CJK COMPATIBILITY IDEOGRAPH-2F8AA;Lo;0;L;617A;;;;N;;;;;
+2F8AB;CJK COMPATIBILITY IDEOGRAPH-2F8AB;Lo;0;L;618E;;;;N;;;;;
+2F8AC;CJK COMPATIBILITY IDEOGRAPH-2F8AC;Lo;0;L;61B2;;;;N;;;;;
+2F8AD;CJK COMPATIBILITY IDEOGRAPH-2F8AD;Lo;0;L;61A4;;;;N;;;;;
+2F8AE;CJK COMPATIBILITY IDEOGRAPH-2F8AE;Lo;0;L;61AF;;;;N;;;;;
+2F8AF;CJK COMPATIBILITY IDEOGRAPH-2F8AF;Lo;0;L;61DE;;;;N;;;;;
+2F8B0;CJK COMPATIBILITY IDEOGRAPH-2F8B0;Lo;0;L;61F2;;;;N;;;;;
+2F8B1;CJK COMPATIBILITY IDEOGRAPH-2F8B1;Lo;0;L;61F6;;;;N;;;;;
+2F8B2;CJK COMPATIBILITY IDEOGRAPH-2F8B2;Lo;0;L;6210;;;;N;;;;;
+2F8B3;CJK COMPATIBILITY IDEOGRAPH-2F8B3;Lo;0;L;621B;;;;N;;;;;
+2F8B4;CJK COMPATIBILITY IDEOGRAPH-2F8B4;Lo;0;L;625D;;;;N;;;;;
+2F8B5;CJK COMPATIBILITY IDEOGRAPH-2F8B5;Lo;0;L;62B1;;;;N;;;;;
+2F8B6;CJK COMPATIBILITY IDEOGRAPH-2F8B6;Lo;0;L;62D4;;;;N;;;;;
+2F8B7;CJK COMPATIBILITY IDEOGRAPH-2F8B7;Lo;0;L;6350;;;;N;;;;;
+2F8B8;CJK COMPATIBILITY IDEOGRAPH-2F8B8;Lo;0;L;22B0C;;;;N;;;;;
+2F8B9;CJK COMPATIBILITY IDEOGRAPH-2F8B9;Lo;0;L;633D;;;;N;;;;;
+2F8BA;CJK COMPATIBILITY IDEOGRAPH-2F8BA;Lo;0;L;62FC;;;;N;;;;;
+2F8BB;CJK COMPATIBILITY IDEOGRAPH-2F8BB;Lo;0;L;6368;;;;N;;;;;
+2F8BC;CJK COMPATIBILITY IDEOGRAPH-2F8BC;Lo;0;L;6383;;;;N;;;;;
+2F8BD;CJK COMPATIBILITY IDEOGRAPH-2F8BD;Lo;0;L;63E4;;;;N;;;;;
+2F8BE;CJK COMPATIBILITY IDEOGRAPH-2F8BE;Lo;0;L;22BF1;;;;N;;;;;
+2F8BF;CJK COMPATIBILITY IDEOGRAPH-2F8BF;Lo;0;L;6422;;;;N;;;;;
+2F8C0;CJK COMPATIBILITY IDEOGRAPH-2F8C0;Lo;0;L;63C5;;;;N;;;;;
+2F8C1;CJK COMPATIBILITY IDEOGRAPH-2F8C1;Lo;0;L;63A9;;;;N;;;;;
+2F8C2;CJK COMPATIBILITY IDEOGRAPH-2F8C2;Lo;0;L;3A2E;;;;N;;;;;
+2F8C3;CJK COMPATIBILITY IDEOGRAPH-2F8C3;Lo;0;L;6469;;;;N;;;;;
+2F8C4;CJK COMPATIBILITY IDEOGRAPH-2F8C4;Lo;0;L;647E;;;;N;;;;;
+2F8C5;CJK COMPATIBILITY IDEOGRAPH-2F8C5;Lo;0;L;649D;;;;N;;;;;
+2F8C6;CJK COMPATIBILITY IDEOGRAPH-2F8C6;Lo;0;L;6477;;;;N;;;;;
+2F8C7;CJK COMPATIBILITY IDEOGRAPH-2F8C7;Lo;0;L;3A6C;;;;N;;;;;
+2F8C8;CJK COMPATIBILITY IDEOGRAPH-2F8C8;Lo;0;L;654F;;;;N;;;;;
+2F8C9;CJK COMPATIBILITY IDEOGRAPH-2F8C9;Lo;0;L;656C;;;;N;;;;;
+2F8CA;CJK COMPATIBILITY IDEOGRAPH-2F8CA;Lo;0;L;2300A;;;;N;;;;;
+2F8CB;CJK COMPATIBILITY IDEOGRAPH-2F8CB;Lo;0;L;65E3;;;;N;;;;;
+2F8CC;CJK COMPATIBILITY IDEOGRAPH-2F8CC;Lo;0;L;66F8;;;;N;;;;;
+2F8CD;CJK COMPATIBILITY IDEOGRAPH-2F8CD;Lo;0;L;6649;;;;N;;;;;
+2F8CE;CJK COMPATIBILITY IDEOGRAPH-2F8CE;Lo;0;L;3B19;;;;N;;;;;
+2F8CF;CJK COMPATIBILITY IDEOGRAPH-2F8CF;Lo;0;L;6691;;;;N;;;;;
+2F8D0;CJK COMPATIBILITY IDEOGRAPH-2F8D0;Lo;0;L;3B08;;;;N;;;;;
+2F8D1;CJK COMPATIBILITY IDEOGRAPH-2F8D1;Lo;0;L;3AE4;;;;N;;;;;
+2F8D2;CJK COMPATIBILITY IDEOGRAPH-2F8D2;Lo;0;L;5192;;;;N;;;;;
+2F8D3;CJK COMPATIBILITY IDEOGRAPH-2F8D3;Lo;0;L;5195;;;;N;;;;;
+2F8D4;CJK COMPATIBILITY IDEOGRAPH-2F8D4;Lo;0;L;6700;;;;N;;;;;
+2F8D5;CJK COMPATIBILITY IDEOGRAPH-2F8D5;Lo;0;L;669C;;;;N;;;;;
+2F8D6;CJK COMPATIBILITY IDEOGRAPH-2F8D6;Lo;0;L;80AD;;;;N;;;;;
+2F8D7;CJK COMPATIBILITY IDEOGRAPH-2F8D7;Lo;0;L;43D9;;;;N;;;;;
+2F8D8;CJK COMPATIBILITY IDEOGRAPH-2F8D8;Lo;0;L;6717;;;;N;;;;;
+2F8D9;CJK COMPATIBILITY IDEOGRAPH-2F8D9;Lo;0;L;671B;;;;N;;;;;
+2F8DA;CJK COMPATIBILITY IDEOGRAPH-2F8DA;Lo;0;L;6721;;;;N;;;;;
+2F8DB;CJK COMPATIBILITY IDEOGRAPH-2F8DB;Lo;0;L;675E;;;;N;;;;;
+2F8DC;CJK COMPATIBILITY IDEOGRAPH-2F8DC;Lo;0;L;6753;;;;N;;;;;
+2F8DD;CJK COMPATIBILITY IDEOGRAPH-2F8DD;Lo;0;L;233C3;;;;N;;;;;
+2F8DE;CJK COMPATIBILITY IDEOGRAPH-2F8DE;Lo;0;L;3B49;;;;N;;;;;
+2F8DF;CJK COMPATIBILITY IDEOGRAPH-2F8DF;Lo;0;L;67FA;;;;N;;;;;
+2F8E0;CJK COMPATIBILITY IDEOGRAPH-2F8E0;Lo;0;L;6785;;;;N;;;;;
+2F8E1;CJK COMPATIBILITY IDEOGRAPH-2F8E1;Lo;0;L;6852;;;;N;;;;;
+2F8E2;CJK COMPATIBILITY IDEOGRAPH-2F8E2;Lo;0;L;6885;;;;N;;;;;
+2F8E3;CJK COMPATIBILITY IDEOGRAPH-2F8E3;Lo;0;L;2346D;;;;N;;;;;
+2F8E4;CJK COMPATIBILITY IDEOGRAPH-2F8E4;Lo;0;L;688E;;;;N;;;;;
+2F8E5;CJK COMPATIBILITY IDEOGRAPH-2F8E5;Lo;0;L;681F;;;;N;;;;;
+2F8E6;CJK COMPATIBILITY IDEOGRAPH-2F8E6;Lo;0;L;6914;;;;N;;;;;
+2F8E7;CJK COMPATIBILITY IDEOGRAPH-2F8E7;Lo;0;L;3B9D;;;;N;;;;;
+2F8E8;CJK COMPATIBILITY IDEOGRAPH-2F8E8;Lo;0;L;6942;;;;N;;;;;
+2F8E9;CJK COMPATIBILITY IDEOGRAPH-2F8E9;Lo;0;L;69A3;;;;N;;;;;
+2F8EA;CJK COMPATIBILITY IDEOGRAPH-2F8EA;Lo;0;L;69EA;;;;N;;;;;
+2F8EB;CJK COMPATIBILITY IDEOGRAPH-2F8EB;Lo;0;L;6AA8;;;;N;;;;;
+2F8EC;CJK COMPATIBILITY IDEOGRAPH-2F8EC;Lo;0;L;236A3;;;;N;;;;;
+2F8ED;CJK COMPATIBILITY IDEOGRAPH-2F8ED;Lo;0;L;6ADB;;;;N;;;;;
+2F8EE;CJK COMPATIBILITY IDEOGRAPH-2F8EE;Lo;0;L;3C18;;;;N;;;;;
+2F8EF;CJK COMPATIBILITY IDEOGRAPH-2F8EF;Lo;0;L;6B21;;;;N;;;;;
+2F8F0;CJK COMPATIBILITY IDEOGRAPH-2F8F0;Lo;0;L;238A7;;;;N;;;;;
+2F8F1;CJK COMPATIBILITY IDEOGRAPH-2F8F1;Lo;0;L;6B54;;;;N;;;;;
+2F8F2;CJK COMPATIBILITY IDEOGRAPH-2F8F2;Lo;0;L;3C4E;;;;N;;;;;
+2F8F3;CJK COMPATIBILITY IDEOGRAPH-2F8F3;Lo;0;L;6B72;;;;N;;;;;
+2F8F4;CJK COMPATIBILITY IDEOGRAPH-2F8F4;Lo;0;L;6B9F;;;;N;;;;;
+2F8F5;CJK COMPATIBILITY IDEOGRAPH-2F8F5;Lo;0;L;6BBA;;;;N;;;;;
+2F8F6;CJK COMPATIBILITY IDEOGRAPH-2F8F6;Lo;0;L;6BBB;;;;N;;;;;
+2F8F7;CJK COMPATIBILITY IDEOGRAPH-2F8F7;Lo;0;L;23A8D;;;;N;;;;;
+2F8F8;CJK COMPATIBILITY IDEOGRAPH-2F8F8;Lo;0;L;21D0B;;;;N;;;;;
+2F8F9;CJK COMPATIBILITY IDEOGRAPH-2F8F9;Lo;0;L;23AFA;;;;N;;;;;
+2F8FA;CJK COMPATIBILITY IDEOGRAPH-2F8FA;Lo;0;L;6C4E;;;;N;;;;;
+2F8FB;CJK COMPATIBILITY IDEOGRAPH-2F8FB;Lo;0;L;23CBC;;;;N;;;;;
+2F8FC;CJK COMPATIBILITY IDEOGRAPH-2F8FC;Lo;0;L;6CBF;;;;N;;;;;
+2F8FD;CJK COMPATIBILITY IDEOGRAPH-2F8FD;Lo;0;L;6CCD;;;;N;;;;;
+2F8FE;CJK COMPATIBILITY IDEOGRAPH-2F8FE;Lo;0;L;6C67;;;;N;;;;;
+2F8FF;CJK COMPATIBILITY IDEOGRAPH-2F8FF;Lo;0;L;6D16;;;;N;;;;;
+2F900;CJK COMPATIBILITY IDEOGRAPH-2F900;Lo;0;L;6D3E;;;;N;;;;;
+2F901;CJK COMPATIBILITY IDEOGRAPH-2F901;Lo;0;L;6D77;;;;N;;;;;
+2F902;CJK COMPATIBILITY IDEOGRAPH-2F902;Lo;0;L;6D41;;;;N;;;;;
+2F903;CJK COMPATIBILITY IDEOGRAPH-2F903;Lo;0;L;6D69;;;;N;;;;;
+2F904;CJK COMPATIBILITY IDEOGRAPH-2F904;Lo;0;L;6D78;;;;N;;;;;
+2F905;CJK COMPATIBILITY IDEOGRAPH-2F905;Lo;0;L;6D85;;;;N;;;;;
+2F906;CJK COMPATIBILITY IDEOGRAPH-2F906;Lo;0;L;23D1E;;;;N;;;;;
+2F907;CJK COMPATIBILITY IDEOGRAPH-2F907;Lo;0;L;6D34;;;;N;;;;;
+2F908;CJK COMPATIBILITY IDEOGRAPH-2F908;Lo;0;L;6E2F;;;;N;;;;;
+2F909;CJK COMPATIBILITY IDEOGRAPH-2F909;Lo;0;L;6E6E;;;;N;;;;;
+2F90A;CJK COMPATIBILITY IDEOGRAPH-2F90A;Lo;0;L;3D33;;;;N;;;;;
+2F90B;CJK COMPATIBILITY IDEOGRAPH-2F90B;Lo;0;L;6ECB;;;;N;;;;;
+2F90C;CJK COMPATIBILITY IDEOGRAPH-2F90C;Lo;0;L;6EC7;;;;N;;;;;
+2F90D;CJK COMPATIBILITY IDEOGRAPH-2F90D;Lo;0;L;23ED1;;;;N;;;;;
+2F90E;CJK COMPATIBILITY IDEOGRAPH-2F90E;Lo;0;L;6DF9;;;;N;;;;;
+2F90F;CJK COMPATIBILITY IDEOGRAPH-2F90F;Lo;0;L;6F6E;;;;N;;;;;
+2F910;CJK COMPATIBILITY IDEOGRAPH-2F910;Lo;0;L;23F5E;;;;N;;;;;
+2F911;CJK COMPATIBILITY IDEOGRAPH-2F911;Lo;0;L;23F8E;;;;N;;;;;
+2F912;CJK COMPATIBILITY IDEOGRAPH-2F912;Lo;0;L;6FC6;;;;N;;;;;
+2F913;CJK COMPATIBILITY IDEOGRAPH-2F913;Lo;0;L;7039;;;;N;;;;;
+2F914;CJK COMPATIBILITY IDEOGRAPH-2F914;Lo;0;L;701E;;;;N;;;;;
+2F915;CJK COMPATIBILITY IDEOGRAPH-2F915;Lo;0;L;701B;;;;N;;;;;
+2F916;CJK COMPATIBILITY IDEOGRAPH-2F916;Lo;0;L;3D96;;;;N;;;;;
+2F917;CJK COMPATIBILITY IDEOGRAPH-2F917;Lo;0;L;704A;;;;N;;;;;
+2F918;CJK COMPATIBILITY IDEOGRAPH-2F918;Lo;0;L;707D;;;;N;;;;;
+2F919;CJK COMPATIBILITY IDEOGRAPH-2F919;Lo;0;L;7077;;;;N;;;;;
+2F91A;CJK COMPATIBILITY IDEOGRAPH-2F91A;Lo;0;L;70AD;;;;N;;;;;
+2F91B;CJK COMPATIBILITY IDEOGRAPH-2F91B;Lo;0;L;20525;;;;N;;;;;
+2F91C;CJK COMPATIBILITY IDEOGRAPH-2F91C;Lo;0;L;7145;;;;N;;;;;
+2F91D;CJK COMPATIBILITY IDEOGRAPH-2F91D;Lo;0;L;24263;;;;N;;;;;
+2F91E;CJK COMPATIBILITY IDEOGRAPH-2F91E;Lo;0;L;719C;;;;N;;;;;
+2F91F;CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo;0;L;243AB;;;;N;;;;;
+2F920;CJK COMPATIBILITY IDEOGRAPH-2F920;Lo;0;L;7228;;;;N;;;;;
+2F921;CJK COMPATIBILITY IDEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;;
+2F922;CJK COMPATIBILITY IDEOGRAPH-2F922;Lo;0;L;7250;;;;N;;;;;
+2F923;CJK COMPATIBILITY IDEOGRAPH-2F923;Lo;0;L;24608;;;;N;;;;;
+2F924;CJK COMPATIBILITY IDEOGRAPH-2F924;Lo;0;L;7280;;;;N;;;;;
+2F925;CJK COMPATIBILITY IDEOGRAPH-2F925;Lo;0;L;7295;;;;N;;;;;
+2F926;CJK COMPATIBILITY IDEOGRAPH-2F926;Lo;0;L;24735;;;;N;;;;;
+2F927;CJK COMPATIBILITY IDEOGRAPH-2F927;Lo;0;L;24814;;;;N;;;;;
+2F928;CJK COMPATIBILITY IDEOGRAPH-2F928;Lo;0;L;737A;;;;N;;;;;
+2F929;CJK COMPATIBILITY IDEOGRAPH-2F929;Lo;0;L;738B;;;;N;;;;;
+2F92A;CJK COMPATIBILITY IDEOGRAPH-2F92A;Lo;0;L;3EAC;;;;N;;;;;
+2F92B;CJK COMPATIBILITY IDEOGRAPH-2F92B;Lo;0;L;73A5;;;;N;;;;;
+2F92C;CJK COMPATIBILITY IDEOGRAPH-2F92C;Lo;0;L;3EB8;;;;N;;;;;
+2F92D;CJK COMPATIBILITY IDEOGRAPH-2F92D;Lo;0;L;3EB8;;;;N;;;;;
+2F92E;CJK COMPATIBILITY IDEOGRAPH-2F92E;Lo;0;L;7447;;;;N;;;;;
+2F92F;CJK COMPATIBILITY IDEOGRAPH-2F92F;Lo;0;L;745C;;;;N;;;;;
+2F930;CJK COMPATIBILITY IDEOGRAPH-2F930;Lo;0;L;7471;;;;N;;;;;
+2F931;CJK COMPATIBILITY IDEOGRAPH-2F931;Lo;0;L;7485;;;;N;;;;;
+2F932;CJK COMPATIBILITY IDEOGRAPH-2F932;Lo;0;L;74CA;;;;N;;;;;
+2F933;CJK COMPATIBILITY IDEOGRAPH-2F933;Lo;0;L;3F1B;;;;N;;;;;
+2F934;CJK COMPATIBILITY IDEOGRAPH-2F934;Lo;0;L;7524;;;;N;;;;;
+2F935;CJK COMPATIBILITY IDEOGRAPH-2F935;Lo;0;L;24C36;;;;N;;;;;
+2F936;CJK COMPATIBILITY IDEOGRAPH-2F936;Lo;0;L;753E;;;;N;;;;;
+2F937;CJK COMPATIBILITY IDEOGRAPH-2F937;Lo;0;L;24C92;;;;N;;;;;
+2F938;CJK COMPATIBILITY IDEOGRAPH-2F938;Lo;0;L;7570;;;;N;;;;;
+2F939;CJK COMPATIBILITY IDEOGRAPH-2F939;Lo;0;L;2219F;;;;N;;;;;
+2F93A;CJK COMPATIBILITY IDEOGRAPH-2F93A;Lo;0;L;7610;;;;N;;;;;
+2F93B;CJK COMPATIBILITY IDEOGRAPH-2F93B;Lo;0;L;24FA1;;;;N;;;;;
+2F93C;CJK COMPATIBILITY IDEOGRAPH-2F93C;Lo;0;L;24FB8;;;;N;;;;;
+2F93D;CJK COMPATIBILITY IDEOGRAPH-2F93D;Lo;0;L;25044;;;;N;;;;;
+2F93E;CJK COMPATIBILITY IDEOGRAPH-2F93E;Lo;0;L;3FFC;;;;N;;;;;
+2F93F;CJK COMPATIBILITY IDEOGRAPH-2F93F;Lo;0;L;4008;;;;N;;;;;
+2F940;CJK COMPATIBILITY IDEOGRAPH-2F940;Lo;0;L;76F4;;;;N;;;;;
+2F941;CJK COMPATIBILITY IDEOGRAPH-2F941;Lo;0;L;250F3;;;;N;;;;;
+2F942;CJK COMPATIBILITY IDEOGRAPH-2F942;Lo;0;L;250F2;;;;N;;;;;
+2F943;CJK COMPATIBILITY IDEOGRAPH-2F943;Lo;0;L;25119;;;;N;;;;;
+2F944;CJK COMPATIBILITY IDEOGRAPH-2F944;Lo;0;L;25133;;;;N;;;;;
+2F945;CJK COMPATIBILITY IDEOGRAPH-2F945;Lo;0;L;771E;;;;N;;;;;
+2F946;CJK COMPATIBILITY IDEOGRAPH-2F946;Lo;0;L;771F;;;;N;;;;;
+2F947;CJK COMPATIBILITY IDEOGRAPH-2F947;Lo;0;L;771F;;;;N;;;;;
+2F948;CJK COMPATIBILITY IDEOGRAPH-2F948;Lo;0;L;774A;;;;N;;;;;
+2F949;CJK COMPATIBILITY IDEOGRAPH-2F949;Lo;0;L;4039;;;;N;;;;;
+2F94A;CJK COMPATIBILITY IDEOGRAPH-2F94A;Lo;0;L;778B;;;;N;;;;;
+2F94B;CJK COMPATIBILITY IDEOGRAPH-2F94B;Lo;0;L;4046;;;;N;;;;;
+2F94C;CJK COMPATIBILITY IDEOGRAPH-2F94C;Lo;0;L;4096;;;;N;;;;;
+2F94D;CJK COMPATIBILITY IDEOGRAPH-2F94D;Lo;0;L;2541D;;;;N;;;;;
+2F94E;CJK COMPATIBILITY IDEOGRAPH-2F94E;Lo;0;L;784E;;;;N;;;;;
+2F94F;CJK COMPATIBILITY IDEOGRAPH-2F94F;Lo;0;L;788C;;;;N;;;;;
+2F950;CJK COMPATIBILITY IDEOGRAPH-2F950;Lo;0;L;78CC;;;;N;;;;;
+2F951;CJK COMPATIBILITY IDEOGRAPH-2F951;Lo;0;L;40E3;;;;N;;;;;
+2F952;CJK COMPATIBILITY IDEOGRAPH-2F952;Lo;0;L;25626;;;;N;;;;;
+2F953;CJK COMPATIBILITY IDEOGRAPH-2F953;Lo;0;L;7956;;;;N;;;;;
+2F954;CJK COMPATIBILITY IDEOGRAPH-2F954;Lo;0;L;2569A;;;;N;;;;;
+2F955;CJK COMPATIBILITY IDEOGRAPH-2F955;Lo;0;L;256C5;;;;N;;;;;
+2F956;CJK COMPATIBILITY IDEOGRAPH-2F956;Lo;0;L;798F;;;;N;;;;;
+2F957;CJK COMPATIBILITY IDEOGRAPH-2F957;Lo;0;L;79EB;;;;N;;;;;
+2F958;CJK COMPATIBILITY IDEOGRAPH-2F958;Lo;0;L;412F;;;;N;;;;;
+2F959;CJK COMPATIBILITY IDEOGRAPH-2F959;Lo;0;L;7A40;;;;N;;;;;
+2F95A;CJK COMPATIBILITY IDEOGRAPH-2F95A;Lo;0;L;7A4A;;;;N;;;;;
+2F95B;CJK COMPATIBILITY IDEOGRAPH-2F95B;Lo;0;L;7A4F;;;;N;;;;;
+2F95C;CJK COMPATIBILITY IDEOGRAPH-2F95C;Lo;0;L;2597C;;;;N;;;;;
+2F95D;CJK COMPATIBILITY IDEOGRAPH-2F95D;Lo;0;L;25AA7;;;;N;;;;;
+2F95E;CJK COMPATIBILITY IDEOGRAPH-2F95E;Lo;0;L;25AA7;;;;N;;;;;
+2F95F;CJK COMPATIBILITY IDEOGRAPH-2F95F;Lo;0;L;7AEE;;;;N;;;;;
+2F960;CJK COMPATIBILITY IDEOGRAPH-2F960;Lo;0;L;4202;;;;N;;;;;
+2F961;CJK COMPATIBILITY IDEOGRAPH-2F961;Lo;0;L;25BAB;;;;N;;;;;
+2F962;CJK COMPATIBILITY IDEOGRAPH-2F962;Lo;0;L;7BC6;;;;N;;;;;
+2F963;CJK COMPATIBILITY IDEOGRAPH-2F963;Lo;0;L;7BC9;;;;N;;;;;
+2F964;CJK COMPATIBILITY IDEOGRAPH-2F964;Lo;0;L;4227;;;;N;;;;;
+2F965;CJK COMPATIBILITY IDEOGRAPH-2F965;Lo;0;L;25C80;;;;N;;;;;
+2F966;CJK COMPATIBILITY IDEOGRAPH-2F966;Lo;0;L;7CD2;;;;N;;;;;
+2F967;CJK COMPATIBILITY IDEOGRAPH-2F967;Lo;0;L;42A0;;;;N;;;;;
+2F968;CJK COMPATIBILITY IDEOGRAPH-2F968;Lo;0;L;7CE8;;;;N;;;;;
+2F969;CJK COMPATIBILITY IDEOGRAPH-2F969;Lo;0;L;7CE3;;;;N;;;;;
+2F96A;CJK COMPATIBILITY IDEOGRAPH-2F96A;Lo;0;L;7D00;;;;N;;;;;
+2F96B;CJK COMPATIBILITY IDEOGRAPH-2F96B;Lo;0;L;25F86;;;;N;;;;;
+2F96C;CJK COMPATIBILITY IDEOGRAPH-2F96C;Lo;0;L;7D63;;;;N;;;;;
+2F96D;CJK COMPATIBILITY IDEOGRAPH-2F96D;Lo;0;L;4301;;;;N;;;;;
+2F96E;CJK COMPATIBILITY IDEOGRAPH-2F96E;Lo;0;L;7DC7;;;;N;;;;;
+2F96F;CJK COMPATIBILITY IDEOGRAPH-2F96F;Lo;0;L;7E02;;;;N;;;;;
+2F970;CJK COMPATIBILITY IDEOGRAPH-2F970;Lo;0;L;7E45;;;;N;;;;;
+2F971;CJK COMPATIBILITY IDEOGRAPH-2F971;Lo;0;L;4334;;;;N;;;;;
+2F972;CJK COMPATIBILITY IDEOGRAPH-2F972;Lo;0;L;26228;;;;N;;;;;
+2F973;CJK COMPATIBILITY IDEOGRAPH-2F973;Lo;0;L;26247;;;;N;;;;;
+2F974;CJK COMPATIBILITY IDEOGRAPH-2F974;Lo;0;L;4359;;;;N;;;;;
+2F975;CJK COMPATIBILITY IDEOGRAPH-2F975;Lo;0;L;262D9;;;;N;;;;;
+2F976;CJK COMPATIBILITY IDEOGRAPH-2F976;Lo;0;L;7F7A;;;;N;;;;;
+2F977;CJK COMPATIBILITY IDEOGRAPH-2F977;Lo;0;L;2633E;;;;N;;;;;
+2F978;CJK COMPATIBILITY IDEOGRAPH-2F978;Lo;0;L;7F95;;;;N;;;;;
+2F979;CJK COMPATIBILITY IDEOGRAPH-2F979;Lo;0;L;7FFA;;;;N;;;;;
+2F97A;CJK COMPATIBILITY IDEOGRAPH-2F97A;Lo;0;L;8005;;;;N;;;;;
+2F97B;CJK COMPATIBILITY IDEOGRAPH-2F97B;Lo;0;L;264DA;;;;N;;;;;
+2F97C;CJK COMPATIBILITY IDEOGRAPH-2F97C;Lo;0;L;26523;;;;N;;;;;
+2F97D;CJK COMPATIBILITY IDEOGRAPH-2F97D;Lo;0;L;8060;;;;N;;;;;
+2F97E;CJK COMPATIBILITY IDEOGRAPH-2F97E;Lo;0;L;265A8;;;;N;;;;;
+2F97F;CJK COMPATIBILITY IDEOGRAPH-2F97F;Lo;0;L;8070;;;;N;;;;;
+2F980;CJK COMPATIBILITY IDEOGRAPH-2F980;Lo;0;L;2335F;;;;N;;;;;
+2F981;CJK COMPATIBILITY IDEOGRAPH-2F981;Lo;0;L;43D5;;;;N;;;;;
+2F982;CJK COMPATIBILITY IDEOGRAPH-2F982;Lo;0;L;80B2;;;;N;;;;;
+2F983;CJK COMPATIBILITY IDEOGRAPH-2F983;Lo;0;L;8103;;;;N;;;;;
+2F984;CJK COMPATIBILITY IDEOGRAPH-2F984;Lo;0;L;440B;;;;N;;;;;
+2F985;CJK COMPATIBILITY IDEOGRAPH-2F985;Lo;0;L;813E;;;;N;;;;;
+2F986;CJK COMPATIBILITY IDEOGRAPH-2F986;Lo;0;L;5AB5;;;;N;;;;;
+2F987;CJK COMPATIBILITY IDEOGRAPH-2F987;Lo;0;L;267A7;;;;N;;;;;
+2F988;CJK COMPATIBILITY IDEOGRAPH-2F988;Lo;0;L;267B5;;;;N;;;;;
+2F989;CJK COMPATIBILITY IDEOGRAPH-2F989;Lo;0;L;23393;;;;N;;;;;
+2F98A;CJK COMPATIBILITY IDEOGRAPH-2F98A;Lo;0;L;2339C;;;;N;;;;;
+2F98B;CJK COMPATIBILITY IDEOGRAPH-2F98B;Lo;0;L;8201;;;;N;;;;;
+2F98C;CJK COMPATIBILITY IDEOGRAPH-2F98C;Lo;0;L;8204;;;;N;;;;;
+2F98D;CJK COMPATIBILITY IDEOGRAPH-2F98D;Lo;0;L;8F9E;;;;N;;;;;
+2F98E;CJK COMPATIBILITY IDEOGRAPH-2F98E;Lo;0;L;446B;;;;N;;;;;
+2F98F;CJK COMPATIBILITY IDEOGRAPH-2F98F;Lo;0;L;8291;;;;N;;;;;
+2F990;CJK COMPATIBILITY IDEOGRAPH-2F990;Lo;0;L;828B;;;;N;;;;;
+2F991;CJK COMPATIBILITY IDEOGRAPH-2F991;Lo;0;L;829D;;;;N;;;;;
+2F992;CJK COMPATIBILITY IDEOGRAPH-2F992;Lo;0;L;52B3;;;;N;;;;;
+2F993;CJK COMPATIBILITY IDEOGRAPH-2F993;Lo;0;L;82B1;;;;N;;;;;
+2F994;CJK COMPATIBILITY IDEOGRAPH-2F994;Lo;0;L;82B3;;;;N;;;;;
+2F995;CJK COMPATIBILITY IDEOGRAPH-2F995;Lo;0;L;82BD;;;;N;;;;;
+2F996;CJK COMPATIBILITY IDEOGRAPH-2F996;Lo;0;L;82E6;;;;N;;;;;
+2F997;CJK COMPATIBILITY IDEOGRAPH-2F997;Lo;0;L;26B3C;;;;N;;;;;
+2F998;CJK COMPATIBILITY IDEOGRAPH-2F998;Lo;0;L;82E5;;;;N;;;;;
+2F999;CJK COMPATIBILITY IDEOGRAPH-2F999;Lo;0;L;831D;;;;N;;;;;
+2F99A;CJK COMPATIBILITY IDEOGRAPH-2F99A;Lo;0;L;8363;;;;N;;;;;
+2F99B;CJK COMPATIBILITY IDEOGRAPH-2F99B;Lo;0;L;83AD;;;;N;;;;;
+2F99C;CJK COMPATIBILITY IDEOGRAPH-2F99C;Lo;0;L;8323;;;;N;;;;;
+2F99D;CJK COMPATIBILITY IDEOGRAPH-2F99D;Lo;0;L;83BD;;;;N;;;;;
+2F99E;CJK COMPATIBILITY IDEOGRAPH-2F99E;Lo;0;L;83E7;;;;N;;;;;
+2F99F;CJK COMPATIBILITY IDEOGRAPH-2F99F;Lo;0;L;8457;;;;N;;;;;
+2F9A0;CJK COMPATIBILITY IDEOGRAPH-2F9A0;Lo;0;L;8353;;;;N;;;;;
+2F9A1;CJK COMPATIBILITY IDEOGRAPH-2F9A1;Lo;0;L;83CA;;;;N;;;;;
+2F9A2;CJK COMPATIBILITY IDEOGRAPH-2F9A2;Lo;0;L;83CC;;;;N;;;;;
+2F9A3;CJK COMPATIBILITY IDEOGRAPH-2F9A3;Lo;0;L;83DC;;;;N;;;;;
+2F9A4;CJK COMPATIBILITY IDEOGRAPH-2F9A4;Lo;0;L;26C36;;;;N;;;;;
+2F9A5;CJK COMPATIBILITY IDEOGRAPH-2F9A5;Lo;0;L;26D6B;;;;N;;;;;
+2F9A6;CJK COMPATIBILITY IDEOGRAPH-2F9A6;Lo;0;L;26CD5;;;;N;;;;;
+2F9A7;CJK COMPATIBILITY IDEOGRAPH-2F9A7;Lo;0;L;452B;;;;N;;;;;
+2F9A8;CJK COMPATIBILITY IDEOGRAPH-2F9A8;Lo;0;L;84F1;;;;N;;;;;
+2F9A9;CJK COMPATIBILITY IDEOGRAPH-2F9A9;Lo;0;L;84F3;;;;N;;;;;
+2F9AA;CJK COMPATIBILITY IDEOGRAPH-2F9AA;Lo;0;L;8516;;;;N;;;;;
+2F9AB;CJK COMPATIBILITY IDEOGRAPH-2F9AB;Lo;0;L;273CA;;;;N;;;;;
+2F9AC;CJK COMPATIBILITY IDEOGRAPH-2F9AC;Lo;0;L;8564;;;;N;;;;;
+2F9AD;CJK COMPATIBILITY IDEOGRAPH-2F9AD;Lo;0;L;26F2C;;;;N;;;;;
+2F9AE;CJK COMPATIBILITY IDEOGRAPH-2F9AE;Lo;0;L;455D;;;;N;;;;;
+2F9AF;CJK COMPATIBILITY IDEOGRAPH-2F9AF;Lo;0;L;4561;;;;N;;;;;
+2F9B0;CJK COMPATIBILITY IDEOGRAPH-2F9B0;Lo;0;L;26FB1;;;;N;;;;;
+2F9B1;CJK COMPATIBILITY IDEOGRAPH-2F9B1;Lo;0;L;270D2;;;;N;;;;;
+2F9B2;CJK COMPATIBILITY IDEOGRAPH-2F9B2;Lo;0;L;456B;;;;N;;;;;
+2F9B3;CJK COMPATIBILITY IDEOGRAPH-2F9B3;Lo;0;L;8650;;;;N;;;;;
+2F9B4;CJK COMPATIBILITY IDEOGRAPH-2F9B4;Lo;0;L;865C;;;;N;;;;;
+2F9B5;CJK COMPATIBILITY IDEOGRAPH-2F9B5;Lo;0;L;8667;;;;N;;;;;
+2F9B6;CJK COMPATIBILITY IDEOGRAPH-2F9B6;Lo;0;L;8669;;;;N;;;;;
+2F9B7;CJK COMPATIBILITY IDEOGRAPH-2F9B7;Lo;0;L;86A9;;;;N;;;;;
+2F9B8;CJK COMPATIBILITY IDEOGRAPH-2F9B8;Lo;0;L;8688;;;;N;;;;;
+2F9B9;CJK COMPATIBILITY IDEOGRAPH-2F9B9;Lo;0;L;870E;;;;N;;;;;
+2F9BA;CJK COMPATIBILITY IDEOGRAPH-2F9BA;Lo;0;L;86E2;;;;N;;;;;
+2F9BB;CJK COMPATIBILITY IDEOGRAPH-2F9BB;Lo;0;L;8779;;;;N;;;;;
+2F9BC;CJK COMPATIBILITY IDEOGRAPH-2F9BC;Lo;0;L;8728;;;;N;;;;;
+2F9BD;CJK COMPATIBILITY IDEOGRAPH-2F9BD;Lo;0;L;876B;;;;N;;;;;
+2F9BE;CJK COMPATIBILITY IDEOGRAPH-2F9BE;Lo;0;L;8786;;;;N;;;;;
+2F9BF;CJK COMPATIBILITY IDEOGRAPH-2F9BF;Lo;0;L;45D7;;;;N;;;;;
+2F9C0;CJK COMPATIBILITY IDEOGRAPH-2F9C0;Lo;0;L;87E1;;;;N;;;;;
+2F9C1;CJK COMPATIBILITY IDEOGRAPH-2F9C1;Lo;0;L;8801;;;;N;;;;;
+2F9C2;CJK COMPATIBILITY IDEOGRAPH-2F9C2;Lo;0;L;45F9;;;;N;;;;;
+2F9C3;CJK COMPATIBILITY IDEOGRAPH-2F9C3;Lo;0;L;8860;;;;N;;;;;
+2F9C4;CJK COMPATIBILITY IDEOGRAPH-2F9C4;Lo;0;L;8863;;;;N;;;;;
+2F9C5;CJK COMPATIBILITY IDEOGRAPH-2F9C5;Lo;0;L;27667;;;;N;;;;;
+2F9C6;CJK COMPATIBILITY IDEOGRAPH-2F9C6;Lo;0;L;88D7;;;;N;;;;;
+2F9C7;CJK COMPATIBILITY IDEOGRAPH-2F9C7;Lo;0;L;88DE;;;;N;;;;;
+2F9C8;CJK COMPATIBILITY IDEOGRAPH-2F9C8;Lo;0;L;4635;;;;N;;;;;
+2F9C9;CJK COMPATIBILITY IDEOGRAPH-2F9C9;Lo;0;L;88FA;;;;N;;;;;
+2F9CA;CJK COMPATIBILITY IDEOGRAPH-2F9CA;Lo;0;L;34BB;;;;N;;;;;
+2F9CB;CJK COMPATIBILITY IDEOGRAPH-2F9CB;Lo;0;L;278AE;;;;N;;;;;
+2F9CC;CJK COMPATIBILITY IDEOGRAPH-2F9CC;Lo;0;L;27966;;;;N;;;;;
+2F9CD;CJK COMPATIBILITY IDEOGRAPH-2F9CD;Lo;0;L;46BE;;;;N;;;;;
+2F9CE;CJK COMPATIBILITY IDEOGRAPH-2F9CE;Lo;0;L;46C7;;;;N;;;;;
+2F9CF;CJK COMPATIBILITY IDEOGRAPH-2F9CF;Lo;0;L;8AA0;;;;N;;;;;
+2F9D0;CJK COMPATIBILITY IDEOGRAPH-2F9D0;Lo;0;L;8AED;;;;N;;;;;
+2F9D1;CJK COMPATIBILITY IDEOGRAPH-2F9D1;Lo;0;L;8B8A;;;;N;;;;;
+2F9D2;CJK COMPATIBILITY IDEOGRAPH-2F9D2;Lo;0;L;8C55;;;;N;;;;;
+2F9D3;CJK COMPATIBILITY IDEOGRAPH-2F9D3;Lo;0;L;27CA8;;;;N;;;;;
+2F9D4;CJK COMPATIBILITY IDEOGRAPH-2F9D4;Lo;0;L;8CAB;;;;N;;;;;
+2F9D5;CJK COMPATIBILITY IDEOGRAPH-2F9D5;Lo;0;L;8CC1;;;;N;;;;;
+2F9D6;CJK COMPATIBILITY IDEOGRAPH-2F9D6;Lo;0;L;8D1B;;;;N;;;;;
+2F9D7;CJK COMPATIBILITY IDEOGRAPH-2F9D7;Lo;0;L;8D77;;;;N;;;;;
+2F9D8;CJK COMPATIBILITY IDEOGRAPH-2F9D8;Lo;0;L;27F2F;;;;N;;;;;
+2F9D9;CJK COMPATIBILITY IDEOGRAPH-2F9D9;Lo;0;L;20804;;;;N;;;;;
+2F9DA;CJK COMPATIBILITY IDEOGRAPH-2F9DA;Lo;0;L;8DCB;;;;N;;;;;
+2F9DB;CJK COMPATIBILITY IDEOGRAPH-2F9DB;Lo;0;L;8DBC;;;;N;;;;;
+2F9DC;CJK COMPATIBILITY IDEOGRAPH-2F9DC;Lo;0;L;8DF0;;;;N;;;;;
+2F9DD;CJK COMPATIBILITY IDEOGRAPH-2F9DD;Lo;0;L;208DE;;;;N;;;;;
+2F9DE;CJK COMPATIBILITY IDEOGRAPH-2F9DE;Lo;0;L;8ED4;;;;N;;;;;
+2F9DF;CJK COMPATIBILITY IDEOGRAPH-2F9DF;Lo;0;L;8F38;;;;N;;;;;
+2F9E0;CJK COMPATIBILITY IDEOGRAPH-2F9E0;Lo;0;L;285D2;;;;N;;;;;
+2F9E1;CJK COMPATIBILITY IDEOGRAPH-2F9E1;Lo;0;L;285ED;;;;N;;;;;
+2F9E2;CJK COMPATIBILITY IDEOGRAPH-2F9E2;Lo;0;L;9094;;;;N;;;;;
+2F9E3;CJK COMPATIBILITY IDEOGRAPH-2F9E3;Lo;0;L;90F1;;;;N;;;;;
+2F9E4;CJK COMPATIBILITY IDEOGRAPH-2F9E4;Lo;0;L;9111;;;;N;;;;;
+2F9E5;CJK COMPATIBILITY IDEOGRAPH-2F9E5;Lo;0;L;2872E;;;;N;;;;;
+2F9E6;CJK COMPATIBILITY IDEOGRAPH-2F9E6;Lo;0;L;911B;;;;N;;;;;
+2F9E7;CJK COMPATIBILITY IDEOGRAPH-2F9E7;Lo;0;L;9238;;;;N;;;;;
+2F9E8;CJK COMPATIBILITY IDEOGRAPH-2F9E8;Lo;0;L;92D7;;;;N;;;;;
+2F9E9;CJK COMPATIBILITY IDEOGRAPH-2F9E9;Lo;0;L;92D8;;;;N;;;;;
+2F9EA;CJK COMPATIBILITY IDEOGRAPH-2F9EA;Lo;0;L;927C;;;;N;;;;;
+2F9EB;CJK COMPATIBILITY IDEOGRAPH-2F9EB;Lo;0;L;93F9;;;;N;;;;;
+2F9EC;CJK COMPATIBILITY IDEOGRAPH-2F9EC;Lo;0;L;9415;;;;N;;;;;
+2F9ED;CJK COMPATIBILITY IDEOGRAPH-2F9ED;Lo;0;L;28BFA;;;;N;;;;;
+2F9EE;CJK COMPATIBILITY IDEOGRAPH-2F9EE;Lo;0;L;958B;;;;N;;;;;
+2F9EF;CJK COMPATIBILITY IDEOGRAPH-2F9EF;Lo;0;L;4995;;;;N;;;;;
+2F9F0;CJK COMPATIBILITY IDEOGRAPH-2F9F0;Lo;0;L;95B7;;;;N;;;;;
+2F9F1;CJK COMPATIBILITY IDEOGRAPH-2F9F1;Lo;0;L;28D77;;;;N;;;;;
+2F9F2;CJK COMPATIBILITY IDEOGRAPH-2F9F2;Lo;0;L;49E6;;;;N;;;;;
+2F9F3;CJK COMPATIBILITY IDEOGRAPH-2F9F3;Lo;0;L;96C3;;;;N;;;;;
+2F9F4;CJK COMPATIBILITY IDEOGRAPH-2F9F4;Lo;0;L;5DB2;;;;N;;;;;
+2F9F5;CJK COMPATIBILITY IDEOGRAPH-2F9F5;Lo;0;L;9723;;;;N;;;;;
+2F9F6;CJK COMPATIBILITY IDEOGRAPH-2F9F6;Lo;0;L;29145;;;;N;;;;;
+2F9F7;CJK COMPATIBILITY IDEOGRAPH-2F9F7;Lo;0;L;2921A;;;;N;;;;;
+2F9F8;CJK COMPATIBILITY IDEOGRAPH-2F9F8;Lo;0;L;4A6E;;;;N;;;;;
+2F9F9;CJK COMPATIBILITY IDEOGRAPH-2F9F9;Lo;0;L;4A76;;;;N;;;;;
+2F9FA;CJK COMPATIBILITY IDEOGRAPH-2F9FA;Lo;0;L;97E0;;;;N;;;;;
+2F9FB;CJK COMPATIBILITY IDEOGRAPH-2F9FB;Lo;0;L;2940A;;;;N;;;;;
+2F9FC;CJK COMPATIBILITY IDEOGRAPH-2F9FC;Lo;0;L;4AB2;;;;N;;;;;
+2F9FD;CJK COMPATIBILITY IDEOGRAPH-2F9FD;Lo;0;L;29496;;;;N;;;;;
+2F9FE;CJK COMPATIBILITY IDEOGRAPH-2F9FE;Lo;0;L;980B;;;;N;;;;;
+2F9FF;CJK COMPATIBILITY IDEOGRAPH-2F9FF;Lo;0;L;980B;;;;N;;;;;
+2FA00;CJK COMPATIBILITY IDEOGRAPH-2FA00;Lo;0;L;9829;;;;N;;;;;
+2FA01;CJK COMPATIBILITY IDEOGRAPH-2FA01;Lo;0;L;295B6;;;;N;;;;;
+2FA02;CJK COMPATIBILITY IDEOGRAPH-2FA02;Lo;0;L;98E2;;;;N;;;;;
+2FA03;CJK COMPATIBILITY IDEOGRAPH-2FA03;Lo;0;L;4B33;;;;N;;;;;
+2FA04;CJK COMPATIBILITY IDEOGRAPH-2FA04;Lo;0;L;9929;;;;N;;;;;
+2FA05;CJK COMPATIBILITY IDEOGRAPH-2FA05;Lo;0;L;99A7;;;;N;;;;;
+2FA06;CJK COMPATIBILITY IDEOGRAPH-2FA06;Lo;0;L;99C2;;;;N;;;;;
+2FA07;CJK COMPATIBILITY IDEOGRAPH-2FA07;Lo;0;L;99FE;;;;N;;;;;
+2FA08;CJK COMPATIBILITY IDEOGRAPH-2FA08;Lo;0;L;4BCE;;;;N;;;;;
+2FA09;CJK COMPATIBILITY IDEOGRAPH-2FA09;Lo;0;L;29B30;;;;N;;;;;
+2FA0A;CJK COMPATIBILITY IDEOGRAPH-2FA0A;Lo;0;L;9B12;;;;N;;;;;
+2FA0B;CJK COMPATIBILITY IDEOGRAPH-2FA0B;Lo;0;L;9C40;;;;N;;;;;
+2FA0C;CJK COMPATIBILITY IDEOGRAPH-2FA0C;Lo;0;L;9CFD;;;;N;;;;;
+2FA0D;CJK COMPATIBILITY IDEOGRAPH-2FA0D;Lo;0;L;4CCE;;;;N;;;;;
+2FA0E;CJK COMPATIBILITY IDEOGRAPH-2FA0E;Lo;0;L;4CED;;;;N;;;;;
+2FA0F;CJK COMPATIBILITY IDEOGRAPH-2FA0F;Lo;0;L;9D67;;;;N;;;;;
+2FA10;CJK COMPATIBILITY IDEOGRAPH-2FA10;Lo;0;L;2A0CE;;;;N;;;;;
+2FA11;CJK COMPATIBILITY IDEOGRAPH-2FA11;Lo;0;L;4CF8;;;;N;;;;;
+2FA12;CJK COMPATIBILITY IDEOGRAPH-2FA12;Lo;0;L;2A105;;;;N;;;;;
+2FA13;CJK COMPATIBILITY IDEOGRAPH-2FA13;Lo;0;L;2A20E;;;;N;;;;;
+2FA14;CJK COMPATIBILITY IDEOGRAPH-2FA14;Lo;0;L;2A291;;;;N;;;;;
+2FA15;CJK COMPATIBILITY IDEOGRAPH-2FA15;Lo;0;L;9EBB;;;;N;;;;;
+2FA16;CJK COMPATIBILITY IDEOGRAPH-2FA16;Lo;0;L;4D56;;;;N;;;;;
+2FA17;CJK COMPATIBILITY IDEOGRAPH-2FA17;Lo;0;L;9EF9;;;;N;;;;;
+2FA18;CJK COMPATIBILITY IDEOGRAPH-2FA18;Lo;0;L;9EFE;;;;N;;;;;
+2FA19;CJK COMPATIBILITY IDEOGRAPH-2FA19;Lo;0;L;9F05;;;;N;;;;;
+2FA1A;CJK COMPATIBILITY IDEOGRAPH-2FA1A;Lo;0;L;9F0F;;;;N;;;;;
+2FA1B;CJK COMPATIBILITY IDEOGRAPH-2FA1B;Lo;0;L;9F16;;;;N;;;;;
+2FA1C;CJK COMPATIBILITY IDEOGRAPH-2FA1C;Lo;0;L;9F3B;;;;N;;;;;
+2FA1D;CJK COMPATIBILITY IDEOGRAPH-2FA1D;Lo;0;L;2A600;;;;N;;;;;
+30000;<CJK Ideograph Extension G, First>;Lo;0;L;;;;;N;;;;;
+3134A;<CJK Ideograph Extension G, Last>;Lo;0;L;;;;;N;;;;;
+E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;;
+E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;;
+E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;;
+E0022;TAG QUOTATION MARK;Cf;0;BN;;;;;N;;;;;
+E0023;TAG NUMBER SIGN;Cf;0;BN;;;;;N;;;;;
+E0024;TAG DOLLAR SIGN;Cf;0;BN;;;;;N;;;;;
+E0025;TAG PERCENT SIGN;Cf;0;BN;;;;;N;;;;;
+E0026;TAG AMPERSAND;Cf;0;BN;;;;;N;;;;;
+E0027;TAG APOSTROPHE;Cf;0;BN;;;;;N;;;;;
+E0028;TAG LEFT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
+E0029;TAG RIGHT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
+E002A;TAG ASTERISK;Cf;0;BN;;;;;N;;;;;
+E002B;TAG PLUS SIGN;Cf;0;BN;;;;;N;;;;;
+E002C;TAG COMMA;Cf;0;BN;;;;;N;;;;;
+E002D;TAG HYPHEN-MINUS;Cf;0;BN;;;;;N;;;;;
+E002E;TAG FULL STOP;Cf;0;BN;;;;;N;;;;;
+E002F;TAG SOLIDUS;Cf;0;BN;;;;;N;;;;;
+E0030;TAG DIGIT ZERO;Cf;0;BN;;;;;N;;;;;
+E0031;TAG DIGIT ONE;Cf;0;BN;;;;;N;;;;;
+E0032;TAG DIGIT TWO;Cf;0;BN;;;;;N;;;;;
+E0033;TAG DIGIT THREE;Cf;0;BN;;;;;N;;;;;
+E0034;TAG DIGIT FOUR;Cf;0;BN;;;;;N;;;;;
+E0035;TAG DIGIT FIVE;Cf;0;BN;;;;;N;;;;;
+E0036;TAG DIGIT SIX;Cf;0;BN;;;;;N;;;;;
+E0037;TAG DIGIT SEVEN;Cf;0;BN;;;;;N;;;;;
+E0038;TAG DIGIT EIGHT;Cf;0;BN;;;;;N;;;;;
+E0039;TAG DIGIT NINE;Cf;0;BN;;;;;N;;;;;
+E003A;TAG COLON;Cf;0;BN;;;;;N;;;;;
+E003B;TAG SEMICOLON;Cf;0;BN;;;;;N;;;;;
+E003C;TAG LESS-THAN SIGN;Cf;0;BN;;;;;N;;;;;
+E003D;TAG EQUALS SIGN;Cf;0;BN;;;;;N;;;;;
+E003E;TAG GREATER-THAN SIGN;Cf;0;BN;;;;;N;;;;;
+E003F;TAG QUESTION MARK;Cf;0;BN;;;;;N;;;;;
+E0040;TAG COMMERCIAL AT;Cf;0;BN;;;;;N;;;;;
+E0041;TAG LATIN CAPITAL LETTER A;Cf;0;BN;;;;;N;;;;;
+E0042;TAG LATIN CAPITAL LETTER B;Cf;0;BN;;;;;N;;;;;
+E0043;TAG LATIN CAPITAL LETTER C;Cf;0;BN;;;;;N;;;;;
+E0044;TAG LATIN CAPITAL LETTER D;Cf;0;BN;;;;;N;;;;;
+E0045;TAG LATIN CAPITAL LETTER E;Cf;0;BN;;;;;N;;;;;
+E0046;TAG LATIN CAPITAL LETTER F;Cf;0;BN;;;;;N;;;;;
+E0047;TAG LATIN CAPITAL LETTER G;Cf;0;BN;;;;;N;;;;;
+E0048;TAG LATIN CAPITAL LETTER H;Cf;0;BN;;;;;N;;;;;
+E0049;TAG LATIN CAPITAL LETTER I;Cf;0;BN;;;;;N;;;;;
+E004A;TAG LATIN CAPITAL LETTER J;Cf;0;BN;;;;;N;;;;;
+E004B;TAG LATIN CAPITAL LETTER K;Cf;0;BN;;;;;N;;;;;
+E004C;TAG LATIN CAPITAL LETTER L;Cf;0;BN;;;;;N;;;;;
+E004D;TAG LATIN CAPITAL LETTER M;Cf;0;BN;;;;;N;;;;;
+E004E;TAG LATIN CAPITAL LETTER N;Cf;0;BN;;;;;N;;;;;
+E004F;TAG LATIN CAPITAL LETTER O;Cf;0;BN;;;;;N;;;;;
+E0050;TAG LATIN CAPITAL LETTER P;Cf;0;BN;;;;;N;;;;;
+E0051;TAG LATIN CAPITAL LETTER Q;Cf;0;BN;;;;;N;;;;;
+E0052;TAG LATIN CAPITAL LETTER R;Cf;0;BN;;;;;N;;;;;
+E0053;TAG LATIN CAPITAL LETTER S;Cf;0;BN;;;;;N;;;;;
+E0054;TAG LATIN CAPITAL LETTER T;Cf;0;BN;;;;;N;;;;;
+E0055;TAG LATIN CAPITAL LETTER U;Cf;0;BN;;;;;N;;;;;
+E0056;TAG LATIN CAPITAL LETTER V;Cf;0;BN;;;;;N;;;;;
+E0057;TAG LATIN CAPITAL LETTER W;Cf;0;BN;;;;;N;;;;;
+E0058;TAG LATIN CAPITAL LETTER X;Cf;0;BN;;;;;N;;;;;
+E0059;TAG LATIN CAPITAL LETTER Y;Cf;0;BN;;;;;N;;;;;
+E005A;TAG LATIN CAPITAL LETTER Z;Cf;0;BN;;;;;N;;;;;
+E005B;TAG LEFT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
+E005C;TAG REVERSE SOLIDUS;Cf;0;BN;;;;;N;;;;;
+E005D;TAG RIGHT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
+E005E;TAG CIRCUMFLEX ACCENT;Cf;0;BN;;;;;N;;;;;
+E005F;TAG LOW LINE;Cf;0;BN;;;;;N;;;;;
+E0060;TAG GRAVE ACCENT;Cf;0;BN;;;;;N;;;;;
+E0061;TAG LATIN SMALL LETTER A;Cf;0;BN;;;;;N;;;;;
+E0062;TAG LATIN SMALL LETTER B;Cf;0;BN;;;;;N;;;;;
+E0063;TAG LATIN SMALL LETTER C;Cf;0;BN;;;;;N;;;;;
+E0064;TAG LATIN SMALL LETTER D;Cf;0;BN;;;;;N;;;;;
+E0065;TAG LATIN SMALL LETTER E;Cf;0;BN;;;;;N;;;;;
+E0066;TAG LATIN SMALL LETTER F;Cf;0;BN;;;;;N;;;;;
+E0067;TAG LATIN SMALL LETTER G;Cf;0;BN;;;;;N;;;;;
+E0068;TAG LATIN SMALL LETTER H;Cf;0;BN;;;;;N;;;;;
+E0069;TAG LATIN SMALL LETTER I;Cf;0;BN;;;;;N;;;;;
+E006A;TAG LATIN SMALL LETTER J;Cf;0;BN;;;;;N;;;;;
+E006B;TAG LATIN SMALL LETTER K;Cf;0;BN;;;;;N;;;;;
+E006C;TAG LATIN SMALL LETTER L;Cf;0;BN;;;;;N;;;;;
+E006D;TAG LATIN SMALL LETTER M;Cf;0;BN;;;;;N;;;;;
+E006E;TAG LATIN SMALL LETTER N;Cf;0;BN;;;;;N;;;;;
+E006F;TAG LATIN SMALL LETTER O;Cf;0;BN;;;;;N;;;;;
+E0070;TAG LATIN SMALL LETTER P;Cf;0;BN;;;;;N;;;;;
+E0071;TAG LATIN SMALL LETTER Q;Cf;0;BN;;;;;N;;;;;
+E0072;TAG LATIN SMALL LETTER R;Cf;0;BN;;;;;N;;;;;
+E0073;TAG LATIN SMALL LETTER S;Cf;0;BN;;;;;N;;;;;
+E0074;TAG LATIN SMALL LETTER T;Cf;0;BN;;;;;N;;;;;
+E0075;TAG LATIN SMALL LETTER U;Cf;0;BN;;;;;N;;;;;
+E0076;TAG LATIN SMALL LETTER V;Cf;0;BN;;;;;N;;;;;
+E0077;TAG LATIN SMALL LETTER W;Cf;0;BN;;;;;N;;;;;
+E0078;TAG LATIN SMALL LETTER X;Cf;0;BN;;;;;N;;;;;
+E0079;TAG LATIN SMALL LETTER Y;Cf;0;BN;;;;;N;;;;;
+E007A;TAG LATIN SMALL LETTER Z;Cf;0;BN;;;;;N;;;;;
+E007B;TAG LEFT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
+E007C;TAG VERTICAL LINE;Cf;0;BN;;;;;N;;;;;
+E007D;TAG RIGHT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
+E007E;TAG TILDE;Cf;0;BN;;;;;N;;;;;
+E007F;CANCEL TAG;Cf;0;BN;;;;;N;;;;;
+E0100;VARIATION SELECTOR-17;Mn;0;NSM;;;;;N;;;;;
+E0101;VARIATION SELECTOR-18;Mn;0;NSM;;;;;N;;;;;
+E0102;VARIATION SELECTOR-19;Mn;0;NSM;;;;;N;;;;;
+E0103;VARIATION SELECTOR-20;Mn;0;NSM;;;;;N;;;;;
+E0104;VARIATION SELECTOR-21;Mn;0;NSM;;;;;N;;;;;
+E0105;VARIATION SELECTOR-22;Mn;0;NSM;;;;;N;;;;;
+E0106;VARIATION SELECTOR-23;Mn;0;NSM;;;;;N;;;;;
+E0107;VARIATION SELECTOR-24;Mn;0;NSM;;;;;N;;;;;
+E0108;VARIATION SELECTOR-25;Mn;0;NSM;;;;;N;;;;;
+E0109;VARIATION SELECTOR-26;Mn;0;NSM;;;;;N;;;;;
+E010A;VARIATION SELECTOR-27;Mn;0;NSM;;;;;N;;;;;
+E010B;VARIATION SELECTOR-28;Mn;0;NSM;;;;;N;;;;;
+E010C;VARIATION SELECTOR-29;Mn;0;NSM;;;;;N;;;;;
+E010D;VARIATION SELECTOR-30;Mn;0;NSM;;;;;N;;;;;
+E010E;VARIATION SELECTOR-31;Mn;0;NSM;;;;;N;;;;;
+E010F;VARIATION SELECTOR-32;Mn;0;NSM;;;;;N;;;;;
+E0110;VARIATION SELECTOR-33;Mn;0;NSM;;;;;N;;;;;
+E0111;VARIATION SELECTOR-34;Mn;0;NSM;;;;;N;;;;;
+E0112;VARIATION SELECTOR-35;Mn;0;NSM;;;;;N;;;;;
+E0113;VARIATION SELECTOR-36;Mn;0;NSM;;;;;N;;;;;
+E0114;VARIATION SELECTOR-37;Mn;0;NSM;;;;;N;;;;;
+E0115;VARIATION SELECTOR-38;Mn;0;NSM;;;;;N;;;;;
+E0116;VARIATION SELECTOR-39;Mn;0;NSM;;;;;N;;;;;
+E0117;VARIATION SELECTOR-40;Mn;0;NSM;;;;;N;;;;;
+E0118;VARIATION SELECTOR-41;Mn;0;NSM;;;;;N;;;;;
+E0119;VARIATION SELECTOR-42;Mn;0;NSM;;;;;N;;;;;
+E011A;VARIATION SELECTOR-43;Mn;0;NSM;;;;;N;;;;;
+E011B;VARIATION SELECTOR-44;Mn;0;NSM;;;;;N;;;;;
+E011C;VARIATION SELECTOR-45;Mn;0;NSM;;;;;N;;;;;
+E011D;VARIATION SELECTOR-46;Mn;0;NSM;;;;;N;;;;;
+E011E;VARIATION SELECTOR-47;Mn;0;NSM;;;;;N;;;;;
+E011F;VARIATION SELECTOR-48;Mn;0;NSM;;;;;N;;;;;
+E0120;VARIATION SELECTOR-49;Mn;0;NSM;;;;;N;;;;;
+E0121;VARIATION SELECTOR-50;Mn;0;NSM;;;;;N;;;;;
+E0122;VARIATION SELECTOR-51;Mn;0;NSM;;;;;N;;;;;
+E0123;VARIATION SELECTOR-52;Mn;0;NSM;;;;;N;;;;;
+E0124;VARIATION SELECTOR-53;Mn;0;NSM;;;;;N;;;;;
+E0125;VARIATION SELECTOR-54;Mn;0;NSM;;;;;N;;;;;
+E0126;VARIATION SELECTOR-55;Mn;0;NSM;;;;;N;;;;;
+E0127;VARIATION SELECTOR-56;Mn;0;NSM;;;;;N;;;;;
+E0128;VARIATION SELECTOR-57;Mn;0;NSM;;;;;N;;;;;
+E0129;VARIATION SELECTOR-58;Mn;0;NSM;;;;;N;;;;;
+E012A;VARIATION SELECTOR-59;Mn;0;NSM;;;;;N;;;;;
+E012B;VARIATION SELECTOR-60;Mn;0;NSM;;;;;N;;;;;
+E012C;VARIATION SELECTOR-61;Mn;0;NSM;;;;;N;;;;;
+E012D;VARIATION SELECTOR-62;Mn;0;NSM;;;;;N;;;;;
+E012E;VARIATION SELECTOR-63;Mn;0;NSM;;;;;N;;;;;
+E012F;VARIATION SELECTOR-64;Mn;0;NSM;;;;;N;;;;;
+E0130;VARIATION SELECTOR-65;Mn;0;NSM;;;;;N;;;;;
+E0131;VARIATION SELECTOR-66;Mn;0;NSM;;;;;N;;;;;
+E0132;VARIATION SELECTOR-67;Mn;0;NSM;;;;;N;;;;;
+E0133;VARIATION SELECTOR-68;Mn;0;NSM;;;;;N;;;;;
+E0134;VARIATION SELECTOR-69;Mn;0;NSM;;;;;N;;;;;
+E0135;VARIATION SELECTOR-70;Mn;0;NSM;;;;;N;;;;;
+E0136;VARIATION SELECTOR-71;Mn;0;NSM;;;;;N;;;;;
+E0137;VARIATION SELECTOR-72;Mn;0;NSM;;;;;N;;;;;
+E0138;VARIATION SELECTOR-73;Mn;0;NSM;;;;;N;;;;;
+E0139;VARIATION SELECTOR-74;Mn;0;NSM;;;;;N;;;;;
+E013A;VARIATION SELECTOR-75;Mn;0;NSM;;;;;N;;;;;
+E013B;VARIATION SELECTOR-76;Mn;0;NSM;;;;;N;;;;;
+E013C;VARIATION SELECTOR-77;Mn;0;NSM;;;;;N;;;;;
+E013D;VARIATION SELECTOR-78;Mn;0;NSM;;;;;N;;;;;
+E013E;VARIATION SELECTOR-79;Mn;0;NSM;;;;;N;;;;;
+E013F;VARIATION SELECTOR-80;Mn;0;NSM;;;;;N;;;;;
+E0140;VARIATION SELECTOR-81;Mn;0;NSM;;;;;N;;;;;
+E0141;VARIATION SELECTOR-82;Mn;0;NSM;;;;;N;;;;;
+E0142;VARIATION SELECTOR-83;Mn;0;NSM;;;;;N;;;;;
+E0143;VARIATION SELECTOR-84;Mn;0;NSM;;;;;N;;;;;
+E0144;VARIATION SELECTOR-85;Mn;0;NSM;;;;;N;;;;;
+E0145;VARIATION SELECTOR-86;Mn;0;NSM;;;;;N;;;;;
+E0146;VARIATION SELECTOR-87;Mn;0;NSM;;;;;N;;;;;
+E0147;VARIATION SELECTOR-88;Mn;0;NSM;;;;;N;;;;;
+E0148;VARIATION SELECTOR-89;Mn;0;NSM;;;;;N;;;;;
+E0149;VARIATION SELECTOR-90;Mn;0;NSM;;;;;N;;;;;
+E014A;VARIATION SELECTOR-91;Mn;0;NSM;;;;;N;;;;;
+E014B;VARIATION SELECTOR-92;Mn;0;NSM;;;;;N;;;;;
+E014C;VARIATION SELECTOR-93;Mn;0;NSM;;;;;N;;;;;
+E014D;VARIATION SELECTOR-94;Mn;0;NSM;;;;;N;;;;;
+E014E;VARIATION SELECTOR-95;Mn;0;NSM;;;;;N;;;;;
+E014F;VARIATION SELECTOR-96;Mn;0;NSM;;;;;N;;;;;
+E0150;VARIATION SELECTOR-97;Mn;0;NSM;;;;;N;;;;;
+E0151;VARIATION SELECTOR-98;Mn;0;NSM;;;;;N;;;;;
+E0152;VARIATION SELECTOR-99;Mn;0;NSM;;;;;N;;;;;
+E0153;VARIATION SELECTOR-100;Mn;0;NSM;;;;;N;;;;;
+E0154;VARIATION SELECTOR-101;Mn;0;NSM;;;;;N;;;;;
+E0155;VARIATION SELECTOR-102;Mn;0;NSM;;;;;N;;;;;
+E0156;VARIATION SELECTOR-103;Mn;0;NSM;;;;;N;;;;;
+E0157;VARIATION SELECTOR-104;Mn;0;NSM;;;;;N;;;;;
+E0158;VARIATION SELECTOR-105;Mn;0;NSM;;;;;N;;;;;
+E0159;VARIATION SELECTOR-106;Mn;0;NSM;;;;;N;;;;;
+E015A;VARIATION SELECTOR-107;Mn;0;NSM;;;;;N;;;;;
+E015B;VARIATION SELECTOR-108;Mn;0;NSM;;;;;N;;;;;
+E015C;VARIATION SELECTOR-109;Mn;0;NSM;;;;;N;;;;;
+E015D;VARIATION SELECTOR-110;Mn;0;NSM;;;;;N;;;;;
+E015E;VARIATION SELECTOR-111;Mn;0;NSM;;;;;N;;;;;
+E015F;VARIATION SELECTOR-112;Mn;0;NSM;;;;;N;;;;;
+E0160;VARIATION SELECTOR-113;Mn;0;NSM;;;;;N;;;;;
+E0161;VARIATION SELECTOR-114;Mn;0;NSM;;;;;N;;;;;
+E0162;VARIATION SELECTOR-115;Mn;0;NSM;;;;;N;;;;;
+E0163;VARIATION SELECTOR-116;Mn;0;NSM;;;;;N;;;;;
+E0164;VARIATION SELECTOR-117;Mn;0;NSM;;;;;N;;;;;
+E0165;VARIATION SELECTOR-118;Mn;0;NSM;;;;;N;;;;;
+E0166;VARIATION SELECTOR-119;Mn;0;NSM;;;;;N;;;;;
+E0167;VARIATION SELECTOR-120;Mn;0;NSM;;;;;N;;;;;
+E0168;VARIATION SELECTOR-121;Mn;0;NSM;;;;;N;;;;;
+E0169;VARIATION SELECTOR-122;Mn;0;NSM;;;;;N;;;;;
+E016A;VARIATION SELECTOR-123;Mn;0;NSM;;;;;N;;;;;
+E016B;VARIATION SELECTOR-124;Mn;0;NSM;;;;;N;;;;;
+E016C;VARIATION SELECTOR-125;Mn;0;NSM;;;;;N;;;;;
+E016D;VARIATION SELECTOR-126;Mn;0;NSM;;;;;N;;;;;
+E016E;VARIATION SELECTOR-127;Mn;0;NSM;;;;;N;;;;;
+E016F;VARIATION SELECTOR-128;Mn;0;NSM;;;;;N;;;;;
+E0170;VARIATION SELECTOR-129;Mn;0;NSM;;;;;N;;;;;
+E0171;VARIATION SELECTOR-130;Mn;0;NSM;;;;;N;;;;;
+E0172;VARIATION SELECTOR-131;Mn;0;NSM;;;;;N;;;;;
+E0173;VARIATION SELECTOR-132;Mn;0;NSM;;;;;N;;;;;
+E0174;VARIATION SELECTOR-133;Mn;0;NSM;;;;;N;;;;;
+E0175;VARIATION SELECTOR-134;Mn;0;NSM;;;;;N;;;;;
+E0176;VARIATION SELECTOR-135;Mn;0;NSM;;;;;N;;;;;
+E0177;VARIATION SELECTOR-136;Mn;0;NSM;;;;;N;;;;;
+E0178;VARIATION SELECTOR-137;Mn;0;NSM;;;;;N;;;;;
+E0179;VARIATION SELECTOR-138;Mn;0;NSM;;;;;N;;;;;
+E017A;VARIATION SELECTOR-139;Mn;0;NSM;;;;;N;;;;;
+E017B;VARIATION SELECTOR-140;Mn;0;NSM;;;;;N;;;;;
+E017C;VARIATION SELECTOR-141;Mn;0;NSM;;;;;N;;;;;
+E017D;VARIATION SELECTOR-142;Mn;0;NSM;;;;;N;;;;;
+E017E;VARIATION SELECTOR-143;Mn;0;NSM;;;;;N;;;;;
+E017F;VARIATION SELECTOR-144;Mn;0;NSM;;;;;N;;;;;
+E0180;VARIATION SELECTOR-145;Mn;0;NSM;;;;;N;;;;;
+E0181;VARIATION SELECTOR-146;Mn;0;NSM;;;;;N;;;;;
+E0182;VARIATION SELECTOR-147;Mn;0;NSM;;;;;N;;;;;
+E0183;VARIATION SELECTOR-148;Mn;0;NSM;;;;;N;;;;;
+E0184;VARIATION SELECTOR-149;Mn;0;NSM;;;;;N;;;;;
+E0185;VARIATION SELECTOR-150;Mn;0;NSM;;;;;N;;;;;
+E0186;VARIATION SELECTOR-151;Mn;0;NSM;;;;;N;;;;;
+E0187;VARIATION SELECTOR-152;Mn;0;NSM;;;;;N;;;;;
+E0188;VARIATION SELECTOR-153;Mn;0;NSM;;;;;N;;;;;
+E0189;VARIATION SELECTOR-154;Mn;0;NSM;;;;;N;;;;;
+E018A;VARIATION SELECTOR-155;Mn;0;NSM;;;;;N;;;;;
+E018B;VARIATION SELECTOR-156;Mn;0;NSM;;;;;N;;;;;
+E018C;VARIATION SELECTOR-157;Mn;0;NSM;;;;;N;;;;;
+E018D;VARIATION SELECTOR-158;Mn;0;NSM;;;;;N;;;;;
+E018E;VARIATION SELECTOR-159;Mn;0;NSM;;;;;N;;;;;
+E018F;VARIATION SELECTOR-160;Mn;0;NSM;;;;;N;;;;;
+E0190;VARIATION SELECTOR-161;Mn;0;NSM;;;;;N;;;;;
+E0191;VARIATION SELECTOR-162;Mn;0;NSM;;;;;N;;;;;
+E0192;VARIATION SELECTOR-163;Mn;0;NSM;;;;;N;;;;;
+E0193;VARIATION SELECTOR-164;Mn;0;NSM;;;;;N;;;;;
+E0194;VARIATION SELECTOR-165;Mn;0;NSM;;;;;N;;;;;
+E0195;VARIATION SELECTOR-166;Mn;0;NSM;;;;;N;;;;;
+E0196;VARIATION SELECTOR-167;Mn;0;NSM;;;;;N;;;;;
+E0197;VARIATION SELECTOR-168;Mn;0;NSM;;;;;N;;;;;
+E0198;VARIATION SELECTOR-169;Mn;0;NSM;;;;;N;;;;;
+E0199;VARIATION SELECTOR-170;Mn;0;NSM;;;;;N;;;;;
+E019A;VARIATION SELECTOR-171;Mn;0;NSM;;;;;N;;;;;
+E019B;VARIATION SELECTOR-172;Mn;0;NSM;;;;;N;;;;;
+E019C;VARIATION SELECTOR-173;Mn;0;NSM;;;;;N;;;;;
+E019D;VARIATION SELECTOR-174;Mn;0;NSM;;;;;N;;;;;
+E019E;VARIATION SELECTOR-175;Mn;0;NSM;;;;;N;;;;;
+E019F;VARIATION SELECTOR-176;Mn;0;NSM;;;;;N;;;;;
+E01A0;VARIATION SELECTOR-177;Mn;0;NSM;;;;;N;;;;;
+E01A1;VARIATION SELECTOR-178;Mn;0;NSM;;;;;N;;;;;
+E01A2;VARIATION SELECTOR-179;Mn;0;NSM;;;;;N;;;;;
+E01A3;VARIATION SELECTOR-180;Mn;0;NSM;;;;;N;;;;;
+E01A4;VARIATION SELECTOR-181;Mn;0;NSM;;;;;N;;;;;
+E01A5;VARIATION SELECTOR-182;Mn;0;NSM;;;;;N;;;;;
+E01A6;VARIATION SELECTOR-183;Mn;0;NSM;;;;;N;;;;;
+E01A7;VARIATION SELECTOR-184;Mn;0;NSM;;;;;N;;;;;
+E01A8;VARIATION SELECTOR-185;Mn;0;NSM;;;;;N;;;;;
+E01A9;VARIATION SELECTOR-186;Mn;0;NSM;;;;;N;;;;;
+E01AA;VARIATION SELECTOR-187;Mn;0;NSM;;;;;N;;;;;
+E01AB;VARIATION SELECTOR-188;Mn;0;NSM;;;;;N;;;;;
+E01AC;VARIATION SELECTOR-189;Mn;0;NSM;;;;;N;;;;;
+E01AD;VARIATION SELECTOR-190;Mn;0;NSM;;;;;N;;;;;
+E01AE;VARIATION SELECTOR-191;Mn;0;NSM;;;;;N;;;;;
+E01AF;VARIATION SELECTOR-192;Mn;0;NSM;;;;;N;;;;;
+E01B0;VARIATION SELECTOR-193;Mn;0;NSM;;;;;N;;;;;
+E01B1;VARIATION SELECTOR-194;Mn;0;NSM;;;;;N;;;;;
+E01B2;VARIATION SELECTOR-195;Mn;0;NSM;;;;;N;;;;;
+E01B3;VARIATION SELECTOR-196;Mn;0;NSM;;;;;N;;;;;
+E01B4;VARIATION SELECTOR-197;Mn;0;NSM;;;;;N;;;;;
+E01B5;VARIATION SELECTOR-198;Mn;0;NSM;;;;;N;;;;;
+E01B6;VARIATION SELECTOR-199;Mn;0;NSM;;;;;N;;;;;
+E01B7;VARIATION SELECTOR-200;Mn;0;NSM;;;;;N;;;;;
+E01B8;VARIATION SELECTOR-201;Mn;0;NSM;;;;;N;;;;;
+E01B9;VARIATION SELECTOR-202;Mn;0;NSM;;;;;N;;;;;
+E01BA;VARIATION SELECTOR-203;Mn;0;NSM;;;;;N;;;;;
+E01BB;VARIATION SELECTOR-204;Mn;0;NSM;;;;;N;;;;;
+E01BC;VARIATION SELECTOR-205;Mn;0;NSM;;;;;N;;;;;
+E01BD;VARIATION SELECTOR-206;Mn;0;NSM;;;;;N;;;;;
+E01BE;VARIATION SELECTOR-207;Mn;0;NSM;;;;;N;;;;;
+E01BF;VARIATION SELECTOR-208;Mn;0;NSM;;;;;N;;;;;
+E01C0;VARIATION SELECTOR-209;Mn;0;NSM;;;;;N;;;;;
+E01C1;VARIATION SELECTOR-210;Mn;0;NSM;;;;;N;;;;;
+E01C2;VARIATION SELECTOR-211;Mn;0;NSM;;;;;N;;;;;
+E01C3;VARIATION SELECTOR-212;Mn;0;NSM;;;;;N;;;;;
+E01C4;VARIATION SELECTOR-213;Mn;0;NSM;;;;;N;;;;;
+E01C5;VARIATION SELECTOR-214;Mn;0;NSM;;;;;N;;;;;
+E01C6;VARIATION SELECTOR-215;Mn;0;NSM;;;;;N;;;;;
+E01C7;VARIATION SELECTOR-216;Mn;0;NSM;;;;;N;;;;;
+E01C8;VARIATION SELECTOR-217;Mn;0;NSM;;;;;N;;;;;
+E01C9;VARIATION SELECTOR-218;Mn;0;NSM;;;;;N;;;;;
+E01CA;VARIATION SELECTOR-219;Mn;0;NSM;;;;;N;;;;;
+E01CB;VARIATION SELECTOR-220;Mn;0;NSM;;;;;N;;;;;
+E01CC;VARIATION SELECTOR-221;Mn;0;NSM;;;;;N;;;;;
+E01CD;VARIATION SELECTOR-222;Mn;0;NSM;;;;;N;;;;;
+E01CE;VARIATION SELECTOR-223;Mn;0;NSM;;;;;N;;;;;
+E01CF;VARIATION SELECTOR-224;Mn;0;NSM;;;;;N;;;;;
+E01D0;VARIATION SELECTOR-225;Mn;0;NSM;;;;;N;;;;;
+E01D1;VARIATION SELECTOR-226;Mn;0;NSM;;;;;N;;;;;
+E01D2;VARIATION SELECTOR-227;Mn;0;NSM;;;;;N;;;;;
+E01D3;VARIATION SELECTOR-228;Mn;0;NSM;;;;;N;;;;;
+E01D4;VARIATION SELECTOR-229;Mn;0;NSM;;;;;N;;;;;
+E01D5;VARIATION SELECTOR-230;Mn;0;NSM;;;;;N;;;;;
+E01D6;VARIATION SELECTOR-231;Mn;0;NSM;;;;;N;;;;;
+E01D7;VARIATION SELECTOR-232;Mn;0;NSM;;;;;N;;;;;
+E01D8;VARIATION SELECTOR-233;Mn;0;NSM;;;;;N;;;;;
+E01D9;VARIATION SELECTOR-234;Mn;0;NSM;;;;;N;;;;;
+E01DA;VARIATION SELECTOR-235;Mn;0;NSM;;;;;N;;;;;
+E01DB;VARIATION SELECTOR-236;Mn;0;NSM;;;;;N;;;;;
+E01DC;VARIATION SELECTOR-237;Mn;0;NSM;;;;;N;;;;;
+E01DD;VARIATION SELECTOR-238;Mn;0;NSM;;;;;N;;;;;
+E01DE;VARIATION SELECTOR-239;Mn;0;NSM;;;;;N;;;;;
+E01DF;VARIATION SELECTOR-240;Mn;0;NSM;;;;;N;;;;;
+E01E0;VARIATION SELECTOR-241;Mn;0;NSM;;;;;N;;;;;
+E01E1;VARIATION SELECTOR-242;Mn;0;NSM;;;;;N;;;;;
+E01E2;VARIATION SELECTOR-243;Mn;0;NSM;;;;;N;;;;;
+E01E3;VARIATION SELECTOR-244;Mn;0;NSM;;;;;N;;;;;
+E01E4;VARIATION SELECTOR-245;Mn;0;NSM;;;;;N;;;;;
+E01E5;VARIATION SELECTOR-246;Mn;0;NSM;;;;;N;;;;;
+E01E6;VARIATION SELECTOR-247;Mn;0;NSM;;;;;N;;;;;
+E01E7;VARIATION SELECTOR-248;Mn;0;NSM;;;;;N;;;;;
+E01E8;VARIATION SELECTOR-249;Mn;0;NSM;;;;;N;;;;;
+E01E9;VARIATION SELECTOR-250;Mn;0;NSM;;;;;N;;;;;
+E01EA;VARIATION SELECTOR-251;Mn;0;NSM;;;;;N;;;;;
+E01EB;VARIATION SELECTOR-252;Mn;0;NSM;;;;;N;;;;;
+E01EC;VARIATION SELECTOR-253;Mn;0;NSM;;;;;N;;;;;
+E01ED;VARIATION SELECTOR-254;Mn;0;NSM;;;;;N;;;;;
+E01EE;VARIATION SELECTOR-255;Mn;0;NSM;;;;;N;;;;;
+E01EF;VARIATION SELECTOR-256;Mn;0;NSM;;;;;N;;;;;
+F0000;<Plane 15 Private Use, First>;Co;0;L;;;;;N;;;;;
+FFFFD;<Plane 15 Private Use, Last>;Co;0;L;;;;;N;;;;;
+100000;<Plane 16 Private Use, First>;Co;0;L;;;;;N;;;;;
+10FFFD;<Plane 16 Private Use, Last>;Co;0;L;;;;;N;;;;;
diff -Nru gnupg2-2.2.20/regexp/_unicode_mapping.c gnupg2-2.2.27/regexp/_unicode_mapping.c
--- gnupg2-2.2.20/regexp/_unicode_mapping.c	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/_unicode_mapping.c	2021-01-11 18:47:15.000000000 +0100
@@ -0,0 +1,284 @@
+/* Generated from UnicodeData.txt */
+
+static const struct casemap unicode_case_mapping_upper[] = {
+	{ 0x00b5, 0x039c },	{ 0x00e0, 0x00c0 },	{ 0x00e1, 0x00c1 },	{ 0x00e2, 0x00c2 },
+	{ 0x00e3, 0x00c3 },	{ 0x00e4, 0x00c4 },	{ 0x00e5, 0x00c5 },	{ 0x00e6, 0x00c6 },
+	{ 0x00e7, 0x00c7 },	{ 0x00e8, 0x00c8 },	{ 0x00e9, 0x00c9 },	{ 0x00ea, 0x00ca },
+	{ 0x00eb, 0x00cb },	{ 0x00ec, 0x00cc },	{ 0x00ed, 0x00cd },	{ 0x00ee, 0x00ce },
+	{ 0x00ef, 0x00cf },	{ 0x00f0, 0x00d0 },	{ 0x00f1, 0x00d1 },	{ 0x00f2, 0x00d2 },
+	{ 0x00f3, 0x00d3 },	{ 0x00f4, 0x00d4 },	{ 0x00f5, 0x00d5 },	{ 0x00f6, 0x00d6 },
+	{ 0x00f8, 0x00d8 },	{ 0x00f9, 0x00d9 },	{ 0x00fa, 0x00da },	{ 0x00fb, 0x00db },
+	{ 0x00fc, 0x00dc },	{ 0x00fd, 0x00dd },	{ 0x00fe, 0x00de },	{ 0x00ff, 0x0178 },
+	{ 0x0101, 0x0100 },	{ 0x0103, 0x0102 },	{ 0x0105, 0x0104 },	{ 0x0107, 0x0106 },
+	{ 0x0109, 0x0108 },	{ 0x010b, 0x010a },	{ 0x010d, 0x010c },	{ 0x010f, 0x010e },
+	{ 0x0111, 0x0110 },	{ 0x0113, 0x0112 },	{ 0x0115, 0x0114 },	{ 0x0117, 0x0116 },
+	{ 0x0119, 0x0118 },	{ 0x011b, 0x011a },	{ 0x011d, 0x011c },	{ 0x011f, 0x011e },
+	{ 0x0121, 0x0120 },	{ 0x0123, 0x0122 },	{ 0x0125, 0x0124 },	{ 0x0127, 0x0126 },
+	{ 0x0129, 0x0128 },	{ 0x012b, 0x012a },	{ 0x012d, 0x012c },	{ 0x012f, 0x012e },
+	{ 0x0131, 0x0049 },	{ 0x0133, 0x0132 },	{ 0x0135, 0x0134 },	{ 0x0137, 0x0136 },
+	{ 0x013a, 0x0139 },	{ 0x013c, 0x013b },	{ 0x013e, 0x013d },	{ 0x0140, 0x013f },
+	{ 0x0142, 0x0141 },	{ 0x0144, 0x0143 },	{ 0x0146, 0x0145 },	{ 0x0148, 0x0147 },
+	{ 0x014b, 0x014a },	{ 0x014d, 0x014c },	{ 0x014f, 0x014e },	{ 0x0151, 0x0150 },
+	{ 0x0153, 0x0152 },	{ 0x0155, 0x0154 },	{ 0x0157, 0x0156 },	{ 0x0159, 0x0158 },
+	{ 0x015b, 0x015a },	{ 0x015d, 0x015c },	{ 0x015f, 0x015e },	{ 0x0161, 0x0160 },
+	{ 0x0163, 0x0162 },	{ 0x0165, 0x0164 },	{ 0x0167, 0x0166 },	{ 0x0169, 0x0168 },
+	{ 0x016b, 0x016a },	{ 0x016d, 0x016c },	{ 0x016f, 0x016e },	{ 0x0171, 0x0170 },
+	{ 0x0173, 0x0172 },	{ 0x0175, 0x0174 },	{ 0x0177, 0x0176 },	{ 0x017a, 0x0179 },
+	{ 0x017c, 0x017b },	{ 0x017e, 0x017d },	{ 0x017f, 0x0053 },	{ 0x0180, 0x0243 },
+	{ 0x0183, 0x0182 },	{ 0x0185, 0x0184 },	{ 0x0188, 0x0187 },	{ 0x018c, 0x018b },
+	{ 0x0192, 0x0191 },	{ 0x0195, 0x01f6 },	{ 0x0199, 0x0198 },	{ 0x019a, 0x023d },
+	{ 0x019e, 0x0220 },	{ 0x01a1, 0x01a0 },	{ 0x01a3, 0x01a2 },	{ 0x01a5, 0x01a4 },
+	{ 0x01a8, 0x01a7 },	{ 0x01ad, 0x01ac },	{ 0x01b0, 0x01af },	{ 0x01b4, 0x01b3 },
+	{ 0x01b6, 0x01b5 },	{ 0x01b9, 0x01b8 },	{ 0x01bd, 0x01bc },	{ 0x01bf, 0x01f7 },
+	{ 0x01c5, 0x01c4 },	{ 0x01c6, 0x01c4 },	{ 0x01c8, 0x01c7 },	{ 0x01c9, 0x01c7 },
+	{ 0x01cb, 0x01ca },	{ 0x01cc, 0x01ca },	{ 0x01ce, 0x01cd },	{ 0x01d0, 0x01cf },
+	{ 0x01d2, 0x01d1 },	{ 0x01d4, 0x01d3 },	{ 0x01d6, 0x01d5 },	{ 0x01d8, 0x01d7 },
+	{ 0x01da, 0x01d9 },	{ 0x01dc, 0x01db },	{ 0x01dd, 0x018e },	{ 0x01df, 0x01de },
+	{ 0x01e1, 0x01e0 },	{ 0x01e3, 0x01e2 },	{ 0x01e5, 0x01e4 },	{ 0x01e7, 0x01e6 },
+	{ 0x01e9, 0x01e8 },	{ 0x01eb, 0x01ea },	{ 0x01ed, 0x01ec },	{ 0x01ef, 0x01ee },
+	{ 0x01f2, 0x01f1 },	{ 0x01f3, 0x01f1 },	{ 0x01f5, 0x01f4 },	{ 0x01f9, 0x01f8 },
+	{ 0x01fb, 0x01fa },	{ 0x01fd, 0x01fc },	{ 0x01ff, 0x01fe },	{ 0x0201, 0x0200 },
+	{ 0x0203, 0x0202 },	{ 0x0205, 0x0204 },	{ 0x0207, 0x0206 },	{ 0x0209, 0x0208 },
+	{ 0x020b, 0x020a },	{ 0x020d, 0x020c },	{ 0x020f, 0x020e },	{ 0x0211, 0x0210 },
+	{ 0x0213, 0x0212 },	{ 0x0215, 0x0214 },	{ 0x0217, 0x0216 },	{ 0x0219, 0x0218 },
+	{ 0x021b, 0x021a },	{ 0x021d, 0x021c },	{ 0x021f, 0x021e },	{ 0x0223, 0x0222 },
+	{ 0x0225, 0x0224 },	{ 0x0227, 0x0226 },	{ 0x0229, 0x0228 },	{ 0x022b, 0x022a },
+	{ 0x022d, 0x022c },	{ 0x022f, 0x022e },	{ 0x0231, 0x0230 },	{ 0x0233, 0x0232 },
+	{ 0x023c, 0x023b },	{ 0x023f, 0x2c7e },	{ 0x0240, 0x2c7f },	{ 0x0242, 0x0241 },
+	{ 0x0247, 0x0246 },	{ 0x0249, 0x0248 },	{ 0x024b, 0x024a },	{ 0x024d, 0x024c },
+	{ 0x024f, 0x024e },	{ 0x0250, 0x2c6f },	{ 0x0251, 0x2c6d },	{ 0x0252, 0x2c70 },
+	{ 0x0253, 0x0181 },	{ 0x0254, 0x0186 },	{ 0x0256, 0x0189 },	{ 0x0257, 0x018a },
+	{ 0x0259, 0x018f },	{ 0x025b, 0x0190 },	{ 0x025c, 0xa7ab },	{ 0x0260, 0x0193 },
+	{ 0x0261, 0xa7ac },	{ 0x0263, 0x0194 },	{ 0x0265, 0xa78d },	{ 0x0266, 0xa7aa },
+	{ 0x0268, 0x0197 },	{ 0x0269, 0x0196 },	{ 0x026a, 0xa7ae },	{ 0x026b, 0x2c62 },
+	{ 0x026c, 0xa7ad },	{ 0x026f, 0x019c },	{ 0x0271, 0x2c6e },	{ 0x0272, 0x019d },
+	{ 0x0275, 0x019f },	{ 0x027d, 0x2c64 },	{ 0x0280, 0x01a6 },	{ 0x0282, 0xa7c5 },
+	{ 0x0283, 0x01a9 },	{ 0x0287, 0xa7b1 },	{ 0x0288, 0x01ae },	{ 0x0289, 0x0244 },
+	{ 0x028a, 0x01b1 },	{ 0x028b, 0x01b2 },	{ 0x028c, 0x0245 },	{ 0x0292, 0x01b7 },
+	{ 0x029d, 0xa7b2 },	{ 0x029e, 0xa7b0 },	{ 0x0371, 0x0370 },	{ 0x0373, 0x0372 },
+	{ 0x0377, 0x0376 },	{ 0x037b, 0x03fd },	{ 0x037c, 0x03fe },	{ 0x037d, 0x03ff },
+	{ 0x03ac, 0x0386 },	{ 0x03ad, 0x0388 },	{ 0x03ae, 0x0389 },	{ 0x03af, 0x038a },
+	{ 0x03b1, 0x0391 },	{ 0x03b2, 0x0392 },	{ 0x03b3, 0x0393 },	{ 0x03b4, 0x0394 },
+	{ 0x03b5, 0x0395 },	{ 0x03b6, 0x0396 },	{ 0x03b7, 0x0397 },	{ 0x03b8, 0x0398 },
+	{ 0x03b9, 0x0399 },	{ 0x03ba, 0x039a },	{ 0x03bb, 0x039b },	{ 0x03bc, 0x039c },
+	{ 0x03bd, 0x039d },	{ 0x03be, 0x039e },	{ 0x03bf, 0x039f },	{ 0x03c0, 0x03a0 },
+	{ 0x03c1, 0x03a1 },	{ 0x03c2, 0x03a3 },	{ 0x03c3, 0x03a3 },	{ 0x03c4, 0x03a4 },
+	{ 0x03c5, 0x03a5 },	{ 0x03c6, 0x03a6 },	{ 0x03c7, 0x03a7 },	{ 0x03c8, 0x03a8 },
+	{ 0x03c9, 0x03a9 },	{ 0x03ca, 0x03aa },	{ 0x03cb, 0x03ab },	{ 0x03cc, 0x038c },
+	{ 0x03cd, 0x038e },	{ 0x03ce, 0x038f },	{ 0x03d0, 0x0392 },	{ 0x03d1, 0x0398 },
+	{ 0x03d5, 0x03a6 },	{ 0x03d6, 0x03a0 },	{ 0x03d7, 0x03cf },	{ 0x03d9, 0x03d8 },
+	{ 0x03db, 0x03da },	{ 0x03dd, 0x03dc },	{ 0x03df, 0x03de },	{ 0x03e1, 0x03e0 },
+	{ 0x03e3, 0x03e2 },	{ 0x03e5, 0x03e4 },	{ 0x03e7, 0x03e6 },	{ 0x03e9, 0x03e8 },
+	{ 0x03eb, 0x03ea },	{ 0x03ed, 0x03ec },	{ 0x03ef, 0x03ee },	{ 0x03f0, 0x039a },
+	{ 0x03f1, 0x03a1 },	{ 0x03f2, 0x03f9 },	{ 0x03f3, 0x037f },	{ 0x03f5, 0x0395 },
+	{ 0x03f8, 0x03f7 },	{ 0x03fb, 0x03fa },	{ 0x0430, 0x0410 },	{ 0x0431, 0x0411 },
+	{ 0x0432, 0x0412 },	{ 0x0433, 0x0413 },	{ 0x0434, 0x0414 },	{ 0x0435, 0x0415 },
+	{ 0x0436, 0x0416 },	{ 0x0437, 0x0417 },	{ 0x0438, 0x0418 },	{ 0x0439, 0x0419 },
+	{ 0x043a, 0x041a },	{ 0x043b, 0x041b },	{ 0x043c, 0x041c },	{ 0x043d, 0x041d },
+	{ 0x043e, 0x041e },	{ 0x043f, 0x041f },	{ 0x0440, 0x0420 },	{ 0x0441, 0x0421 },
+	{ 0x0442, 0x0422 },	{ 0x0443, 0x0423 },	{ 0x0444, 0x0424 },	{ 0x0445, 0x0425 },
+	{ 0x0446, 0x0426 },	{ 0x0447, 0x0427 },	{ 0x0448, 0x0428 },	{ 0x0449, 0x0429 },
+	{ 0x044a, 0x042a },	{ 0x044b, 0x042b },	{ 0x044c, 0x042c },	{ 0x044d, 0x042d },
+	{ 0x044e, 0x042e },	{ 0x044f, 0x042f },	{ 0x0450, 0x0400 },	{ 0x0451, 0x0401 },
+	{ 0x0452, 0x0402 },	{ 0x0453, 0x0403 },	{ 0x0454, 0x0404 },	{ 0x0455, 0x0405 },
+	{ 0x0456, 0x0406 },	{ 0x0457, 0x0407 },	{ 0x0458, 0x0408 },	{ 0x0459, 0x0409 },
+	{ 0x045a, 0x040a },	{ 0x045b, 0x040b },	{ 0x045c, 0x040c },	{ 0x045d, 0x040d },
+	{ 0x045e, 0x040e },	{ 0x045f, 0x040f },	{ 0x0461, 0x0460 },	{ 0x0463, 0x0462 },
+	{ 0x0465, 0x0464 },	{ 0x0467, 0x0466 },	{ 0x0469, 0x0468 },	{ 0x046b, 0x046a },
+	{ 0x046d, 0x046c },	{ 0x046f, 0x046e },	{ 0x0471, 0x0470 },	{ 0x0473, 0x0472 },
+	{ 0x0475, 0x0474 },	{ 0x0477, 0x0476 },	{ 0x0479, 0x0478 },	{ 0x047b, 0x047a },
+	{ 0x047d, 0x047c },	{ 0x047f, 0x047e },	{ 0x0481, 0x0480 },	{ 0x048b, 0x048a },
+	{ 0x048d, 0x048c },	{ 0x048f, 0x048e },	{ 0x0491, 0x0490 },	{ 0x0493, 0x0492 },
+	{ 0x0495, 0x0494 },	{ 0x0497, 0x0496 },	{ 0x0499, 0x0498 },	{ 0x049b, 0x049a },
+	{ 0x049d, 0x049c },	{ 0x049f, 0x049e },	{ 0x04a1, 0x04a0 },	{ 0x04a3, 0x04a2 },
+	{ 0x04a5, 0x04a4 },	{ 0x04a7, 0x04a6 },	{ 0x04a9, 0x04a8 },	{ 0x04ab, 0x04aa },
+	{ 0x04ad, 0x04ac },	{ 0x04af, 0x04ae },	{ 0x04b1, 0x04b0 },	{ 0x04b3, 0x04b2 },
+	{ 0x04b5, 0x04b4 },	{ 0x04b7, 0x04b6 },	{ 0x04b9, 0x04b8 },	{ 0x04bb, 0x04ba },
+	{ 0x04bd, 0x04bc },	{ 0x04bf, 0x04be },	{ 0x04c2, 0x04c1 },	{ 0x04c4, 0x04c3 },
+	{ 0x04c6, 0x04c5 },	{ 0x04c8, 0x04c7 },	{ 0x04ca, 0x04c9 },	{ 0x04cc, 0x04cb },
+	{ 0x04ce, 0x04cd },	{ 0x04cf, 0x04c0 },	{ 0x04d1, 0x04d0 },	{ 0x04d3, 0x04d2 },
+	{ 0x04d5, 0x04d4 },	{ 0x04d7, 0x04d6 },	{ 0x04d9, 0x04d8 },	{ 0x04db, 0x04da },
+	{ 0x04dd, 0x04dc },	{ 0x04df, 0x04de },	{ 0x04e1, 0x04e0 },	{ 0x04e3, 0x04e2 },
+	{ 0x04e5, 0x04e4 },	{ 0x04e7, 0x04e6 },	{ 0x04e9, 0x04e8 },	{ 0x04eb, 0x04ea },
+	{ 0x04ed, 0x04ec },	{ 0x04ef, 0x04ee },	{ 0x04f1, 0x04f0 },	{ 0x04f3, 0x04f2 },
+	{ 0x04f5, 0x04f4 },	{ 0x04f7, 0x04f6 },	{ 0x04f9, 0x04f8 },	{ 0x04fb, 0x04fa },
+	{ 0x04fd, 0x04fc },	{ 0x04ff, 0x04fe },	{ 0x0501, 0x0500 },	{ 0x0503, 0x0502 },
+	{ 0x0505, 0x0504 },	{ 0x0507, 0x0506 },	{ 0x0509, 0x0508 },	{ 0x050b, 0x050a },
+	{ 0x050d, 0x050c },	{ 0x050f, 0x050e },	{ 0x0511, 0x0510 },	{ 0x0513, 0x0512 },
+	{ 0x0515, 0x0514 },	{ 0x0517, 0x0516 },	{ 0x0519, 0x0518 },	{ 0x051b, 0x051a },
+	{ 0x051d, 0x051c },	{ 0x051f, 0x051e },	{ 0x0521, 0x0520 },	{ 0x0523, 0x0522 },
+	{ 0x0525, 0x0524 },	{ 0x0527, 0x0526 },	{ 0x0529, 0x0528 },	{ 0x052b, 0x052a },
+	{ 0x052d, 0x052c },	{ 0x052f, 0x052e },	{ 0x0561, 0x0531 },	{ 0x0562, 0x0532 },
+	{ 0x0563, 0x0533 },	{ 0x0564, 0x0534 },	{ 0x0565, 0x0535 },	{ 0x0566, 0x0536 },
+	{ 0x0567, 0x0537 },	{ 0x0568, 0x0538 },	{ 0x0569, 0x0539 },	{ 0x056a, 0x053a },
+	{ 0x056b, 0x053b },	{ 0x056c, 0x053c },	{ 0x056d, 0x053d },	{ 0x056e, 0x053e },
+	{ 0x056f, 0x053f },	{ 0x0570, 0x0540 },	{ 0x0571, 0x0541 },	{ 0x0572, 0x0542 },
+	{ 0x0573, 0x0543 },	{ 0x0574, 0x0544 },	{ 0x0575, 0x0545 },	{ 0x0576, 0x0546 },
+	{ 0x0577, 0x0547 },	{ 0x0578, 0x0548 },	{ 0x0579, 0x0549 },	{ 0x057a, 0x054a },
+	{ 0x057b, 0x054b },	{ 0x057c, 0x054c },	{ 0x057d, 0x054d },	{ 0x057e, 0x054e },
+	{ 0x057f, 0x054f },	{ 0x0580, 0x0550 },	{ 0x0581, 0x0551 },	{ 0x0582, 0x0552 },
+	{ 0x0583, 0x0553 },	{ 0x0584, 0x0554 },	{ 0x0585, 0x0555 },	{ 0x0586, 0x0556 },
+	{ 0x10d0, 0x1c90 },	{ 0x10d1, 0x1c91 },	{ 0x10d2, 0x1c92 },	{ 0x10d3, 0x1c93 },
+	{ 0x10d4, 0x1c94 },	{ 0x10d5, 0x1c95 },	{ 0x10d6, 0x1c96 },	{ 0x10d7, 0x1c97 },
+	{ 0x10d8, 0x1c98 },	{ 0x10d9, 0x1c99 },	{ 0x10da, 0x1c9a },	{ 0x10db, 0x1c9b },
+	{ 0x10dc, 0x1c9c },	{ 0x10dd, 0x1c9d },	{ 0x10de, 0x1c9e },	{ 0x10df, 0x1c9f },
+	{ 0x10e0, 0x1ca0 },	{ 0x10e1, 0x1ca1 },	{ 0x10e2, 0x1ca2 },	{ 0x10e3, 0x1ca3 },
+	{ 0x10e4, 0x1ca4 },	{ 0x10e5, 0x1ca5 },	{ 0x10e6, 0x1ca6 },	{ 0x10e7, 0x1ca7 },
+	{ 0x10e8, 0x1ca8 },	{ 0x10e9, 0x1ca9 },	{ 0x10ea, 0x1caa },	{ 0x10eb, 0x1cab },
+	{ 0x10ec, 0x1cac },	{ 0x10ed, 0x1cad },	{ 0x10ee, 0x1cae },	{ 0x10ef, 0x1caf },
+	{ 0x10f0, 0x1cb0 },	{ 0x10f1, 0x1cb1 },	{ 0x10f2, 0x1cb2 },	{ 0x10f3, 0x1cb3 },
+	{ 0x10f4, 0x1cb4 },	{ 0x10f5, 0x1cb5 },	{ 0x10f6, 0x1cb6 },	{ 0x10f7, 0x1cb7 },
+	{ 0x10f8, 0x1cb8 },	{ 0x10f9, 0x1cb9 },	{ 0x10fa, 0x1cba },	{ 0x10fd, 0x1cbd },
+	{ 0x10fe, 0x1cbe },	{ 0x10ff, 0x1cbf },	{ 0x13f8, 0x13f0 },	{ 0x13f9, 0x13f1 },
+	{ 0x13fa, 0x13f2 },	{ 0x13fb, 0x13f3 },	{ 0x13fc, 0x13f4 },	{ 0x13fd, 0x13f5 },
+	{ 0x1c80, 0x0412 },	{ 0x1c81, 0x0414 },	{ 0x1c82, 0x041e },	{ 0x1c83, 0x0421 },
+	{ 0x1c84, 0x0422 },	{ 0x1c85, 0x0422 },	{ 0x1c86, 0x042a },	{ 0x1c87, 0x0462 },
+	{ 0x1c88, 0xa64a },	{ 0x1d79, 0xa77d },	{ 0x1d7d, 0x2c63 },	{ 0x1d8e, 0xa7c6 },
+	{ 0x1e01, 0x1e00 },	{ 0x1e03, 0x1e02 },	{ 0x1e05, 0x1e04 },	{ 0x1e07, 0x1e06 },
+	{ 0x1e09, 0x1e08 },	{ 0x1e0b, 0x1e0a },	{ 0x1e0d, 0x1e0c },	{ 0x1e0f, 0x1e0e },
+	{ 0x1e11, 0x1e10 },	{ 0x1e13, 0x1e12 },	{ 0x1e15, 0x1e14 },	{ 0x1e17, 0x1e16 },
+	{ 0x1e19, 0x1e18 },	{ 0x1e1b, 0x1e1a },	{ 0x1e1d, 0x1e1c },	{ 0x1e1f, 0x1e1e },
+	{ 0x1e21, 0x1e20 },	{ 0x1e23, 0x1e22 },	{ 0x1e25, 0x1e24 },	{ 0x1e27, 0x1e26 },
+	{ 0x1e29, 0x1e28 },	{ 0x1e2b, 0x1e2a },	{ 0x1e2d, 0x1e2c },	{ 0x1e2f, 0x1e2e },
+	{ 0x1e31, 0x1e30 },	{ 0x1e33, 0x1e32 },	{ 0x1e35, 0x1e34 },	{ 0x1e37, 0x1e36 },
+	{ 0x1e39, 0x1e38 },	{ 0x1e3b, 0x1e3a },	{ 0x1e3d, 0x1e3c },	{ 0x1e3f, 0x1e3e },
+	{ 0x1e41, 0x1e40 },	{ 0x1e43, 0x1e42 },	{ 0x1e45, 0x1e44 },	{ 0x1e47, 0x1e46 },
+	{ 0x1e49, 0x1e48 },	{ 0x1e4b, 0x1e4a },	{ 0x1e4d, 0x1e4c },	{ 0x1e4f, 0x1e4e },
+	{ 0x1e51, 0x1e50 },	{ 0x1e53, 0x1e52 },	{ 0x1e55, 0x1e54 },	{ 0x1e57, 0x1e56 },
+	{ 0x1e59, 0x1e58 },	{ 0x1e5b, 0x1e5a },	{ 0x1e5d, 0x1e5c },	{ 0x1e5f, 0x1e5e },
+	{ 0x1e61, 0x1e60 },	{ 0x1e63, 0x1e62 },	{ 0x1e65, 0x1e64 },	{ 0x1e67, 0x1e66 },
+	{ 0x1e69, 0x1e68 },	{ 0x1e6b, 0x1e6a },	{ 0x1e6d, 0x1e6c },	{ 0x1e6f, 0x1e6e },
+	{ 0x1e71, 0x1e70 },	{ 0x1e73, 0x1e72 },	{ 0x1e75, 0x1e74 },	{ 0x1e77, 0x1e76 },
+	{ 0x1e79, 0x1e78 },	{ 0x1e7b, 0x1e7a },	{ 0x1e7d, 0x1e7c },	{ 0x1e7f, 0x1e7e },
+	{ 0x1e81, 0x1e80 },	{ 0x1e83, 0x1e82 },	{ 0x1e85, 0x1e84 },	{ 0x1e87, 0x1e86 },
+	{ 0x1e89, 0x1e88 },	{ 0x1e8b, 0x1e8a },	{ 0x1e8d, 0x1e8c },	{ 0x1e8f, 0x1e8e },
+	{ 0x1e91, 0x1e90 },	{ 0x1e93, 0x1e92 },	{ 0x1e95, 0x1e94 },	{ 0x1e9b, 0x1e60 },
+	{ 0x1ea1, 0x1ea0 },	{ 0x1ea3, 0x1ea2 },	{ 0x1ea5, 0x1ea4 },	{ 0x1ea7, 0x1ea6 },
+	{ 0x1ea9, 0x1ea8 },	{ 0x1eab, 0x1eaa },	{ 0x1ead, 0x1eac },	{ 0x1eaf, 0x1eae },
+	{ 0x1eb1, 0x1eb0 },	{ 0x1eb3, 0x1eb2 },	{ 0x1eb5, 0x1eb4 },	{ 0x1eb7, 0x1eb6 },
+	{ 0x1eb9, 0x1eb8 },	{ 0x1ebb, 0x1eba },	{ 0x1ebd, 0x1ebc },	{ 0x1ebf, 0x1ebe },
+	{ 0x1ec1, 0x1ec0 },	{ 0x1ec3, 0x1ec2 },	{ 0x1ec5, 0x1ec4 },	{ 0x1ec7, 0x1ec6 },
+	{ 0x1ec9, 0x1ec8 },	{ 0x1ecb, 0x1eca },	{ 0x1ecd, 0x1ecc },	{ 0x1ecf, 0x1ece },
+	{ 0x1ed1, 0x1ed0 },	{ 0x1ed3, 0x1ed2 },	{ 0x1ed5, 0x1ed4 },	{ 0x1ed7, 0x1ed6 },
+	{ 0x1ed9, 0x1ed8 },	{ 0x1edb, 0x1eda },	{ 0x1edd, 0x1edc },	{ 0x1edf, 0x1ede },
+	{ 0x1ee1, 0x1ee0 },	{ 0x1ee3, 0x1ee2 },	{ 0x1ee5, 0x1ee4 },	{ 0x1ee7, 0x1ee6 },
+	{ 0x1ee9, 0x1ee8 },	{ 0x1eeb, 0x1eea },	{ 0x1eed, 0x1eec },	{ 0x1eef, 0x1eee },
+	{ 0x1ef1, 0x1ef0 },	{ 0x1ef3, 0x1ef2 },	{ 0x1ef5, 0x1ef4 },	{ 0x1ef7, 0x1ef6 },
+	{ 0x1ef9, 0x1ef8 },	{ 0x1efb, 0x1efa },	{ 0x1efd, 0x1efc },	{ 0x1eff, 0x1efe },
+	{ 0x1f00, 0x1f08 },	{ 0x1f01, 0x1f09 },	{ 0x1f02, 0x1f0a },	{ 0x1f03, 0x1f0b },
+	{ 0x1f04, 0x1f0c },	{ 0x1f05, 0x1f0d },	{ 0x1f06, 0x1f0e },	{ 0x1f07, 0x1f0f },
+	{ 0x1f10, 0x1f18 },	{ 0x1f11, 0x1f19 },	{ 0x1f12, 0x1f1a },	{ 0x1f13, 0x1f1b },
+	{ 0x1f14, 0x1f1c },	{ 0x1f15, 0x1f1d },	{ 0x1f20, 0x1f28 },	{ 0x1f21, 0x1f29 },
+	{ 0x1f22, 0x1f2a },	{ 0x1f23, 0x1f2b },	{ 0x1f24, 0x1f2c },	{ 0x1f25, 0x1f2d },
+	{ 0x1f26, 0x1f2e },	{ 0x1f27, 0x1f2f },	{ 0x1f30, 0x1f38 },	{ 0x1f31, 0x1f39 },
+	{ 0x1f32, 0x1f3a },	{ 0x1f33, 0x1f3b },	{ 0x1f34, 0x1f3c },	{ 0x1f35, 0x1f3d },
+	{ 0x1f36, 0x1f3e },	{ 0x1f37, 0x1f3f },	{ 0x1f40, 0x1f48 },	{ 0x1f41, 0x1f49 },
+	{ 0x1f42, 0x1f4a },	{ 0x1f43, 0x1f4b },	{ 0x1f44, 0x1f4c },	{ 0x1f45, 0x1f4d },
+	{ 0x1f51, 0x1f59 },	{ 0x1f53, 0x1f5b },	{ 0x1f55, 0x1f5d },	{ 0x1f57, 0x1f5f },
+	{ 0x1f60, 0x1f68 },	{ 0x1f61, 0x1f69 },	{ 0x1f62, 0x1f6a },	{ 0x1f63, 0x1f6b },
+	{ 0x1f64, 0x1f6c },	{ 0x1f65, 0x1f6d },	{ 0x1f66, 0x1f6e },	{ 0x1f67, 0x1f6f },
+	{ 0x1f70, 0x1fba },	{ 0x1f71, 0x1fbb },	{ 0x1f72, 0x1fc8 },	{ 0x1f73, 0x1fc9 },
+	{ 0x1f74, 0x1fca },	{ 0x1f75, 0x1fcb },	{ 0x1f76, 0x1fda },	{ 0x1f77, 0x1fdb },
+	{ 0x1f78, 0x1ff8 },	{ 0x1f79, 0x1ff9 },	{ 0x1f7a, 0x1fea },	{ 0x1f7b, 0x1feb },
+	{ 0x1f7c, 0x1ffa },	{ 0x1f7d, 0x1ffb },	{ 0x1f80, 0x1f88 },	{ 0x1f81, 0x1f89 },
+	{ 0x1f82, 0x1f8a },	{ 0x1f83, 0x1f8b },	{ 0x1f84, 0x1f8c },	{ 0x1f85, 0x1f8d },
+	{ 0x1f86, 0x1f8e },	{ 0x1f87, 0x1f8f },	{ 0x1f90, 0x1f98 },	{ 0x1f91, 0x1f99 },
+	{ 0x1f92, 0x1f9a },	{ 0x1f93, 0x1f9b },	{ 0x1f94, 0x1f9c },	{ 0x1f95, 0x1f9d },
+	{ 0x1f96, 0x1f9e },	{ 0x1f97, 0x1f9f },	{ 0x1fa0, 0x1fa8 },	{ 0x1fa1, 0x1fa9 },
+	{ 0x1fa2, 0x1faa },	{ 0x1fa3, 0x1fab },	{ 0x1fa4, 0x1fac },	{ 0x1fa5, 0x1fad },
+	{ 0x1fa6, 0x1fae },	{ 0x1fa7, 0x1faf },	{ 0x1fb0, 0x1fb8 },	{ 0x1fb1, 0x1fb9 },
+	{ 0x1fb3, 0x1fbc },	{ 0x1fbe, 0x0399 },	{ 0x1fc3, 0x1fcc },	{ 0x1fd0, 0x1fd8 },
+	{ 0x1fd1, 0x1fd9 },	{ 0x1fe0, 0x1fe8 },	{ 0x1fe1, 0x1fe9 },	{ 0x1fe5, 0x1fec },
+	{ 0x1ff3, 0x1ffc },	{ 0x214e, 0x2132 },	{ 0x2184, 0x2183 },	{ 0x2c30, 0x2c00 },
+	{ 0x2c31, 0x2c01 },	{ 0x2c32, 0x2c02 },	{ 0x2c33, 0x2c03 },	{ 0x2c34, 0x2c04 },
+	{ 0x2c35, 0x2c05 },	{ 0x2c36, 0x2c06 },	{ 0x2c37, 0x2c07 },	{ 0x2c38, 0x2c08 },
+	{ 0x2c39, 0x2c09 },	{ 0x2c3a, 0x2c0a },	{ 0x2c3b, 0x2c0b },	{ 0x2c3c, 0x2c0c },
+	{ 0x2c3d, 0x2c0d },	{ 0x2c3e, 0x2c0e },	{ 0x2c3f, 0x2c0f },	{ 0x2c40, 0x2c10 },
+	{ 0x2c41, 0x2c11 },	{ 0x2c42, 0x2c12 },	{ 0x2c43, 0x2c13 },	{ 0x2c44, 0x2c14 },
+	{ 0x2c45, 0x2c15 },	{ 0x2c46, 0x2c16 },	{ 0x2c47, 0x2c17 },	{ 0x2c48, 0x2c18 },
+	{ 0x2c49, 0x2c19 },	{ 0x2c4a, 0x2c1a },	{ 0x2c4b, 0x2c1b },	{ 0x2c4c, 0x2c1c },
+	{ 0x2c4d, 0x2c1d },	{ 0x2c4e, 0x2c1e },	{ 0x2c4f, 0x2c1f },	{ 0x2c50, 0x2c20 },
+	{ 0x2c51, 0x2c21 },	{ 0x2c52, 0x2c22 },	{ 0x2c53, 0x2c23 },	{ 0x2c54, 0x2c24 },
+	{ 0x2c55, 0x2c25 },	{ 0x2c56, 0x2c26 },	{ 0x2c57, 0x2c27 },	{ 0x2c58, 0x2c28 },
+	{ 0x2c59, 0x2c29 },	{ 0x2c5a, 0x2c2a },	{ 0x2c5b, 0x2c2b },	{ 0x2c5c, 0x2c2c },
+	{ 0x2c5d, 0x2c2d },	{ 0x2c5e, 0x2c2e },	{ 0x2c61, 0x2c60 },	{ 0x2c65, 0x023a },
+	{ 0x2c66, 0x023e },	{ 0x2c68, 0x2c67 },	{ 0x2c6a, 0x2c69 },	{ 0x2c6c, 0x2c6b },
+	{ 0x2c73, 0x2c72 },	{ 0x2c76, 0x2c75 },	{ 0x2c81, 0x2c80 },	{ 0x2c83, 0x2c82 },
+	{ 0x2c85, 0x2c84 },	{ 0x2c87, 0x2c86 },	{ 0x2c89, 0x2c88 },	{ 0x2c8b, 0x2c8a },
+	{ 0x2c8d, 0x2c8c },	{ 0x2c8f, 0x2c8e },	{ 0x2c91, 0x2c90 },	{ 0x2c93, 0x2c92 },
+	{ 0x2c95, 0x2c94 },	{ 0x2c97, 0x2c96 },	{ 0x2c99, 0x2c98 },	{ 0x2c9b, 0x2c9a },
+	{ 0x2c9d, 0x2c9c },	{ 0x2c9f, 0x2c9e },	{ 0x2ca1, 0x2ca0 },	{ 0x2ca3, 0x2ca2 },
+	{ 0x2ca5, 0x2ca4 },	{ 0x2ca7, 0x2ca6 },	{ 0x2ca9, 0x2ca8 },	{ 0x2cab, 0x2caa },
+	{ 0x2cad, 0x2cac },	{ 0x2caf, 0x2cae },	{ 0x2cb1, 0x2cb0 },	{ 0x2cb3, 0x2cb2 },
+	{ 0x2cb5, 0x2cb4 },	{ 0x2cb7, 0x2cb6 },	{ 0x2cb9, 0x2cb8 },	{ 0x2cbb, 0x2cba },
+	{ 0x2cbd, 0x2cbc },	{ 0x2cbf, 0x2cbe },	{ 0x2cc1, 0x2cc0 },	{ 0x2cc3, 0x2cc2 },
+	{ 0x2cc5, 0x2cc4 },	{ 0x2cc7, 0x2cc6 },	{ 0x2cc9, 0x2cc8 },	{ 0x2ccb, 0x2cca },
+	{ 0x2ccd, 0x2ccc },	{ 0x2ccf, 0x2cce },	{ 0x2cd1, 0x2cd0 },	{ 0x2cd3, 0x2cd2 },
+	{ 0x2cd5, 0x2cd4 },	{ 0x2cd7, 0x2cd6 },	{ 0x2cd9, 0x2cd8 },	{ 0x2cdb, 0x2cda },
+	{ 0x2cdd, 0x2cdc },	{ 0x2cdf, 0x2cde },	{ 0x2ce1, 0x2ce0 },	{ 0x2ce3, 0x2ce2 },
+	{ 0x2cec, 0x2ceb },	{ 0x2cee, 0x2ced },	{ 0x2cf3, 0x2cf2 },	{ 0x2d00, 0x10a0 },
+	{ 0x2d01, 0x10a1 },	{ 0x2d02, 0x10a2 },	{ 0x2d03, 0x10a3 },	{ 0x2d04, 0x10a4 },
+	{ 0x2d05, 0x10a5 },	{ 0x2d06, 0x10a6 },	{ 0x2d07, 0x10a7 },	{ 0x2d08, 0x10a8 },
+	{ 0x2d09, 0x10a9 },	{ 0x2d0a, 0x10aa },	{ 0x2d0b, 0x10ab },	{ 0x2d0c, 0x10ac },
+	{ 0x2d0d, 0x10ad },	{ 0x2d0e, 0x10ae },	{ 0x2d0f, 0x10af },	{ 0x2d10, 0x10b0 },
+	{ 0x2d11, 0x10b1 },	{ 0x2d12, 0x10b2 },	{ 0x2d13, 0x10b3 },	{ 0x2d14, 0x10b4 },
+	{ 0x2d15, 0x10b5 },	{ 0x2d16, 0x10b6 },	{ 0x2d17, 0x10b7 },	{ 0x2d18, 0x10b8 },
+	{ 0x2d19, 0x10b9 },	{ 0x2d1a, 0x10ba },	{ 0x2d1b, 0x10bb },	{ 0x2d1c, 0x10bc },
+	{ 0x2d1d, 0x10bd },	{ 0x2d1e, 0x10be },	{ 0x2d1f, 0x10bf },	{ 0x2d20, 0x10c0 },
+	{ 0x2d21, 0x10c1 },	{ 0x2d22, 0x10c2 },	{ 0x2d23, 0x10c3 },	{ 0x2d24, 0x10c4 },
+	{ 0x2d25, 0x10c5 },	{ 0x2d27, 0x10c7 },	{ 0x2d2d, 0x10cd },	{ 0xa641, 0xa640 },
+	{ 0xa643, 0xa642 },	{ 0xa645, 0xa644 },	{ 0xa647, 0xa646 },	{ 0xa649, 0xa648 },
+	{ 0xa64b, 0xa64a },	{ 0xa64d, 0xa64c },	{ 0xa64f, 0xa64e },	{ 0xa651, 0xa650 },
+	{ 0xa653, 0xa652 },	{ 0xa655, 0xa654 },	{ 0xa657, 0xa656 },	{ 0xa659, 0xa658 },
+	{ 0xa65b, 0xa65a },	{ 0xa65d, 0xa65c },	{ 0xa65f, 0xa65e },	{ 0xa661, 0xa660 },
+	{ 0xa663, 0xa662 },	{ 0xa665, 0xa664 },	{ 0xa667, 0xa666 },	{ 0xa669, 0xa668 },
+	{ 0xa66b, 0xa66a },	{ 0xa66d, 0xa66c },	{ 0xa681, 0xa680 },	{ 0xa683, 0xa682 },
+	{ 0xa685, 0xa684 },	{ 0xa687, 0xa686 },	{ 0xa689, 0xa688 },	{ 0xa68b, 0xa68a },
+	{ 0xa68d, 0xa68c },	{ 0xa68f, 0xa68e },	{ 0xa691, 0xa690 },	{ 0xa693, 0xa692 },
+	{ 0xa695, 0xa694 },	{ 0xa697, 0xa696 },	{ 0xa699, 0xa698 },	{ 0xa69b, 0xa69a },
+	{ 0xa723, 0xa722 },	{ 0xa725, 0xa724 },	{ 0xa727, 0xa726 },	{ 0xa729, 0xa728 },
+	{ 0xa72b, 0xa72a },	{ 0xa72d, 0xa72c },	{ 0xa72f, 0xa72e },	{ 0xa733, 0xa732 },
+	{ 0xa735, 0xa734 },	{ 0xa737, 0xa736 },	{ 0xa739, 0xa738 },	{ 0xa73b, 0xa73a },
+	{ 0xa73d, 0xa73c },	{ 0xa73f, 0xa73e },	{ 0xa741, 0xa740 },	{ 0xa743, 0xa742 },
+	{ 0xa745, 0xa744 },	{ 0xa747, 0xa746 },	{ 0xa749, 0xa748 },	{ 0xa74b, 0xa74a },
+	{ 0xa74d, 0xa74c },	{ 0xa74f, 0xa74e },	{ 0xa751, 0xa750 },	{ 0xa753, 0xa752 },
+	{ 0xa755, 0xa754 },	{ 0xa757, 0xa756 },	{ 0xa759, 0xa758 },	{ 0xa75b, 0xa75a },
+	{ 0xa75d, 0xa75c },	{ 0xa75f, 0xa75e },	{ 0xa761, 0xa760 },	{ 0xa763, 0xa762 },
+	{ 0xa765, 0xa764 },	{ 0xa767, 0xa766 },	{ 0xa769, 0xa768 },	{ 0xa76b, 0xa76a },
+	{ 0xa76d, 0xa76c },	{ 0xa76f, 0xa76e },	{ 0xa77a, 0xa779 },	{ 0xa77c, 0xa77b },
+	{ 0xa77f, 0xa77e },	{ 0xa781, 0xa780 },	{ 0xa783, 0xa782 },	{ 0xa785, 0xa784 },
+	{ 0xa787, 0xa786 },	{ 0xa78c, 0xa78b },	{ 0xa791, 0xa790 },	{ 0xa793, 0xa792 },
+	{ 0xa794, 0xa7c4 },	{ 0xa797, 0xa796 },	{ 0xa799, 0xa798 },	{ 0xa79b, 0xa79a },
+	{ 0xa79d, 0xa79c },	{ 0xa79f, 0xa79e },	{ 0xa7a1, 0xa7a0 },	{ 0xa7a3, 0xa7a2 },
+	{ 0xa7a5, 0xa7a4 },	{ 0xa7a7, 0xa7a6 },	{ 0xa7a9, 0xa7a8 },	{ 0xa7b5, 0xa7b4 },
+	{ 0xa7b7, 0xa7b6 },	{ 0xa7b9, 0xa7b8 },	{ 0xa7bb, 0xa7ba },	{ 0xa7bd, 0xa7bc },
+	{ 0xa7bf, 0xa7be },	{ 0xa7c3, 0xa7c2 },	{ 0xa7c8, 0xa7c7 },	{ 0xa7ca, 0xa7c9 },
+	{ 0xa7f6, 0xa7f5 },	{ 0xab53, 0xa7b3 },	{ 0xab70, 0x13a0 },	{ 0xab71, 0x13a1 },
+	{ 0xab72, 0x13a2 },	{ 0xab73, 0x13a3 },	{ 0xab74, 0x13a4 },	{ 0xab75, 0x13a5 },
+	{ 0xab76, 0x13a6 },	{ 0xab77, 0x13a7 },	{ 0xab78, 0x13a8 },	{ 0xab79, 0x13a9 },
+	{ 0xab7a, 0x13aa },	{ 0xab7b, 0x13ab },	{ 0xab7c, 0x13ac },	{ 0xab7d, 0x13ad },
+	{ 0xab7e, 0x13ae },	{ 0xab7f, 0x13af },	{ 0xab80, 0x13b0 },	{ 0xab81, 0x13b1 },
+	{ 0xab82, 0x13b2 },	{ 0xab83, 0x13b3 },	{ 0xab84, 0x13b4 },	{ 0xab85, 0x13b5 },
+	{ 0xab86, 0x13b6 },	{ 0xab87, 0x13b7 },	{ 0xab88, 0x13b8 },	{ 0xab89, 0x13b9 },
+	{ 0xab8a, 0x13ba },	{ 0xab8b, 0x13bb },	{ 0xab8c, 0x13bc },	{ 0xab8d, 0x13bd },
+	{ 0xab8e, 0x13be },	{ 0xab8f, 0x13bf },	{ 0xab90, 0x13c0 },	{ 0xab91, 0x13c1 },
+	{ 0xab92, 0x13c2 },	{ 0xab93, 0x13c3 },	{ 0xab94, 0x13c4 },	{ 0xab95, 0x13c5 },
+	{ 0xab96, 0x13c6 },	{ 0xab97, 0x13c7 },	{ 0xab98, 0x13c8 },	{ 0xab99, 0x13c9 },
+	{ 0xab9a, 0x13ca },	{ 0xab9b, 0x13cb },	{ 0xab9c, 0x13cc },	{ 0xab9d, 0x13cd },
+	{ 0xab9e, 0x13ce },	{ 0xab9f, 0x13cf },	{ 0xaba0, 0x13d0 },	{ 0xaba1, 0x13d1 },
+	{ 0xaba2, 0x13d2 },	{ 0xaba3, 0x13d3 },	{ 0xaba4, 0x13d4 },	{ 0xaba5, 0x13d5 },
+	{ 0xaba6, 0x13d6 },	{ 0xaba7, 0x13d7 },	{ 0xaba8, 0x13d8 },	{ 0xaba9, 0x13d9 },
+	{ 0xabaa, 0x13da },	{ 0xabab, 0x13db },	{ 0xabac, 0x13dc },	{ 0xabad, 0x13dd },
+	{ 0xabae, 0x13de },	{ 0xabaf, 0x13df },	{ 0xabb0, 0x13e0 },	{ 0xabb1, 0x13e1 },
+	{ 0xabb2, 0x13e2 },	{ 0xabb3, 0x13e3 },	{ 0xabb4, 0x13e4 },	{ 0xabb5, 0x13e5 },
+	{ 0xabb6, 0x13e6 },	{ 0xabb7, 0x13e7 },	{ 0xabb8, 0x13e8 },	{ 0xabb9, 0x13e9 },
+	{ 0xabba, 0x13ea },	{ 0xabbb, 0x13eb },	{ 0xabbc, 0x13ec },	{ 0xabbd, 0x13ed },
+	{ 0xabbe, 0x13ee },	{ 0xabbf, 0x13ef },	{ 0xff41, 0xff21 },	{ 0xff42, 0xff22 },
+	{ 0xff43, 0xff23 },	{ 0xff44, 0xff24 },	{ 0xff45, 0xff25 },	{ 0xff46, 0xff26 },
+	{ 0xff47, 0xff27 },	{ 0xff48, 0xff28 },	{ 0xff49, 0xff29 },	{ 0xff4a, 0xff2a },
+	{ 0xff4b, 0xff2b },	{ 0xff4c, 0xff2c },	{ 0xff4d, 0xff2d },	{ 0xff4e, 0xff2e },
+	{ 0xff4f, 0xff2f },	{ 0xff50, 0xff30 },	{ 0xff51, 0xff31 },	{ 0xff52, 0xff32 },
+	{ 0xff53, 0xff33 },	{ 0xff54, 0xff34 },	{ 0xff55, 0xff35 },	{ 0xff56, 0xff36 },
+	{ 0xff57, 0xff37 },	{ 0xff58, 0xff38 },	{ 0xff59, 0xff39 },	{ 0xff5a, 0xff3a },
+
+};
diff -Nru gnupg2-2.2.20/regexp/utf8.c gnupg2-2.2.27/regexp/utf8.c
--- gnupg2-2.2.20/regexp/utf8.c	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/utf8.c	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,150 @@
+/**
+ * UTF-8 utility functions
+ *
+ * (c) 2010-2016 Steve Bennett <steveb@workware.net.au>
+ *
+ * See LICENCE for licence details.
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include "utf8.h"
+
+/* This one is always implemented */
+int utf8_fromunicode(char *p, unsigned uc)
+{
+    if (uc <= 0x7f) {
+        *p = uc;
+        return 1;
+    }
+    else if (uc <= 0x7ff) {
+        *p++ = 0xc0 | ((uc & 0x7c0) >> 6);
+        *p = 0x80 | (uc & 0x3f);
+        return 2;
+    }
+    else if (uc <= 0xffff) {
+        *p++ = 0xe0 | ((uc & 0xf000) >> 12);
+        *p++ = 0x80 | ((uc & 0xfc0) >> 6);
+        *p = 0x80 | (uc & 0x3f);
+        return 3;
+    }
+    /* Note: We silently truncate to 21 bits here: 0x1fffff */
+    else {
+        *p++ = 0xf0 | ((uc & 0x1c0000) >> 18);
+        *p++ = 0x80 | ((uc & 0x3f000) >> 12);
+        *p++ = 0x80 | ((uc & 0xfc0) >> 6);
+        *p = 0x80 | (uc & 0x3f);
+        return 4;
+    }
+}
+
+#if defined(USE_UTF8) && !defined(JIM_BOOTSTRAP)
+int utf8_charlen(int c)
+{
+    if ((c & 0x80) == 0) {
+        return 1;
+    }
+    if ((c & 0xe0) == 0xc0) {
+        return 2;
+    }
+    if ((c & 0xf0) == 0xe0) {
+        return 3;
+    }
+    if ((c & 0xf8) == 0xf0) {
+        return 4;
+    }
+    /* Invalid sequence, so treat it as a single byte */
+    return 1;
+}
+
+int utf8_index(const char *str, int index)
+{
+    const char *s = str;
+    while (index--) {
+        s += utf8_charlen(*s);
+    }
+    return s - str;
+}
+
+int utf8_tounicode(const char *str, int *uc)
+{
+    unsigned const char *s = (unsigned const char *)str;
+
+    if (s[0] < 0xc0) {
+        *uc = s[0];
+        return 1;
+    }
+    if (s[0] < 0xe0) {
+        if ((s[1] & 0xc0) == 0x80) {
+            *uc = ((s[0] & ~0xc0) << 6) | (s[1] & ~0x80);
+            if (*uc >= 0x80) {
+                return 2;
+            }
+            /* Otherwise this is an invalid sequence */
+        }
+    }
+    else if (s[0] < 0xf0) {
+        if (((str[1] & 0xc0) == 0x80) && ((str[2] & 0xc0) == 0x80)) {
+            *uc = ((s[0] & ~0xe0) << 12) | ((s[1] & ~0x80) << 6) | (s[2] & ~0x80);
+            if (*uc >= 0x800) {
+                return 3;
+            }
+            /* Otherwise this is an invalid sequence */
+        }
+    }
+    else if (s[0] < 0xf8) {
+        if (((str[1] & 0xc0) == 0x80) && ((str[2] & 0xc0) == 0x80) && ((str[3] & 0xc0) == 0x80)) {
+            *uc = ((s[0] & ~0xf0) << 18) | ((s[1] & ~0x80) << 12) | ((s[2] & ~0x80) << 6) | (s[3] & ~0x80);
+            if (*uc >= 0x10000) {
+                return 4;
+            }
+            /* Otherwise this is an invalid sequence */
+        }
+    }
+
+    /* Invalid sequence, so just return the byte */
+    *uc = *s;
+    return 1;
+}
+
+struct casemap {
+    unsigned short code;        /* code point */
+    unsigned short altcode;     /* alternate case code point */
+};
+
+
+/* Generated mapping tables */
+#include "_unicode_mapping.c"
+
+#define ARRAYSIZE(A) sizeof(A) / sizeof(*(A))
+
+static int cmp_casemap(const void *key, const void *cm)
+{
+    return *(int *)key - (int)((const struct casemap *)cm)->code;
+}
+
+static int utf8_map_case(const struct casemap *mapping, int num, int ch)
+{
+    /* We only support 16 bit case mapping */
+    if (ch <= 0xffff) {
+        const struct casemap *cm =
+            bsearch(&ch, mapping, num, sizeof(*mapping), cmp_casemap);
+
+        if (cm) {
+            return cm->altcode;
+        }
+    }
+    return ch;
+}
+
+int utf8_upper(int ch)
+{
+    if (isascii(ch)) {
+        return toupper(ch);
+    }
+    return utf8_map_case(unicode_case_mapping_upper, ARRAYSIZE(unicode_case_mapping_upper), ch);
+}
+#endif /* JIM_BOOTSTRAP */
diff -Nru gnupg2-2.2.20/regexp/utf8.h gnupg2-2.2.27/regexp/utf8.h
--- gnupg2-2.2.20/regexp/utf8.h	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/regexp/utf8.h	2020-07-16 11:35:25.000000000 +0200
@@ -0,0 +1,90 @@
+#ifndef UTF8_UTIL_H
+#define UTF8_UTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * UTF-8 utility functions
+ *
+ * (c) 2010-2016 Steve Bennett <steveb@workware.net.au>
+ *
+ * See LICENCE for licence details.
+ */
+
+/* Currently we support unicode points up to 2^22-1 */
+#define MAX_UTF8_LEN 4
+
+/**
+ * Converts the given unicode codepoint (0 - 0x1fffff) to utf-8
+ * and stores the result at 'p'.
+ *
+ * Returns the number of utf-8 characters (up to MAX_UTF8_LEN).
+ */
+int utf8_fromunicode(char *p, unsigned uc);
+
+#ifndef JIM_UTF8
+#include <ctype.h>
+
+/* No utf-8 support. 1 byte = 1 char */
+#define utf8_tounicode(S, CP) (*(CP) = (unsigned char)*(S), 1)
+#define utf8_getchars(CP, C) (*(CP) = (C), 1)
+#define utf8_upper(C) toupper(C)
+#define utf8_index(C, I) (I)
+#define utf8_charlen(C) 1
+
+#else
+#if !defined(JIM_BOOTSTRAP)
+
+#define utf8_getchars utf8_fromunicode
+
+/**
+ * Returns the length of the utf-8 sequence starting with 'c'.
+ *
+ * Returns 1-4.
+ * If 'c' is not a valid start byte, returns 1.
+ */
+int utf8_charlen(int c);
+
+/**
+ * Returns the byte index of the given character in the utf-8 string.
+ *
+ * The string *must* be null terminated.
+ *
+ * This will return the byte length of a utf-8 string
+ * if given the char length.
+ */
+int utf8_index(const char *str, int charindex);
+
+/**
+ * Returns the unicode codepoint corresponding to the
+ * utf-8 sequence 'str'.
+ *
+ * Stores the result in *uc and returns the number of bytes
+ * consumed.
+ *
+ * If 'str' is null terminated, then an invalid utf-8 sequence
+ * at the end of the string will be returned as individual bytes.
+ *
+ * If it is not null terminated, the length *must* be checked first.
+ *
+ * Does not support unicode code points > \u1fffff
+ */
+int utf8_tounicode(const char *str, int *uc);
+
+/**
+ * Returns the upper-case variant of the given unicode codepoint.
+ *
+ * Unicode code points > \uffff are returned unchanged.
+ */
+int utf8_upper(int uc);
+#endif /* JIM_BOOTSTRAP */
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru gnupg2-2.2.20/scd/apdu.c gnupg2-2.2.27/scd/apdu.c
--- gnupg2-2.2.20/scd/apdu.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/apdu.c	2020-11-11 14:24:13.000000000 +0100
@@ -67,7 +67,7 @@
 #include "ccid-driver.h"
 
 struct dev_list {
-  struct ccid_dev_table *ccid_table;
+  void *table;
   const char *portstr;
   int idx;
   int idx_max;
@@ -475,7 +475,7 @@
   if (reader_table[slot].atrlen)
     {
       log_info ("slot %d: ATR=", slot);
-      log_printhex ("", reader_table[slot].atr, reader_table[slot].atrlen);
+      log_printhex (reader_table[slot].atr, reader_table[slot].atrlen, "");
     }
 }
 
@@ -502,6 +502,13 @@
     case SW_HOST_NO_PINPAD: return "no pinpad";
     case SW_HOST_ALREADY_CONNECTED: return "already connected";
     case SW_HOST_CANCELLED: return "cancelled";
+    case SW_HOST_USB_OTHER:    return "USB general error";
+    case SW_HOST_USB_IO:       return "USB I/O error";
+    case SW_HOST_USB_ACCESS:   return "USB permission denied";
+    case SW_HOST_USB_NO_DEVICE:return "USB no device";
+    case SW_HOST_USB_BUSY:     return "USB busy";
+    case SW_HOST_USB_TIMEOUT:  return "USB timeout";
+    case SW_HOST_USB_OVERFLOW: return "USB overflow";
     default: return "unknown host status error";
     }
 }
@@ -675,7 +682,7 @@
     reader_table[slot].pcsc.current_state =
       (rdrstates[0].event_state & ~PCSC_STATE_CHANGED);
 
-  if (DBG_CARD_IO)
+  if (DBG_READER)
     log_debug
       ("pcsc_get_status_change: %s%s%s%s%s%s%s%s%s%s\n",
        (rdrstates[0].event_state & PCSC_STATE_IGNORE)? " ignore":"",
@@ -739,7 +746,7 @@
     return err;
 
   if (DBG_CARD_IO)
-    log_printhex ("  PCSC_data:", apdu, apdulen);
+    log_printhex (apdu, apdulen, "  PCSC_data:");
 
   if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
       send_pci.protocol = PCSC_PROTOCOL_T1;
@@ -1453,7 +1460,7 @@
     return err;
 
   if (DBG_CARD_IO)
-    log_printhex (" raw apdu:", apdu, apdulen);
+    log_printhex (apdu, apdulen, " raw apdu:");
 
   maxbuflen = *buflen;
   if (pininfo)
@@ -1527,7 +1534,7 @@
     return -1;
   slotp = reader_table + slot;
 
-  err = ccid_open_reader (dl->portstr, dl->idx, dl->ccid_table,
+  err = ccid_open_reader (dl->portstr, dl->idx, dl->table,
                           &slotp->ccid.handle, &slotp->rdrname);
   if (!err)
     {
@@ -1723,7 +1730,7 @@
 
   *buflen = 0;
   if (DBG_CARD_IO)
-    log_printhex ("  APDU_data:", apdu, apdulen);
+    log_printhex (apdu, apdulen, "  APDU_data:");
 
   if (apdulen < 4)
     {
@@ -1886,14 +1893,14 @@
 #ifdef HAVE_LIBUSB
   if (opt.disable_ccid)
     {
-      dl->ccid_table = NULL;
+      dl->table = NULL;
       dl->idx_max = 1;
     }
   else
     {
       gpg_error_t err;
 
-      err = ccid_dev_scan (&dl->idx_max, &dl->ccid_table);
+      err = ccid_dev_scan (&dl->idx_max, &dl->table);
       if (err)
         return err;
 
@@ -1915,7 +1922,7 @@
         }
     }
 #else
-  dl->ccid_table = NULL;
+  dl->table = NULL;
   dl->idx_max = 1;
 #endif /* HAVE_LIBUSB */
 
@@ -1927,8 +1934,8 @@
 apdu_dev_list_finish (struct dev_list *dl)
 {
 #ifdef HAVE_LIBUSB
-  if (dl->ccid_table)
-    ccid_dev_scan_finish (dl->ccid_table, dl->idx_max);
+  if (dl->table)
+    ccid_dev_scan_finish (dl->table, dl->idx_max);
 #endif
   xfree (dl);
   npth_mutex_unlock (&reader_table_lock);
@@ -2044,7 +2051,7 @@
   int slot;
 
 #ifdef HAVE_LIBUSB
-  if (dl->ccid_table)
+  if (dl->table)
     { /* CCID readers.  */
       int readerno;
 
@@ -2081,7 +2088,7 @@
 
       while (dl->idx < dl->idx_max)
         {
-          unsigned int bai = ccid_get_BAI (dl->idx, dl->ccid_table);
+          unsigned int bai = ccid_get_BAI (dl->idx, dl->table);
 
           if (DBG_READER)
             log_debug ("apdu_open_reader: BAI=%x\n", bai);
@@ -2879,7 +2886,7 @@
       log_debug (" response: sw=%04X  datalen=%d\n",
                  sw, (unsigned int)resultlen);
       if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
-        log_printhex ("    dump: ", result, resultlen);
+        log_printhex (result, resultlen, "    dump: ");
     }
 
   if (sw == SW_SUCCESS || sw == SW_EOF_REACHED)
@@ -2952,7 +2959,7 @@
               log_debug ("     more: sw=%04X  datalen=%d\n",
                          sw, (unsigned int)resultlen);
               if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
-                log_printhex ("     dump: ", result, resultlen);
+                log_printhex (result, resultlen, "     dump: ");
             }
 
           if ((sw & 0xff00) == SW_MORE_DATA
@@ -2998,7 +3005,7 @@
   xfree (result_buffer);
 
   if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS)
-    log_printhex ("      dump: ", *retbuf, *retbuflen);
+    log_printhex (*retbuf, *retbuflen, "      dump: ");
 
   return sw;
 }
@@ -3164,7 +3171,7 @@
       log_debug (" response: sw=%04X  datalen=%d\n",
                  sw, (unsigned int)resultlen);
       if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
-        log_printhex ("     dump: ", result, resultlen);
+        log_printhex (result, resultlen, "     dump: ");
     }
 
   if (handle_more && (sw & 0xff00) == SW_MORE_DATA)
@@ -3220,7 +3227,7 @@
               log_debug ("     more: sw=%04X  datalen=%d\n",
                          sw, (unsigned int)resultlen);
               if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
-                log_printhex ("     dump: ", result, resultlen);
+                log_printhex (result, resultlen, "     dump: ");
             }
 
           if ((sw & 0xff00) == SW_MORE_DATA
@@ -3292,7 +3299,7 @@
     *r_sw = sw;
 
   if (DBG_CARD_IO && retbuf)
-    log_printhex ("      dump: ", *retbuf, *retbuflen);
+    log_printhex (*retbuf, *retbuflen, "      dump: ");
 
 
   return 0;
diff -Nru gnupg2-2.2.20/scd/apdu.h gnupg2-2.2.27/scd/apdu.h
--- gnupg2-2.2.20/scd/apdu.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/apdu.h	2020-10-23 20:08:54.000000000 +0200
@@ -72,7 +72,15 @@
   SW_HOST_ABORTED       = 0x1000d,
   SW_HOST_NO_PINPAD     = 0x1000e,
   SW_HOST_ALREADY_CONNECTED = 0x1000f,
-  SW_HOST_CANCELLED     = 0x10010
+  SW_HOST_CANCELLED     = 0x10010,
+  SW_HOST_DEVICE_ACCESS = 0x10011,
+  SW_HOST_USB_OTHER     = 0x10020,
+  SW_HOST_USB_IO        = 0x10021,
+  SW_HOST_USB_ACCESS    = 0x10023,
+  SW_HOST_USB_NO_DEVICE = 0x10024,
+  SW_HOST_USB_BUSY      = 0x10026,
+  SW_HOST_USB_TIMEOUT   = 0x10027,
+  SW_HOST_USB_OVERFLOW  = 0x10028
 };
 
 struct dev_list;
diff -Nru gnupg2-2.2.20/scd/app.c gnupg2-2.2.27/scd/app.c
--- gnupg2-2.2.20/scd/app.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/app.c	2020-10-23 20:08:54.000000000 +0200
@@ -973,18 +973,18 @@
   char *homestr, *envstr;
   char *fname;
   char templ[50];
-  FILE *fp;
+  estream_t fp;
 
   snprintf (templ, sizeof templ, "reader_%d.status", slot);
   fname = make_filename (gnupg_homedir (), templ, NULL );
-  fp = fopen (fname, "w");
+  fp = es_fopen (fname, "w");
   if (fp)
     {
-      fprintf (fp, "%s\n",
+      es_fprintf (fp, "%s\n",
                (cur_status & 1)? "USABLE":
                (cur_status & 4)? "ACTIVE":
                (cur_status & 2)? "PRESENT": "NOCARD");
-      fclose (fp);
+      es_fclose (fp);
     }
   xfree (fname);
 
diff -Nru gnupg2-2.2.20/scd/app-common.h gnupg2-2.2.27/scd/app-common.h
--- gnupg2-2.2.20/scd/app-common.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/app-common.h	2020-05-12 18:18:45.000000000 +0200
@@ -119,9 +119,26 @@
   } fnc;
 };
 
+
+/* Helper to get the slot from an APP object. */
+static inline int
+app_get_slot (app_t app)
+{
+  /* Note that this is a similar function of the one in 2.3 which we
+   * use to make back porting easier.  */
+  if (app)
+    return app->slot;
+  return -1;
+}
+
+
 /*-- app-help.c --*/
 unsigned int app_help_count_bits (const unsigned char *a, size_t len);
-gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip);
+gpg_error_t app_help_get_keygrip_string_pk (const void *pk, size_t pklen,
+                                            char *hexkeygrip,
+                                            gcry_sexp_t *r_pkey);
+gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip,
+                                         gcry_sexp_t *r_pkey);
 size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff);
 
 
diff -Nru gnupg2-2.2.20/scd/app-dinsig.c gnupg2-2.2.27/scd/app-dinsig.c
--- gnupg2-2.2.20/scd/app-dinsig.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/app-dinsig.c	2020-04-01 15:02:03.000000000 +0200
@@ -137,7 +137,7 @@
       ksba_cert_release (cert);
       return err;
     }
-  err = app_help_get_keygrip_string (cert, hexkeygrip);
+  err = app_help_get_keygrip_string (cert, hexkeygrip, NULL);
   if (err)
     {
       log_error ("failed to calculate the keygrip for FID 0x%04X\n", fid);
diff -Nru gnupg2-2.2.20/scd/app-help.c gnupg2-2.2.27/scd/app-help.c
--- gnupg2-2.2.20/scd/app-help.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/app-help.c	2020-04-01 15:15:12.000000000 +0200
@@ -52,26 +52,24 @@
 }
 
 
-/* Return the KEYGRIP for the certificate CERT as an hex encoded
-   string in the user provided buffer HEXKEYGRIP which must be of at
-   least 41 bytes. */
+/* Return the KEYGRIP for the canonical encoded public key (PK,PKLEN)
+ * as an hex encoded string in the user provided buffer HEXKEYGRIP
+ * which must be of at least 41 bytes.  If R_PKEY is not NULL and the
+ * function succeeded, the S-expression representing the key is
+ * stored there.  The caller needs to call gcry_sexp_release on
+ * that.  */
 gpg_error_t
-app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip)
+app_help_get_keygrip_string_pk (const void *pk, size_t pklen, char *hexkeygrip,
+                                gcry_sexp_t *r_pkey)
 {
   gpg_error_t err;
   gcry_sexp_t s_pkey;
-  ksba_sexp_t p;
-  size_t n;
-  unsigned char array[20];
+  unsigned char array[KEYGRIP_LEN];
 
-  p = ksba_cert_get_public_key (cert);
-  if (!p)
-    return gpg_error (GPG_ERR_BUG);
-  n = gcry_sexp_canon_len (p, 0, NULL, NULL);
-  if (!n)
-    return gpg_error (GPG_ERR_INV_SEXP);
-  err = gcry_sexp_sscan (&s_pkey, NULL, (char*)p, n);
-  xfree (p);
+  if (r_pkey)
+    *r_pkey = NULL;
+
+  err = gcry_sexp_sscan (&s_pkey, NULL, pk, pklen);
   if (err)
     return err; /* Can't parse that S-expression. */
   if (!gcry_pk_get_keygrip (s_pkey, array))
@@ -79,14 +77,45 @@
       gcry_sexp_release (s_pkey);
       return gpg_error (GPG_ERR_GENERAL); /* Failed to calculate the keygrip.*/
     }
-  gcry_sexp_release (s_pkey);
 
-  bin2hex (array, 20, hexkeygrip);
+  if (r_pkey)
+    *r_pkey = s_pkey;
+  else
+    gcry_sexp_release (s_pkey);
+
+  bin2hex (array, KEYGRIP_LEN, hexkeygrip);
 
   return 0;
 }
 
 
+/* Return the KEYGRIP for the certificate CERT as an hex encoded
+ * string in the user provided buffer HEXKEYGRIP which must be of at
+ * least 41 bytes.  If R_PKEY is not NULL and the function succeeded,
+ * the S-expression representing the key is stored there.  The caller
+ * needs to call gcry_sexp_release on that. */
+gpg_error_t
+app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip,
+                             gcry_sexp_t *r_pkey)
+{
+  gpg_error_t err;
+  ksba_sexp_t p;
+  size_t n;
+
+  if (r_pkey)
+    *r_pkey = NULL;
+
+  p = ksba_cert_get_public_key (cert);
+  if (!p)
+    return gpg_error (GPG_ERR_BUG);
+  n = gcry_sexp_canon_len (p, 0, NULL, NULL);
+  if (!n)
+    return gpg_error (GPG_ERR_INV_SEXP);
+  err = app_help_get_keygrip_string_pk ((void*)p, n, hexkeygrip, r_pkey);
+  ksba_free (p);
+  return err;
+}
+
 
 /* Given the SLOT and the File ID FID, return the length of the
    certificate contained in that file. Returns 0 if the file does not
diff -Nru gnupg2-2.2.20/scd/app-nks.c gnupg2-2.2.27/scd/app-nks.c
--- gnupg2-2.2.20/scd/app-nks.c	2019-08-21 14:01:03.000000000 +0200
+++ gnupg2-2.2.27/scd/app-nks.c	2020-11-27 17:52:20.000000000 +0100
@@ -248,53 +248,17 @@
 
 
 /* TCOS responds to a verify with empty data (i.e. without the Lc
-   byte) with the status of the PIN.  PWID is the PIN ID, If SIGG is
-   true, the application is switched into SigG mode.
-   Returns:
-            -1 = Error retrieving the data,
-            -2 = No such PIN,
-            -3 = PIN blocked,
-            -4 = NullPIN activ,
-        n >= 0 = Number of verification attempts left.  */
+ * byte) with the status of the PIN.  PWID is the PIN ID, If SIGG is
+ * true, the application is switched into SigG mode.  Returns:
+ * ISO7816_VERIFY_* codes or non-negative number of verification
+ * attempts left.  */
 static int
 get_chv_status (app_t app, int sigg, int pwid)
 {
-  unsigned char *result = NULL;
-  size_t resultlen;
-  char command[4];
-  int rc;
-
   if (switch_application (app, sigg))
     return sigg? -2 : -1; /* No such PIN / General error.  */
 
-  command[0] = 0x00;
-  command[1] = 0x20;
-  command[2] = 0x00;
-  command[3] = pwid;
-
-  if (apdu_send_direct (app->slot, 0, (unsigned char *)command,
-                        4, 0, NULL, &result, &resultlen))
-    rc = -1; /* Error. */
-  else if (resultlen < 2)
-    rc = -1; /* Error. */
-  else
-    {
-      unsigned int sw = buf16_to_uint (result+resultlen-2);
-
-      if (sw == 0x6a88)
-        rc = -2; /* No such PIN.  */
-      else if (sw == 0x6983)
-        rc = -3; /* PIN is blocked.  */
-      else if (sw == 0x6985)
-        rc = -4; /* NullPIN is activ.  */
-      else if ((sw & 0xfff0) == 0x63C0)
-        rc = (sw & 0x000f); /* PIN has N tries left.  */
-      else
-        rc = -1; /* Other error.  */
-    }
-  xfree (result);
-
-  return rc;
+  return iso7816_verify_status (app_get_slot (app), pwid);
 }
 
 
diff -Nru gnupg2-2.2.20/scd/app-openpgp.c gnupg2-2.2.27/scd/app-openpgp.c
--- gnupg2-2.2.20/scd/app-openpgp.c	2020-03-18 16:05:20.000000000 +0100
+++ gnupg2-2.2.27/scd/app-openpgp.c	2020-12-18 11:22:00.000000000 +0100
@@ -1,6 +1,7 @@
 /* app-openpgp.c - The OpenPGP card application.
- * Copyright (C) 2003, 2004, 2005, 2007, 2008,
- *               2009, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2005, 2007-2009,
+ *               2013-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2005, 2007-2009, 2013-2015, 2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -50,17 +51,7 @@
 #include <assert.h>
 #include <time.h>
 
-#if GNUPG_MAJOR_VERSION == 1
-/* This is used with GnuPG version < 1.9.  The code has been source
-   copied from the current GnuPG >= 1.9  and is maintained over
-   there. */
-#include "options.h"
-#include "errors.h"
-#include "memory.h"
-#include "cardglue.h"
-#else /* GNUPG_MAJOR_VERSION != 1 */
 #include "scdaemon.h"
-#endif /* GNUPG_MAJOR_VERSION != 1 */
 
 #include "../common/util.h"
 #include "../common/i18n.h"
@@ -176,6 +167,7 @@
                            is usually only required for cross checks
                            because the length of an S-expression is
                            implicitly available.  */
+    unsigned char keygrip_str[41]; /* The keygrip, null terminated */
   } pk[3];
 
   unsigned char status_indicator; /* The card status indicator.  */
@@ -268,6 +260,47 @@
                             void *pincb_arg,
                             const void *value, size_t valuelen);
 
+
+/* Return the OpenPGP card manufacturer name. */
+static const char *
+get_manufacturer (unsigned int no)
+{
+  /* Note:  Make sure that there is no colon or linefeed in the string. */
+  switch (no)
+    {
+    case 0x0001: return "PPC Card Systems";
+    case 0x0002: return "Prism";
+    case 0x0003: return "OpenFortress";
+    case 0x0004: return "Wewid";
+    case 0x0005: return "ZeitControl";
+    case 0x0006: return "Yubico";
+    case 0x0007: return "OpenKMS";
+    case 0x0008: return "LogoEmail";
+    case 0x0009: return "Fidesmo";
+    case 0x000A: return "Dangerous Things";
+    case 0x000B: return "Feitian Technologies";
+
+    case 0x002A: return "Magrathea";
+    case 0x0042: return "GnuPG e.V.";
+
+    case 0x1337: return "Warsaw Hackerspace";
+    case 0x2342: return "warpzone"; /* hackerspace Muenster.  */
+    case 0x4354: return "Confidential Technologies";   /* cotech.de */
+    case 0x5443: return "TIF-IT e.V.";
+    case 0x63AF: return "Trustica";
+    case 0xBA53: return "c-base e.V.";
+    case 0xBD0E: return "Paranoidlabs";
+    case 0xF517: return "FSIJ";
+    case 0xF5EC: return "F-Secure";
+
+      /* 0x0000 and 0xFFFF are defined as test cards per spec,
+       * 0xFF00 to 0xFFFE are assigned for use with randomly created
+       * serial numbers.  */
+    case 0x0000:
+    case 0xffff: return "test card";
+    default: return (no & 0xff00) == 0xff00? "unmanaged S/N range":"unknown";
+    }
+}
 
 
 
@@ -567,7 +600,7 @@
           if (data_objects[i].binary)
             {
               log_info ("DO '%s': ", data_objects[i].desc);
-              log_printhex ("", buffer, buflen);
+              log_printhex (buffer, buflen, "");
             }
           else
             log_info ("DO '%s': '%.*s'\n",
@@ -597,7 +630,7 @@
                           if (valuelen > 200)
                             log_info ("[%u]\n", (unsigned int)valuelen);
                           else
-                            log_printhex ("", value, valuelen);
+                            log_printhex (value, valuelen, "");
                         }
                       else
                         log_info ("DO '%s': '%.*s'\n",
@@ -992,6 +1025,7 @@
     { "$SIGNKEYID",   0x0000, -7 },
     { "$DISPSERIALNO",0x0000, -4 },
     { "KDF",          0x00F9, 5 },
+    { "MANUFACTURER", 0x0000, -8 },
     { NULL, 0 }
   };
   int idx, i, rc;
@@ -1083,6 +1117,13 @@
       send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
       return 0;
     }
+  if (table[idx].special == -8)
+    {
+      return send_status_printf
+        (ctrl, table[idx].name, "%u %s",
+         app->app_local->manufacturer,
+         get_manufacturer (app->app_local->manufacturer));
+    }
 
   relptr = get_one_do (app, table[idx].tag, &value, &valuelen, &rc);
   if (relptr)
@@ -1242,7 +1283,6 @@
    the according hex representation to FPR.  Caller must have provide
    a buffer at FPR of least 41 bytes.  Returns 0 on success or an
    error code. */
-#if GNUPG_MAJOR_VERSION > 1
 static gpg_error_t
 retrieve_fpr_from_card (app_t app, int keyno, char *fpr)
 {
@@ -1261,7 +1301,6 @@
   xfree (relptr);
   return err;
 }
-#endif /*GNUPG_MAJOR_VERSION > 1*/
 
 
 /* Retrieve the public key material for the RSA key, whose fingerprint
@@ -1270,7 +1309,6 @@
    public exponent at E and ELEN.  Returns zero on success, an error
    code on failure.  Caller must release the allocated buffers at M
    and E if the function returns success.  */
-#if GNUPG_MAJOR_VERSION > 1
 static gpg_error_t
 retrieve_key_material (FILE *fp, const char *hexkeyid,
                        const unsigned char **m, size_t *mlen,
@@ -1375,7 +1413,6 @@
   xfree (line);
   return err;
 }
-#endif /*GNUPG_MAJOR_VERSION > 1*/
 
 
 static gpg_error_t
@@ -1589,6 +1626,24 @@
 }
 
 
+/* Compute the keygrip form the local info and store it there.  */
+static gpg_error_t
+store_keygrip (app_t app, int keyno)
+{
+  gpg_error_t err;
+  unsigned char grip[20];
+
+  err = keygrip_from_canon_sexp (app->app_local->pk[keyno].key,
+                                 app->app_local->pk[keyno].keylen,
+                                 grip);
+  if (err)
+    return err;
+
+  bin2hex (grip, 20, app->app_local->pk[keyno].keygrip_str);
+  return 0;
+}
+
+
 /* Parse tag-length-value data for public key in BUFFER of BUFLEN
    length.  Key of KEYNO in APP is updated with an S-expression of
    public key.  When CTRL is not NULL, fingerprint is computed with
@@ -1640,6 +1695,8 @@
       app->app_local->pk[keyno].key = keybuf;
       /* Decrement for trailing '\0' */
       app->app_local->pk[keyno].keylen = len - 1;
+
+      err = store_keygrip (app, keyno);
     }
 
   return err;
@@ -1656,7 +1713,6 @@
    consuming to send it just for the fun of it. However, given that we
    use the same code in gpg 1.4, we can't use the gcry S-expression
    here but need to open encode it. */
-#if GNUPG_MAJOR_VERSION > 1
 static gpg_error_t
 get_public_key (app_t app, int keyno)
 {
@@ -1707,6 +1763,12 @@
                                      2, le_value, &buffer, &buflen);
       if (err)
         {
+          /* Yubikey returns wrong code.  Fix it up.  */
+          /*
+           * NOTE: It's not correct to blindly change the error code,
+           * however, for our experiences, it is only Yubikey...
+           */
+          err = gpg_error (GPG_ERR_NO_OBJ);
           log_error (_("reading public key failed: %s\n"), gpg_strerror (err));
           goto leave;
         }
@@ -1787,17 +1849,18 @@
       app->app_local->pk[keyno].key = (unsigned char*)keybuf;
       /* Decrement for trailing '\0' */
       app->app_local->pk[keyno].keylen = len - 1;
+
+      err = store_keygrip (app, keyno);
     }
 
  leave:
   /* Set a flag to indicate that we tried to read the key.  */
-  app->app_local->pk[keyno].read_done = 1;
+  if (!err)
+    app->app_local->pk[keyno].read_done = 1;
 
   xfree (buffer);
   return err;
 }
-#endif /* GNUPG_MAJOR_VERSION > 1 */
-
 
 
 /* Send the KEYPAIRINFO back. KEY needs to be in the range [1,3].
@@ -1807,11 +1870,6 @@
 {
   int keyno = key - 1;
   gpg_error_t err = 0;
-  /* Note that GnuPG 1.x does not need this and it would be too time
-     consuming to send it just for the fun of it. */
-#if GNUPG_MAJOR_VERSION > 1
-  unsigned char grip[20];
-  char gripstr[41];
   char idbuf[50];
   const char *usage;
 
@@ -1823,14 +1881,6 @@
   if (!app->app_local->pk[keyno].key)
     goto leave; /* No such key - ignore. */
 
-  err = keygrip_from_canon_sexp (app->app_local->pk[keyno].key,
-                                 app->app_local->pk[keyno].keylen,
-                                 grip);
-  if (err)
-    goto leave;
-
-  bin2hex (grip, 20, gripstr);
-
   switch (keyno)
     {
     case 0: usage = "sc"; break;
@@ -1841,14 +1891,12 @@
 
   sprintf (idbuf, "OPENPGP.%d", keyno+1);
   send_status_info (ctrl, "KEYPAIRINFO",
-                    gripstr, 40,
+                    app->app_local->pk[keyno].keygrip_str, 40,
                     idbuf, strlen (idbuf),
                     usage, strlen (usage),
                     NULL, (size_t)0);
 
  leave:
-#endif /* GNUPG_MAJOR_VERSION > 1 */
-
   return err;
 }
 
@@ -1857,37 +1905,73 @@
 static gpg_error_t
 do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
 {
+  gpg_error_t err = 0;
+
   (void)flags;
 
-  do_getattr (app, ctrl, "EXTCAP");
-  do_getattr (app, ctrl, "DISP-NAME");
-  do_getattr (app, ctrl, "DISP-LANG");
-  do_getattr (app, ctrl, "DISP-SEX");
-  do_getattr (app, ctrl, "PUBKEY-URL");
-  do_getattr (app, ctrl, "LOGIN-DATA");
-  do_getattr (app, ctrl, "KEY-FPR");
-  if (app->card_version > 0x0100)
-    do_getattr (app, ctrl, "KEY-TIME");
-  do_getattr (app, ctrl, "CA-FPR");
-  do_getattr (app, ctrl, "CHV-STATUS");
-  do_getattr (app, ctrl, "SIG-COUNTER");
-  if (app->app_local->extcap.kdf_do)
-    do_getattr (app, ctrl, "KDF");
-  if (app->app_local->extcap.private_dos)
-    {
-      do_getattr (app, ctrl, "PRIVATE-DO-1");
-      do_getattr (app, ctrl, "PRIVATE-DO-2");
-      if (app->did_chv2)
-        do_getattr (app, ctrl, "PRIVATE-DO-3");
-      if (app->did_chv3)
-        do_getattr (app, ctrl, "PRIVATE-DO-4");
-    }
-  send_keypair_info (app, ctrl, 1);
-  send_keypair_info (app, ctrl, 2);
-  send_keypair_info (app, ctrl, 3);
+  err = do_getattr (app, ctrl, "EXTCAP");
+  if (!err)
+    err = do_getattr (app, ctrl, "MANUFACTURER");
+  if (!err)
+    err = do_getattr (app, ctrl, "DISP-NAME");
+  if (!err)
+    err = do_getattr (app, ctrl, "DISP-LANG");
+  if (!err)
+    err = do_getattr (app, ctrl, "DISP-SEX");
+  if (!err)
+    err = do_getattr (app, ctrl, "PUBKEY-URL");
+  if (!err)
+    err = do_getattr (app, ctrl, "LOGIN-DATA");
+  if (!err)
+    err = do_getattr (app, ctrl, "KEY-FPR");
+  if (!err && app->card_version > 0x0100)
+    err = do_getattr (app, ctrl, "KEY-TIME");
+  if (!err)
+    err = do_getattr (app, ctrl, "CA-FPR");
+  if (!err)
+    err = do_getattr (app, ctrl, "CHV-STATUS");
+  if (!err)
+    err = do_getattr (app, ctrl, "SIG-COUNTER");
+  if (!err && app->app_local->extcap.kdf_do)
+    {
+      err = do_getattr (app, ctrl, "KDF");
+      if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+        err = 0;
+    }
+  if (!err && app->app_local->extcap.private_dos)
+    {
+      if (!err)
+        err = do_getattr (app, ctrl, "PRIVATE-DO-1");
+      if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+        err = 0;
+      if (!err)
+        err = do_getattr (app, ctrl, "PRIVATE-DO-2");
+      if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+        err = 0;
+      if (!err && app->did_chv2)
+        err = do_getattr (app, ctrl, "PRIVATE-DO-3");
+      if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+        err = 0;
+      if (!err && app->did_chv3)
+        err = do_getattr (app, ctrl, "PRIVATE-DO-4");
+      if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+        err = 0;
+    }
+  if (!err)
+    err = send_keypair_info (app, ctrl, 1);
+  if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+    err = 0;
+  if (!err)
+    err = send_keypair_info (app, ctrl, 2);
+  if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+    err = 0;
+  if (!err)
+    err = send_keypair_info (app, ctrl, 3);
+  if (gpg_err_code (err) == GPG_ERR_NO_OBJ)
+    err = 0;
   /* Note: We do not send the Cardholder Certificate, because that is
      relatively long and for OpenPGP applications not really needed.  */
-  return 0;
+  return err;
 }
 
 
@@ -1900,7 +1984,6 @@
 do_readkey (app_t app, int advanced, const char *keyid,
             unsigned char **pk, size_t *pklen)
 {
-#if GNUPG_MAJOR_VERSION > 1
   gpg_error_t err;
   int keyno;
   unsigned char *buf;
@@ -1958,9 +2041,6 @@
     }
 
   return 0;
-#else
-  return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-#endif
 }
 
 /* Read the standard certificate of an OpenPGP v2 card.  It is
@@ -1971,7 +2051,6 @@
 do_readcert (app_t app, const char *certid,
              unsigned char **cert, size_t *certlen)
 {
-#if GNUPG_MAJOR_VERSION > 1
   gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
@@ -2000,9 +2079,6 @@
     }
   xfree (relptr);
   return err;
-#else
-  return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-#endif
 }
 
 
@@ -2307,31 +2383,45 @@
   int rc;
   char *pinvalue;
   int pinlen;
+  int i;
 
   if (app->did_chv2)
     return 0;  /* We already verified CHV2.  */
 
-  rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen);
-  if (rc)
-    return rc;
-  app->did_chv2 = 1;
+  /* Make sure we have load the public keys.  */
+  for (i = 0; i < 3; i++)
+    get_public_key (app, i);
 
-  if (!app->did_chv1 && !app->force_chv1 && pinvalue)
+  if (app->app_local->pk[1].key || app->app_local->pk[2].key)
     {
-      /* For convenience we verify CHV1 here too.  We do this only if
-         the card is not configured to require a verification before
-         each CHV1 controlled operation (force_chv1) and if we are not
-         using the pinpad (PINVALUE == NULL). */
-      rc = iso7816_verify (app->slot, 0x81, pinvalue, pinlen);
-      if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
-        rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
+      rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen);
       if (rc)
+        return rc;
+      app->did_chv2 = 1;
+
+      if (!app->did_chv1 && !app->force_chv1 && pinvalue)
         {
-          log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
-          flush_cache_after_error (app);
+          /* For convenience we verify CHV1 here too.  We do this only if
+             the card is not configured to require a verification before
+             each CHV1 controlled operation (force_chv1) and if we are not
+             using the pinpad (PINVALUE == NULL). */
+          rc = iso7816_verify (app->slot, 0x81, pinvalue, pinlen);
+          if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
+            rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
+          if (rc)
+            {
+              log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
+              flush_cache_after_error (app);
+            }
+          else
+            app->did_chv1 = 1;
         }
-      else
-        app->did_chv1 = 1;
+    }
+  else
+    {
+      rc = verify_a_chv (app, pincb, pincb_arg, 1, 0, &pinvalue, &pinlen);
+      if (rc)
+        return rc;
     }
 
   xfree (pinvalue);
@@ -2389,13 +2479,11 @@
 {
   int rc = 0;
 
-#if GNUPG_MAJOR_VERSION != 1
   if (!opt.allow_admin)
     {
       log_info (_("access to admin commands is not configured\n"));
       return gpg_error (GPG_ERR_EACCES);
     }
-#endif
 
   if (!app->did_chv3)
     {
@@ -2584,7 +2672,7 @@
               const unsigned char *certdata, size_t certdatalen)
 {
   (void)ctrl;
-#if GNUPG_MAJOR_VERSION > 1
+
   if (strcmp (certidstr, "OPENPGP.3"))
     return gpg_error (GPG_ERR_INV_ID);
   if (!certdata || !certdatalen)
@@ -2594,9 +2682,6 @@
   if (certdatalen > app->app_local->extcap.max_certlen_3)
     return gpg_error (GPG_ERR_TOO_LARGE);
   return do_setattr (app, "CERT-3", pincb, pincb_arg, certdata, certdatalen);
-#else
-  return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-#endif
 }
 
 
@@ -3169,14 +3254,15 @@
 static gpg_error_t
 build_ecc_privkey_template (app_t app, int keyno,
                             const unsigned char *ecc_d, size_t ecc_d_len,
+                            size_t ecc_d_fixed_len,
                             const unsigned char *ecc_q, size_t ecc_q_len,
                             unsigned char **result, size_t *resultlen)
 {
-  unsigned char privkey[2+2];
+  unsigned char privkey[2*(1+3)];
   size_t privkey_len;
-  unsigned char exthdr[2+2+1];
+  unsigned char exthdr[2+2+3];
   size_t exthdr_len;
-  unsigned char suffix[2+1];
+  unsigned char suffix[2+3];
   size_t suffix_len;
   unsigned char *tp;
   size_t datalen;
@@ -3184,6 +3270,18 @@
   size_t template_size;
   int pubkey_required;
 
+  /* This case doesn't occur in GnuPG 2.3 or later, because
+     agent/sexp-secret.c does the fixup.  */
+  if (ecc_d_fixed_len < ecc_d_len)
+    {
+      if (ecc_d_fixed_len != ecc_d_len - 1 || *ecc_d)
+        return gpg_error (GPG_ERR_INV_OBJ);
+
+      /* Remove the additional zero.  */
+      ecc_d_len--;
+      ecc_d++;
+    }
+
   pubkey_required = !!(app->app_local->keyattr[keyno].ecc.flags
                        & ECC_FLAG_PUBKEY);
 
@@ -3194,8 +3292,8 @@
   datalen = 0;
   tp = privkey;
 
-  tp += add_tlv (tp, 0x92, ecc_d_len);
-  datalen += ecc_d_len;
+  tp += add_tlv (tp, 0x92, ecc_d_fixed_len);
+  datalen += ecc_d_fixed_len;
 
   if (pubkey_required)
     {
@@ -3238,8 +3336,14 @@
   memcpy (tp, suffix, suffix_len);
   tp += suffix_len;
 
-  memcpy (tp, ecc_d, ecc_d_len);
-  tp += ecc_d_len;
+  if (ecc_d_fixed_len > ecc_d_len)
+    {
+      memset (tp, 0, ecc_d_fixed_len - ecc_d_len);
+      memcpy (tp + ecc_d_fixed_len - ecc_d_len, ecc_d, ecc_d_len);
+    }
+  else
+    memcpy (tp, ecc_d, ecc_d_len);
+  tp += ecc_d_fixed_len;
 
   if (pubkey_required)
     {
@@ -3255,7 +3359,7 @@
 }
 
 
-/* Helper for do_writekley to change the size of a key.  Not ethat
+/* Helper for do_writekey to change the size of a key.  Note that
    this deletes the entire key without asking.  */
 static gpg_error_t
 change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,
@@ -3758,6 +3862,7 @@
   unsigned int n;
   size_t oid_len;
   unsigned char fprbuf[20];
+  size_t ecc_d_fixed_len;
 
   /* (private-key(ecc(curve%s)(q%m)(d%m))(created-at%d)):
      curve = "NIST P-256" */
@@ -3900,7 +4005,8 @@
   else
     algo = PUBKEY_ALGO_ECDSA;
 
-  oidstr = openpgp_curve_to_oid (curve, NULL);
+  oidstr = openpgp_curve_to_oid (curve, &n);
+  ecc_d_fixed_len = (n+7)/8;
   err = openpgp_oid_from_str (oidstr, &oid);
   if (err)
     goto leave;
@@ -3965,7 +4071,7 @@
       int exmode;
 
       err = build_ecc_privkey_template (app, keyno,
-                                        ecc_d, ecc_d_len,
+                                        ecc_d, ecc_d_len, ecc_d_fixed_len,
                                         ecc_q, ecc_q_len,
                                         &template, &template_len);
       if (err)
@@ -4239,7 +4345,7 @@
       return gpg_error (GPG_ERR_GENERAL);
     }
   fpr = find_tlv (buffer, buflen, 0x00C5, &n);
-  if (!fpr || n != 60)
+  if (!fpr || n < 60)
     {
       xfree (buffer);
       log_error (_("error reading fingerprint DO\n"));
@@ -4285,6 +4391,94 @@
 }
 
 
+/* Check KEYIDSTR, if it's valid.
+   When KEYNO is 0, it means it's for PIN check.
+   Otherwise, KEYNO corresponds to the slot (signing, decipher and auth).
+   KEYIDSTR is either:
+    (1) Serial number
+    (2) Serial number "/" fingerprint
+    (3) Serial number "[CHV3]"
+    (4) keygrip
+
+   When KEYNO is 0 and KEYIDSTR is for a keygrip, the keygrip should
+   be to be compared is the first one (keygrip for signing).
+   When KEYNO is 1, KEYIDSTR is for a keygrip, and R_USE_AUTH is not
+   NULL, OpenPGP.1 is first tested and then OpenPGP.3.  In the latter
+   case 1 is stored at R_USE_AUTH
+ */
+static int
+check_keyidstr (app_t app, const char *keyidstr, int keyno, int *r_use_auth)
+{
+  int rc;
+  const char *s;
+  int n;
+  const char *fpr = NULL;
+  int i;
+
+  if (r_use_auth)
+    *r_use_auth = 0;
+
+  /* Make sure we have load the public keys.  */
+  for (i = 0; i < 3; i++)
+    get_public_key (app, i);
+
+  if (strlen (keyidstr) < 32)
+    return gpg_error (GPG_ERR_INV_ID);
+  else
+    {
+      char *serial;
+
+      for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
+        ;
+
+      /* Check if it's a keygrip */
+      if (n == 40)
+        {
+          const unsigned char *keygrip_str;
+
+          keygrip_str = app->app_local->pk[keyno?keyno-1:0].keygrip_str;
+          if (!strncmp (keygrip_str, keyidstr, 40))
+            return 0;
+          else if (keyno == 1 && r_use_auth
+                   && !strncmp (app->app_local->pk[2].keygrip_str,
+                                keyidstr, 40))
+            {
+              *r_use_auth = 1;
+              return 0;
+            }
+          else
+            return gpg_error (GPG_ERR_INV_ID);
+        }
+
+      if (n != 32 || strncmp (keyidstr, "D27600012401", 12))
+        return gpg_error (GPG_ERR_INV_ID);
+      else if (!*s)
+        ; /* no fingerprint given: we allow this for now. */
+      else if (*s == '/')
+        fpr = s + 1;
+
+      serial = app_get_serialno (app);
+      if (strncmp (serial, keyidstr, 32))
+        {
+          xfree (serial);
+          return gpg_error (GPG_ERR_WRONG_CARD);
+        }
+
+      xfree (serial);
+    }
+
+  /* If a fingerprint has been specified check it against the one on
+     the card.  This is allows for a meaningful error message in case
+     the key on the card has been replaced but the shadow information
+     known to gpg was not updated.  If there is no fingerprint, gpg
+     will detect a bogus signature anyway due to the
+     verify-after-signing feature. */
+  rc = (fpr&&keyno)? check_against_given_fingerprint (app, fpr, keyno) : 0;
+
+  return rc;
+}
+
+
 /* Compute a digital signature on INDATA which is expected to be the
    raw message digest. For this application the KEYIDSTR consists of
    the serialnumber and the fingerprint delimited by a slash.
@@ -4329,10 +4523,6 @@
   int rc;
   unsigned char data[19+64];
   size_t datalen;
-  unsigned char tmp_sn[20]; /* Actually 16 bytes but also for the fpr. */
-  const char *s;
-  int n;
-  const char *fpr = NULL;
   unsigned long sigcount;
   int use_auth = 0;
   int exmode, le_value;
@@ -4377,40 +4567,13 @@
     ;
   else if (!strcmp (keyidstr, "OPENPGP.3"))
     use_auth = 1;
-  else if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12))
-    return gpg_error (GPG_ERR_INV_ID);
   else
     {
-      for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
-        ;
-      if (n != 32)
-        return gpg_error (GPG_ERR_INV_ID);
-      else if (!*s)
-        ; /* no fingerprint given: we allow this for now. */
-      else if (*s == '/')
-        fpr = s + 1;
-      else
-        return gpg_error (GPG_ERR_INV_ID);
-
-      for (s=keyidstr, n=0; n < 16; s += 2, n++)
-        tmp_sn[n] = xtoi_2 (s);
-
-      if (app->serialnolen != 16)
-        return gpg_error (GPG_ERR_INV_CARD);
-      if (memcmp (app->serialno, tmp_sn, 16))
-        return gpg_error (GPG_ERR_WRONG_CARD);
+      rc = check_keyidstr (app, keyidstr, 1, &use_auth);
+      if (rc)
+        return rc;
     }
 
-  /* If a fingerprint has been specified check it against the one on
-     the card.  This is allows for a meaningful error message in case
-     the key on the card has been replaced but the shadow information
-     known to gpg was not updated.  If there is no fingerprint, gpg
-     will detect a bogus signature anyway due to the
-     verify-after-signing feature. */
-  rc = fpr? check_against_given_fingerprint (app, fpr, 1) : 0;
-  if (rc)
-    return rc;
-
   /* Concatenate prefix and digest.  */
 #define X(a,b,d) \
   if (hashalgo == GCRY_MD_ ## a && (d) )                      \
@@ -4525,10 +4688,6 @@
          unsigned char **outdata, size_t *outdatalen )
 {
   int rc;
-  unsigned char tmp_sn[20]; /* Actually 16 but we use it also for the fpr. */
-  const char *s;
-  int n;
-  const char *fpr = NULL;
 
   if (!keyidstr || !*keyidstr)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -4554,42 +4713,15 @@
     }
 
   /* Check whether an OpenPGP card of any version has been requested. */
-  if (!strcmp (keyidstr, "OPENPGP.3"))
+  if (!ascii_strcasecmp (keyidstr, "OPENPGP.3"))
     ;
-  else if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12))
-    return gpg_error (GPG_ERR_INV_ID);
   else
     {
-      for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
-        ;
-      if (n != 32)
-        return gpg_error (GPG_ERR_INV_ID);
-      else if (!*s)
-        ; /* no fingerprint given: we allow this for now. */
-      else if (*s == '/')
-        fpr = s + 1;
-      else
-        return gpg_error (GPG_ERR_INV_ID);
-
-      for (s=keyidstr, n=0; n < 16; s += 2, n++)
-        tmp_sn[n] = xtoi_2 (s);
-
-      if (app->serialnolen != 16)
-        return gpg_error (GPG_ERR_INV_CARD);
-      if (memcmp (app->serialno, tmp_sn, 16))
-        return gpg_error (GPG_ERR_WRONG_CARD);
+      rc = check_keyidstr (app, keyidstr, 3, NULL);
+      if (rc)
+        return rc;
     }
 
-  /* If a fingerprint has been specified check it against the one on
-     the card.  This is allows for a meaningful error message in case
-     the key on the card has been replaced but the shadow information
-     known to gpg was not updated.  If there is no fingerprint, gpg
-     will detect a bogus signature anyway due to the
-     verify-after-signing feature. */
-  rc = fpr? check_against_given_fingerprint (app, fpr, 3) : 0;
-  if (rc)
-    return rc;
-
   rc = verify_chv2 (app, pincb, pincb_arg);
   if (!rc)
     {
@@ -4624,10 +4756,7 @@
              unsigned int *r_info)
 {
   int rc;
-  unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */
-  const char *s;
   int n;
-  const char *fpr = NULL;
   int exmode, le_value;
   unsigned char *fixbuf = NULL;
   int padind = 0;
@@ -4637,41 +4766,15 @@
     return gpg_error (GPG_ERR_INV_VALUE);
 
   /* Check whether an OpenPGP card of any version has been requested. */
-  if (!strcmp (keyidstr, "OPENPGP.2"))
+  if (!ascii_strcasecmp (keyidstr, "OPENPGP.2"))
     ;
-  else if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12))
-    return gpg_error (GPG_ERR_INV_ID);
   else
     {
-      for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
-        ;
-      if (n != 32)
-        return gpg_error (GPG_ERR_INV_ID);
-      else if (!*s)
-        ; /* no fingerprint given: we allow this for now. */
-      else if (*s == '/')
-        fpr = s + 1;
-      else
-        return gpg_error (GPG_ERR_INV_ID);
-
-      for (s=keyidstr, n=0; n < 16; s += 2, n++)
-        tmp_sn[n] = xtoi_2 (s);
-
-      if (app->serialnolen != 16)
-        return gpg_error (GPG_ERR_INV_CARD);
-      if (memcmp (app->serialno, tmp_sn, 16))
-        return gpg_error (GPG_ERR_WRONG_CARD);
+      rc = check_keyidstr (app, keyidstr, 2, NULL);
+      if (rc)
+        return rc;
     }
 
-  /* If a fingerprint has been specified check it against the one on
-     the card.  This is allows for a meaningful error message in case
-     the key on the card has been replaced but the shadow information
-     known to gpg was not updated.  If there is no fingerprint, the
-     decryption won't produce the right plaintext anyway. */
-  rc = fpr? check_against_given_fingerprint (app, fpr, 2) : 0;
-  if (rc)
-    return rc;
-
   rc = verify_chv2 (app, pincb, pincb_arg);
   if (rc)
     return rc;
@@ -4885,38 +4988,19 @@
               gpg_error_t (*pincb)(void*, const char *, char **),
               void *pincb_arg)
 {
-  unsigned char tmp_sn[20];
-  const char *s;
-  int n;
+  int rc;
   int admin_pin = 0;
 
   if (!keyidstr || !*keyidstr)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  /* Check whether an OpenPGP card of any version has been requested. */
-  if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12))
-    return gpg_error (GPG_ERR_INV_ID);
+  rc = check_keyidstr (app, keyidstr, 0, NULL);
+  if (rc)
+    return rc;
 
-  for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
-    ;
-  if (n != 32)
-    return gpg_error (GPG_ERR_INV_ID);
-  else if (!*s)
-    ; /* No fingerprint given: we allow this for now. */
-  else if (*s == '/')
-    ; /* We ignore a fingerprint. */
-  else if (!strcmp (s, "[CHV3]") )
+  if ((strlen (keyidstr) >= 32+6 && !strcmp (keyidstr+32, "[CHV3]"))
+      || (strlen (keyidstr) >= 40+6 && !strcmp (keyidstr+40, "[CHV3]")))
     admin_pin = 1;
-  else
-    return gpg_error (GPG_ERR_INV_ID);
-
-  for (s=keyidstr, n=0; n < 16; s += 2, n++)
-    tmp_sn[n] = xtoi_2 (s);
-
-  if (app->serialnolen != 16)
-    return gpg_error (GPG_ERR_INV_CARD);
-  if (memcmp (app->serialno, tmp_sn, 16))
-    return gpg_error (GPG_ERR_WRONG_CARD);
 
   /* Yes, there is a race conditions: The user might pull the card
      right here and we won't notice that.  However this is not a
@@ -5156,7 +5240,7 @@
       curve = ecc_curve (buffer + 1, oidlen);
 
       if (!curve)
-        log_printhex ("Curve with OID not supported: ", buffer+1, buflen-1);
+        log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
       else
         {
           app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
@@ -5174,7 +5258,7 @@
         }
     }
   else if (opt.verbose)
-    log_printhex ("", buffer, buflen);
+    log_printhex (buffer, buflen, "");
 
   xfree (relptr);
 }
@@ -5216,7 +5300,7 @@
       if (opt.verbose)
         {
           log_info ("AID: ");
-          log_printhex ("", buffer, buflen);
+          log_printhex (buffer, buflen, "");
         }
 
       app->card_version = buffer[6] << 8;
@@ -5249,7 +5333,7 @@
           if (opt.verbose)
             {
               log_info ("Historical Bytes: ");
-              log_printhex ("", buffer, buflen);
+              log_printhex (buffer, buflen, "");
             }
           parse_historical (app->app_local, buffer, buflen);
           xfree (relptr);
diff -Nru gnupg2-2.2.20/scd/app-p15.c gnupg2-2.2.27/scd/app-p15.c
--- gnupg2-2.2.20/scd/app-p15.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/app-p15.c	2020-05-12 18:31:15.000000000 +0200
@@ -1,5 +1,6 @@
 /* app-p15.c - The pkcs#15 card application.
  *	Copyright (C) 2005 Free Software Foundation, Inc.
+ *	Copyright (C) 2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -15,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* Information pertaining to the BELPIC developer card samples:
@@ -39,6 +41,7 @@
 
 #include "iso7816.h"
 #include "app-common.h"
+#include "../common/i18n.h"
 #include "../common/tlv.h"
 #include "apdu.h" /* fixme: we should move the card detection to a
                      separate file */
@@ -49,10 +52,22 @@
     CARD_TYPE_UNKNOWN,
     CARD_TYPE_TCOS,
     CARD_TYPE_MICARDO,
+    CARD_TYPE_CARDOS_50,
     CARD_TYPE_BELPIC   /* Belgian eID card specs. */
   }
 card_type_t;
 
+/* The OS of card as specified by card_type_t is not always
+ * sufficient.  Thus we also distinguish the actual product build upon
+ * the given OS.  */
+typedef enum
+  {
+    CARD_PRODUCT_UNKNOWN,
+    CARD_PRODUCT_DTRUST    /* D-Trust GmbH (bundesdruckerei.de) */
+  }
+card_product_t;
+
+
 /* A list card types with ATRs noticed with these cards. */
 #define X(a) ((unsigned char const *)(a))
 static struct
@@ -79,7 +94,8 @@
   { 26, X("\x3B\xFE\x94\x00\xFF\x80\xB1\xFA\x45\x1F\x03\x45\x73\x74\x45\x49"
           "\x44\x20\x76\x65\x72\x20\x31\x2E\x30\x43"),
     CARD_TYPE_MICARDO }, /* EstEID (Estonian Big Brother card) */
-
+  { 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x01\x14"),
+    CARD_TYPE_CARDOS_50 }, /* CardOS 5.0 */
   { 0 }
 };
 #undef X
@@ -135,7 +151,12 @@
   /* Link to next item when used in a linked list. */
   struct cdf_object_s *next;
 
-  /* Length and allocated buffer with the Id of this object. */
+  /* Flags to indicate whether fields are valid.  */
+  unsigned int have_off:1;
+
+  /* Length and allocated buffer with the Id of this object.
+   * This field is used for X.509 in PKCS#11 to make it easier to
+   * match a private key with a certificate.  */
   size_t objidlen;
   unsigned char *objid;
 
@@ -144,8 +165,6 @@
   size_t imagelen;
   unsigned char *image;
 
-  /* Set to true if a length and offset is available. */
-  int have_off;
   /* The offset and length of the object.  They are only valid if
      HAVE_OFF is true and set to 0 if HAVE_OFF is false. */
   unsigned long off, len;
@@ -169,6 +188,37 @@
   /* Link to next item when used in a linked list. */
   struct prkdf_object_s *next;
 
+  /* Flags to indicate whether fields are valid.  */
+  unsigned int keygrip_valid:1;
+  unsigned int key_reference_valid:1;
+  unsigned int have_off:1;
+
+  /* Flag indicating that the corresponding PIN has already been
+   * verified. */
+  unsigned int pin_verified:1;
+
+  /* The key's usage flags. */
+  keyusage_flags_t usageflags;
+
+  /* The keygrip of the key.  This is used as a cache.  */
+  char keygrip[2*KEYGRIP_LEN+1];
+
+  /* The Gcrypt algo identifier for the key.  It is valid if the
+   * keygrip is also valid.  */
+  int keyalgo;
+
+  /* The length of the key in bits (e.g. for RSA the length of the
+   * modulus).  It is valid if the keygrip is also valid.  */
+  unsigned int keynbits;
+
+  /* Malloced CN from the Subject-DN of the corresponding certificate
+   * or NULL if not known.  */
+  char *common_name;
+
+  /* Malloced SerialNumber from the Subject-DN of the corresponding
+   * certificate or NULL if not known.  */
+  char *serial_number;
+
   /* Length and allocated buffer with the Id of this object. */
   size_t objidlen;
   unsigned char *objid;
@@ -178,17 +228,11 @@
   size_t authidlen;
   unsigned char *authid;
 
-  /* The key's usage flags. */
-  keyusage_flags_t usageflags;
-
   /* The keyReference and a flag telling whether it is valid. */
   unsigned long key_reference;
-  int key_reference_valid;
 
-  /* Set to true if a length and offset is available. */
-  int have_off;
   /* The offset and length of the object.  They are only valid if
-     HAVE_OFF is true and set to 0 if HAVE_OFF is false. */
+   * HAVE_OFF is true otherwise they are set to 0. */
   unsigned long off, len;
 
   /* The length of the path as given in the PrKDF and the path itself.
@@ -209,6 +253,9 @@
   /* Link to next item when used in a linked list. */
   struct aodf_object_s *next;
 
+  /* Flags to indicate whether fields are valid.  */
+  unsigned int have_off:1;
+
   /* Length and allocated buffer with the Id of this object. */
   size_t objidlen;
   unsigned char *objid;
@@ -218,6 +265,9 @@
   size_t authidlen;
   unsigned char *authid;
 
+  /* The file ID of this AODF.  */
+  unsigned short fid;
+
   /* The PIN Flags. */
   struct
   {
@@ -256,9 +306,6 @@
   char pad_char;
   int pad_char_valid;
 
-
-  /* Set to true if a length and offset is available. */
-  int have_off;
   /* The offset and length of the object.  They are only valid if
      HAVE_OFF is true and set to 0 if HAVE_OFF is false. */
   unsigned long off, len;
@@ -279,9 +326,12 @@
      hierarchy.  Thus we assume this is directly below the MF.  */
   unsigned short home_df;
 
-  /* The type of the card. */
+  /* The type of the card's OS. */
   card_type_t card_type;
 
+  /* The vendor's product.  */
+  card_product_t card_product;
+
   /* Flag indicating whether we may use direct path selection. */
   int direct_path_selection;
 
@@ -304,6 +354,9 @@
   unsigned char *serialno;
   size_t serialnolen;
 
+  /* The manufacturerID from the TokenInfo EF.  Malloced. */
+  char *manufacturer_id;
+
   /* Information on all certificates. */
   cdf_object_t certificate_info;
   /* Information on all trusted certificates. */
@@ -321,8 +374,11 @@
 
 
 /*** Local prototypes.  ***/
+static gpg_error_t keygrip_from_prkdf (app_t app, prkdf_object_t prkdf);
 static gpg_error_t readcert_by_cdf (app_t app, cdf_object_t cdf,
                                     unsigned char **r_cert, size_t *r_certlen);
+static char *get_dispserialno (app_t app, prkdf_object_t prkdf);
+static gpg_error_t do_getattr (app_t app, ctrl_t ctrl, const char *name);
 
 
 
@@ -347,6 +403,8 @@
   while (a)
     {
       prkdf_object_t tmp = a->next;
+      xfree (a->common_name);
+      xfree (a->serial_number);
       xfree (a->objid);
       xfree (a->authid);
       xfree (a);
@@ -391,6 +449,7 @@
       release_cdflist (app->app_local->useful_certificate_info);
       release_prkdflist (app->app_local->private_key_info);
       release_aodflist (app->app_local->auth_object_info);
+      xfree (app->app_local->manufacturer_id);
       xfree (app->app_local->serialno);
       xfree (app->app_local);
       app->app_local = NULL;
@@ -412,14 +471,14 @@
   err = iso7816_select_file (slot, efid, 0);
   if (err)
     {
-      log_error ("error selecting %s (0x%04X): %s\n",
+      log_error ("p15: error selecting %s (0x%04X): %s\n",
                  efid_desc, efid, gpg_strerror (err));
       return err;
     }
   err = iso7816_read_binary (slot, 0, 0, buffer, buflen);
   if (err)
     {
-      log_error ("error reading %s (0x%04X): %s\n",
+      log_error ("p15: error reading %s (0x%04X): %s\n",
                  efid_desc, efid, gpg_strerror (err));
       return err;
     }
@@ -439,14 +498,14 @@
     return gpg_error (GPG_ERR_INV_VALUE);
 
   if (pathlen && *path != 0x3f00 )
-    log_debug ("WARNING: relative path selection not yet implemented\n");
+    log_error ("p15: warning: relative path selection not yet implemented\n");
 
   if (app->app_local->direct_path_selection)
     {
       err = iso7816_select_path (app->slot, path+1, pathlen-1);
       if (err)
         {
-          log_error ("error selecting path ");
+          log_error ("p15: error selecting path ");
           for (j=0; j < pathlen; j++)
             log_printf ("%04hX", path[j]);
           log_printf (": %s\n", gpg_strerror (err));
@@ -464,7 +523,7 @@
           err = iso7816_select_file (app->slot, path[i], !(i+1 == pathlen));
           if (err)
             {
-              log_error ("error selecting part %d from path ", i);
+              log_error ("p15: error selecting part %d from path ", i);
               for (j=0; j < pathlen; j++)
                 log_printf ("%04hX", path[j]);
               log_printf (": %s\n", gpg_strerror (err));
@@ -492,35 +551,55 @@
   *r_objid = NULL;
   *r_objidlen = 0;
 
-  if (app->app_local->home_df)
-    snprintf (tmpbuf, sizeof tmpbuf,
-              "P15-%04X.", (unsigned int)(app->app_local->home_df & 0xffff));
-  else
-    strcpy (tmpbuf, "P15.");
-  if (strncmp (certid, tmpbuf, strlen (tmpbuf)) )
+  if (certid[0] != 'P' && strlen (certid) == 40)  /* This is a keygrip.  */
     {
-      if (!strncmp (certid, "P15.", 4)
-          || (!strncmp (certid, "P15-", 4)
-              && hexdigitp (certid+4)
-              && hexdigitp (certid+5)
-              && hexdigitp (certid+6)
-              && hexdigitp (certid+7)
-              && certid[8] == '.'))
+      prkdf_object_t prkdf;
+
+      for (prkdf = app->app_local->private_key_info;
+           prkdf; prkdf = prkdf->next)
+        if (!keygrip_from_prkdf (app, prkdf)
+            && !strcmp (certid, prkdf->keygrip))
+          break;
+      if (!prkdf || !prkdf->objidlen || !prkdf->objid)
         return gpg_error (GPG_ERR_NOT_FOUND);
-      return gpg_error (GPG_ERR_INV_ID);
+      objidlen = prkdf->objidlen;
+      objid = xtrymalloc (objidlen);
+      if (!objid)
+        return gpg_error_from_syserror ();
+      memcpy (objid, prkdf->objid, prkdf->objidlen);
+    }
+  else /* This is a usual keyref.  */
+    {
+      if (app->app_local->home_df)
+        snprintf (tmpbuf, sizeof tmpbuf, "P15-%04X.",
+                  (unsigned int)(app->app_local->home_df & 0xffff));
+      else
+        strcpy (tmpbuf, "P15.");
+      if (strncmp (certid, tmpbuf, strlen (tmpbuf)) )
+        {
+          if (!strncmp (certid, "P15.", 4)
+              || (!strncmp (certid, "P15-", 4)
+                  && hexdigitp (certid+4)
+                  && hexdigitp (certid+5)
+                  && hexdigitp (certid+6)
+                  && hexdigitp (certid+7)
+                  && certid[8] == '.'))
+            return gpg_error (GPG_ERR_NOT_FOUND);
+          return gpg_error (GPG_ERR_INV_ID);
+        }
+      certid += strlen (tmpbuf);
+      for (s=certid, objidlen=0; hexdigitp (s); s++, objidlen++)
+        ;
+      if (*s || !objidlen || (objidlen%2))
+        return gpg_error (GPG_ERR_INV_ID);
+      objidlen /= 2;
+      objid = xtrymalloc (objidlen);
+      if (!objid)
+        return gpg_error_from_syserror ();
+      for (s=certid, i=0; i < objidlen; i++, s+=2)
+        objid[i] = xtoi_2 (s);
     }
-  certid += strlen (tmpbuf);
 
-  for (s=certid, objidlen=0; hexdigitp (s); s++, objidlen++)
-    ;
-  if (*s || !objidlen || (objidlen%2))
-    return gpg_error (GPG_ERR_INV_ID);
-  objidlen /= 2;
-  objid = xtrymalloc (objidlen);
-  if (!objid)
-    return gpg_error_from_syserror ();
-  for (s=certid, i=0; i < objidlen; i++, s+=2)
-    objid[i] = xtoi_2 (s);
   *r_objid = objid;
   *r_objidlen = objidlen;
   return 0;
@@ -595,9 +674,9 @@
 
    A0 06 30 04 04 02 60 34  = Private Keys
    A4 06 30 04 04 02 60 35  = Certificates
-   A5 06 30 04 04 02 60 36  = TrustedCertificates
-   A7 06 30 04 04 02 60 37  = DataObjects
-   A8 06 30 04 04 02 60 38  = AuthObjects
+   A5 06 30 04 04 02 60 36  = Trusted Certificates
+   A7 06 30 04 04 02 60 37  = Data Objects
+   A8 06 30 04 04 02 60 38  = Auth Objects
 
    These are all PathOrObjects using the path CHOICE element.  The
    paths are octet strings of length 2.  Using this Path CHOICE
@@ -608,9 +687,10 @@
 {
   gpg_error_t err;
   unsigned char *buffer, *p;
-  size_t buflen;
+  size_t buflen, n;
   unsigned short value;
   size_t offset;
+  unsigned short home_df = 0;
 
   err = select_and_read_binary (app->slot, odf_fid, "ODF", &buffer, &buflen);
   if (err)
@@ -618,10 +698,12 @@
 
   if (buflen < 8)
     {
-      log_error ("error: ODF too short\n");
+      log_error ("p15: error: ODF too short\n");
       xfree (buffer);
       return gpg_error (GPG_ERR_INV_OBJ);
     }
+
+  home_df = app->app_local->home_df;
   p = buffer;
   while (buflen && *p && *p != 0xff)
     {
@@ -634,17 +716,35 @@
       else if ( buflen >= 12
                 && (p[0] & 0xf0) == 0xA0
                 && !memcmp (p+1, "\x0a\x30\x08\x04\x06\x3F\x00", 7)
-                && app->app_local->home_df == ((p[8]<<8)|p[9]) )
+                && (!home_df || home_df == ((p[8]<<8)|p[9])) )
         {
+          /* If we do not know the home DF, we take it from the first
+           * ODF object.  Here are sample values:
+           * a0 0a 30 08 0406 3f00 5015 4401
+           * a1 0a 30 08 0406 3f00 5015 4411
+           * a4 0a 30 08 0406 3f00 5015 4441
+           * a5 0a 30 08 0406 3f00 5015 4451
+           * a8 0a 30 08 0406 3f00 5015 4481
+           * 00000000 */
+          if (!home_df)
+            {
+              home_df = ((p[8]<<8)|p[9]);
+              app->app_local->home_df = home_df;
+              log_info ("p15: application directory detected as 0x%04hX\n",
+                        home_df);
+              /* We assume that direct path selection is possible.  */
+              app->app_local->direct_path_selection = 1;
+            }
+
           /* We only allow a full path if all files are at the same
-             level and below the home directory.  The extend this we
+             level and below the home directory.  To extend this we
              would need to make use of new data type capable of
              keeping a full path. */
           offset = 10;
         }
       else
         {
-          log_error ("ODF format is not supported by us\n");
+          log_printhex (p, buflen, "p15: ODF format not supported:");
           xfree (buffer);
           return gpg_error (GPG_ERR_INV_OBJ);
         }
@@ -663,7 +763,8 @@
         }
       if (value)
         {
-          log_error ("duplicate object type %d in ODF ignored\n",(p[0]&0x0f));
+          log_error ("p15: duplicate object type %d in ODF ignored\n",
+                     (p[0]&0x0f));
           continue;
         }
       value = ((p[offset] << 8) | p[offset+1]);
@@ -679,7 +780,8 @@
         case 7: app->app_local->odf.data_objects = value; break;
         case 8: app->app_local->odf.auth_objects = value; break;
         default:
-          log_error ("unknown object type %d in ODF ignored\n", (p[0]&0x0f));
+          log_error ("p15: unknown object type %d in ODF ignored\n",
+                     (p[0]&0x0f));
         }
       offset += 2;
 
@@ -690,8 +792,16 @@
     }
 
   if (buflen)
-    log_info ("warning: %u bytes of garbage detected at end of ODF\n",
-              (unsigned int)buflen);
+    {
+      /* Print a warning if non-null garbage is left over.  */
+      for (n=0; n < buflen && !p[n]; n++)
+        ;
+      if (n < buflen)
+        {
+          log_info ("p15: warning: garbage detected at end of ODF: ");
+          log_printhex (p, buflen, "");
+        }
+    }
 
   xfree (buffer);
   return 0;
@@ -861,7 +971,8 @@
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         {
-          log_error ("error parsing PrKDF record: %s\n", gpg_strerror (err));
+          log_error ("p15: error parsing PrKDF record: %s\n",
+                     gpg_strerror (err));
           goto leave;
         }
       pp = p;
@@ -1202,38 +1313,41 @@
         }
 
 
-      log_debug ("PrKDF %04hX: id=", fid);
-      for (i=0; i < prkdf->objidlen; i++)
-        log_printf ("%02X", prkdf->objid[i]);
-      log_printf (" path=");
-      for (i=0; i < prkdf->pathlen; i++)
-        log_printf ("%04hX", prkdf->path[i]);
-      if (prkdf->have_off)
-        log_printf ("[%lu/%lu]", prkdf->off, prkdf->len);
-      if (prkdf->authid)
-        {
-          log_printf (" authid=");
-          for (i=0; i < prkdf->authidlen; i++)
-            log_printf ("%02X", prkdf->authid[i]);
-        }
-      if (prkdf->key_reference_valid)
-        log_printf (" keyref=0x%02lX", prkdf->key_reference);
-      log_printf (" usage=");
-      s = "";
-      if (prkdf->usageflags.encrypt) log_printf ("%sencrypt", s), s = ",";
-      if (prkdf->usageflags.decrypt) log_printf ("%sdecrypt", s), s = ",";
-      if (prkdf->usageflags.sign   ) log_printf ("%ssign", s), s = ",";
-      if (prkdf->usageflags.sign_recover)
-        log_printf ("%ssign_recover", s), s = ",";
-      if (prkdf->usageflags.wrap   ) log_printf ("%swrap", s), s = ",";
-      if (prkdf->usageflags.unwrap ) log_printf ("%sunwrap", s), s = ",";
-      if (prkdf->usageflags.verify ) log_printf ("%sverify", s), s = ",";
-      if (prkdf->usageflags.verify_recover)
-        log_printf ("%sverify_recover", s), s = ",";
-      if (prkdf->usageflags.derive ) log_printf ("%sderive", s), s = ",";
-      if (prkdf->usageflags.non_repudiation)
-        log_printf ("%snon_repudiation", s), s = ",";
-      log_printf ("\n");
+      if (opt.verbose)
+        {
+          log_info ("p15: PrKDF %04hX: id=", fid);
+          for (i=0; i < prkdf->objidlen; i++)
+            log_printf ("%02X", prkdf->objid[i]);
+          log_printf (" path=");
+          for (i=0; i < prkdf->pathlen; i++)
+            log_printf ("%s%04hX", i?"/":"",prkdf->path[i]);
+          if (prkdf->have_off)
+            log_printf ("[%lu/%lu]", prkdf->off, prkdf->len);
+          if (prkdf->authid)
+            {
+              log_printf (" authid=");
+              for (i=0; i < prkdf->authidlen; i++)
+                log_printf ("%02X", prkdf->authid[i]);
+            }
+          if (prkdf->key_reference_valid)
+            log_printf (" keyref=0x%02lX", prkdf->key_reference);
+          log_info ("p15:             usage=");
+          s = "";
+          if (prkdf->usageflags.encrypt) log_printf ("%sencrypt", s), s = ",";
+          if (prkdf->usageflags.decrypt) log_printf ("%sdecrypt", s), s = ",";
+          if (prkdf->usageflags.sign   ) log_printf ("%ssign", s), s = ",";
+          if (prkdf->usageflags.sign_recover)
+            log_printf ("%ssign_recover", s), s = ",";
+          if (prkdf->usageflags.wrap   ) log_printf ("%swrap", s), s = ",";
+          if (prkdf->usageflags.unwrap ) log_printf ("%sunwrap", s), s = ",";
+          if (prkdf->usageflags.verify ) log_printf ("%sverify", s), s = ",";
+          if (prkdf->usageflags.verify_recover)
+            log_printf ("%sverify_recover", s), s = ",";
+          if (prkdf->usageflags.derive ) log_printf ("%sderive", s), s = ",";
+          if (prkdf->usageflags.non_repudiation)
+            log_printf ("%snon_repudiation", s), s = ",";
+          log_printf ("\n");
+        }
 
       /* Put it into the list. */
       prkdf->next = prkdflist;
@@ -1242,7 +1356,7 @@
       continue; /* Ready. */
 
     parse_error:
-      log_error ("error parsing PrKDF record (%d): %s - skipped\n",
+      log_error ("p15: error parsing PrKDF record (%d): %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       if (prkdf)
         {
@@ -1309,7 +1423,7 @@
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         {
-          log_error ("error parsing CDF record: %s\n", gpg_strerror (err));
+          log_error ("p15: error parsing CDF record: %s\n", gpg_strerror (err));
           goto leave;
         }
       pp = p;
@@ -1470,15 +1584,18 @@
           cdf->len = ul;
         }
 
-      log_debug ("CDF %04hX: id=", fid);
-      for (i=0; i < cdf->objidlen; i++)
-        log_printf ("%02X", cdf->objid[i]);
-      log_printf (" path=");
-      for (i=0; i < cdf->pathlen; i++)
-        log_printf ("%04hX", cdf->path[i]);
-      if (cdf->have_off)
-        log_printf ("[%lu/%lu]", cdf->off, cdf->len);
-      log_printf ("\n");
+      if (opt.verbose)
+        {
+          log_info ("p15: CDF %04hX: id=", fid);
+          for (i=0; i < cdf->objidlen; i++)
+            log_printf ("%02X", cdf->objid[i]);
+          log_printf (" path=");
+          for (i=0; i < cdf->pathlen; i++)
+            log_printf ("%s%04hX", i?"/":"", cdf->path[i]);
+          if (cdf->have_off)
+            log_printf ("[%lu/%lu]", cdf->off, cdf->len);
+          log_printf ("\n");
+        }
 
       /* Put it into the list. */
       cdf->next = cdflist;
@@ -1487,7 +1604,7 @@
       continue; /* Ready. */
 
     parse_error:
-      log_error ("error parsing CDF record (%d): %s - skipped\n",
+      log_error ("p15: error parsing CDF record (%d): %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       xfree (cdf);
       err = 0;
@@ -1583,7 +1700,8 @@
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         {
-          log_error ("error parsing AODF record: %s\n", gpg_strerror (err));
+          log_error ("p15: error parsing AODF record: %s\n",
+                     gpg_strerror (err));
           goto leave;
         }
       pp = p;
@@ -1595,6 +1713,7 @@
       aodf = xtrycalloc (1, sizeof *aodf);
       if (!aodf)
         goto no_core;
+      aodf->fid = fid;
 
       /* Parse the commonObjectAttributes.  */
       where = __LINE__;
@@ -2057,73 +2176,77 @@
          extensions of pkcs#15. */
 
     ready:
-      log_debug ("AODF %04hX: id=", fid);
-      for (i=0; i < aodf->objidlen; i++)
-        log_printf ("%02X", aodf->objid[i]);
-      if (aodf->authid)
+      if (opt.verbose)
         {
-          log_printf (" authid=");
-          for (i=0; i < aodf->authidlen; i++)
-            log_printf ("%02X", aodf->authid[i]);
-        }
-      log_printf (" flags=");
-      s = "";
-      if (aodf->pinflags.case_sensitive)
-        log_printf ("%scase_sensitive", s), s = ",";
-      if (aodf->pinflags.local)
-        log_printf ("%slocal", s), s = ",";
-      if (aodf->pinflags.change_disabled)
-        log_printf ("%schange_disabled", s), s = ",";
-      if (aodf->pinflags.unblock_disabled)
-        log_printf ("%sunblock_disabled", s), s = ",";
-      if (aodf->pinflags.initialized)
-        log_printf ("%sinitialized", s), s = ",";
-      if (aodf->pinflags.needs_padding)
-        log_printf ("%sneeds_padding", s), s = ",";
-      if (aodf->pinflags.unblocking_pin)
-        log_printf ("%sunblocking_pin", s), s = ",";
-      if (aodf->pinflags.so_pin)
-        log_printf ("%sso_pin", s), s = ",";
-      if (aodf->pinflags.disable_allowed)
-        log_printf ("%sdisable_allowed", s), s = ",";
-      if (aodf->pinflags.integrity_protected)
-        log_printf ("%sintegrity_protected", s), s = ",";
-      if (aodf->pinflags.confidentiality_protected)
-        log_printf ("%sconfidentiality_protected", s), s = ",";
-      if (aodf->pinflags.exchange_ref_data)
-        log_printf ("%sexchange_ref_data", s), s = ",";
-      {
-        char numbuf[50];
-        switch (aodf->pintype)
+          log_info ("p15: AODF %04hX: id=", fid);
+          for (i=0; i < aodf->objidlen; i++)
+            log_printf ("%02X", aodf->objid[i]);
+          if (aodf->authid)
+            {
+              log_printf (" authid=");
+              for (i=0; i < aodf->authidlen; i++)
+                log_printf ("%02X", aodf->authid[i]);
+            }
+          if (aodf->pin_reference_valid)
+            log_printf (" pinref=0x%02lX", aodf->pin_reference);
+          if (aodf->pathlen)
+            {
+              log_printf (" path=");
+              for (i=0; i < aodf->pathlen; i++)
+                log_printf ("%s%04hX", i?"/":"",aodf->path[i]);
+              if (aodf->have_off)
+                log_printf ("[%lu/%lu]", aodf->off, aodf->len);
+            }
+          log_printf (" min=%lu", aodf->min_length);
+          log_printf (" stored=%lu", aodf->stored_length);
+          if (aodf->max_length_valid)
+            log_printf (" max=%lu", aodf->max_length);
+          if (aodf->pad_char_valid)
+            log_printf (" pad=0x%02x", aodf->pad_char);
+
+          log_info ("p15:            flags=");
+          s = "";
+          if (aodf->pinflags.case_sensitive)
+            log_printf ("%scase_sensitive", s), s = ",";
+          if (aodf->pinflags.local)
+            log_printf ("%slocal", s), s = ",";
+          if (aodf->pinflags.change_disabled)
+            log_printf ("%schange_disabled", s), s = ",";
+          if (aodf->pinflags.unblock_disabled)
+            log_printf ("%sunblock_disabled", s), s = ",";
+          if (aodf->pinflags.initialized)
+            log_printf ("%sinitialized", s), s = ",";
+          if (aodf->pinflags.needs_padding)
+            log_printf ("%sneeds_padding", s), s = ",";
+          if (aodf->pinflags.unblocking_pin)
+            log_printf ("%sunblocking_pin", s), s = ",";
+          if (aodf->pinflags.so_pin)
+            log_printf ("%sso_pin", s), s = ",";
+          if (aodf->pinflags.disable_allowed)
+            log_printf ("%sdisable_allowed", s), s = ",";
+          if (aodf->pinflags.integrity_protected)
+            log_printf ("%sintegrity_protected", s), s = ",";
+          if (aodf->pinflags.confidentiality_protected)
+            log_printf ("%sconfidentiality_protected", s), s = ",";
+          if (aodf->pinflags.exchange_ref_data)
+            log_printf ("%sexchange_ref_data", s), s = ",";
           {
-          case PIN_TYPE_BCD: s = "bcd"; break;
-          case PIN_TYPE_ASCII_NUMERIC: s = "ascii-numeric"; break;
-          case PIN_TYPE_UTF8: s = "utf8"; break;
-          case PIN_TYPE_HALF_NIBBLE_BCD: s = "half-nibble-bcd"; break;
-          case PIN_TYPE_ISO9564_1: s = "iso9564-1"; break;
-          default:
-            sprintf (numbuf, "%lu", (unsigned long)aodf->pintype);
-            s = numbuf;
+            char numbuf[50];
+            switch (aodf->pintype)
+              {
+              case PIN_TYPE_BCD: s = "bcd"; break;
+              case PIN_TYPE_ASCII_NUMERIC: s = "ascii-numeric"; break;
+              case PIN_TYPE_UTF8: s = "utf8"; break;
+              case PIN_TYPE_HALF_NIBBLE_BCD: s = "half-nibble-bcd"; break;
+              case PIN_TYPE_ISO9564_1: s = "iso9564-1"; break;
+              default:
+                sprintf (numbuf, "%lu", (unsigned long)aodf->pintype);
+                s = numbuf;
+              }
+            log_printf (" type=%s", s);
           }
-        log_printf (" type=%s", s);
-      }
-      log_printf (" min=%lu", aodf->min_length);
-      log_printf (" stored=%lu", aodf->stored_length);
-      if (aodf->max_length_valid)
-        log_printf (" max=%lu", aodf->max_length);
-      if (aodf->pad_char_valid)
-        log_printf (" pad=0x%02x", aodf->pad_char);
-      if (aodf->pin_reference_valid)
-        log_printf (" pinref=0x%02lX", aodf->pin_reference);
-      if (aodf->pathlen)
-        {
-          log_printf (" path=");
-          for (i=0; i < aodf->pathlen; i++)
-            log_printf ("%04hX", aodf->path[i]);
-          if (aodf->have_off)
-            log_printf ("[%lu/%lu]", aodf->off, aodf->len);
+          log_printf ("\n");
         }
-      log_printf ("\n");
 
       /* Put it into the list. */
       aodf->next = aodflist;
@@ -2137,7 +2260,7 @@
       goto leave;
 
     parse_error:
-      log_error ("error parsing AODF record (%d): %s - skipped\n",
+      log_error ("p15: error parsing AODF record (%d): %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       err = 0;
       release_aodf_object (aodf);
@@ -2153,6 +2276,62 @@
 }
 
 
+/* Print the BIT STRING with the tokenflags from the TokenInfo.  */
+static void
+print_tokeninfo_tokenflags (const unsigned char *der, size_t derlen)
+{
+  unsigned int bits, mask;
+  int i, unused, full;
+  int other = 0;
+
+  if (!derlen)
+    {
+      log_printf (" [invalid object]");
+      return;
+    }
+
+  unused = *der++; derlen--;
+  if ((!derlen && unused) || unused/8 > derlen)
+    {
+      log_printf (" [wrong encoding]");
+      return;
+    }
+  full = derlen - (unused+7)/8;
+  unused %= 8;
+  mask = 0;
+  for (i=1; unused; i <<= 1, unused--)
+    mask |= i;
+
+  /* First octet */
+  if (derlen)
+    {
+      bits = *der++; derlen--;
+      if (full)
+        full--;
+      else
+        {
+          bits &= ~mask;
+          mask = 0;
+        }
+    }
+  else
+    bits = 0;
+  if ((bits & 0x80)) log_printf (" readonly");
+  if ((bits & 0x40)) log_printf (" loginRequired");
+  if ((bits & 0x20)) log_printf (" prnGeneration");
+  if ((bits & 0x10)) log_printf (" eidCompliant");
+  if ((bits & 0x08)) other = 1;
+  if ((bits & 0x04)) other = 1;
+  if ((bits & 0x02)) other = 1;
+  if ((bits & 0x01)) other = 1;
+
+  /* Next octet.  */
+  if (derlen)
+    other = 1;
+
+  if (other)
+    log_printf (" [unknown]");
+}
 
 
 
@@ -2216,6 +2395,10 @@
   int class, tag, constructed, ndef;
   unsigned long ul;
 
+  xfree (app->app_local->manufacturer_id);
+  app->app_local->manufacturer_id = NULL;
+  app->app_local->card_product = CARD_PRODUCT_UNKNOWN;
+
   err = select_and_read_binary (app->slot, 0x5032, "TokenInfo",
                                 &buffer, &buflen);
   if (err)
@@ -2230,7 +2413,7 @@
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     {
-      log_error ("error parsing TokenInfo: %s\n", gpg_strerror (err));
+      log_error ("p15: error parsing TokenInfo: %s\n", gpg_strerror (err));
       goto leave;
     }
 
@@ -2252,11 +2435,13 @@
     }
   if (ul)
     {
-      log_error ("invalid version %lu in TokenInfo\n", ul);
+      log_error ("p15: invalid version %lu in TokenInfo\n", ul);
       err = gpg_error (GPG_ERR_INV_OBJ);
       goto leave;
     }
 
+  if (opt.verbose)
+    log_info ("p15: TokenInfo:\n");
   /* serialNumber.  */
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
@@ -2274,7 +2459,68 @@
     }
   memcpy (app->app_local->serialno, p, objlen);
   app->app_local->serialnolen = objlen;
-  log_printhex ("Serialnumber from EF(TokenInfo) is:", p, objlen);
+  if (opt.verbose)
+    {
+      /* (We use a separate log_info to avoid the "DBG:" prefix.)  */
+      log_info ("p15:  serialNumber .: ");
+      log_printhex (p, objlen, "");
+    }
+  p += objlen;
+  n -= objlen;
+
+  /* Is there an optional manufacturerID?  */
+  err = parse_ber_header (&p, &n, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > n || !objlen))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    goto leave;
+  if (class == CLASS_UNIVERSAL && tag == TAG_UTF8_STRING)
+    {
+      if (opt.verbose)
+        log_info ("p15:  manufacturerID: %.*s\n", (int)objlen, p);
+      app->app_local->manufacturer_id = percent_data_escape (0, NULL,
+                                                             p, objlen);
+      p += objlen;
+      n -= objlen;
+      /* Get next TLV.  */
+      err = parse_ber_header (&p, &n, &class, &tag, &constructed,
+                              &ndef, &objlen, &hdrlen);
+      if (!err && (objlen > n || !objlen))
+        err = gpg_error (GPG_ERR_INV_OBJ);
+      if (err)
+        goto leave;
+    }
+  if (class == CLASS_CONTEXT && tag == 0)
+    {
+      if (opt.verbose)
+        log_info ("p15:  label ........: %.*s\n", (int)objlen, p);
+      if (objlen > 15 && !memcmp (p, "D-TRUST Card V3", 15)
+          && app->app_local->card_type == CARD_TYPE_CARDOS_50)
+        app->app_local->card_product = CARD_PRODUCT_DTRUST;
+
+      p += objlen;
+      n -= objlen;
+      /* Get next TLV.  */
+      err = parse_ber_header (&p, &n, &class, &tag, &constructed,
+                              &ndef, &objlen, &hdrlen);
+      if (!err && (objlen > n || !objlen))
+        err = gpg_error (GPG_ERR_INV_OBJ);
+      if (err)
+        goto leave;
+    }
+  /* The next is the mandatory tokenflags object.  */
+  if (class == CLASS_UNIVERSAL && tag == TAG_BIT_STRING)
+    {
+      if (opt.verbose)
+        {
+          log_info ("p15:  tokenflags ...:");
+          print_tokeninfo_tokenflags (p, objlen);
+          log_printf ("\n");
+        }
+      p += objlen;
+      n -= objlen;
+    }
 
  leave:
   xfree (buffer);
@@ -2386,21 +2632,31 @@
 
 
 /* Get the keygrip of the private key object PRKDF.  On success the
-   keygrip gets returned in the caller provided 41 byte buffer
-   R_GRIPSTR. */
+ * keygrip, the algo and the length are stored in the KEYGRIP,
+ * KEYALGO, and KEYNBITS fields of the PRKDF object.  */
 static gpg_error_t
-keygripstr_from_prkdf (app_t app, prkdf_object_t prkdf, char *r_gripstr)
+keygrip_from_prkdf (app_t app, prkdf_object_t prkdf)
 {
   gpg_error_t err;
   cdf_object_t cdf;
   unsigned char *der;
   size_t derlen;
   ksba_cert_t cert;
+  gcry_sexp_t s_pkey = NULL;
+
+  /* Easy if we got a cached version.  */
+  if (prkdf->keygrip_valid)
+    return 0;
+
+  xfree (prkdf->common_name);
+  prkdf->common_name = NULL;
+  xfree (prkdf->serial_number);
+  prkdf->serial_number = NULL;
 
   /* FIXME: We should check whether a public key directory file and a
      matching public key for PRKDF is available.  This should make
      extraction of the key much easier.  My current test card doesn't
-     have one, so we can only use the fallback solution bu looking for
+     have one, so we can only use the fallback solution by looking for
      a matching certificate and extract the key from there. */
 
   /* Look for a matching certificate. A certificate matches if the Id
@@ -2420,67 +2676,172 @@
           && !memcmp (cdf->objid, prkdf->objid, prkdf->objidlen))
         break;
   if (!cdf)
-    return gpg_error (GPG_ERR_NOT_FOUND);
+    {
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      goto leave;
+    }
 
   err = readcert_by_cdf (app, cdf, &der, &derlen);
   if (err)
-    return err;
+    goto leave;
 
   err = ksba_cert_new (&cert);
   if (!err)
     err = ksba_cert_init_from_mem (cert, der, derlen);
   xfree (der);
   if (!err)
-    err = app_help_get_keygrip_string (cert, r_gripstr);
+    err = app_help_get_keygrip_string (cert, prkdf->keygrip, &s_pkey);
+  if (!err)
+    {
+      /* Try to get the CN and the SerialNumber from the certificate;
+       * we use a very simple approach here which should work in many
+       * cases.  Eventually we should add a rfc-2253 parser into
+       * libksba to make it easier to parse such a string.
+       *
+       * First example string:
+       *   "CN=Otto Schily,O=Miniluv,C=DE"
+       * Second example string:
+       *   "2.5.4.5=#445452323030303236333531,2.5.4.4=#4B6F6368,"
+       *   "2.5.4.42=#5765726E6572,CN=Werner Koch,OU=For testing"
+       *   " purposes only!,O=Testorganisation,C=DE"
+       */
+      char *dn = ksba_cert_get_subject (cert, 0);
+      if (dn)
+        {
+          char *p, *pend, *buf;
+
+          p = strstr (dn, "CN=");
+          if (p && (p==dn || p[-1] == ','))
+            {
+              p += 3;
+              if (!(pend = strchr (p, ',')))
+                pend = p + strlen (p);
+              if (pend && pend > p
+                  && (prkdf->common_name = xtrymalloc ((pend - p) + 1)))
+                {
+                  memcpy (prkdf->common_name, p, pend-p);
+                  prkdf->common_name[pend-p] = 0;
+                }
+            }
+          p = strstr (dn, "2.5.4.5=#"); /* OID of the SerialNumber */
+          if (p && (p==dn || p[-1] == ','))
+            {
+              p += 9;
+              if (!(pend = strchr (p, ',')))
+                pend = p + strlen (p);
+              if (pend && pend > p
+                  && (buf = xtrymalloc ((pend - p) + 1)))
+                {
+                  memcpy (buf, p, pend-p);
+                  buf[pend-p] = 0;
+                  if (!hex2str (buf, buf, strlen (buf)+1, NULL))
+                    xfree (buf);  /* Invalid hex encoding.  */
+                  else
+                    prkdf->serial_number = buf;
+                }
+            }
+          ksba_free (dn);
+        }
+    }
+
   ksba_cert_release (cert);
+  if (err)
+    goto leave;
 
+  prkdf->keyalgo = get_pk_algo_from_key (s_pkey);
+  if (!prkdf->keyalgo)
+    {
+      err = gpg_error (GPG_ERR_PUBKEY_ALGO);
+      goto leave;
+    }
+
+  prkdf->keynbits = gcry_pk_get_nbits (s_pkey);
+  if (!prkdf->keynbits)
+    {
+      err = gpg_error (GPG_ERR_PUBKEY_ALGO);
+      goto leave;
+    }
+
+  prkdf->keygrip_valid = 1;  /* Yeah, got everything.  */
+
+ leave:
+  gcry_sexp_release (s_pkey);
   return err;
 }
 
 
+/* Return a malloced keyref string for PRKDF.  Returns NULL on
+ * malloc failure.  */
+static char *
+keyref_from_prkdf (app_t app, prkdf_object_t prkdf)
+{
+  char *buf, *p;
+
+  buf = xtrymalloc (4 + 5 + prkdf->objidlen*2 + 1);
+  if (!buf)
+    return NULL;
+  p = stpcpy (buf, "P15");
+  if (app->app_local->home_df)
+    {
+      snprintf (p, 6, "-%04X",
+                (unsigned int)(app->app_local->home_df & 0xffff));
+      p += 5;
+    }
+  p = stpcpy (p, ".");
+  bin2hex (prkdf->objid, prkdf->objidlen, p);
+  return buf;
+}
 
 
 /* Helper to do_learn_status: Send information about all known
    keypairs back.  FIXME: much code duplication from
    send_certinfo(). */
 static gpg_error_t
-send_keypairinfo (app_t app, ctrl_t ctrl, prkdf_object_t keyinfo)
+send_keypairinfo (app_t app, ctrl_t ctrl, prkdf_object_t prkdf)
 {
   gpg_error_t err;
 
-  for (; keyinfo; keyinfo = keyinfo->next)
+  for (; prkdf; prkdf = prkdf->next)
     {
-      char gripstr[40+1];
-      char *buf, *p;
+      char *buf;
       int j;
 
-      buf = xtrymalloc (9 + keyinfo->objidlen*2 + 1);
+      buf = keyref_from_prkdf (app, prkdf);
       if (!buf)
         return gpg_error_from_syserror ();
-      p = stpcpy (buf, "P15");
-      if (app->app_local->home_df)
-        {
-          snprintf (p, 6, "-%04X",
-                    (unsigned int)(app->app_local->home_df & 0xffff));
-          p += 5;
-        }
-      p = stpcpy (p, ".");
-      bin2hex (keyinfo->objid, keyinfo->objidlen, p);
 
-      err = keygripstr_from_prkdf (app, keyinfo, gripstr);
+      err = keygrip_from_prkdf (app, prkdf);
       if (err)
         {
-          log_error ("can't get keygrip from ");
-          for (j=0; j < keyinfo->pathlen; j++)
-            log_printf ("%04hX", keyinfo->path[j]);
+          log_error ("p15: error getting keygrip from ");
+          for (j=0; j < prkdf->pathlen; j++)
+            log_printf ("%s%04hX", j?"/":"", prkdf->path[j]);
           log_printf (": %s\n", gpg_strerror (err));
         }
       else
         {
-          assert (strlen (gripstr) == 40);
+          char usage[5];
+          size_t usagelen = 0;
+
+          if (prkdf->usageflags.sign
+              || prkdf->usageflags.sign_recover
+              || prkdf->usageflags.non_repudiation)
+            usage[usagelen++] = 's';
+          if (prkdf->usageflags.sign
+              || prkdf->usageflags.sign_recover)
+            usage[usagelen++] = 'c';
+          if (prkdf->usageflags.decrypt
+              || prkdf->usageflags.unwrap)
+            usage[usagelen++] = 'e';
+          if (prkdf->usageflags.sign
+              || prkdf->usageflags.sign_recover)
+            usage[usagelen++] = 'a';
+
+          log_assert (strlen (prkdf->keygrip) == 40);
           send_status_info (ctrl, "KEYPAIRINFO",
-                            gripstr, 40,
+                            prkdf->keygrip, 2*KEYGRIP_LEN,
                             buf, strlen (buf),
+                            usage, usagelen,
                             NULL, (size_t)0);
         }
       xfree (buf);
@@ -2500,7 +2861,10 @@
     err = 0;
   else
     {
-      err = send_certinfo (app, ctrl, "100", app->app_local->certificate_info);
+      err = do_getattr (app, ctrl, "MANUFACTURER");
+      if (!err)
+        err = send_certinfo (app, ctrl, "100",
+                             app->app_local->certificate_info);
       if (!err)
         err = send_certinfo (app, ctrl, "101",
                              app->app_local->trusted_certificate_info);
@@ -2553,14 +2917,18 @@
   if (err)
     goto leave;
 
-  err = iso7816_read_binary (app->slot, cdf->off, cdf->len, &buffer, &buflen);
+  err = iso7816_read_binary_ext (app_get_slot (app), 1, cdf->off, cdf->len,
+                                 &buffer, &buflen);
   if (!err && (!buflen || *buffer == 0xff))
     err = gpg_error (GPG_ERR_NOT_FOUND);
   if (err)
     {
-      log_error ("error reading certificate with Id ");
+      log_error ("p15: error reading certificate id=");
       for (i=0; i < cdf->objidlen; i++)
         log_printf ("%02X", cdf->objid[i]);
+      log_printf (" at ");
+      for (i=0; i < cdf->pathlen; i++)
+        log_printf ("%s%04hX", i? "/":"", cdf->path[i]);
       log_printf (": %s\n", gpg_strerror (err));
       goto leave;
     }
@@ -2666,37 +3034,42 @@
 do_getattr (app_t app, ctrl_t ctrl, const char *name)
 {
   gpg_error_t err;
+  prkdf_object_t prkdf;
 
-  if (!strcmp (name, "$AUTHKEYID"))
-    {
-      char *buf, *p;
-      prkdf_object_t prkdf;
-
-      /* We return the ID of the first private keycapable of
-         signing. */
+  if (!strcmp (name, "$AUTHKEYID")
+      || !strcmp (name, "$ENCRKEYID")
+      || !strcmp (name, "$SIGNKEYID"))
+    {
+      char *buf;
+
+      /* We return the ID of the first private key capable of the
+       * requested action.  Note that we do not yet return
+       * non_repudiation keys for $SIGNKEYID because our D-Trust
+       * testcard uses rsaPSS, which is not supported by gpgsm and not
+       * covered by the VS-NfD approval.  */
       for (prkdf = app->app_local->private_key_info; prkdf;
            prkdf = prkdf->next)
-        if (prkdf->usageflags.sign)
-          break;
+        {
+          if (name[1] == 'A' && (prkdf->usageflags.sign
+                                 || prkdf->usageflags.sign_recover))
+            break;
+          else if (name[1] == 'E' && (prkdf->usageflags.decrypt
+                                      || prkdf->usageflags.unwrap))
+            break;
+          else if (name[1] == 'S' && (prkdf->usageflags.sign
+                                      || prkdf->usageflags.sign_recover))
+            break;
+        }
       if (prkdf)
         {
-          buf = xtrymalloc (9 + prkdf->objidlen*2 + 1);
+          buf = keyref_from_prkdf (app, prkdf);
           if (!buf)
             return gpg_error_from_syserror ();
-          p = stpcpy (buf, "P15");
-          if (app->app_local->home_df)
-            {
-              snprintf (p, 6, "-%04X",
-                        (unsigned int)(app->app_local->home_df & 0xffff));
-              p += 5;
-            }
-          p = stpcpy (p, ".");
-          bin2hex (prkdf->objid, prkdf->objidlen, p);
 
           send_status_info (ctrl, name, buf, strlen (buf), NULL, 0);
           xfree (buf);
-          return 0;
         }
+      return 0;
     }
   else if (!strcmp (name, "$DISPSERIALNO"))
     {
@@ -2716,7 +3089,8 @@
             err = iso7816_read_binary (app->slot, 0, 0, &buffer, &buflen);
           if (err)
             {
-              log_error ("error accessing EF(ID): %s\n", gpg_strerror (err));
+              log_error ("p15: error accessing EF(ID): %s\n",
+                         gpg_strerror (err));
               return err;
             }
 
@@ -2736,7 +3110,41 @@
             }
           xfree (buffer);
         }
-
+      else
+        {
+          /* We use the first private key object which has a serial
+           * number set.  If none was found, we parse the first
+           * object and see whether this has then a serial number.  */
+          for (prkdf = app->app_local->private_key_info; prkdf;
+               prkdf = prkdf->next)
+            if (prkdf->serial_number)
+              break;
+          if (!prkdf && app->app_local->private_key_info)
+            {
+              prkdf = app->app_local->private_key_info;
+              keygrip_from_prkdf (app, prkdf);
+              if (!prkdf->serial_number)
+                prkdf = NULL;
+            }
+          if (prkdf)
+            {
+              char *sn = get_dispserialno (app, prkdf);
+              /* Unless there is a bogus S/N in the cert we should
+               * have a suitable one from the cert here now.  */
+              err = send_status_printf (ctrl, name, "%s", sn);
+              xfree (sn);
+              return err;
+            }
+        }
+      /* No abbreviated serial number. */
+    }
+  else if (!strcmp (name, "MANUFACTURER"))
+    {
+      if (app->app_local->manufacturer_id)
+        return send_status_printf (ctrl, "MANUFACTURER", "0 %s",
+                                   app->app_local->manufacturer_id);
+      else
+        return 0;
     }
   return gpg_error (GPG_ERR_INV_NAME);
 }
@@ -2761,7 +3169,7 @@
   err = iso7816_select_file (app->slot, 0x0013, 0);
   if (err)
     {
-      log_error ("error reading EF_keyD: %s\n", gpg_strerror (err));
+      log_error ("p15: error reading EF_keyD: %s\n", gpg_strerror (err));
       return err;
     }
 
@@ -2777,11 +3185,15 @@
         break; /* ready */
       if (err)
         {
-          log_error ("error reading EF_keyD record: %s\n",
+          log_error ("p15: error reading EF_keyD record: %s\n",
                      gpg_strerror (err));
           return err;
         }
-      log_printhex ("keyD record:", buffer, buflen);
+      if (opt.verbose)
+        {
+          log_info (buffer, buflen, "p15: keyD record: ");
+          log_printhex (buffer, buflen, "");
+        }
       p = find_tlv (buffer, buflen, 0x83, &n);
       if (p && n == 4 && ((p[2]<<8)|p[3]) == fid)
         {
@@ -2803,7 +3215,7 @@
     }
   if (se_num == -1)
     {
-      log_error ("CRT for keyfile %04hX not found\n", fid);
+      log_error ("p15: CRT for keyfile %04hX not found\n", fid);
       return gpg_error (GPG_ERR_NOT_FOUND);
     }
 
@@ -2814,7 +3226,7 @@
       err = iso7816_manage_security_env (app->slot, 0xf3, se_num, NULL, 0);
       if (err)
         {
-          log_error ("restoring SE to %d failed: %s\n",
+          log_error ("p15: restoring SE to %d failed: %s\n",
                      se_num, gpg_strerror (err));
           return err;
         }
@@ -2829,7 +3241,7 @@
   err = iso7816_manage_security_env (app->slot, 0x41, 0xb6, msebuf, 5);
   if (err)
     {
-      log_error ("setting SE to reference file %04hX failed: %s\n",
+      log_error ("p15: setting SE to reference file %04hX failed: %s\n",
                  refdata, gpg_strerror (err));
       return err;
     }
@@ -2838,6 +3250,372 @@
 
 
 
+/* Prepare the verification of the PIN for the key PRKDF by checking
+ * the AODF and selecting the key file.  KEYREF is used for error
+ * messages.  */
+static gpg_error_t
+prepare_verify_pin (app_t app, const char *keyref,
+                    prkdf_object_t prkdf, aodf_object_t aodf)
+{
+  gpg_error_t err;
+  int i;
+
+  if (opt.verbose)
+    {
+      log_info ("p15: using AODF %04hX id=", aodf->fid);
+      for (i=0; i < aodf->objidlen; i++)
+        log_printf ("%02X", aodf->objid[i]);
+      log_printf ("\n");
+    }
+
+  if (aodf->authid && opt.verbose)
+    log_info ("p15: PIN is controlled by another authentication token\n");
+
+  if (aodf->pinflags.integrity_protected
+      || aodf->pinflags.confidentiality_protected)
+    {
+      log_error ("p15: "
+                 "PIN verification requires unsupported protection method\n");
+      return gpg_error (GPG_ERR_BAD_PIN_METHOD);
+    }
+  if (!aodf->stored_length && aodf->pinflags.needs_padding)
+    {
+      log_error ("p15: "
+                 "PIN verification requires padding but no length known\n");
+      return gpg_error (GPG_ERR_INV_CARD);
+    }
+
+
+  if (app->app_local->card_product == CARD_PRODUCT_DTRUST)
+    {
+      /* According to our protocol analysis we need to select a
+       * special AID here.  Before that the master file needs to be
+       * selected.  (RID A000000167 is assigned to IBM) */
+      static char const dtrust_aid[] =
+        { 0xA0, 0x00, 0x00, 0x01, 0x67, 0x45, 0x53, 0x49, 0x47, 0x4E };
+
+      err = iso7816_select_mf (app_get_slot (app));
+      if (!err)
+        err = iso7816_select_application (app_get_slot (app),
+                                          dtrust_aid, sizeof dtrust_aid, 0);
+      if (err)
+        log_error ("p15: error selecting D-TRUST's AID for key %s: %s\n",
+                   keyref, gpg_strerror (err));
+    }
+  else
+    {
+      /* Standard case: Select the key file.  Note that this may
+       * change the security environment thus we need to do it before
+       * PIN verification. */
+      err = select_ef_by_path (app, prkdf->path, prkdf->pathlen);
+      if (err)
+        log_error ("p15: error selecting file for key %s: %s\n",
+                   keyref, gpg_strerror (err));
+    }
+
+  return err;
+}
+
+
+static int
+any_control_or_space (const char *string)
+{
+  const unsigned char *s;
+
+  for (s = string; *string; string++)
+    if (*s <= 0x20 || *s >= 0x7f)
+      return 1;
+  return 0;
+}
+
+
+/* Return a malloced serial number to be shown to the user.  PRKDF is
+ * used to get it from a certificate; PRKDF may be NULL.  */
+static char *
+get_dispserialno (app_t app, prkdf_object_t prkdf)
+{
+  char *serial;
+
+  /* We prefer the SerialNumber RDN from the Subject-DN but we don't
+   * use it if it features a percent sign (special character in pin
+   * prompts) or has any control character.  */
+  if (prkdf && prkdf->serial_number && *prkdf->serial_number
+      && !strchr (prkdf->serial_number, '%')
+      && !any_control_or_space (prkdf->serial_number))
+    {
+      serial = xtrystrdup (prkdf->serial_number);
+    }
+  else
+    {
+      serial = app_get_serialno (app);
+    }
+  return serial;
+}
+
+
+/* Return an allocated string to be used as prompt.  Returns NULL on
+ * malloc error.  */
+static char *
+make_pin_prompt (app_t app, int remaining, const char *firstline,
+                 prkdf_object_t prkdf)
+{
+  char *serial, *tmpbuf, *result;
+
+  serial = get_dispserialno (app, prkdf);
+
+  /* TRANSLATORS: Put a \x1f right before a colon.  This can be
+   * used by pinentry to nicely align the names and values.  Keep
+   * the %s at the start and end of the string.  */
+  result = xtryasprintf (_("%s"
+                           "Number\x1f: %s%%0A"
+                           "Holder\x1f: %s"
+                           "%s"),
+                         "\x1e",
+                         serial,
+                         prkdf->common_name? prkdf->common_name: "",
+                         "");
+  xfree (serial);
+  if (!result)
+    return NULL; /* Out of core.  */
+
+  /* Append a "remaining attempts" info if needed.  */
+  if (remaining != -1 && remaining < 3)
+    {
+      char *rembuf;
+
+      /* TRANSLATORS: This is the number of remaining attempts to
+       * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed. */
+      rembuf = xtryasprintf (_("Remaining attempts: %d"), remaining);
+      if (rembuf)
+        {
+          tmpbuf = strconcat (firstline, "%0A%0A", result,
+                              "%0A%0A", rembuf, NULL);
+          xfree (rembuf);
+        }
+      else
+        tmpbuf = NULL;
+      xfree (result);
+      result = tmpbuf;
+    }
+  else
+    {
+      tmpbuf = strconcat (firstline, "%0A%0A", result, NULL);
+      xfree (result);
+      result = tmpbuf;
+    }
+
+  return result;
+}
+
+
+/* Given the private key object PRKDF and its authentication object
+ * AODF ask for the PIN and verify that PIN.  */
+static gpg_error_t
+verify_pin (app_t app,
+            gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg,
+            prkdf_object_t prkdf, aodf_object_t aodf)
+{
+  gpg_error_t err;
+  char *pinvalue;
+  size_t pinvaluelen;
+  const char *label;
+  const char *errstr;
+  const char *s;
+  int remaining;
+  int pin_reference;
+  int i;
+
+  if (!aodf)
+    return 0;
+
+  pin_reference = aodf->pin_reference_valid? aodf->pin_reference : 0;
+
+  if (app->app_local->card_type == CARD_TYPE_CARDOS_50)
+    {
+      /* We know that this card supports a verify status check.  Note
+       * that in contrast to PIV cards ISO7816_VERIFY_NOT_NEEDED is
+       * not supported.  */
+      remaining = iso7816_verify_status (app_get_slot (app), pin_reference);
+      if (remaining < 0)
+        remaining = -1; /* We don't care about the concrete error.  */
+      if (remaining < 3)
+        {
+          if (remaining >= 0)
+            log_info ("p15: PIN has %d attempts left\n", remaining);
+          /* On error or if less than 3 better ask. */
+          prkdf->pin_verified = 0;
+        }
+    }
+  else
+    remaining = -1;  /* Unknown.  */
+
+  /* Check whether we already verified it.  */
+  if (prkdf->pin_verified)
+    return 0;  /* Already done.  */
+
+  if (prkdf->usageflags.non_repudiation
+      && (app->app_local->card_type == CARD_TYPE_BELPIC
+          || app->app_local->card_product == CARD_PRODUCT_DTRUST))
+    label = _("||Please enter the PIN for the key to create "
+              "qualified signatures.");
+  else
+    label = _("||Please enter the PIN for the standard keys.");
+
+  {
+    char *prompt = make_pin_prompt (app, remaining, label, prkdf);
+    if (!prompt)
+      err = gpg_error_from_syserror ();
+    else
+      err = pincb (pincb_arg, prompt, &pinvalue);
+    xfree (prompt);
+  }
+  if (err)
+    {
+      log_info ("p15: PIN callback returned error: %s\n", gpg_strerror (err));
+      return err;
+    }
+
+  /* We might need to cope with UTF8 things here.  Not sure how
+     min_length etc. are exactly defined, for now we take them as
+     a plain octet count. */
+  if (strlen (pinvalue) < aodf->min_length)
+    {
+      log_error ("p15: PIN is too short; minimum length is %lu\n",
+                 aodf->min_length);
+      err = gpg_error (GPG_ERR_BAD_PIN);
+    }
+  else if (aodf->stored_length && strlen (pinvalue) > aodf->stored_length)
+    {
+      /* This would otherwise truncate the PIN silently. */
+      log_error ("p15: PIN is too large; maximum length is %lu\n",
+                 aodf->stored_length);
+      err = gpg_error (GPG_ERR_BAD_PIN);
+    }
+  else if (aodf->max_length_valid && strlen (pinvalue) > aodf->max_length)
+    {
+      log_error ("p15: PIN is too large; maximum length is %lu\n",
+                 aodf->max_length);
+      err = gpg_error (GPG_ERR_BAD_PIN);
+    }
+
+  if (err)
+    {
+      xfree (pinvalue);
+      return err;
+    }
+
+  errstr = NULL;
+  err = 0;
+  switch (aodf->pintype)
+    {
+    case PIN_TYPE_BCD:
+    case PIN_TYPE_ASCII_NUMERIC:
+      for (s=pinvalue; digitp (s); s++)
+        ;
+      if (*s)
+        {
+          errstr = "Non-numeric digits found in PIN";
+          err = gpg_error (GPG_ERR_BAD_PIN);
+        }
+      break;
+    case PIN_TYPE_UTF8:
+      break;
+    case PIN_TYPE_HALF_NIBBLE_BCD:
+      errstr = "PIN type Half-Nibble-BCD is not supported";
+      break;
+    case PIN_TYPE_ISO9564_1:
+      errstr = "PIN type ISO9564-1 is not supported";
+      break;
+    default:
+      errstr = "Unknown PIN type";
+      break;
+    }
+  if (errstr)
+    {
+      log_error ("p15: can't verify PIN: %s\n", errstr);
+      xfree (pinvalue);
+      return err? err : gpg_error (GPG_ERR_BAD_PIN_METHOD);
+    }
+
+
+  if (aodf->pintype == PIN_TYPE_BCD )
+    {
+      char *paddedpin;
+      int ndigits;
+
+      for (ndigits=0, s=pinvalue; *s; ndigits++, s++)
+        ;
+      paddedpin = xtrymalloc (aodf->stored_length+1);
+      if (!paddedpin)
+        {
+          err = gpg_error_from_syserror ();
+          xfree (pinvalue);
+          return err;
+        }
+
+      i = 0;
+      paddedpin[i++] = 0x20 | (ndigits & 0x0f);
+      for (s=pinvalue; i < aodf->stored_length && *s && s[1]; s = s+2 )
+        paddedpin[i++] = (((*s - '0') << 4) | ((s[1] - '0') & 0x0f));
+      if (i < aodf->stored_length && *s)
+        paddedpin[i++] = (((*s - '0') << 4)
+                          |((aodf->pad_char_valid?aodf->pad_char:0)&0x0f));
+
+      if (aodf->pinflags.needs_padding)
+        {
+          while (i < aodf->stored_length)
+            paddedpin[i++] = aodf->pad_char_valid? aodf->pad_char : 0;
+        }
+
+      xfree (pinvalue);
+      pinvalue = paddedpin;
+      pinvaluelen = i;
+    }
+  else if (aodf->pinflags.needs_padding)
+    {
+      char *paddedpin;
+
+      paddedpin = xtrymalloc (aodf->stored_length+1);
+      if (!paddedpin)
+        {
+          err = gpg_error_from_syserror ();
+          xfree (pinvalue);
+          return err;
+        }
+      for (i=0, s=pinvalue; i < aodf->stored_length && *s; i++, s++)
+        paddedpin[i] = *s;
+      /* Not sure what padding char to use if none has been set.
+         For now we use 0x00; maybe a space would be better. */
+      for (; i < aodf->stored_length; i++)
+        paddedpin[i] = aodf->pad_char_valid? aodf->pad_char : 0;
+      paddedpin[i] = 0;
+      pinvaluelen = i;
+      xfree (pinvalue);
+      pinvalue = paddedpin;
+    }
+  else
+    pinvaluelen = strlen (pinvalue);
+
+  /* log_printhex (pinvalue, pinvaluelen, */
+  /*               "about to verify with ref %lu pin:", pin_reference); */
+  err = iso7816_verify (app_get_slot (app), pin_reference,
+                        pinvalue, pinvaluelen);
+  xfree (pinvalue);
+  if (err)
+    {
+      log_error ("p15: PIN verification failed: %s\n", gpg_strerror (err));
+      return err;
+    }
+  if (opt.verbose)
+    log_info ("p15: PIN verification succeeded\n");
+  prkdf->pin_verified = 1;
+
+  return 0;
+}
+
+
+
+
 /* Handler for the PKSIGN command.
 
    Create the signature and return the allocated result in OUTDATA.
@@ -2851,6 +3629,9 @@
          const void *indata, size_t indatalen,
          unsigned char **outdata, size_t *outdatalen )
 {
+  static unsigned char sha256_prefix[19] = /* OID: 2.16.840.1.101.3.4.2.1 */
+    { 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48,
+      0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 };
   static unsigned char sha1_prefix[15] = /* Object ID is 1.3.14.3.2.26 */
     { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
       0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 };
@@ -2859,18 +3640,24 @@
       0x02, 0x01, 0x05, 0x00, 0x04, 0x14 };
 
   gpg_error_t err;
-  int i;
-  unsigned char data[36];   /* Must be large enough for a SHA-1 digest
-                               + the largest OID prefix above and also
-                               fit the 36 bytes of md5sha1.  */
+  unsigned char data[32+19]; /* Must be large enough for a SHA-256 digest
+                              * + the largest OID prefix above and also
+                              * fit the 36 bytes of md5sha1.  */
   prkdf_object_t prkdf;    /* The private key object. */
   aodf_object_t aodf;      /* The associated authentication object. */
   int no_data_padding = 0; /* True if the card want the data without padding.*/
   int mse_done = 0;        /* Set to true if the MSE has been done. */
+  unsigned int hashlen;    /* Length of the hash.  */
+  unsigned int datalen;    /* Length of the data to sign (prefix+hash).  */
+  unsigned char *dataptr;
+  int exmode, le_value;
+
 
   if (!keyidstr || !*keyidstr)
     return gpg_error (GPG_ERR_INV_VALUE);
-  if (indatalen != 20 && indatalen != 16 && indatalen != 35 && indatalen != 36)
+  if (indatalen != 20 && indatalen != 16
+      && indatalen != 35 && indatalen != 36
+      && indatalen != (32+19))
     return gpg_error (GPG_ERR_INV_VALUE);
 
   err = prkdf_object_from_keyidstr (app, keyidstr, &prkdf);
@@ -2879,13 +3666,13 @@
   if (!(prkdf->usageflags.sign || prkdf->usageflags.sign_recover
         ||prkdf->usageflags.non_repudiation))
     {
-      log_error ("key %s may not be used for signing\n", keyidstr);
+      log_error ("p15: key %s may not be used for signing\n", keyidstr);
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
   if (!prkdf->authid)
     {
-      log_error ("no authentication object defined for %s\n", keyidstr);
+      log_error ("p15: no authentication object defined for %s\n", keyidstr);
       /* fixme: we might want to go ahead and do without PIN
          verification. */
       return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
@@ -2898,37 +3685,25 @@
       break;
   if (!aodf)
     {
-      log_error ("authentication object for %s missing\n", keyidstr);
-      return gpg_error (GPG_ERR_INV_CARD);
-    }
-  if (aodf->authid)
-    {
-      log_error ("PIN verification is protected by an "
-                 "additional authentication token\n");
-      return gpg_error (GPG_ERR_BAD_PIN_METHOD);
-    }
-  if (aodf->pinflags.integrity_protected
-      || aodf->pinflags.confidentiality_protected)
-    {
-      log_error ("PIN verification requires unsupported protection method\n");
-      return gpg_error (GPG_ERR_BAD_PIN_METHOD);
-    }
-  if (!aodf->stored_length && aodf->pinflags.needs_padding)
-    {
-      log_error ("PIN verification requires padding but no length known\n");
+      log_error ("p15: authentication object for %s missing\n", keyidstr);
       return gpg_error (GPG_ERR_INV_CARD);
     }
 
-  /* Select the key file.  Note that this may change the security
-     environment thus we do it before PIN verification. */
-  err = select_ef_by_path (app, prkdf->path, prkdf->pathlen);
+  /* We need some more info about the key - get the keygrip to
+   * populate these fields.  */
+  err = keygrip_from_prkdf (app, prkdf);
   if (err)
     {
-      log_error ("error selecting file for key %s: %s\n",
-                 keyidstr, gpg_strerror (errno));
+      log_error ("p15: keygrip_from_prkdf failed: %s\n", gpg_strerror (err));
       return err;
     }
 
+  /* Prepare PIN verification.  This is split so that we can do
+   * MSE operation for some task after having selected the key file but
+   * before sending the verify APDU.  */
+  err = prepare_verify_pin (app, keyidstr, prkdf, aodf);
+  if (err)
+    return err;
 
   /* Due to the fact that the non-repudiation signature on a BELPIC
      card requires a verify immediately before the DSO we set the
@@ -2956,162 +3731,16 @@
     }
   if (err)
     {
-      log_error ("MSE failed: %s\n", gpg_strerror (err));
+      log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
       return err;
     }
 
+  /* Now that we have all the information available run the actual PIN
+   * verification.*/
+  err = verify_pin (app, pincb, pincb_arg, prkdf, aodf);
+  if (err)
+    return err;
 
-  /* Now that we have all the information available, prepare and run
-     the PIN verification.*/
-  if (1)
-    {
-      char *pinvalue;
-      size_t pinvaluelen;
-      const char *errstr;
-      const char *s;
-
-      if (prkdf->usageflags.non_repudiation
-          && app->app_local->card_type == CARD_TYPE_BELPIC)
-        err = pincb (pincb_arg, "PIN (qualified signature!)", &pinvalue);
-      else
-        err = pincb (pincb_arg, "PIN", &pinvalue);
-      if (err)
-        {
-          log_info ("PIN callback returned error: %s\n", gpg_strerror (err));
-          return err;
-        }
-
-      /* We might need to cope with UTF8 things here.  Not sure how
-         min_length etc. are exactly defined, for now we take them as
-         a plain octet count. */
-
-      if (strlen (pinvalue) < aodf->min_length)
-        {
-          log_error ("PIN is too short; minimum length is %lu\n",
-                     aodf->min_length);
-          err = gpg_error (GPG_ERR_BAD_PIN);
-        }
-      else if (aodf->stored_length && strlen (pinvalue) > aodf->stored_length)
-        {
-          /* This would otherwise truncate the PIN silently. */
-          log_error ("PIN is too large; maximum length is %lu\n",
-                     aodf->stored_length);
-          err = gpg_error (GPG_ERR_BAD_PIN);
-        }
-      else if (aodf->max_length_valid && strlen (pinvalue) > aodf->max_length)
-        {
-          log_error ("PIN is too large; maximum length is %lu\n",
-                     aodf->max_length);
-          err = gpg_error (GPG_ERR_BAD_PIN);
-        }
-
-      if (err)
-        {
-          xfree (pinvalue);
-          return err;
-        }
-
-      errstr = NULL;
-      err = 0;
-      switch (aodf->pintype)
-        {
-        case PIN_TYPE_BCD:
-        case PIN_TYPE_ASCII_NUMERIC:
-          for (s=pinvalue; digitp (s); s++)
-            ;
-          if (*s)
-            {
-              errstr = "Non-numeric digits found in PIN";
-              err = gpg_error (GPG_ERR_BAD_PIN);
-            }
-          break;
-        case PIN_TYPE_UTF8:
-          break;
-        case PIN_TYPE_HALF_NIBBLE_BCD:
-          errstr = "PIN type Half-Nibble-BCD is not supported";
-          break;
-        case PIN_TYPE_ISO9564_1:
-          errstr = "PIN type ISO9564-1 is not supported";
-          break;
-        default:
-          errstr = "Unknown PIN type";
-          break;
-        }
-      if (errstr)
-        {
-          log_error ("can't verify PIN: %s\n", errstr);
-          xfree (pinvalue);
-          return err? err : gpg_error (GPG_ERR_BAD_PIN_METHOD);
-        }
-
-
-      if (aodf->pintype == PIN_TYPE_BCD )
-        {
-          char *paddedpin;
-          int ndigits;
-
-          for (ndigits=0, s=pinvalue; *s; ndigits++, s++)
-            ;
-          paddedpin = xtrymalloc (aodf->stored_length+1);
-          if (!paddedpin)
-            {
-              err = gpg_error_from_syserror ();
-              xfree (pinvalue);
-              return err;
-            }
-
-          i = 0;
-          paddedpin[i++] = 0x20 | (ndigits & 0x0f);
-          for (s=pinvalue; i < aodf->stored_length && *s && s[1]; s = s+2 )
-            paddedpin[i++] = (((*s - '0') << 4) | ((s[1] - '0') & 0x0f));
-          if (i < aodf->stored_length && *s)
-            paddedpin[i++] = (((*s - '0') << 4)
-                              |((aodf->pad_char_valid?aodf->pad_char:0)&0x0f));
-
-          if (aodf->pinflags.needs_padding)
-            while (i < aodf->stored_length)
-              paddedpin[i++] = aodf->pad_char_valid? aodf->pad_char : 0;
-
-          xfree (pinvalue);
-          pinvalue = paddedpin;
-          pinvaluelen = i;
-        }
-      else if (aodf->pinflags.needs_padding)
-        {
-          char *paddedpin;
-
-          paddedpin = xtrymalloc (aodf->stored_length+1);
-          if (!paddedpin)
-            {
-              err = gpg_error_from_syserror ();
-              xfree (pinvalue);
-              return err;
-            }
-          for (i=0, s=pinvalue; i < aodf->stored_length && *s; i++, s++)
-            paddedpin[i] = *s;
-          /* Not sure what padding char to use if none has been set.
-             For now we use 0x00; maybe a space would be better. */
-          for (; i < aodf->stored_length; i++)
-            paddedpin[i] = aodf->pad_char_valid? aodf->pad_char : 0;
-          paddedpin[i] = 0;
-          pinvaluelen = i;
-          xfree (pinvalue);
-          pinvalue = paddedpin;
-        }
-      else
-        pinvaluelen = strlen (pinvalue);
-
-      err = iso7816_verify (app->slot,
-                            aodf->pin_reference_valid? aodf->pin_reference : 0,
-                            pinvalue, pinvaluelen);
-      xfree (pinvalue);
-      if (err)
-        {
-          log_error ("PIN verification failed: %s\n", gpg_strerror (err));
-          return err;
-        }
-      log_debug ("PIN verification succeeded\n");
-    }
 
   /* Prepare the DER object from INDATA. */
   if (indatalen == 36)
@@ -3120,6 +3749,7 @@
       if (hashalgo != MD_USER_TLS_MD5SHA1)
         return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
       memcpy (data, indata, indatalen);
+      datalen = hashlen = 36;
     }
   else if (indatalen == 35)
     {
@@ -3134,20 +3764,50 @@
       else
         return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
       memcpy (data, indata, indatalen);
+      datalen = 35;
+      hashlen = 20;
+    }
+  else if (indatalen == 32 + 19)
+    {
+      /* Seems to be a prepared SHA256 DER object.  */
+      if (hashalgo == GCRY_MD_SHA256 && !memcmp (indata, sha256_prefix, 19))
+        ;
+      else
+        return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
+      memcpy (data, indata, indatalen);
+      datalen = 51;
+      hashlen = 32;
     }
   else
     {
       /* Need to prepend the prefix. */
-      if (hashalgo == GCRY_MD_SHA1)
-        memcpy (data, sha1_prefix, 15);
+      if (hashalgo == GCRY_MD_SHA256)
+        {
+          memcpy (data, sha256_prefix, 19);
+          memcpy (data+19, indata, indatalen);
+          datalen = 51;
+          hashlen = 32;
+        }
+      else if (hashalgo == GCRY_MD_SHA1)
+        {
+          memcpy (data, sha1_prefix, 15);
+          memcpy (data+15, indata, indatalen);
+          datalen = 35;
+          hashlen = 20;
+        }
       else if (hashalgo == GCRY_MD_RMD160)
-        memcpy (data, rmd160_prefix, 15);
+        {
+          memcpy (data, rmd160_prefix, 15);
+          memcpy (data+15, indata, indatalen);
+          datalen = 35;
+          hashlen = 20;
+        }
       else
         return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
-      memcpy (data+15, indata, indatalen);
     }
 
-  /* Manage security environment needs to be weaked for certain cards. */
+
+  /* Manage security environment needs to be tweaked for certain cards. */
   if (mse_done)
     err = 0;
   else if (app->app_local->card_type == CARD_TYPE_TCOS)
@@ -3176,16 +3836,32 @@
     }
   if (err)
     {
-      log_error ("MSE failed: %s\n", gpg_strerror (err));
+      log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
       return err;
     }
 
-  if (hashalgo == MD_USER_TLS_MD5SHA1)
-    err = iso7816_compute_ds (app->slot, 0, data, 36, 0, outdata, outdatalen);
-  else if (no_data_padding)
-    err = iso7816_compute_ds (app->slot, 0, data+15, 20, 0,outdata,outdatalen);
+  dataptr = data;
+  if (no_data_padding)
+    {
+      dataptr += datalen - hashlen;
+      datalen = hashlen;
+    }
+
+  if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits > 2048)
+    {
+      exmode = 1;
+      le_value = prkdf->keynbits / 8;
+    }
   else
-    err = iso7816_compute_ds (app->slot, 0, data, 35, 0, outdata, outdatalen);
+    {
+      exmode = 0;
+      le_value = 0;
+    }
+
+  err = iso7816_compute_ds (app_get_slot (app),
+                            exmode, dataptr, datalen,
+                            le_value, outdata, outdatalen);
+
   return err;
 }
 
@@ -3215,7 +3891,7 @@
     return err;
   if (!prkdf->usageflags.sign)
     {
-      log_error ("key %s may not be used for authentication\n", keyidstr);
+      log_error ("p15: key %s may not be used for authentication\n", keyidstr);
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
@@ -3225,6 +3901,134 @@
 }
 
 
+/* Handler for the PKDECRYPT command.  Decrypt the data in INDATA and
+ * return the allocated result in OUTDATA.  If a PIN is required the
+ * PINCB will be used to ask for the PIN; it should return the PIN in
+ * an allocated buffer and put it into PIN.  */
+static gpg_error_t
+do_decipher (app_t app, const char *keyidstr,
+             gpg_error_t (*pincb)(void*, const char *, char **),
+             void *pincb_arg,
+             const void *indata, size_t indatalen,
+             unsigned char **outdata, size_t *outdatalen,
+             unsigned int *r_info)
+{
+  gpg_error_t err;
+  prkdf_object_t prkdf;    /* The private key object. */
+  aodf_object_t aodf;      /* The associated authentication object. */
+  int exmode, le_value, padind;
+
+  (void)r_info;
+
+  if (!keyidstr || !*keyidstr)
+    return gpg_error (GPG_ERR_INV_VALUE);
+  if (!indatalen || !indata || !outdatalen || !outdata)
+    return gpg_error (GPG_ERR_INV_ARG);
+
+  err = prkdf_object_from_keyidstr (app, keyidstr, &prkdf);
+  if (err)
+    return err;
+  if (!(prkdf->usageflags.decrypt || prkdf->usageflags.unwrap))
+    {
+      log_error ("p15: key %s may not be used for decruption\n", keyidstr);
+      return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
+    }
+
+  /* Find the authentication object to this private key object. */
+  if (!prkdf->authid)
+    {
+      log_error ("p15: no authentication object defined for %s\n", keyidstr);
+      /* fixme: we might want to go ahead and do without PIN
+         verification. */
+      return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
+    }
+  for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
+    if (aodf->objidlen == prkdf->authidlen
+        && !memcmp (aodf->objid, prkdf->authid, prkdf->authidlen))
+      break;
+  if (!aodf)
+    {
+      log_error ("p15: authentication object for %s missing\n", keyidstr);
+      return gpg_error (GPG_ERR_INV_CARD);
+    }
+
+  /* We need some more info about the key - get the keygrip to
+   * populate these fields.  */
+  err = keygrip_from_prkdf (app, prkdf);
+  if (err)
+    {
+      log_error ("p15: keygrip_from_prkdf failed: %s\n", gpg_strerror (err));
+      return err;
+    }
+
+  /* Verify the PIN.  */
+  err = prepare_verify_pin (app, keyidstr, prkdf, aodf);
+  if (!err)
+    err = verify_pin (app, pincb, pincb_arg, prkdf, aodf);
+  if (err)
+    return err;
+
+
+  /* The next is guess work for CardOS.  */
+  if (app->app_local->card_product == CARD_PRODUCT_DTRUST)
+    {
+      /* From analyzing an USB trace of a Windows signing application
+       * we see that the SE is simply reset to 0x14.  It seems to be
+       * sufficient to do this for decryption; signing still works
+       * with the standard code despite that our trace showed that
+       * there the SE is restored to 0x09.  Note that the special
+       * D-Trust AID is in any case select by prepare_verify_pin.
+       *
+       * Hey, D-Trust please hand over the specs so that you can
+       * actually sell your cards and we can properly implement it;
+       * other vendors understand this and do not demand ridiculous
+       * paper work or complicated procedures to get samples.  */
+      err = iso7816_manage_security_env (app_get_slot (app),
+                                         0xF3, 0x14, NULL, 0);
+
+    }
+  else if (prkdf->key_reference_valid)
+    {
+      unsigned char mse[6];
+
+      /* Note: This works with CardOS but the D-Trust card has the
+       * problem that the next created signature would be broken.  */
+
+      mse[0] = 0x80; /* Algorithm reference.  */
+      mse[1] = 1;
+      mse[2] = 0x0a; /* RSA, no padding.  */
+      mse[3] = 0x84;
+      mse[4] = 1;
+      mse[5] = prkdf->key_reference;
+      err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB8,
+                                         mse, sizeof mse);
+    }
+  /* Check for MSE error.  */
+  if (err)
+    {
+      log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
+      return err;
+    }
+
+  exmode = le_value = 0;
+  padind = 0;
+  if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits > 2048)
+    {
+      exmode = 1;   /* Extended length w/o a limit.  */
+      le_value = prkdf->keynbits / 8;
+    }
+
+  if (app->app_local->card_product == CARD_PRODUCT_DTRUST)
+    padind = 0x81;
+
+  err = iso7816_decipher (app_get_slot (app), exmode,
+                          indata, indatalen,
+                          le_value, padind,
+                          outdata, outdatalen);
+  return err;
+}
+
+
 
 /* Assume that EF(DIR) has been selected.  Read its content and figure
    out the home EF of pkcs#15.  Return that home DF or 0 if not found
@@ -3244,7 +4048,7 @@
   err = iso7816_read_binary (slot, 0, 0, &buffer, &buflen);
   if (err)
     {
-      log_error ("error reading EF{DIR}: %s\n", gpg_strerror (err));
+      log_error ("p15: error reading EF(DIR): %s\n", gpg_strerror (err));
       return 0;
     }
 
@@ -3258,14 +4062,15 @@
                                   && !memcmp (pp, pkcs15be_aid, nn)))))
         {
           pp = find_tlv (p, n, 0x50, &nn);
-          if (pp) /* fixme: Filter log value? */
-            log_info ("pkcs#15 application label from EF(DIR) is '%.*s'\n",
+          if (pp && opt.verbose)
+            log_info ("p15: application label from EF(DIR) is '%.*s'\n",
                       (int)nn, pp);
           pp = find_tlv (p, n, 0x51, &nn);
           if (pp && nn == 4 && *pp == 0x3f && !pp[1])
             {
               result = ((pp[2] << 8) | pp[3]);
-              log_info ("pkcs#15 application directory is 0x%04hX\n", result);
+              if (opt.verbose)
+                log_info ("p15: application directory is 0x%04hX\n", result);
             }
         }
     }
@@ -3294,11 +4099,11 @@
          does only allow for that.  Many other cards supports this
          selection method too.  Note, that we don't use
          select_application above for the Belgian card - the call
-         works but it seems that it did not switch to the correct DF.
+         works but it seems that it does not switch to the correct DF.
          Using the 2f02 just works. */
       unsigned short path[1] = { 0x2f00 };
 
-      rc = iso7816_select_path (app->slot, path, 1);
+      rc = iso7816_select_path (slot, path, 1);
       if (!rc)
         {
           direct = 1;
@@ -3306,7 +4111,7 @@
           if (def_home_df)
             {
               path[0] = def_home_df;
-              rc = iso7816_select_path (app->slot, path, 1);
+              rc = iso7816_select_path (slot, path, 1);
             }
         }
     }
@@ -3368,6 +4173,8 @@
          the common APP structure. */
       app->app_local->card_type = card_type;
 
+      app->app_local->card_product = CARD_PRODUCT_UNKNOWN;
+
       /* Store whether we may and should use direct path selection. */
       app->app_local->direct_path_selection = direct;
 
@@ -3411,7 +4218,7 @@
       app->fnc.genkey = NULL;
       app->fnc.sign = do_sign;
       app->fnc.auth = do_auth;
-      app->fnc.decipher = NULL;
+      app->fnc.decipher = do_decipher;
       app->fnc.change_pin = NULL;
       app->fnc.check_pin = NULL;
 
diff -Nru gnupg2-2.2.20/scd/app-sc-hsm.c gnupg2-2.2.27/scd/app-sc-hsm.c
--- gnupg2-2.2.20/scd/app-sc-hsm.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/app-sc-hsm.c	2020-04-01 15:02:03.000000000 +0200
@@ -1354,7 +1354,7 @@
     err = ksba_cert_init_from_mem (cert, der, derlen);
   xfree (der);
   if (!err)
-    err = app_help_get_keygrip_string (cert, r_gripstr);
+    err = app_help_get_keygrip_string (cert, r_gripstr, NULL);
   ksba_cert_release (cert);
 
   return err;
diff -Nru gnupg2-2.2.20/scd/ccid-driver.c gnupg2-2.2.27/scd/ccid-driver.c
--- gnupg2-2.2.20/scd/ccid-driver.c	2019-11-18 18:28:10.000000000 +0100
+++ gnupg2-2.2.27/scd/ccid-driver.c	2020-12-18 11:22:00.000000000 +0100
@@ -100,18 +100,16 @@
 /* Max length of buffer with out CCID message header of 10-byte
    Sending: 547 for RSA-4096 key import
         APDU size = 540 (24+4+256+256)
-        commnd + lc + le = 4 + 3 + 0
+        command + lc + le = 4 + 3 + 0
    Sending: write data object of cardholder certificate
         APDU size = 2048
-        commnd + lc + le = 4 + 3 + 0
+        command + lc + le = 4 + 3 + 0
    Receiving: 2048 for cardholder certificate
 */
 #define CCID_MAX_BUF (2048+7+10)
 
 /* CCID command timeout.  */
 #define CCID_CMD_TIMEOUT (5*1000)
-/* OpenPGPcard v2.1 requires huge timeout for key generation.  */
-#define CCID_CMD_TIMEOUT_LONGER (60*1000)
 
 /* Depending on how this source is used we either define our error
    output to go to stderr or to the GnuPG based logging functions.  We
@@ -285,6 +283,24 @@
                             size_t datalen, unsigned char *result,
                             size_t resultmax, size_t *resultlen);
 
+
+static int
+map_libusb_error (int usberr)
+{
+  switch (usberr)
+    {
+    case 0:                     return 0;
+    case LIBUSB_ERROR_IO:       return CCID_DRIVER_ERR_USB_IO;
+    case LIBUSB_ERROR_ACCESS:   return CCID_DRIVER_ERR_USB_ACCESS;
+    case LIBUSB_ERROR_NO_DEVICE:return CCID_DRIVER_ERR_USB_NO_DEVICE;
+    case LIBUSB_ERROR_BUSY:     return CCID_DRIVER_ERR_USB_BUSY;
+    case LIBUSB_ERROR_TIMEOUT:  return CCID_DRIVER_ERR_USB_TIMEOUT;
+    case LIBUSB_ERROR_OVERFLOW: return CCID_DRIVER_ERR_USB_OVERFLOW;
+    }
+  return CCID_DRIVER_ERR_USB_OTHER;
+}
+
+
 /* Convert a little endian stored 4 byte value into an unsigned
    integer. */
 static unsigned int
@@ -960,7 +976,7 @@
   rc = libusb_control_transfer (idev, LIBUSB_ENDPOINT_IN,
                                 LIBUSB_REQUEST_GET_DESCRIPTOR,
                                 (LIBUSB_DT_STRING << 8), 0,
-                                (char*)buf, sizeof buf, 1000 /* ms timeout */);
+                                buf, sizeof buf, 1000 /* ms timeout */);
 #ifdef USE_NPTH
   npth_protect ();
 #endif
@@ -975,7 +991,7 @@
   rc = libusb_control_transfer (idev, LIBUSB_ENDPOINT_IN,
                                 LIBUSB_REQUEST_GET_DESCRIPTOR,
                                 (LIBUSB_DT_STRING << 8) + idx, langid,
-                                (char*)buf, sizeof buf, 1000 /* ms timeout */);
+                                buf, sizeof buf, 1000 /* ms timeout */);
 #ifdef USE_NPTH
   npth_protect ();
 #endif
@@ -1250,9 +1266,10 @@
 static int
 ccid_vendor_specific_init (ccid_driver_t handle)
 {
+  int r = 0;
+
   if (handle->id_vendor == VENDOR_VEGA && handle->id_product == VEGA_ALPHA)
     {
-      int r;
       /*
        * Vega alpha has a feature to show retry counter on the pinpad
        * display.  But it assumes that the card returns the value of
@@ -1264,11 +1281,34 @@
       const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
 
       r = send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
-      if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE
-          && r != CCID_DRIVER_ERR_NO_CARD)
-        return r;
     }
+  else if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532)
+    {
+      /*
+       * It seems that SEQ may be out of sync between host and the card reader,
+       * and SET_INTERFACE doesn't reset it.  Make sure it works at the init.
+       */
+      abort_cmd (handle, 0);
+    }
+
+  if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE
+      && r != CCID_DRIVER_ERR_NO_CARD)
+    return r;
+  else
+    return 0;
+}
 
+
+static int
+ccid_vendor_specific_setup (ccid_driver_t handle)
+{
+  if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532)
+    {
+      DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n");
+      send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3,
+                       NULL, 0, NULL);
+      libusb_clear_halt (handle->idev, handle->ep_intr);
+    }
   return 0;
 }
 
@@ -1290,7 +1330,7 @@
 static struct ccid_dev_table ccid_dev_table[MAX_DEVICE];
 
 gpg_error_t
-ccid_dev_scan (int *idx_max_p, struct ccid_dev_table **t_p)
+ccid_dev_scan (int *idx_max_p, void **t_p)
 {
   ssize_t n;
   libusb_device *dev;
@@ -1417,9 +1457,10 @@
 }
 
 void
-ccid_dev_scan_finish (struct ccid_dev_table *tbl, int max)
+ccid_dev_scan_finish (void *tbl0, int max)
 {
   int i;
+  struct ccid_dev_table *tbl = tbl0;
 
   for (i = 0; i < max; i++)
     {
@@ -1438,12 +1479,13 @@
 }
 
 unsigned int
-ccid_get_BAI (int idx, struct ccid_dev_table *tbl)
+ccid_get_BAI (int idx, void *tbl0)
 {
   int n;
   int bus, addr, intf;
   unsigned int bai;
   libusb_device *dev;
+  struct ccid_dev_table *tbl = tbl0;
 
   n = tbl[idx].n;
   dev = ccid_usb_dev_list[n];
@@ -1468,7 +1510,8 @@
 {
   ccid_driver_t handle = transfer->user_data;
 
-  DEBUGOUT_1 ("CCID: interrupt callback %d\n", transfer->status);
+  DEBUGOUT_2 ("CCID: interrupt callback %d (%d)\n",
+              transfer->status, transfer->actual_length);
 
   if (transfer->status == LIBUSB_TRANSFER_TIMED_OUT)
     {
@@ -1484,13 +1527,50 @@
     }
   else if (transfer->status == LIBUSB_TRANSFER_COMPLETED)
     {
-      if (transfer->actual_length == 2
-          && transfer->buffer[0] == 0x50
-          && (transfer->buffer[1] & 1) == 0)
+      size_t len = transfer->actual_length;
+      unsigned char *p = transfer->buffer;
+      int card_removed = 0;
+
+      while (len)
+        {
+          if (*p == RDR_to_PC_NotifySlotChange)
+            {
+              if (len < 2)
+                break;
+
+              DEBUGOUT_1 ("CCID: NotifySlotChange: %02x\n", p[1]);
+
+              if ((p[1] & 1))
+                card_removed = 0;
+              else
+                card_removed = 1;
+
+              p += 2;
+              len -= 2;
+            }
+          else if (*p == RDR_to_PC_HardwareError)
+            {
+              if (len < 4)
+                break;
+
+              DEBUGOUT_1 ("CCID: hardware error detected: %02x\n", p[3]);
+              p += 4;
+              len -= 4;
+            }
+          else
+            {
+              DEBUGOUT_1 ("CCID: unknown intr: %02x\n", p[0]);
+              break;
+            }
+        }
+
+      if (card_removed)
         {
           DEBUGOUT ("CCID: card removed\n");
           handle->powered_off = 1;
+#if defined(GNUPG_MAJOR_VERSION)
           scd_kick_the_loop ();
+#endif
         }
       else
         {
@@ -1505,7 +1585,9 @@
     device_removed:
       DEBUGOUT ("CCID: device removed\n");
       handle->powered_off = 1;
+#if defined(GNUPG_MAJOR_VERSION)
       scd_kick_the_loop ();
+#endif
     }
 }
 
@@ -1547,7 +1629,7 @@
 
 static int
 ccid_open_usb_reader (const char *spec_reader_name,
-                      int idx, struct ccid_dev_table *ccid_table,
+                      int idx, void *ccid_table0,
                       ccid_driver_t *handle, char **rdrname_p)
 {
   libusb_device *dev;
@@ -1559,6 +1641,7 @@
   int n;
   int bus, addr;
   unsigned int bai;
+  struct ccid_dev_table *ccid_table = ccid_table0;
 
   n = ccid_table[idx].n;
   ifc_no = ccid_table[idx].interface_number;
@@ -1575,7 +1658,7 @@
       DEBUGOUT_1 ("usb_open failed: %s\n", libusb_error_name (rc));
       free (*handle);
       *handle = NULL;
-      return rc;
+      return map_libusb_error (rc);
     }
 
   if (ccid_usb_thread_is_alive++ == 0)
@@ -1610,6 +1693,7 @@
   if (rc)
     {
       DEBUGOUT ("get_device_descripor failed\n");
+      rc = map_libusb_error (rc);
       goto leave;
     }
 
@@ -1649,19 +1733,17 @@
   if (rc)
     {
       DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc);
-      rc = CCID_DRIVER_ERR_CARD_IO_ERROR;
+      rc = map_libusb_error (rc);
       goto leave;
     }
 
-  if (set_no != 0)
+  /* Submit SET_INTERFACE control transfer which can reset the device.  */
+  rc = libusb_set_interface_alt_setting (idev, ifc_no, set_no);
+  if (rc)
     {
-      rc = libusb_set_interface_alt_setting (idev, ifc_no, set_no);
-      if (rc)
-        {
-          DEBUGOUT_1 ("usb_set_interface_alt_setting failed: %d\n", rc);
-          rc = CCID_DRIVER_ERR_CARD_IO_ERROR;
-          goto leave;
-        }
+      DEBUGOUT_1 ("usb_set_interface_alt_setting failed: %d\n", rc);
+      rc = map_libusb_error (rc);
+      goto leave;
     }
 
   rc = ccid_vendor_specific_init (*handle);
@@ -1671,6 +1753,7 @@
     {
       --ccid_usb_thread_is_alive;
       free (rid);
+      libusb_release_interface (idev, ifc_no);
       libusb_close (idev);
       free (*handle);
       *handle = NULL;
@@ -1690,9 +1773,11 @@
    pointer to be used as handle in HANDLE.  Returns 0 on success. */
 int
 ccid_open_reader (const char *spec_reader_name, int idx,
-                  struct ccid_dev_table *ccid_table,
+                  void *ccid_table0,
                   ccid_driver_t *handle, char **rdrname_p)
 {
+  struct ccid_dev_table *ccid_table = ccid_table0;
+
   *handle = calloc (1, sizeof **handle);
   if (!*handle)
     {
@@ -1714,7 +1799,25 @@
      detect removal of a card and can detect removal of a reader.
   */
   if (handle->ep_intr >= 0)
-    return 0;
+    {
+      if (handle->id_vendor != VENDOR_SCM)
+        return 0;
+
+      /*
+       * For card reader with interrupt transfer support, ideally,
+       * removal is detected by intr_cb, but some card reader
+       * (e.g. SPR532) has a possible case of missing report to
+       * intr_cb, and another case of valid report to intr_cb.
+       *
+       * For such a reader, the removal should be able to be detected
+       * by PC_to_RDR_GetSlotStatus, too.  Thus, calls to
+       * ccid_slot_status should go on wire even if "on_wire" is not
+       * requested.
+       *
+       */
+      if (handle->transfer == NULL)
+        return 0;
+    }
 
   /* Libusb actually detects the removal of USB device in use.
      However, there is no good API to handle the removal (yet),
@@ -1733,31 +1836,37 @@
   return 1;
 }
 
-
-static void
-do_close_reader (ccid_driver_t handle)
+static int
+send_power_off (ccid_driver_t handle)
 {
   int rc;
   unsigned char msg[100];
   size_t msglen;
   unsigned char seqno;
 
-  if (!handle->powered_off)
-    {
-      msg[0] = PC_to_RDR_IccPowerOff;
-      msg[5] = 0; /* slot */
-      msg[6] = seqno = handle->seqno++;
-      msg[7] = 0; /* RFU */
-      msg[8] = 0; /* RFU */
-      msg[9] = 0; /* RFU */
-      set_msg_len (msg, 0);
-      msglen = 10;
+  msg[0] = PC_to_RDR_IccPowerOff;
+  msg[5] = 0; /* slot */
+  msg[6] = seqno = handle->seqno++;
+  msg[7] = 0; /* RFU */
+  msg[8] = 0; /* RFU */
+  msg[9] = 0; /* RFU */
+  set_msg_len (msg, 0);
+  msglen = 10;
 
-      rc = bulk_out (handle, msg, msglen, 0);
-      if (!rc)
-        bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus,
-                 seqno, 2000, 0);
-    }
+  rc = bulk_out (handle, msg, msglen, 0);
+  if (!rc)
+    bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus,
+             seqno, 2000, 0);
+  return rc;
+}
+
+static void
+do_close_reader (ccid_driver_t handle)
+{
+  int rc;
+
+  if (!handle->powered_off)
+    send_power_off (handle);
 
   if (handle->transfer)
     {
@@ -1909,7 +2018,7 @@
   npth_unprotect ();
 #endif
   rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_out,
-                             (char*)msg, msglen, &transferred,
+                             msg, msglen, &transferred,
                              5000 /* ms timeout */);
 #ifdef USE_NPTH
   npth_protect ();
@@ -1965,12 +2074,9 @@
     {
       DEBUGOUT_1 ("usb_bulk_read error: %s\n", libusb_error_name (rc));
       if (rc == LIBUSB_ERROR_NO_DEVICE)
-        {
-          handle->enodev_seen = 1;
-          return CCID_DRIVER_ERR_NO_READER;
-        }
+        handle->enodev_seen = 1;
 
-      return CCID_DRIVER_ERR_CARD_IO_ERROR;
+      return map_libusb_error (rc);
     }
   if (msglen < 0)
     return CCID_DRIVER_ERR_INV_VALUE;  /* Faulty libusb.  */
@@ -2072,17 +2178,16 @@
       /*
        * Communication failure by device side.
        * Possibly, it was forcibly suspended and resumed.
-       *
-       * Only detect this kind of failure when interrupt transfer is
-       * not supported.  For card reader with interrupt transfer
-       * support removal is detected by intr_cb.
        */
       if (handle->ep_intr < 0)
         {
           DEBUGOUT ("CCID: card inactive/removed\n");
           handle->powered_off = 1;
-          scd_kick_the_loop ();
         }
+
+#if defined(GNUPG_MAJOR_VERSION)
+      scd_kick_the_loop ();
+#endif
     }
 
   return rc;
@@ -2095,7 +2200,7 @@
 abort_cmd (ccid_driver_t handle, int seqno)
 {
   int rc;
-  char dummybuf[8];
+  unsigned char dummybuf[8];
   unsigned char msg[100];
   int msglen;
 
@@ -2121,7 +2226,7 @@
   if (rc)
     {
       DEBUGOUT_1 ("usb_control_msg error: %s\n", libusb_error_name (rc));
-      return CCID_DRIVER_ERR_CARD_IO_ERROR;
+      return map_libusb_error (rc);
     }
 
   /* Now send the abort command to the bulk out pipe using the same
@@ -2146,7 +2251,7 @@
       npth_unprotect ();
 #endif
       rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_out,
-                                 (char*)msg, msglen, &transferred,
+                                 msg, msglen, &transferred,
                                  5000 /* ms timeout */);
 #ifdef USE_NPTH
       npth_protect ();
@@ -2158,13 +2263,13 @@
                     libusb_error_name (rc));
 
       if (rc)
-        return rc;
+        return map_libusb_error (rc);
 
 #ifdef USE_NPTH
       npth_unprotect ();
 #endif
       rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_in,
-                                 (char*)msg, sizeof msg, &msglen,
+                                 msg, sizeof msg, &msglen,
                                  5000 /*ms timeout*/);
 #ifdef USE_NPTH
       npth_protect ();
@@ -2173,7 +2278,7 @@
         {
           DEBUGOUT_1 ("usb_bulk_read error in abort_cmd: %s\n",
                       libusb_error_name (rc));
-          return CCID_DRIVER_ERR_CARD_IO_ERROR;
+          return map_libusb_error (rc);
         }
 
       if (msglen < 10)
@@ -2285,7 +2390,7 @@
   int i, j;
 
   rc = libusb_interrupt_transfer (handle->idev, handle->ep_intr,
-                                  (char*)msg, sizeof msg, &msglen,
+                                  msg, sizeof msg, &msglen,
                                   0 /* ms timeout */ );
   if (rc == LIBUSB_ERROR_TIMEOUT)
     return 0;
@@ -2348,7 +2453,7 @@
     {
       /* Setup interrupt transfer at the initial call of slot_status
          with ON_WIRE == 0 */
-      if (handle->transfer == NULL && handle->ep_intr >= 0)
+      if (handle->transfer == NULL)
         ccid_setup_intr (handle);
 
       *statusbits = 0;
@@ -2372,7 +2477,8 @@
      status and debugging enabled. */
   rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus,
                 seqno, retries? 1000 : 200, 1);
-  if (rc == CCID_DRIVER_ERR_CARD_IO_ERROR && retries < 3)
+  if ((rc == CCID_DRIVER_ERR_CARD_IO_ERROR || rc == CCID_DRIVER_ERR_USB_TIMEOUT)
+      && retries < 3)
     {
       if (!retries)
         {
@@ -2618,6 +2724,21 @@
                             NULL, 0, NULL))
         goto again;
     }
+  else if (statusbits == 0 && CCID_COMMAND_FAILED (msg))
+    {
+      /* Card was active already, and something went wrong with
+         PC_to_RDR_IccPowerOn command.  It may be baud-rate mismatch
+         between the card and the reader.  To recover from this state,
+         send PC_to_RDR_IccPowerOff command to reset the card and try
+         again.
+       */
+      rc = send_power_off (handle);
+      if (rc)
+        return rc;
+
+      statusbits = 1;
+      goto again;
+    }
   else if (CCID_COMMAND_FAILED (msg))
     return CCID_DRIVER_ERR_CARD_IO_ERROR;
 
@@ -2802,6 +2923,7 @@
       DEBUGOUT_1 ("IFSD has been set to %d\n", tpdu[3]);
     }
 
+  ccid_vendor_specific_setup (handle);
   return 0;
 }
 
@@ -3101,7 +3223,7 @@
           msg[0] = PC_to_RDR_XfrBlock;
           msg[5] = 0; /* slot */
           msg[6] = seqno = handle->seqno++;
-          msg[7] = wait_more; /* bBWI */
+          msg[7] = (wait_more ? wait_more : 1); /* bBWI */
           msg[8] = 0; /* RFU */
           msg[9] = 0; /* RFU */
           set_msg_len (msg, tpdulen);
@@ -3127,7 +3249,7 @@
       msg = recv_buffer;
       rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen,
                     via_escape? RDR_to_PC_Escape : RDR_to_PC_DataBlock, seqno,
-                    wait_more? CCID_CMD_TIMEOUT_LONGER: CCID_CMD_TIMEOUT, 0);
+                    (wait_more ? wait_more : 1) * CCID_CMD_TIMEOUT, 0);
       if (rc)
         return rc;
 
@@ -3157,6 +3279,7 @@
                     (!(msg[pcboff] & 0x80) && (msg[pcboff] & 0x20)?
                      " [more]":""));
 
+      wait_more = 0;
       if (!(tpdu[1] & 0x80))
         { /* This is an I-block. */
           retries = 0;
@@ -3302,9 +3425,7 @@
               /* Wait time extension request. */
               unsigned char bwi = tpdu[3];
 
-              /* Check if it's unsual value which can't be expressed in ATR.  */
-              if (bwi > 15)
-                wait_more = 1;
+	      wait_more = bwi;
 
               msg = send_buffer;
               tpdu = msg + hdrlen;
@@ -3463,15 +3584,6 @@
     return CCID_DRIVER_ERR_NOT_SUPPORTED;
 
   msg = send_buffer;
-  if (handle->id_vendor == VENDOR_SCM)
-    {
-      DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n");
-      rc = send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3,
-                            NULL, 0, NULL);
-      if (rc)
-        return rc;
-    }
-
   msg[0] = cherry_mode? 0x89 : PC_to_RDR_Secure;
   msg[5] = 0; /* slot */
   msg[6] = seqno = handle->seqno++;
@@ -3698,7 +3810,7 @@
 
   switch (err)
     {
-    case 0: p = "success";
+    case 0: p = "success"; break;
     case CCID_DRIVER_ERR_OUT_OF_CORE: p = "out of core"; break;
     case CCID_DRIVER_ERR_INV_VALUE: p = "invalid value"; break;
     case CCID_DRIVER_ERR_NO_DRIVER: p = "no driver"; break;
@@ -3747,7 +3859,7 @@
 int
 main (int argc, char **argv)
 {
-  int rc;
+  gpg_error_t err;
   ccid_driver_t ccid;
   int slotstat;
   unsigned char result[512];
@@ -3756,6 +3868,8 @@
   int verify_123456 = 0;
   int did_verify = 0;
   int no_poll = 0;
+  int idx_max;
+  struct ccid_dev_table *ccid_table;
 
   if (argc)
     {
@@ -3799,27 +3913,36 @@
         break;
     }
 
-  rc = ccid_open_reader (&ccid, argc? *argv:NULL, NULL);
-  if (rc)
+  err = ccid_dev_scan (&idx_max, &ccid_table);
+  if (err)
+    return 1;
+
+  if (idx_max == 0)
+    return 1;
+
+  err = ccid_open_reader (argc? *argv:NULL, 0, ccid_table, &ccid, NULL);
+  if (err)
     return 1;
 
+  ccid_dev_scan_finish (ccid_table, idx_max);
+
   if (!no_poll)
     ccid_poll (ccid);
   fputs ("getting ATR ...\n", stderr);
-  rc = ccid_get_atr (ccid, NULL, 0, NULL);
-  if (rc)
+  err = ccid_get_atr (ccid, NULL, 0, NULL);
+  if (err)
     {
-      print_error (rc);
+      print_error (err);
       return 1;
     }
 
   if (!no_poll)
     ccid_poll (ccid);
   fputs ("getting slot status ...\n", stderr);
-  rc = ccid_slot_status (ccid, &slotstat, 1);
-  if (rc)
+  err = ccid_slot_status (ccid, &slotstat, 1);
+  if (err)
     {
-      print_error (rc);
+      print_error (err);
       return 1;
     }
 
@@ -3830,10 +3953,10 @@
   {
     static unsigned char apdu[] = {
       0, 0xA4, 4, 0, 6, 0xD2, 0x76, 0x00, 0x01, 0x24, 0x01};
-    rc = ccid_transceive (ccid,
-                          apdu, sizeof apdu,
-                          result, sizeof result, &resultlen);
-    print_result (rc, result, resultlen);
+    err = ccid_transceive (ccid,
+                           apdu, sizeof apdu,
+                           result, sizeof result, &resultlen);
+    print_result (err, result, resultlen);
   }
 
 
@@ -3843,9 +3966,9 @@
   fputs ("getting OpenPGP DO 0x65 ....\n", stderr);
   {
     static unsigned char apdu[] = { 0, 0xCA, 0, 0x65, 254 };
-    rc = ccid_transceive (ccid, apdu, sizeof apdu,
-                          result, sizeof result, &resultlen);
-    print_result (rc, result, resultlen);
+    err = ccid_transceive (ccid, apdu, sizeof apdu,
+                           result, sizeof result, &resultlen);
+    print_result (err, result, resultlen);
   }
 
   if (!no_pinpad)
@@ -3855,22 +3978,18 @@
   if (!no_pinpad)
     {
       static unsigned char apdu[] = { 0, 0x20, 0, 0x81 };
+      pininfo_t pininfo = { 0, 0, 0 };
 
-
-      if (ccid_transceive_secure (ccid,
-                                  apdu, sizeof apdu,
-                                  1, 0, 0, 0,
+      if (ccid_transceive_secure (ccid, apdu, sizeof apdu, &pininfo,
                                   NULL, 0, NULL))
         fputs ("can't verify using a PIN-Pad reader\n", stderr);
       else
         {
-          fputs ("verifying CHV1 using the PINPad ....\n", stderr);
+           fputs ("verifying CHV1 using the PINPad ....\n", stderr);
 
-          rc = ccid_transceive_secure (ccid,
-                                       apdu, sizeof apdu,
-                                       1, 0, 0, 0,
-                                       result, sizeof result, &resultlen);
-          print_result (rc, result, resultlen);
+          err = ccid_transceive_secure (ccid, apdu, sizeof apdu, &pininfo,
+                                        result, sizeof result, &resultlen);
+          print_result (err, result, resultlen);
           did_verify = 1;
         }
     }
@@ -3881,20 +4000,20 @@
       {
         static unsigned char apdu[] = {0, 0x20, 0, 0x81,
                                        6, '1','2','3','4','5','6'};
-        rc = ccid_transceive (ccid, apdu, sizeof apdu,
-                              result, sizeof result, &resultlen);
-        print_result (rc, result, resultlen);
+        err = ccid_transceive (ccid, apdu, sizeof apdu,
+                               result, sizeof result, &resultlen);
+        print_result (err, result, resultlen);
       }
     }
 
-  if (!rc)
+  if (!err)
     {
       fputs ("getting OpenPGP DO 0x5E ....\n", stderr);
       {
         static unsigned char apdu[] = { 0, 0xCA, 0, 0x5E, 254 };
-        rc = ccid_transceive (ccid, apdu, sizeof apdu,
-                              result, sizeof result, &resultlen);
-        print_result (rc, result, resultlen);
+        err = ccid_transceive (ccid, apdu, sizeof apdu,
+                               result, sizeof result, &resultlen);
+        print_result (err, result, resultlen);
       }
     }
 
@@ -3905,7 +4024,7 @@
 
 /*
  * Local Variables:
- *  compile-command: "gcc -DTEST -Wall -I/usr/local/include -lusb -g ccid-driver.c"
+ *  compile-command: "gcc -DTEST -DGPGRT_ENABLE_ES_MACROS -DHAVE_NPTH -DUSE_NPTH -Wall -I/usr/include/libusb-1.0 -I/usr/local/include -lusb-1.0 -g ccid-driver.c -lnpth -lgpg-error"
  * End:
  */
 #endif /*TEST*/
diff -Nru gnupg2-2.2.20/scd/ccid-driver.h gnupg2-2.2.27/scd/ccid-driver.h
--- gnupg2-2.2.20/scd/ccid-driver.h	2019-11-18 18:28:10.000000000 +0100
+++ gnupg2-2.2.27/scd/ccid-driver.h	2020-10-23 20:08:54.000000000 +0200
@@ -108,6 +108,13 @@
 #define CCID_DRIVER_ERR_NO_READER      0x1000c
 #define CCID_DRIVER_ERR_ABORTED        0x1000d
 #define CCID_DRIVER_ERR_NO_PINPAD      0x1000e
+#define CCID_DRIVER_ERR_USB_OTHER      0x10020
+#define CCID_DRIVER_ERR_USB_IO         0x10021
+#define CCID_DRIVER_ERR_USB_ACCESS     0x10023
+#define CCID_DRIVER_ERR_USB_NO_DEVICE  0x10024
+#define CCID_DRIVER_ERR_USB_BUSY       0x10026
+#define CCID_DRIVER_ERR_USB_TIMEOUT    0x10027
+#define CCID_DRIVER_ERR_USB_OVERFLOW   0x10028
 
 struct ccid_driver_s;
 typedef struct ccid_driver_s *ccid_driver_t;
@@ -117,12 +124,12 @@
 int ccid_set_debug_level (int level);
 char *ccid_get_reader_list (void);
 
-gpg_error_t ccid_dev_scan (int *idx_max, struct ccid_dev_table **t_p);
-void ccid_dev_scan_finish (struct ccid_dev_table *tbl, int max);
-unsigned int ccid_get_BAI (int, struct ccid_dev_table *tbl);
+gpg_error_t ccid_dev_scan (int *idx_max, void **t_p);
+void ccid_dev_scan_finish (void *tbl0, int max);
+unsigned int ccid_get_BAI (int, void *tbl0);
 int ccid_compare_BAI (ccid_driver_t handle, unsigned int);
 int ccid_open_reader (const char *spec_reader_name,
-                      int idx, struct ccid_dev_table *ccid_table,
+                      int idx, void *ccid_table0,
                       ccid_driver_t *handle, char **rdrname_p);
 int ccid_set_progress_cb (ccid_driver_t handle,
                           void (*cb)(void *, const char *, int, int, int),
diff -Nru gnupg2-2.2.20/scd/command.c gnupg2-2.2.27/scd/command.c
--- gnupg2-2.2.20/scd/command.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/command.c	2020-11-12 12:44:57.000000000 +0100
@@ -138,9 +138,10 @@
 
 /* Reset the card and free the application context.  With SEND_RESET
    set to true actually send a RESET to the reader; this is the normal
-   way of calling the function.  */
+   way of calling the function.  If KEEP_LOCK is set and the session
+   is locked that lock wil not be released.  */
 static void
-do_reset (ctrl_t ctrl, int send_reset)
+do_reset (ctrl_t ctrl, int send_reset, int keep_lock)
 {
   app_t app = ctrl->app_ctx;
 
@@ -148,7 +149,7 @@
     app_reset (app, ctrl, IS_LOCKED (ctrl)? 0: send_reset);
 
   /* If we hold a lock, unlock now. */
-  if (locked_session && ctrl->server_local == locked_session)
+  if (!keep_lock && locked_session && ctrl->server_local == locked_session)
     {
       locked_session = NULL;
       log_info ("implicitly unlocking due to RESET\n");
@@ -160,9 +161,7 @@
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
 
-  (void) line;
-
-  do_reset (ctrl, 1);
+  do_reset (ctrl, 1, has_option (line, "--keep-lock"));
   return 0;
 }
 
@@ -291,6 +290,8 @@
   else
     demand = NULL;
 
+  line = skip_options (line);
+
   /* Clear the remove flag so that the open_card is able to reread it.  */
   if (ctrl->server_local->card_removed)
     ctrl->server_local->card_removed = 0;
@@ -1262,7 +1263,7 @@
   "   entry system, only the regular CHV will get blocked and not the\n"
   "   dangerous CHV3.  IDSTR is the usual card's serial number in hex\n"
   "   notation; an optional fingerprint part will get ignored.  There\n"
-  "   is however a special mode if the IDSTR is sffixed with the\n"
+  "   is however a special mode if the IDSTR is suffixed with the\n"
   "   literal string \"[CHV3]\": In this case the Admin PIN is checked\n"
   "   if and only if the retry counter is still at 3.\n"
   "\n"
@@ -1340,9 +1341,10 @@
       npth_sleep (1); /* Better implement an event mechanism. However,
                          for card operations this should be
                          sufficient. */
-      /* FIXME: Need to check that the connection is still alive.
-         This can be done by issuing status messages. */
-      goto retry;
+      /* Send a progress so that we can detect a connection loss.  */
+      rc = send_status_printf (ctrl, "PROGRESS", "scd_locked . 0 0");
+      if (!rc)
+        goto retry;
     }
 #endif /*USE_NPTH*/
 
@@ -1814,7 +1816,7 @@
     }
 
   /* Cleanup.  We don't send an explicit reset to the card.  */
-  do_reset (ctrl, 0);
+  do_reset (ctrl, 0, 0);
 
   /* Release the server object.  */
   if (session_list == ctrl->server_local)
diff -Nru gnupg2-2.2.20/scd/iso7816.c gnupg2-2.2.27/scd/iso7816.c
--- gnupg2-2.2.20/scd/iso7816.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/iso7816.c	2020-10-23 20:08:54.000000000 +0200
@@ -97,12 +97,21 @@
     case SW_HOST_ABORTED:        ec = GPG_ERR_INV_RESPONSE; break;
     case SW_HOST_NO_PINPAD:      ec = GPG_ERR_NOT_SUPPORTED; break;
     case SW_HOST_CANCELLED:      ec = GPG_ERR_CANCELED; break;
+    case SW_HOST_USB_OTHER:      ec = GPG_ERR_EIO; break;
+    case SW_HOST_USB_IO:         ec = GPG_ERR_EIO; break;
+    case SW_HOST_USB_ACCESS:     ec = GPG_ERR_EACCES; break;
+    case SW_HOST_USB_NO_DEVICE:  ec = GPG_ERR_ENODEV; break;
+    case SW_HOST_USB_BUSY:       ec = GPG_ERR_EBUSY; break;
+    case SW_HOST_USB_TIMEOUT:    ec = GPG_ERR_TIMEOUT; break;
+    case SW_HOST_USB_OVERFLOW:   ec = GPG_ERR_EOVERFLOW; break;
 
     default:
       if ((sw & 0x010000))
         ec = GPG_ERR_GENERAL; /* Should not happen. */
       else if ((sw & 0xff00) == SW_MORE_DATA)
         ec = 0; /* This should actually never been seen here. */
+      else if ((sw & 0xfff0) == 0x63C0)
+        ec = GPG_ERR_BAD_PIN;
       else
         ec = GPG_ERR_CARD;
     }
@@ -139,6 +148,32 @@
 }
 
 
+/* This is the same as iso7816_select_application but may return data
+ * at RESULT,RESULTLEN).  */
+gpg_error_t
+iso7816_select_application_ext (int slot, const char *aid, size_t aidlen,
+                                unsigned int flags,
+                                unsigned char **result, size_t *resultlen)
+{
+  int sw;
+  sw = apdu_send (slot, 0, 0x00, CMD_SELECT_FILE, 4,
+                  (flags&1)? 0:0x0c, aidlen, aid,
+                  result, resultlen);
+  return map_sw (sw);
+}
+
+
+/* Simple MF selection as supported by some cards.  */
+gpg_error_t
+iso7816_select_mf (int slot)
+{
+  int sw;
+
+  sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE, 0x000, 0x0c, -1, NULL);
+  return map_sw (sw);
+}
+
+
 gpg_error_t
 iso7816_select_file (int slot, int tag, int is_dir)
 {
@@ -289,6 +324,39 @@
   return map_sw (sw);
 }
 
+
+/* Some cards support a VERIFY command variant to check the status of
+ * the the CHV without a need to try a CHV.  In contrast to the other
+ * functions this function returns the special codes ISO7816_VERIFY_*
+ * or a non-negative number with the left attempts.  */
+int
+iso7816_verify_status (int slot, int chvno)
+{
+  unsigned char apdu[4];
+  unsigned int sw;
+  int result;
+
+  apdu[0] = 0x00;
+  apdu[1] = ISO7816_VERIFY;
+  apdu[2] = 0x00;
+  apdu[3] = chvno;
+  if (!iso7816_apdu_direct (slot, apdu, 4, 0, &sw, NULL, NULL))
+    result = ISO7816_VERIFY_NOT_NEEDED;  /* Not returned by all cards.  */
+  else if (sw == 0x6a88 || sw == 0x6a80)
+    result = ISO7816_VERIFY_NO_PIN;
+  else if (sw == 0x6983)
+    result = ISO7816_VERIFY_BLOCKED;
+  else if (sw == 0x6985)
+    result = ISO7816_VERIFY_NULLPIN;     /* TCOS card  */
+  else if ((sw & 0xfff0) == 0x63C0)
+    result = (sw & 0x000f);
+  else
+    result = ISO7816_VERIFY_ERROR;
+
+  return result;
+}
+
+
 /* Perform a CHANGE_REFERENCE_DATA command on SLOT for the card holder
    verification vector CHVNO.  With PININFO non-NULL the pinpad of the
    reader will be used.  If IS_EXCHANGE is 0, a "change reference
@@ -722,8 +790,9 @@
    stored in a newly allocated buffer at the address passed by RESULT.
    Returns the length of this data at the address of RESULTLEN. */
 gpg_error_t
-iso7816_read_binary (int slot, size_t offset, size_t nmax,
-                     unsigned char **result, size_t *resultlen)
+iso7816_read_binary_ext (int slot, int extended_mode,
+                         size_t offset, size_t nmax,
+                         unsigned char **result, size_t *resultlen)
 {
   int sw;
   unsigned char *buffer;
@@ -746,13 +815,13 @@
       buffer = NULL;
       bufferlen = 0;
       n = read_all? 0 : nmax;
-      sw = apdu_send_le (slot, 0, 0x00, CMD_READ_BINARY,
+      sw = apdu_send_le (slot, extended_mode, 0x00, CMD_READ_BINARY,
                          ((offset>>8) & 0xff), (offset & 0xff) , -1, NULL,
                          n, &buffer, &bufferlen);
       if ( SW_EXACT_LENGTH_P(sw) )
         {
           n = (sw & 0x00ff);
-          sw = apdu_send_le (slot, 0, 0x00, CMD_READ_BINARY,
+          sw = apdu_send_le (slot, extended_mode, 0x00, CMD_READ_BINARY,
                              ((offset>>8) & 0xff), (offset & 0xff) , -1, NULL,
                              n, &buffer, &bufferlen);
         }
@@ -811,6 +880,15 @@
   return 0;
 }
 
+
+gpg_error_t
+iso7816_read_binary (int slot, size_t offset, size_t nmax,
+                     unsigned char **result, size_t *resultlen)
+{
+  return iso7816_read_binary_ext (slot, 0, offset, nmax, result, resultlen);
+}
+
+
 /* Perform a READ RECORD command. RECNO gives the record number to
    read with 0 indicating the current record.  RECCOUNT must be 1 (not
    all cards support reading of more than one record).  SHORT_EF
diff -Nru gnupg2-2.2.20/scd/iso7816.h gnupg2-2.2.27/scd/iso7816.h
--- gnupg2-2.2.20/scd/iso7816.h	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/iso7816.h	2020-04-15 15:32:43.000000000 +0200
@@ -29,6 +29,15 @@
 #define ISO7816_CHANGE_REFERENCE_DATA 0x24
 #define ISO7816_RESET_RETRY_COUNTER   0x2C
 
+/* Error codes returned by iso7816_verify_status.  A non-negative
+ * number gives the number of left tries.
+ * NB: The values are also used by the CHV-STATUS lines and thus are
+ * part of the public interface.  Do not change them.  */
+#define ISO7816_VERIFY_ERROR        (-1)
+#define ISO7816_VERIFY_NO_PIN       (-2)
+#define ISO7816_VERIFY_BLOCKED      (-3)
+#define ISO7816_VERIFY_NULLPIN      (-4)
+#define ISO7816_VERIFY_NOT_NEEDED   (-5)
 
 /* Information to be passed to pinpad equipped readers.  See
    ccid-driver.c for details. */
@@ -51,6 +60,12 @@
 gpg_error_t iso7816_select_application (int slot,
                                         const char *aid, size_t aidlen,
                                         unsigned int flags);
+gpg_error_t iso7816_select_application_ext (int slot,
+                                            const char *aid, size_t aidlen,
+                                            unsigned int flags,
+                                            unsigned char **result,
+                                            size_t *resultlen);
+gpg_error_t iso7816_select_mf (int slot);
 gpg_error_t iso7816_select_file (int slot, int tag, int is_dir);
 gpg_error_t iso7816_select_path (int slot,
                                  const unsigned short *path, size_t pathlen);
@@ -65,6 +80,7 @@
 gpg_error_t iso7816_verify (int slot,
                             int chvno, const char *chv, size_t chvlen);
 gpg_error_t iso7816_verify_kp (int slot, int chvno, pininfo_t *pininfo);
+int iso7816_verify_status (int slot, int chvno);
 gpg_error_t iso7816_change_reference_data (int slot, int chvno,
                                const char *oldchv, size_t oldchvlen,
                                const char *newchv, size_t newchvlen);
@@ -117,6 +133,9 @@
 gpg_error_t iso7816_get_challenge (int slot,
                                    int length, unsigned char *buffer);
 
+gpg_error_t iso7816_read_binary_ext (int slot, int extended_mode,
+                                     size_t offset, size_t nmax,
+                                     unsigned char **result, size_t *resultlen);
 gpg_error_t iso7816_read_binary (int slot, size_t offset, size_t nmax,
                                  unsigned char **result, size_t *resultlen);
 gpg_error_t iso7816_read_record (int slot, int recno, int reccount,
diff -Nru gnupg2-2.2.20/scd/Makefile.am gnupg2-2.2.27/scd/Makefile.am
--- gnupg2-2.2.20/scd/Makefile.am	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/scd/Makefile.am	2020-10-23 20:08:54.000000000 +0200
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
+EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc scdaemon.w32-manifest.in
 
 libexec_PROGRAMS = scdaemon
 
@@ -26,7 +26,7 @@
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-resource_objs += scdaemon-w32info.o
+scdaemon_robjs = $(resource_objs) scdaemon-w32info.o
 endif
 
 AM_CFLAGS =  $(LIBGCRYPT_CFLAGS) \
@@ -48,4 +48,4 @@
 scdaemon_LDADD = $(libcommonpth) \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
-        $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs)
+        $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(scdaemon_robjs)
diff -Nru gnupg2-2.2.20/scd/Makefile.in gnupg2-2.2.27/scd/Makefile.in
--- gnupg2-2.2.20/scd/Makefile.in	2020-03-20 16:37:59.000000000 +0100
+++ gnupg2-2.2.27/scd/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -141,7 +141,6 @@
 @GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 @GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-@HAVE_W32_SYSTEM_TRUE@am__append_8 = scdaemon-w32info.o
 subdir = scd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -163,7 +162,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = scdaemon.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
 PROGRAMS = $(libexec_PROGRAMS)
@@ -176,12 +175,14 @@
 	$(am__objects_1)
 scdaemon_OBJECTS = $(am_scdaemon_OBJECTS)
 am__DEPENDENCIES_1 =
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	scdaemon-w32info.o
 scdaemon_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(resource_objs)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -243,7 +244,8 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/am/cmacros.am \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/scdaemon.w32-manifest.in $(top_srcdir)/am/cmacros.am \
 	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -255,6 +257,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -421,6 +424,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -429,7 +433,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
+EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc scdaemon.w32-manifest.in
 
 # NB: AM_CFLAGS may also be used by tools running on the build
 # platform to create source files.
@@ -447,13 +451,14 @@
 @HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
 @HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags = 
 @HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
-resource_objs = $(am__append_8)
+resource_objs = 
 
 # Convenience macros
 libcommon = ../common/libcommon.a
 libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
+@HAVE_W32_SYSTEM_TRUE@scdaemon_robjs = $(resource_objs) scdaemon-w32info.o
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
 	     $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 
@@ -470,7 +475,7 @@
 scdaemon_LDADD = $(libcommonpth) \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
-        $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs)
+        $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(scdaemon_robjs)
 
 all: all-am
 
@@ -506,6 +511,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+scdaemon.w32-manifest: $(top_builddir)/config.status $(srcdir)/scdaemon.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
diff -Nru gnupg2-2.2.20/scd/scdaemon.c gnupg2-2.2.27/scd/scdaemon.c
--- gnupg2-2.2.20/scd/scdaemon.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/scd/scdaemon.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -121,7 +122,7 @@
   ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
   ARGPARSE_s_n (oSh,    "sh", N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,   "csh", N_("csh-style command output")),
-  ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
   ARGPARSE_s_s (oDebug, "debug", "@"),
   ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level" ,
@@ -161,6 +162,7 @@
                 N_("use variable length input for pinpad")),
   ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
   ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
 
   /* Stubs for options which are implemented by 2.3 or later.  */
   ARGPARSE_s_s (oNoop, "application-priority", "@"),
@@ -287,9 +289,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@SCDAEMON@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -421,13 +425,11 @@
   ARGPARSE_ARGS pargs;
   int orig_argc;
   char **orig_argv;
-  FILE *configfp = NULL;
-  char *configname = NULL;
+  char *last_configname = NULL;
+  const char *configname = NULL;
   const char *shell;
-  unsigned int configlineno;
-  int parse_debug = 0;
+  int debug_argparser = 0;
   const char *debug_level = NULL;
-  int default_config =1;
   int greeting = 0;
   int nogreeting = 0;
   int multi_server = 0;
@@ -437,7 +439,7 @@
   char *logfile = NULL;
   int debug_wait = 0;
   int gpgconf_list = 0;
-  const char *config_filename = NULL;
+  char *config_filename = NULL;
   int allow_coredump = 0;
   struct assuan_malloc_hooks malloc_hooks;
   int res;
@@ -484,73 +486,61 @@
   orig_argv = argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1|(1<<6);  /* do not remove the args, ignore version */
-  while (arg_parse( &pargs, opts))
+  pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
-      if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
-        parse_debug++;
-      else if (pargs.r_opt == oOptions)
-        { /* yes there is one, so we do not try the default one, but
-             read the option file when it is encountered at the
-             commandline */
-          default_config = 0;
-        }
-        else if (pargs.r_opt == oNoOptions)
-          default_config = 0; /* --no-options */
-        else if (pargs.r_opt == oHomedir)
+      switch (pargs.r_opt)
+        {
+        case oDebug:
+        case oDebugAll:
+          debug_argparser++;
+          break;
+        case oHomedir:
           gnupg_set_homedir (pargs.r.ret_str);
+          break;
+        }
     }
+  /* Reset the flags.  */
+  pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
-  /* initialize the secure memory. */
+  /* Initialize the secure memory. */
   gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
   maybe_setuid = 0;
 
   /*
-     Now we are working under our real uid
-  */
-
-
-  if (default_config)
-    configname = make_filename (gnupg_homedir (), SCDAEMON_NAME EXTSEP_S "conf",
-                                NULL );
+   * Now we are working under our real uid
+   */
 
+  /* The configuraton directories for use by gpgrt_argparser.  */
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
 
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* do not remove the args */
- next_pass:
-  if (configname)
-    {
-      configlineno = 0;
-      configfp = fopen (configname, "r");
-      if (!configfp)
+  pargs.flags |=  (ARGPARSE_FLAG_RESET
+                   | ARGPARSE_FLAG_KEEP
+                   | ARGPARSE_FLAG_SYS
+                   | ARGPARSE_FLAG_USER);
+  while (gnupg_argparser (&pargs, opts, SCDAEMON_NAME EXTSEP_S "conf"))
+    {
+      switch (pargs.r_opt)
         {
-          if (default_config)
+        case ARGPARSE_CONFFILE:
+          if (debug_argparser)
+            log_info (_("reading options from '%s'\n"),
+                      pargs.r_type? pargs.r.ret_str: "[cmdline]");
+          if (pargs.r_type)
             {
-              if( parse_debug )
-                log_info (_("Note: no default option file '%s'\n"),
-                          configname );
+              xfree (last_configname);
+              last_configname = xstrdup (pargs.r.ret_str);
+              configname = last_configname;
             }
           else
-            {
-              log_error (_("option file '%s': %s\n"),
-                         configname, strerror(errno) );
-              exit(2);
-            }
-          xfree (configname);
-          configname = NULL;
-        }
-      if (parse_debug && configname )
-        log_info (_("reading options from '%s'\n"), configname );
-      default_config = 0;
-    }
+            configname = NULL;
+          break;
 
-  while (optfile_parse( configfp, configname, &configlineno, &pargs, opts) )
-    {
-      switch (pargs.r_opt)
-        {
         case aGPGConfList: gpgconf_list = 1; break;
         case aGPGConfTest: gpgconf_list = 2; break;
         case oQuiet: opt.quiet = 1; break;
@@ -583,18 +573,8 @@
           set_libassuan_log_cats (pargs.r.ret_ulong);
           break;
 
-        case oOptions:
-          /* config files may not be nested (silently ignore them) */
-          if (!configfp)
-            {
-                xfree(configname);
-                configname = xstrdup(pargs.r.ret_str);
-                goto next_pass;
-            }
-          break;
         case oNoGreeting: nogreeting = 1; break;
         case oNoVerbose: opt.verbose = 0; break;
-        case oNoOptions: break; /* no-options */
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
         case oNoDetach: nodetach = 1; break;
         case oLogFile: logfile = pargs.r.ret_str; break;
@@ -631,21 +611,25 @@
         case oNoop: break;
 
         default:
-          pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
+          if (configname)
+            pargs.err = ARGPARSE_PRINT_WARNING;
+          else
+            pargs.err = ARGPARSE_PRINT_ERROR;
           break;
         }
     }
-  if (configfp)
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
+  if (!last_configname)
+    config_filename = make_filename (gnupg_homedir (),
+                                     SCDAEMON_NAME EXTSEP_S "conf",
+                                     NULL);
+  else
     {
-      fclose( configfp );
-      configfp = NULL;
-      /* Keep a copy of the config name for use by --gpgconf-list. */
-      config_filename = configname;
-      configname = NULL;
-      goto next_pass;
+      config_filename = last_configname;
+      last_configname = NULL;
     }
-  xfree (configname);
-  configname = NULL;
+
   if (log_get_errorcount(0))
     exit(2);
   if (nogreeting )
@@ -692,21 +676,13 @@
   if (gpgconf_list)
     {
       /* List options and default values in the GPG Conf format.  */
-      char *filename = NULL;
       char *filename_esc;
 
-      if (config_filename)
-        filename = xstrdup (config_filename);
-      else
-        filename = make_filename (gnupg_homedir (),
-                                  SCDAEMON_NAME EXTSEP_S "conf", NULL);
-      filename_esc = percent_escape (filename, NULL);
-
+      filename_esc = percent_escape (config_filename, NULL);
       es_printf ("%s-%s.conf:%lu:\"%s\n",
                  GPGCONF_NAME, SCDAEMON_NAME,
                  GC_OPT_FLAG_DEFAULT, filename_esc);
       xfree (filename_esc);
-      xfree (filename);
 
       es_printf ("verbose:%lu:\n"
                  "quiet:%lu:\n"
@@ -960,9 +936,11 @@
       close (fd);
     }
 
+  xfree (config_filename);
   return 0;
 }
 
+
 void
 scd_exit (int rc)
 {
diff -Nru gnupg2-2.2.20/scd/scdaemon-w32info.rc gnupg2-2.2.27/scd/scdaemon-w32info.rc
--- gnupg2-2.2.20/scd/scdaemon-w32info.rc	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/scd/scdaemon-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -48,3 +48,5 @@
       VALUE "Translation", 0x409, 0x4b0
     END
   END
+
+1 RT_MANIFEST "scdaemon.w32-manifest"
diff -Nru gnupg2-2.2.20/scd/scdaemon.w32-manifest.in gnupg2-2.2.27/scd/scdaemon.w32-manifest.in
--- gnupg2-2.2.20/scd/scdaemon.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/scd/scdaemon.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Scmartcard daemon)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.scdaemon"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/sm/call-agent.c gnupg2-2.2.27/sm/call-agent.c
--- gnupg2-2.2.20/sm/call-agent.c	2019-08-21 14:01:03.000000000 +0200
+++ gnupg2-2.2.27/sm/call-agent.c	2020-08-23 12:28:56.000000000 +0200
@@ -565,7 +565,7 @@
 
 
 
-/* Call the agent to generate a newkey */
+/* Call the agent to generate a new key */
 int
 gpgsm_agent_genkey (ctrl_t ctrl,
                     ksba_const_sexp_t keyparms, ksba_sexp_t *r_pubkey)
@@ -575,6 +575,8 @@
   membuf_t data;
   size_t len;
   unsigned char *buf;
+  gnupg_isotime_t timebuf;
+  char line[ASSUAN_LINELENGTH];
 
   *r_pubkey = NULL;
   rc = start_agent (ctrl);
@@ -592,7 +594,9 @@
   gk_parm.sexplen = gcry_sexp_canon_len (keyparms, 0, NULL, NULL);
   if (!gk_parm.sexplen)
     return gpg_error (GPG_ERR_INV_VALUE);
-  rc = assuan_transact (agent_ctx, "GENKEY",
+  gnupg_get_isotime (timebuf);
+  snprintf (line, sizeof line, "GENKEY --timestamp=%s", timebuf);
+  rc = assuan_transact (agent_ctx, line,
                         put_membuf_cb, &data,
                         inq_genkey_parms, &gk_parm, NULL, NULL);
   if (rc)
@@ -1248,7 +1252,7 @@
     return gpg_error_from_syserror ();
 
   snprintf (line, DIM(line), "GET_PASSPHRASE --data%s -- X X X %s",
-            repeat? " --repeat=1 --check --qualitybar":"",
+            repeat? " --repeat=1 --check":"",
             arg4);
   xfree (arg4);
 
@@ -1344,6 +1348,8 @@
 {
   gpg_error_t err;
   struct import_key_parm_s parm;
+  gnupg_isotime_t timebuf;
+  char line[ASSUAN_LINELENGTH];
 
   err = start_agent (ctrl);
   if (err)
@@ -1354,7 +1360,9 @@
   parm.key    = key;
   parm.keylen = keylen;
 
-  err = assuan_transact (agent_ctx, "IMPORT_KEY",
+  gnupg_get_isotime (timebuf);
+  snprintf (line, sizeof line, "IMPORT_KEY --timestamp=%s", timebuf);
+  err = assuan_transact (agent_ctx, line,
                          NULL, NULL, inq_import_key_parms, &parm, NULL, NULL);
   return err;
 }
diff -Nru gnupg2-2.2.20/sm/call-dirmngr.c gnupg2-2.2.27/sm/call-dirmngr.c
--- gnupg2-2.2.20/sm/call-dirmngr.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/call-dirmngr.c	2020-04-16 18:05:44.000000000 +0200
@@ -756,20 +756,24 @@
 
 
 /* Run the Directory Manager's lookup command using the pattern
-   compiled from the strings given in NAMES.  The caller must provide
-   the callback CB which will be passed cert by cert.  Note that CTRL
-   is optional.  With CACHE_ONLY the dirmngr will search only its own
-   key cache. */
+   compiled from the strings given in NAMES or from URI.  The caller
+   must provide the callback CB which will be passed cert by cert.
+   Note that CTRL is optional.  With CACHE_ONLY the dirmngr will
+   search only its own key cache. */
 int
-gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names, int cache_only,
+gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names, const char *uri,
+                      int cache_only,
                       void (*cb)(void*, ksba_cert_t), void *cb_value)
 {
   int rc;
-  char *pattern;
   char line[ASSUAN_LINELENGTH];
   struct lookup_parm_s parm;
   size_t len;
   assuan_context_t ctx;
+  const char *s;
+
+  if ((names && uri) || (!names && !uri))
+    return gpg_error (GPG_ERR_INV_ARG);
 
   /* The lookup function can be invoked from the callback of a lookup
      function, for example to walk the chain.  */
@@ -792,19 +796,35 @@
       log_fatal ("both dirmngr contexts are in use\n");
     }
 
-  pattern = pattern_from_strlist (names);
-  if (!pattern)
+  if (names)
     {
-      if (ctx == dirmngr_ctx)
-	release_dirmngr (ctrl);
-      else
-	release_dirmngr2 (ctrl);
-
-      return out_of_core ();
+      char *pattern = pattern_from_strlist (names);
+      if (!pattern)
+        {
+          if (ctx == dirmngr_ctx)
+            release_dirmngr (ctrl);
+          else
+            release_dirmngr2 (ctrl);
+
+          return out_of_core ();
+        }
+      snprintf (line, DIM(line), "LOOKUP%s %s",
+                cache_only? " --cache-only":"", pattern);
+      xfree (pattern);
+    }
+  else
+    {
+      for (s=uri; *s; s++)
+        if (*s <= ' ')
+          {
+            if (ctx == dirmngr_ctx)
+              release_dirmngr (ctrl);
+            else
+              release_dirmngr2 (ctrl);
+            return gpg_error (GPG_ERR_INV_URI);
+          }
+      snprintf (line, DIM(line), "LOOKUP --url %s", uri);
     }
-  snprintf (line, DIM(line), "LOOKUP%s %s",
-            cache_only? " --cache-only":"", pattern);
-  xfree (pattern);
 
   parm.ctrl = ctrl;
   parm.ctx = ctx;
diff -Nru gnupg2-2.2.20/sm/certchain.c gnupg2-2.2.27/sm/certchain.c
--- gnupg2-2.2.20/sm/certchain.c	2019-12-06 20:32:57.000000000 +0100
+++ gnupg2-2.2.27/sm/certchain.c	2020-10-23 20:08:54.000000000 +0200
@@ -38,6 +38,10 @@
 #include "../common/tlv.h"
 
 
+/* The OID for the authorityInfoAccess's caIssuers.  */
+static const char oidstr_caIssuers[] = "1.3.6.1.5.5.7.48.2";
+
+
 /* Object to keep track of certain root certificates. */
 struct marktrusted_info_s
 {
@@ -304,7 +308,7 @@
 {
   gpg_error_t err;
   char *policies;
-  FILE *fp;
+  estream_t fp;
   int any_critical;
 
   err = ksba_cert_get_cert_policies (cert, &policies);
@@ -336,7 +340,7 @@
       return 0;
     }
 
-  fp = fopen (opt.policy_file, "r");
+  fp = es_fopen (opt.policy_file, "r");
   if (!fp)
     {
       if (opt.verbose || errno != ENOENT)
@@ -365,14 +369,14 @@
       /* read line */
       do
         {
-          if (!fgets (line, DIM(line)-1, fp) )
+          if (!es_fgets (line, DIM(line)-1, fp) )
             {
-              gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
+              gpg_error_t tmperr = gpg_error_from_syserror ();
 
               xfree (policies);
-              if (feof (fp))
+              if (es_feof (fp))
                 {
-                  fclose (fp);
+                  es_fclose (fp);
                   /* With no critical policies this is only a warning */
                   if (!any_critical)
                     {
@@ -384,16 +388,16 @@
                            _("certificate policy not allowed"));
                   return gpg_error (GPG_ERR_NO_POLICY_MATCH);
                 }
-              fclose (fp);
+              es_fclose (fp);
               return tmperr;
             }
 
           if (!*line || line[strlen(line)-1] != '\n')
             {
               /* eat until end of line */
-              while ( (c=getc (fp)) != EOF && c != '\n')
+              while ((c = es_getc (fp)) != EOF && c != '\n')
                 ;
-              fclose (fp);
+              es_fclose (fp);
               xfree (policies);
               return gpg_error (*line? GPG_ERR_LINE_TOO_LONG
                                      : GPG_ERR_INCOMPLETE_LINE);
@@ -413,7 +417,7 @@
       p = strpbrk (allowed, " :\n");
       if (!*p || p == allowed)
         {
-          fclose (fp);
+          es_fclose (fp);
           xfree (policies);
           return gpg_error (GPG_ERR_CONFIGURATION);
         }
@@ -426,7 +430,7 @@
           if (p[strlen (allowed)] != ':')
             continue; /* The length does not match. */
           /* Yep - it does match so return okay. */
-          fclose (fp);
+          es_fclose (fp);
           xfree (policies);
           return 0;
         }
@@ -573,6 +577,9 @@
 {
   ctrl_t ctrl;
   int count;
+  unsigned int want_fpr:1;
+  unsigned int got_fpr:1;
+  unsigned char fpr[20];
 };
 
 static void
@@ -582,6 +589,13 @@
 
   if (keydb_store_cert (parm->ctrl, cert, 1, NULL))
     log_error ("error storing issuer certificate as ephemeral\n");
+  else if (parm->want_fpr && !parm->got_fpr)
+    {
+      if (!gpgsm_get_fingerprint (cert, 0, parm->fpr, NULL))
+        log_error (_("failed to get the fingerprint\n"));
+      else
+        parm->got_fpr = 1;
+    }
   parm->count++;
 }
 
@@ -602,6 +616,8 @@
   const char *s;
 
   find_up_store_certs_parm.ctrl = ctrl;
+  find_up_store_certs_parm.want_fpr = 0;
+  find_up_store_certs_parm.got_fpr = 0;
   find_up_store_certs_parm.count = 0;
 
   if (opt.verbose)
@@ -620,7 +636,7 @@
   add_to_strlist (&names, pattern);
   xfree (pattern);
 
-  rc = gpgsm_dirmngr_lookup (ctrl, names, 0, find_up_store_certs_cb,
+  rc = gpgsm_dirmngr_lookup (ctrl, names, NULL, 0, find_up_store_certs_cb,
                              &find_up_store_certs_parm);
   free_strlist (names);
 
@@ -653,6 +669,105 @@
 }
 
 
+/* Helper for find_up().  Locate the certificate for CERT using the
+ * caIssuer from the authorityInfoAccess.  KH is the keydb context we
+ * are currently using.  On success 0 is returned and the certificate
+ * may be retrieved from the keydb using keydb_get_cert().  If no
+ * suitable authorityInfoAccess is encoded in the certificate
+ * GPG_ERR_NOT_FOUND is returned. */
+static gpg_error_t
+find_up_via_auth_info_access (ctrl_t ctrl, KEYDB_HANDLE kh, ksba_cert_t cert)
+{
+  gpg_error_t err;
+  struct find_up_store_certs_s find_up_store_certs_parm;
+  char *url, *ldapurl;
+  int idx, i;
+  char *oid;
+  ksba_name_t name;
+
+  find_up_store_certs_parm.ctrl = ctrl;
+  find_up_store_certs_parm.want_fpr = 1;
+  find_up_store_certs_parm.got_fpr = 0;
+  find_up_store_certs_parm.count = 0;
+
+  /* Find suitable URLs; if there is a http scheme we prefer that.  */
+  url = ldapurl = NULL;
+  for (idx=0;
+       !url && !(err = ksba_cert_get_authority_info_access (cert, idx,
+                                                            &oid, &name));
+       idx++)
+    {
+      if (!strcmp (oid, oidstr_caIssuers))
+        {
+          for (i=0; !url && ksba_name_enum (name, i); i++)
+            {
+              char *p = ksba_name_get_uri (name, i);
+              if (p)
+                {
+                  if (!strncmp (p, "http:", 5) || !strncmp (p, "https:", 6))
+                    url = p;
+                  else if (ldapurl)
+                    xfree (p); /* We already got one.  */
+                  else if (!strncmp (p, "ldap:",5) || !strncmp (p, "ldaps:",6))
+                    ldapurl = p;
+                }
+              else
+                xfree (p);
+            }
+        }
+      ksba_name_release (name);
+      ksba_free (oid);
+    }
+  if (err && gpg_err_code (err) != GPG_ERR_EOF)
+    {
+      log_error (_("can't get authorityInfoAccess: %s\n"), gpg_strerror (err));
+      return err;
+    }
+  if (!url && ldapurl)
+    {
+      /* No HTTP scheme; fallback to LDAP if available.  */
+      url = ldapurl;
+      ldapurl = NULL;
+    }
+  xfree (ldapurl);
+  if (!url)
+    return gpg_error (GPG_ERR_NOT_FOUND);
+
+  if (opt.verbose)
+    log_info ("looking up issuer via authorityInfoAccess.caIssuers\n");
+
+  err = gpgsm_dirmngr_lookup (ctrl, NULL, url, 0, find_up_store_certs_cb,
+                              &find_up_store_certs_parm);
+
+  /* Although we might receive several certificates we use only the
+   * first one.  Or more exacty the first one for which we retrieved
+   * the fingerprint.  */
+  if (opt.verbose)
+    log_info ("number of caIssuers found: %d\n",
+              find_up_store_certs_parm.count);
+  if (err)
+    {
+      log_error ("external URL lookup failed: %s\n", gpg_strerror (err));
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+    }
+  else if (!find_up_store_certs_parm.got_fpr)
+    err = gpg_error (GPG_ERR_NOT_FOUND);
+  else
+    {
+      int old;
+      /* The retrieved certificates are currently stored in the
+       * ephemeral key DB, so we temporary switch to ephemeral
+       * mode. */
+      old = keydb_set_ephemeral (kh, 1);
+      keydb_search_reset (kh);
+      err = keydb_search_fpr (ctrl, kh, find_up_store_certs_parm.fpr);
+      keydb_set_ephemeral (kh, old);
+    }
+
+  return err;
+}
+
+
 /* Helper for find_up().  Ask the dirmngr for the certificate for
    ISSUER with optional SERIALNO.  KH is the keydb context we are
    currently using.  With SUBJECT_MODE set, ISSUER is searched as the
@@ -693,7 +808,7 @@
   add_to_strlist (&names, pattern);
   xfree (pattern);
 
-  rc = gpgsm_dirmngr_lookup (ctrl, names, 1, find_up_store_certs_cb,
+  rc = gpgsm_dirmngr_lookup (ctrl, names, NULL, 1, find_up_store_certs_cb,
                              &find_up_store_certs_parm);
   free_strlist (names);
 
@@ -813,11 +928,24 @@
         }
 
       /* If we still didn't found it, try an external lookup.  */
-      if (rc == -1 && opt.auto_issuer_key_retrieve && !find_next)
+      if (rc == -1 && !find_next && !ctrl->offline)
         {
-          rc = find_up_external (ctrl, kh, issuer, keyid);
-          if (!rc && DBG_X509)
-            log_debug ("  found via authid and external lookup\n");
+          /* We allow AIA also if CRLs are enabled; both can be used
+           * as a web bug so it does not make sense to not use AIA if
+           * CRL checks are enabled.  */
+          if ((opt.auto_issuer_key_retrieve || !opt.no_crl_check)
+              && !find_up_via_auth_info_access (ctrl, kh, cert))
+            {
+              if (DBG_X509)
+                log_debug ("  found via authorityInfoAccess.caIssuers\n");
+              rc = 0;
+            }
+          else if (opt.auto_issuer_key_retrieve)
+            {
+              rc = find_up_external (ctrl, kh, issuer, keyid);
+              if (!rc && DBG_X509)
+                log_debug ("  found via authid and external lookup\n");
+            }
         }
 
 
@@ -876,11 +1004,21 @@
     }
 
   /* Still not found.  If enabled, try an external lookup.  */
-  if (rc == -1 && opt.auto_issuer_key_retrieve && !find_next)
+  if (rc == -1 && !find_next && !ctrl->offline)
     {
-      rc = find_up_external (ctrl, kh, issuer, NULL);
-      if (!rc && DBG_X509)
-        log_debug ("  found via issuer and external lookup\n");
+      if ((opt.auto_issuer_key_retrieve || !opt.no_crl_check)
+          && !find_up_via_auth_info_access (ctrl, kh, cert))
+        {
+          if (DBG_X509)
+            log_debug ("  found via authorityInfoAccess.caIssuers\n");
+          rc = 0;
+        }
+      else if (opt.auto_issuer_key_retrieve)
+        {
+          rc = find_up_external (ctrl, kh, issuer, NULL);
+          if (!rc && DBG_X509)
+            log_debug ("  found via issuer and external lookup\n");
+        }
     }
 
   return rc;
@@ -1054,6 +1192,24 @@
       return 0;
     }
 
+
+  if (!(force_ocsp || ctrl->use_ocsp)
+      && !opt.enable_issuer_based_crl_check)
+    {
+      err = ksba_cert_get_crl_dist_point (subject_cert, 0, NULL, NULL, NULL);
+      if (gpg_err_code (err) == GPG_ERR_EOF)
+        {
+          /* No DP specified in the certificate.  Thus the CA does not
+           * consider a CRL useful and the user of the certificate
+           * also does not consider this to be a critical thing.  In
+           * this case we can conclude that the certificate shall not
+           * be revocable.  Note that we reach this point here only if
+           * no OCSP responder shall be used.  */
+          audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK, gpg_error (GPG_ERR_TRUE));
+          return 0;
+        }
+    }
+
   err = gpgsm_dirmngr_isvalid (ctrl,
                                subject_cert, issuer_cert,
                                force_ocsp? 2 : !!ctrl->use_ocsp);
diff -Nru gnupg2-2.2.20/sm/certcheck.c gnupg2-2.2.27/sm/certcheck.c
--- gnupg2-2.2.20/sm/certcheck.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/certcheck.c	2020-07-13 14:22:17.000000000 +0200
@@ -1,5 +1,7 @@
 /* certcheck.c - check one certificate
- *	Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2019 Werner Koch
+ * Copyright (C) 2015-2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -15,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -220,6 +223,126 @@
 }
 
 
+/* Return the hash algorithm's algo id from its name given in the
+ * non-null termnated string in (buffer,buflen).  Returns 0 on failure
+ * or if the algo is not known.  */
+static int
+hash_algo_from_buffer (const void *buffer, size_t buflen)
+{
+  char *string;
+  int algo;
+
+  string = xtrymalloc (buflen + 1);
+  if (!string)
+    {
+      log_error (_("out of core\n"));
+      return 0;
+    }
+  memcpy (string, buffer, buflen);
+  string[buflen] = 0;
+  algo = gcry_md_map_name (string);
+  if (!algo)
+    log_error ("unknown digest algorithm '%s' used in certificate\n", string);
+  xfree (string);
+  return algo;
+}
+
+
+/* Return an unsigned integer from the non-null termnated string
+ * (buffer,buflen).  Returns 0 on failure.  */
+static unsigned int
+uint_from_buffer (const void *buffer, size_t buflen)
+{
+  char *string;
+  unsigned int val;
+
+  string = xtrymalloc (buflen + 1);
+  if (!string)
+    {
+      log_error (_("out of core\n"));
+      return 0;
+    }
+  memcpy (string, buffer, buflen);
+  string[buflen] = 0;
+  val = strtoul (string, NULL, 10);
+  xfree (string);
+  return val;
+}
+
+
+/* Extract the hash algorithm and the salt length from the sigval.  */
+static gpg_error_t
+extract_pss_params (gcry_sexp_t s_sig, int *r_algo, unsigned int *r_saltlen)
+{
+  gpg_error_t err;
+  gcry_buffer_t ioarray[2] = { {0}, {0} };
+
+  err = gcry_sexp_extract_param (s_sig, "sig-val",
+                                 "&'hash-algo''salt-length'",
+                                 ioarray+0, ioarray+1, NULL);
+  if (err)
+    {
+      log_error ("extracting params from PSS failed: %s\n", gpg_strerror (err));
+      return err;
+    }
+
+  *r_algo = hash_algo_from_buffer (ioarray[0].data, ioarray[0].len);
+  *r_saltlen = uint_from_buffer (ioarray[1].data, ioarray[1].len);
+  xfree (ioarray[0].data);
+  xfree (ioarray[1].data);
+  if (*r_saltlen < 20)
+    {
+      log_error ("length of PSS salt too short\n");
+      gcry_sexp_release (s_sig);
+      return gpg_error (GPG_ERR_DIGEST_ALGO);
+    }
+  if (!*r_algo)
+    {
+      return gpg_error (GPG_ERR_DIGEST_ALGO);
+    }
+
+  /* PSS has no hash function firewall like PKCS#1 and thus offers
+   * a path for hash algorithm replacement.  To avoid this it makes
+   * sense to restrict the allowed hash algorithms and also allow only
+   * matching salt lengths.  According to Peter Gutmann:
+   *  "Beware of bugs in the above signature scheme;
+   *   I have only proved it secure, not implemented it"
+   *   - Apologies to Donald Knuth.
+   * https://www.metzdowd.com/pipermail/cryptography/2019-November/035449.html
+   *
+   * Given the set of supported algorithms currently available in
+   * Libgcrypt and the extra hash checks we have in some compliance
+   * modes, it would be hard to trick gpgsm to verify a forged
+   * signature.  However, if eventually someone adds the xor256 hash
+   * algorithm (1.3.6.1.4.1.3029.3.2) to Libgcrypt we would be doomed.
+   */
+  switch (*r_algo)
+    {
+    case GCRY_MD_SHA1:
+    case GCRY_MD_SHA256:
+    case GCRY_MD_SHA384:
+    case GCRY_MD_SHA512:
+    case GCRY_MD_SHA3_256:
+    case GCRY_MD_SHA3_384:
+    case GCRY_MD_SHA3_512:
+      break;
+    default:
+      log_error ("PSS hash algorithm '%s' rejected\n",
+                 gcry_md_algo_name (*r_algo));
+      return gpg_error (GPG_ERR_DIGEST_ALGO);
+    }
+
+  if (gcry_md_get_algo_dlen (*r_algo) != *r_saltlen)
+    {
+      log_error ("PSS hash algorithm '%s' rejected due to salt length %u\n",
+                 gcry_md_algo_name (*r_algo), *r_saltlen);
+      return gpg_error (GPG_ERR_DIGEST_ALGO);
+    }
+
+  return 0;
+}
+
+
 /* Check the signature on CERT using the ISSUER-CERT.  This function
    does only test the cryptographic signature and nothing else.  It is
    assumed that the ISSUER_CERT is valid. */
@@ -229,66 +352,76 @@
   const char *algoid;
   gcry_md_hd_t md;
   int rc, algo;
-  gcry_mpi_t frame;
   ksba_sexp_t p;
   size_t n;
-  gcry_sexp_t s_sig, s_hash, s_pkey;
+  gcry_sexp_t s_sig, s_data, s_pkey;
+  int use_pss = 0;
+  unsigned int saltlen;
 
   algo = gcry_md_map_name ( (algoid=ksba_cert_get_digest_algo (cert)));
-  if (!algo)
+  if (!algo && algoid && !strcmp (algoid, "1.2.840.113549.1.1.10"))
+    use_pss = 1;
+  else if (!algo)
     {
-      log_error ("unknown hash algorithm '%s'\n", algoid? algoid:"?");
+      log_error ("unknown digest algorithm '%s' used certificate\n",
+                 algoid? algoid:"?");
       if (algoid
           && (  !strcmp (algoid, "1.2.840.113549.1.1.2")
                 ||!strcmp (algoid, "1.2.840.113549.2.2")))
         log_info (_("(this is the MD2 algorithm)\n"));
       return gpg_error (GPG_ERR_GENERAL);
     }
-  rc = gcry_md_open (&md, algo, 0);
-  if (rc)
-    {
-      log_error ("md_open failed: %s\n", gpg_strerror (rc));
-      return rc;
-    }
-  if (DBG_HASHING)
-    gcry_md_debug (md, "hash.cert");
-
-  rc = ksba_cert_hash (cert, 1, HASH_FNC, md);
-  if (rc)
-    {
-      log_error ("ksba_cert_hash failed: %s\n", gpg_strerror (rc));
-      gcry_md_close (md);
-      return rc;
-    }
-  gcry_md_final (md);
 
+  /* The the signature from the certificate.  */
   p = ksba_cert_get_sig_val (cert);
   n = gcry_sexp_canon_len (p, 0, NULL, NULL);
   if (!n)
     {
       log_error ("libksba did not return a proper S-Exp\n");
-      gcry_md_close (md);
       ksba_free (p);
       return gpg_error (GPG_ERR_BUG);
     }
+  rc = gcry_sexp_sscan ( &s_sig, NULL, (char*)p, n);
+  ksba_free (p);
+  if (rc)
+    {
+      log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (rc));
+      return rc;
+    }
   if (DBG_CRYPTO)
+    gcry_log_debugsxp ("sigval", s_sig);
+
+  if (use_pss)
     {
-      int j;
-      log_debug ("signature value:");
-      for (j=0; j < n; j++)
-        log_printf (" %02X", p[j]);
-      log_printf ("\n");
+      rc = extract_pss_params (s_sig, &algo, &saltlen);
+      if (rc)
+        {
+          gcry_sexp_release (s_sig);
+          return rc;
+        }
     }
 
-  rc = gcry_sexp_sscan ( &s_sig, NULL, (char*)p, n);
-  ksba_free (p);
+
+  /* Hash the to-be-signed parts of the certificate.  */
+  rc = gcry_md_open (&md, algo, 0);
   if (rc)
     {
-      log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (rc));
+      log_error ("md_open failed: %s\n", gpg_strerror (rc));
+      return rc;
+    }
+  if (DBG_HASHING)
+    gcry_md_debug (md, "hash.cert");
+
+  rc = ksba_cert_hash (cert, 1, HASH_FNC, md);
+  if (rc)
+    {
+      log_error ("ksba_cert_hash failed: %s\n", gpg_strerror (rc));
       gcry_md_close (md);
       return rc;
     }
+  gcry_md_final (md);
 
+  /* Get the public key from the certificate.  */
   p = ksba_cert_get_public_key (issuer_cert);
   n = gcry_sexp_canon_len (p, 0, NULL, NULL);
   if (!n)
@@ -308,29 +441,50 @@
       gcry_sexp_release (s_sig);
       return rc;
     }
+  if (DBG_CRYPTO)
+    gcry_log_debugsxp ("pubkey:", s_pkey);
 
-  rc = do_encode_md (md, algo, pk_algo_from_sexp (s_pkey),
-                     gcry_pk_get_nbits (s_pkey), s_pkey, &frame);
-  if (rc)
+  if (use_pss)
     {
-      gcry_md_close (md);
-      gcry_sexp_release (s_sig);
-      gcry_sexp_release (s_pkey);
-      return rc;
+      rc = gcry_sexp_build (&s_data, NULL,
+                            "(data (flags pss)"
+                            "(hash %s %b)"
+                            "(salt-length %u))",
+                            hash_algo_to_string (algo),
+                            (int)gcry_md_get_algo_dlen (algo),
+                            gcry_md_read (md, algo),
+                            saltlen);
+      if (rc)
+        BUG ();
     }
+  else
+    {
+      /* RSA or DSA: Prepare the hash for verification.  */
+      gcry_mpi_t frame;
 
-  /* put hash into the S-Exp s_hash */
-  if ( gcry_sexp_build (&s_hash, NULL, "%m", frame) )
-    BUG ();
-  gcry_mpi_release (frame);
-
+      rc = do_encode_md (md, algo, pk_algo_from_sexp (s_pkey),
+                         gcry_pk_get_nbits (s_pkey), s_pkey, &frame);
+      if (rc)
+        {
+          gcry_md_close (md);
+          gcry_sexp_release (s_sig);
+          gcry_sexp_release (s_pkey);
+          return rc;
+        }
+      if ( gcry_sexp_build (&s_data, NULL, "%m", frame) )
+        BUG ();
+      gcry_mpi_release (frame);
+    }
+  if (DBG_CRYPTO)
+    gcry_log_debugsxp ("data:", s_data);
 
-  rc = gcry_pk_verify (s_sig, s_hash, s_pkey);
+  /* Verify.  */
+  rc = gcry_pk_verify (s_sig, s_data, s_pkey);
   if (DBG_X509)
       log_debug ("gcry_pk_verify: %s\n", gpg_strerror (rc));
   gcry_md_close (md);
   gcry_sexp_release (s_sig);
-  gcry_sexp_release (s_hash);
+  gcry_sexp_release (s_data);
   gcry_sexp_release (s_pkey);
   return rc;
 }
@@ -338,30 +492,41 @@
 
 
 int
-gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
-                           gcry_md_hd_t md, int mdalgo, int *r_pkalgo)
+gpgsm_check_cms_signature (ksba_cert_t cert, gcry_sexp_t s_sig,
+                           gcry_md_hd_t md, int mdalgo,
+                           unsigned int pkalgoflags, int *r_pkalgo)
 {
   int rc;
   ksba_sexp_t p;
-  gcry_mpi_t frame;
-  gcry_sexp_t s_sig, s_hash, s_pkey;
+  gcry_sexp_t s_hash, s_pkey;
   size_t n;
   int pkalgo;
+  int use_pss;
+  unsigned int saltlen = 0;
 
   if (r_pkalgo)
     *r_pkalgo = 0;
 
-  n = gcry_sexp_canon_len (sigval, 0, NULL, NULL);
-  if (!n)
-    {
-      log_error ("libksba did not return a proper S-Exp\n");
-      return gpg_error (GPG_ERR_BUG);
-    }
-  rc = gcry_sexp_sscan (&s_sig, NULL, (char*)sigval, n);
-  if (rc)
+  /* Check whether rsaPSS is needed.  This information is indicated in
+   * the SIG-VAL and already provided to us by the caller so that we
+   * do not need to parse this out. */
+  use_pss = !!(pkalgoflags & PK_ALGO_FLAG_RSAPSS);
+  if (use_pss)
     {
-      log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (rc));
-      return rc;
+      int algo;
+
+      rc = extract_pss_params (s_sig, &algo, &saltlen);
+      if (rc)
+        {
+          gcry_sexp_release (s_sig);
+          return rc;
+        }
+      if (algo != mdalgo)
+        {
+          log_error ("PSS hash algo mismatch (%d/%d)\n", mdalgo, algo);
+          gcry_sexp_release (s_sig);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
     }
 
   p = ksba_cert_get_public_key (cert);
@@ -370,41 +535,57 @@
     {
       log_error ("libksba did not return a proper S-Exp\n");
       ksba_free (p);
-      gcry_sexp_release (s_sig);
       return gpg_error (GPG_ERR_BUG);
     }
   if (DBG_CRYPTO)
-    log_printhex ("public key: ", p, n);
+    log_printhex (p, n, "public key: ");
 
   rc = gcry_sexp_sscan ( &s_pkey, NULL, (char*)p, n);
   ksba_free (p);
   if (rc)
     {
       log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (rc));
-      gcry_sexp_release (s_sig);
       return rc;
     }
 
   pkalgo = pk_algo_from_sexp (s_pkey);
   if (r_pkalgo)
     *r_pkalgo = pkalgo;
-  rc = do_encode_md (md, mdalgo, pkalgo,
-                     gcry_pk_get_nbits (s_pkey), s_pkey, &frame);
-  if (rc)
+
+  if (use_pss)
     {
-      gcry_sexp_release (s_sig);
-      gcry_sexp_release (s_pkey);
-      return rc;
+      rc = gcry_sexp_build (&s_hash, NULL,
+                            "(data (flags pss)"
+                            "(hash %s %b)"
+                            "(salt-length %u))",
+                            hash_algo_to_string (mdalgo),
+                            (int)gcry_md_get_algo_dlen (mdalgo),
+                            gcry_md_read (md, mdalgo),
+                            saltlen);
+      if (rc)
+        BUG ();
+    }
+  else
+    {
+      /* RSA or DSA: Prepare the hash for verification.  */
+      gcry_mpi_t frame;
+
+      rc = do_encode_md (md, mdalgo, pkalgo,
+                         gcry_pk_get_nbits (s_pkey), s_pkey, &frame);
+      if (rc)
+        {
+          gcry_sexp_release (s_pkey);
+          return rc;
+        }
+      /* put hash into the S-Exp s_hash */
+      if ( gcry_sexp_build (&s_hash, NULL, "%m", frame) )
+        BUG ();
+      gcry_mpi_release (frame);
     }
-  /* put hash into the S-Exp s_hash */
-  if ( gcry_sexp_build (&s_hash, NULL, "%m", frame) )
-    BUG ();
-  gcry_mpi_release (frame);
 
   rc = gcry_pk_verify (s_sig, s_hash, s_pkey);
   if (DBG_X509)
-      log_debug ("gcry_pk_verify: %s\n", gpg_strerror (rc));
-  gcry_sexp_release (s_sig);
+    log_debug ("gcry_pk_verify: %s\n", gpg_strerror (rc));
   gcry_sexp_release (s_hash);
   gcry_sexp_release (s_pkey);
   return rc;
diff -Nru gnupg2-2.2.20/sm/certdump.c gnupg2-2.2.27/sm/certdump.c
--- gnupg2-2.2.20/sm/certdump.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/certdump.c	2020-08-28 09:09:34.000000000 +0200
@@ -38,7 +38,7 @@
 
 #include "keydb.h"
 #include "../common/i18n.h"
-
+#include "../common/membuf.h"
 
 struct dn_array_s {
   char *key;
@@ -73,6 +73,85 @@
 }
 
 
+/* Print the first element of an S-Expression in decimal notation
+ * assuming it is a non-negative integer. */
+void
+gpgsm_print_serial_decimal (estream_t fp, ksba_const_sexp_t sn)
+{
+  const char *p = (const char *)sn;
+  unsigned long n, i;
+  char *endp;
+  gcry_mpi_t a, r, ten;
+#if GCRYPT_VERSION_NUMBER >= 0x010900 /* >= 1.9.0 */
+  unsigned int dd;
+#else
+  unsigned char numbuf[10];
+#endif
+
+  if (!p)
+    es_fputs (_("none"), fp);
+  else if (*p != '(')
+    es_fputs ("[Internal error - not an S-expression]", fp);
+  else
+    {
+      p++;
+      n = strtoul (p, &endp, 10);
+      p = endp;
+      if (*p++ != ':')
+        es_fputs ("[Internal Error - invalid S-expression]", fp);
+      else if (gcry_mpi_scan (&a, GCRYMPI_FMT_USG, p, n, NULL))
+        es_fputs ("[Internal Error - can't convert to decimal]", fp);
+      else
+        {
+          membuf_t mb = MEMBUF_ZERO;
+          char *buf;
+          int c;
+
+          ten = gcry_mpi_set_ui (NULL, 10);
+          r = gcry_mpi_new (0);
+
+          do
+            {
+              gcry_mpi_div (a, r, a, ten, 0);
+#if GCRYPT_VERSION_NUMBER >= 0x010900 /* >= 1.9.0 */
+              gcry_mpi_get_ui (&dd, r);
+              put_membuf_printf (&mb, "%u", dd);
+#else
+              *numbuf = 0;  /* Need to clear because USB format prints
+                             * an empty string for a value of 0.  */
+              gcry_mpi_print (GCRYMPI_FMT_USG, numbuf, 10, NULL, r);
+              put_membuf_printf (&mb, "%u", (unsigned int)*numbuf);
+#endif
+            }
+          while (gcry_mpi_cmp_ui (a, 0));
+
+          /* Make sure we have at least an empty string, get it,
+           * reverse it, and print it. */
+          put_membuf (&mb, "", 1);
+          buf = get_membuf (&mb, NULL);
+          if (!buf)
+            es_fputs ("[Internal Error - out of core]", fp);
+          else
+            {
+              n = strlen (buf);
+              for (i=0; i < n/2; i++)
+                {
+                  c = buf[i];
+                  buf[i] = buf[n-1-i];
+                  buf[n-1-i] = c;
+                }
+              es_fputs (buf, fp);
+              xfree (buf);
+            }
+
+          gcry_mpi_release (r);
+          gcry_mpi_release (ten);
+          gcry_mpi_release (a);
+        }
+    }
+}
+
+
 /* Dump the serial number or any other simple S-expression. */
 void
 gpgsm_dump_serial (ksba_const_sexp_t sn)
@@ -167,7 +246,7 @@
       else
         {
           log_printf ( "[ ");
-          log_printhex (NULL, string, strlen (string));
+          log_printhex (string, strlen (string), NULL);
           log_printf ( " ]");
         }
     }
@@ -348,7 +427,7 @@
     { /* hexstring */
       string++;
       for (s=string; hexdigitp (s); s++)
-        s++;
+        ;
       n = s - string;
       if (!n || (n & 1))
         return NULL; /* Empty or odd number of digits. */
diff -Nru gnupg2-2.2.20/sm/certreqgen.c gnupg2-2.2.27/sm/certreqgen.c
--- gnupg2-2.2.20/sm/certreqgen.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/certreqgen.c	2020-03-30 17:31:56.000000000 +0200
@@ -198,7 +198,7 @@
         use |= GCRY_PK_USAGE_CERT;
       else
         {
-          log_error ("line %d: invalid usage list\n", r->lnr);
+          log_error ("line %d: invalid usage list\n", r?r->lnr:0);
           return -1; /* error */
         }
     }
@@ -461,7 +461,10 @@
   if ( (i < 1 || i != GCRY_PK_RSA) && !cardkeyid )
     {
       r = get_parameter (para, pKEYTYPE, 0);
-      log_error (_("line %d: invalid algorithm\n"), r->lnr);
+      if (r)
+        log_error (_("line %d: invalid algorithm\n"), r?r->lnr:0);
+      else
+        log_error ("No Key-Type specified\n");
       return gpg_error (GPG_ERR_INV_PARAMETER);
     }
 
@@ -476,7 +479,7 @@
       /* The BSI specs dated 2002-11-25 don't allow lengths below 1024. */
       r = get_parameter (para, pKEYLENGTH, 0);
       log_error (_("line %d: invalid key length %u (valid are %d to %d)\n"),
-                 r->lnr, nbits, 1024, 4096);
+                 r?r->lnr:0, nbits, 1024, 4096);
       xfree (cardkeyid);
       return gpg_error (GPG_ERR_INV_PARAMETER);
     }
@@ -493,7 +496,7 @@
   if (!(s=get_parameter_value (para, pNAMEDN, 0)))
     {
       r = get_parameter (para, pNAMEDN, 0);
-      log_error (_("line %d: no subject name given\n"), r->lnr);
+      log_error (_("line %d: no subject name given\n"), r?r->lnr:0);
       xfree (cardkeyid);
       return gpg_error (GPG_ERR_INV_PARAMETER);
     }
@@ -503,10 +506,10 @@
       r = get_parameter (para, pNAMEDN, 0);
       if (gpg_err_code (err) == GPG_ERR_UNKNOWN_NAME)
         log_error (_("line %d: invalid subject name label '%.*s'\n"),
-                   r->lnr, (int)errlen, s+erroff);
+                   r?r->lnr:0, (int)errlen, s+erroff);
       else
         log_error (_("line %d: invalid subject name '%s' at pos %d\n"),
-                   r->lnr, s, (int)erroff);
+                   r?r->lnr:0, s, (int)erroff);
 
       xfree (cardkeyid);
       return gpg_error (GPG_ERR_INV_PARAMETER);
@@ -522,7 +525,7 @@
           || strstr(s, ".."))
         {
           r = get_parameter (para, pNAMEEMAIL, seq);
-          log_error (_("line %d: not a valid email address\n"), r->lnr);
+          log_error (_("line %d: not a valid email address\n"), r?r->lnr:0);
           xfree (cardkeyid);
           return gpg_error (GPG_ERR_INV_PARAMETER);
         }
@@ -541,7 +544,7 @@
           if (*s)
             {
               r = get_parameter (para, pSERIAL, 0);
-              log_error (_("line %d: invalid serial number\n"), r->lnr);
+              log_error (_("line %d: invalid serial number\n"), r?r->lnr:0);
               xfree (cardkeyid);
               return gpg_error (GPG_ERR_INV_PARAMETER);
             }
@@ -558,10 +561,10 @@
           r = get_parameter (para, pISSUERDN, 0);
           if (gpg_err_code (err) == GPG_ERR_UNKNOWN_NAME)
             log_error (_("line %d: invalid issuer name label '%.*s'\n"),
-                       r->lnr, (int)errlen, string+erroff);
+                       r?r->lnr:0, (int)errlen, string+erroff);
           else
             log_error (_("line %d: invalid issuer name '%s' at pos %d\n"),
-                       r->lnr, string, (int)erroff);
+                       r?r->lnr:0, string, (int)erroff);
           xfree (cardkeyid);
           return gpg_error (GPG_ERR_INV_PARAMETER);
         }
@@ -572,7 +575,7 @@
   if (string && !string2isotime (NULL, string))
     {
       r = get_parameter (para, pNOTBEFORE, 0);
-      log_error (_("line %d: invalid date given\n"), r->lnr);
+      log_error (_("line %d: invalid date given\n"), r?r->lnr:0);
       xfree (cardkeyid);
       return gpg_error (GPG_ERR_INV_PARAMETER);
     }
@@ -583,7 +586,7 @@
   if (string && !string2isotime (NULL, string))
     {
       r = get_parameter (para, pNOTAFTER, 0);
-      log_error (_("line %d: invalid date given\n"), r->lnr);
+      log_error (_("line %d: invalid date given\n"), r?r->lnr:0);
       xfree (cardkeyid);
       return gpg_error (GPG_ERR_INV_PARAMETER);
     }
@@ -597,7 +600,7 @@
         {
           r = get_parameter (para, pKEYTYPE, 0);
           log_error (_("line %d: error getting signing key by keygrip '%s'"
-                       ": %s\n"), r->lnr, s, gpg_strerror (rc));
+                       ": %s\n"), r?r->lnr:0, s, gpg_strerror (rc));
           xfree (cardkeyid);
           return rc;
         }
@@ -615,7 +618,7 @@
                         || mdalgo == GCRY_MD_SHA512)))
       {
         r = get_parameter (para, pHASHALGO, 0);
-        log_error (_("line %d: invalid hash algorithm given\n"), r->lnr);
+        log_error (_("line %d: invalid hash algorithm given\n"), r?r->lnr:0);
         xfree (cardkeyid);
         return gpg_error (GPG_ERR_INV_PARAMETER);
       }
@@ -630,7 +633,7 @@
       if (*s || (i&1))
         {
           r = get_parameter (para, pAUTHKEYID, 0);
-          log_error (_("line %d: invalid authority-key-id\n"), r->lnr);
+          log_error (_("line %d: invalid authority-key-id\n"), r?r->lnr:0);
           xfree (cardkeyid);
           return gpg_error (GPG_ERR_INV_PARAMETER);
         }
@@ -645,7 +648,7 @@
       if (*s || (i&1))
         {
           r = get_parameter (para, pSUBJKEYID, 0);
-          log_error (_("line %d: invalid subject-key-id\n"), r->lnr);
+          log_error (_("line %d: invalid subject-key-id\n"), r?r->lnr:0);
           xfree (cardkeyid);
           return gpg_error (GPG_ERR_INV_PARAMETER);
         }
@@ -683,7 +686,7 @@
       if (!okay)
         {
           r = get_parameter (para, pEXTENSION, seq);
-          log_error (_("line %d: invalid extension syntax\n"), r->lnr);
+          log_error (_("line %d: invalid extension syntax\n"), r? r->lnr:0);
           xfree (cardkeyid);
           return gpg_error (GPG_ERR_INV_PARAMETER);
         }
@@ -697,7 +700,7 @@
         {
           r = get_parameter (para, pKEYTYPE, 0);
           log_error (_("line %d: error reading key '%s' from card: %s\n"),
-                     r->lnr, cardkeyid, gpg_strerror (rc));
+                     r?r->lnr:0, cardkeyid, gpg_strerror (rc));
           xfree (sigkey);
           xfree (cardkeyid);
           return rc;
@@ -727,7 +730,7 @@
         {
           r = get_parameter (para, pKEYTYPE, 0);
           log_error (_("line %d: key generation failed: %s <%s>\n"),
-                     r->lnr, gpg_strerror (rc), gpg_strsource (rc));
+                     r?r->lnr:0, gpg_strerror (rc), gpg_strsource (rc));
           xfree (sigkey);
           xfree (cardkeyid);
           return rc;
diff -Nru gnupg2-2.2.20/sm/decrypt.c gnupg2-2.2.27/sm/decrypt.c
--- gnupg2-2.2.20/sm/decrypt.c	2019-08-21 09:50:55.000000000 +0200
+++ gnupg2-2.2.27/sm/decrypt.c	2020-07-13 14:22:17.000000000 +0200
@@ -72,7 +72,7 @@
     }
 
   if (DBG_CRYPTO)
-    log_printhex ("pkcs1 encoded session key:", seskey, seskeylen);
+    log_printhex (seskey, seskeylen, "pkcs1 encoded session key:");
 
   n=0;
   if (seskeylen == 32 || seskeylen == 24 || seskeylen == 16)
@@ -115,7 +115,7 @@
     }
 
   if (DBG_CRYPTO)
-    log_printhex ("session key:", seskey+n, seskeylen-n);
+    log_printhex (seskey+n, seskeylen-n, "session key:");
 
   rc = gcry_cipher_open (&parm->hd, parm->algo, parm->mode, 0);
   if (rc)
@@ -483,7 +483,7 @@
                     /* Check compliance.  */
                     if (!gnupg_pk_is_allowed (opt.compliance,
                                               PK_USE_DECRYPTION,
-                                              pk_algo, NULL, nbits, NULL))
+                                              pk_algo, 0, NULL, nbits, NULL))
                       {
                         char  kidstr[10+1];
 
@@ -501,7 +501,7 @@
                     /* Check that all certs are compliant with CO_DE_VS.  */
                     is_de_vs =
                       (is_de_vs
-                       && gnupg_pk_is_compliant (CO_DE_VS, pk_algo, NULL,
+                       && gnupg_pk_is_compliant (CO_DE_VS, pk_algo, 0, NULL,
                                                  nbits, NULL));
                   }
 
diff -Nru gnupg2-2.2.20/sm/encrypt.c gnupg2-2.2.27/sm/encrypt.c
--- gnupg2-2.2.20/sm/encrypt.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/sm/encrypt.c	2020-07-13 14:22:17.000000000 +0200
@@ -480,7 +480,8 @@
 
       /* Check compliance.  */
       pk_algo = gpgsm_get_key_algo_info (cl->cert, &nbits);
-      if (!gnupg_pk_is_compliant (opt.compliance, pk_algo, NULL, nbits, NULL))
+      if (!gnupg_pk_is_compliant (opt.compliance, pk_algo, 0,
+                                  NULL, nbits, NULL))
         {
           char  kidstr[10+1];
 
@@ -495,7 +496,7 @@
       /* Fixme: When adding ECC we need to provide the curvename and
        * the key to gnupg_pk_is_compliant.  */
       if (compliant
-          && !gnupg_pk_is_compliant (CO_DE_VS, pk_algo, NULL, nbits, NULL))
+          && !gnupg_pk_is_compliant (CO_DE_VS, pk_algo, 0, NULL, nbits, NULL))
         compliant = 0;
 
       rc = encrypt_dek (dek, cl->cert, &encval);
diff -Nru gnupg2-2.2.20/sm/fingerprint.c gnupg2-2.2.27/sm/fingerprint.c
--- gnupg2-2.2.20/sm/fingerprint.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/fingerprint.c	2020-07-13 14:22:17.000000000 +0200
@@ -196,7 +196,7 @@
       return NULL;
     }
   if (DBG_X509)
-    log_printhex ("keygrip=", array, 20);
+    log_printhex (array, 20, "keygrip=");
 
   return array;
 }
@@ -277,6 +277,41 @@
 }
 
 
+/* This is a wrapper around pubkey_algo_string which takes a KSBA
+ * certificate instead of a Gcrypt public key.  Note that this
+ * function may return NULL on error.  */
+char *
+gpgsm_pubkey_algo_string (ksba_cert_t cert, int *r_algoid)
+{
+  gpg_error_t err;
+  gcry_sexp_t s_pkey;
+  ksba_sexp_t p;
+  size_t n;
+  enum gcry_pk_algos algoid;
+  char *algostr;
+
+  p = ksba_cert_get_public_key (cert);
+  if (!p)
+    return NULL;
+  n = gcry_sexp_canon_len (p, 0, NULL, NULL);
+  if (!n)
+    {
+      xfree (p);
+      return NULL;
+    }
+  err = gcry_sexp_sscan (&s_pkey, NULL, (char *)p, n);
+  xfree (p);
+  if (err)
+    return NULL;
+
+  algostr = pubkey_algo_string (s_pkey, r_algoid? &algoid : NULL);
+  if (algostr && r_algoid)
+    *r_algoid = algoid;
+
+  gcry_sexp_release (s_pkey);
+  return algostr;
+}
+
 
 
 /* For certain purposes we need a certificate id which has an upper
diff -Nru gnupg2-2.2.20/sm/gpgsm.c gnupg2-2.2.27/sm/gpgsm.c
--- gnupg2-2.2.20/sm/gpgsm.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/sm/gpgsm.c	2020-12-21 17:23:19.000000000 +0100
@@ -1,6 +1,7 @@
 /* gpgsm.c - GnuPG for S/MIME
- * Copyright (C) 2001-2008, 2010  Free Software Foundation, Inc.
- * Copyright (C) 2001-2008, 2010  Werner Koch
+ * Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2019 Werner Koch
+ * Copyright (C) 2015-2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -26,7 +28,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
-/*#include <mcheck.h>*/
 
 #define INCLUDED_BY_MAIN_MODULE 1
 
@@ -144,6 +145,7 @@
   oDisableTrustedCertCRLCheck,
   oEnableTrustedCertCRLCheck,
   oForceCRLRefresh,
+  oEnableIssuerBasedCRLCheck,
 
   oDisableOCSP,
   oEnableOCSP,
@@ -336,7 +338,7 @@
 
   ARGPARSE_s_s (oKeyServer, "keyserver",
                 N_("|SPEC|use this keyserver to lookup keys")),
-  ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
 
   ARGPARSE_s_s (oDebug, "debug", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level",
@@ -372,7 +374,7 @@
   ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
   ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
   ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
-  ARGPARSE_s_n (oNoOptions, "no-options", "@"),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
   ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
   ARGPARSE_s_s (oDisplay,    "display", "@"),
@@ -402,6 +404,8 @@
   ARGPARSE_s_n (oNoCommonCertsImport, "no-common-certs-import", "@"),
   ARGPARSE_s_s (oIgnoreCertExtension, "ignore-cert-extension", "@"),
   ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
+  ARGPARSE_s_n (oEnableIssuerBasedCRLCheck, "enable-issuer-based-crl-check",
+                "@"),
 
   /* Command aliases.  */
   ARGPARSE_c (aListKeys, "list-key", "@"),
@@ -554,9 +558,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@GPGSM@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -890,12 +896,12 @@
   strlist_t sl, remusr= NULL, locusr=NULL;
   strlist_t nrings=NULL;
   int detached_sig = 0;
-  FILE *configfp = NULL;
-  char *configname = NULL;
-  unsigned configlineno;
-  int parse_debug = 0;
+  char *last_configname = NULL;
+  const char *configname = NULL; /* NULL or points to last_configname.
+                                  * NULL also indicates that we are
+                                  * processing options from the cmdline.  */
+  int debug_argparser = 0;
   int no_more_options = 0;
-  int default_config =1;
   int default_keyring = 1;
   char *logfile = NULL;
   char *auditlog = NULL;
@@ -918,7 +924,8 @@
   estream_t htmlauditfp = NULL;
   struct assuan_malloc_hooks malloc_hooks;
   int pwfd = -1;
-  /*mtrace();*/
+
+  static const char *homedirvalue;
 
   early_system_init ();
   gnupg_reopen_std (GPGSM_NAME);
@@ -970,28 +977,35 @@
   orig_argv = argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags= 1|(1<<6);  /* do not remove the args, ignore version */
-  while (arg_parse( &pargs, opts))
+  pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
-      if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
-        parse_debug++;
-      else if (pargs.r_opt == oOptions)
-        { /* yes there is one, so we do not try the default one but
-             read the config file when it is encountered at the
-             commandline */
-          default_config = 0;
-	}
-      else if (pargs.r_opt == oNoOptions)
+      switch (pargs.r_opt)
         {
-          default_config = 0; /* --no-options */
+        case oDebug:
+        case oDebugAll:
+          debug_argparser++;
+          break;
+
+        case oNoOptions:
+          /* Set here here because the homedir would otherwise be
+           * created before main option parsing starts.  */
           opt.no_homedir_creation = 1;
+          break;
+
+        case oHomedir:
+          homedirvalue = pargs.r.ret_str;
+          break;
+
+        case aCallProtectTool:
+          /* Make sure that --version and --help are passed to the
+           * protect-tool. */
+          goto leave_cmdline_parser;
         }
-      else if (pargs.r_opt == oHomedir)
-        gnupg_set_homedir (pargs.r.ret_str);
-      else if (pargs.r_opt == aCallProtectTool)
-        break; /* This break makes sure that --version and --help are
-                  passed to the protect-tool. */
     }
+ leave_cmdline_parser:
+  /* Reset the flags.  */
+  pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
 
   /* Initialize the secure memory. */
@@ -999,8 +1013,8 @@
   maybe_setuid = 0;
 
   /*
-     Now we are now working under our real uid
-  */
+   * Now we are now working under our real uid
+   */
 
   ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free );
 
@@ -1011,6 +1025,9 @@
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
   setup_libassuan_logging (&opt.debug, NULL);
 
+  /* Set homedir.  */
+  gnupg_set_homedir (homedirvalue);
+
   /* Setup a default control structure for command line mode */
   memset (&ctrl, 0, sizeof ctrl);
   gpgsm_init_default_ctrl (&ctrl);
@@ -1018,52 +1035,48 @@
   ctrl.status_fd = -1; /* No status output. */
   ctrl.autodetect_encoding = 1;
 
-  /* Set the default option file */
-  if (default_config )
-    configname = make_filename (gnupg_homedir (),
-                                GPGSM_NAME EXTSEP_S "conf", NULL);
   /* Set the default policy file */
   opt.policy_file = make_filename (gnupg_homedir (), "policies.txt", NULL);
 
+  /* The configuraton directories for use by gpgrt_argparser.  */
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
+
+  /* We are re-using the struct, thus the reset flag.  We OR the
+   * flags so that the internal intialized flag won't be cleared. */
   argc        = orig_argc;
   argv        = orig_argv;
   pargs.argc  = &argc;
   pargs.argv  = &argv;
-  pargs.flags =  1;  /* do not remove the args */
-
- next_pass:
-  if (configname) {
-    configlineno = 0;
-    configfp = fopen (configname, "r");
-    if (!configfp)
-      {
-        if (default_config)
-          {
-            if (parse_debug)
-              log_info (_("Note: no default option file '%s'\n"), configname);
-          }
-        else
-          {
-            log_error (_("option file '%s': %s\n"), configname, strerror(errno));
-            gpgsm_exit(2);
-          }
-        xfree(configname);
-        configname = NULL;
-      }
-    if (parse_debug && configname)
-      log_info (_("reading options from '%s'\n"), configname);
-    default_config = 0;
-  }
+  pargs.flags |=  (ARGPARSE_FLAG_RESET
+                   | ARGPARSE_FLAG_KEEP
+                   | ARGPARSE_FLAG_SYS
+                   | ARGPARSE_FLAG_USER);
 
   while (!no_more_options
-         && optfile_parse (configfp, configname, &configlineno, &pargs, opts))
+         && gnupg_argparser (&pargs, opts, GPGSM_NAME EXTSEP_S "conf"))
     {
       switch (pargs.r_opt)
         {
+        case ARGPARSE_CONFFILE:
+          if (debug_argparser)
+            log_info (_("reading options from '%s'\n"),
+                      pargs.r_type? pargs.r.ret_str: "[cmdline]");
+          if (pargs.r_type)
+            {
+              xfree (last_configname);
+              last_configname = xstrdup (pargs.r.ret_str);
+              configname = last_configname;
+            }
+          else
+            configname = NULL;
+          break;
+
 	case aGPGConfList:
 	case aGPGConfTest:
           set_cmd (&cmd, pargs.r_opt);
           do_not_setup_keys = 1;
+          default_keyring = 0;
           nogreeting = 1;
           break;
 
@@ -1202,6 +1215,9 @@
         case oForceCRLRefresh:
           opt.force_crl_refresh = 1;
           break;
+        case oEnableIssuerBasedCRLCheck:
+          opt.enable_issuer_based_crl_check = 1;
+          break;
 
         case oDisableOCSP:
           ctrl.use_ocsp = opt.enable_ocsp = 0;
@@ -1301,16 +1317,6 @@
           opt.with_keygrip = 1;
           break;
 
-        case oOptions:
-          /* config files may not be nested (silently ignore them) */
-          if (!configfp)
-            {
-              xfree(configname);
-              configname = xstrdup (pargs.r.ret_str);
-              goto next_pass;
-	    }
-          break;
-        case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
         case oAgentProgram: opt.agent_program = pargs.r.ret_str;  break;
 
@@ -1438,7 +1444,7 @@
 	  {
 	    struct keyserver_spec *keyserver;
 	    keyserver = parse_keyserver_line (pargs.r.ret_str,
-					      configname, configlineno);
+					      configname, pargs.lineno);
 	    if (! keyserver)
 	      log_error (_("could not parse keyserver\n"));
 	    else
@@ -1476,27 +1482,28 @@
           break;
 
         default:
-          pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
+          if (configname)
+            pargs.err = ARGPARSE_PRINT_WARNING;
+          else
+            {
+              pargs.err = ARGPARSE_PRINT_ERROR;
+              /* The argparse function calls a plain exit and thus we
+               * need to print a status here.  */
+              gpgsm_status_with_error (&ctrl, STATUS_FAILURE, "option-parser",
+                                       gpg_error (GPG_ERR_GENERAL));
+            }
           break;
 	}
     }
 
-  if (configfp)
-    {
-      fclose (configfp);
-      configfp = NULL;
-      /* Keep a copy of the config filename. */
-      opt.config_filename = configname;
-      configname = NULL;
-      goto next_pass;
-    }
-  xfree (configname);
-  configname = NULL;
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
-  if (!opt.config_filename)
+  if (!last_configname)
     opt.config_filename = make_filename (gnupg_homedir (),
                                          GPGSM_NAME EXTSEP_S "conf",
                                          NULL);
+  else
+    opt.config_filename = last_configname;
 
   if (log_get_errorcount(0))
     {
@@ -1700,7 +1707,7 @@
 
           filelist[0] = make_filename (gnupg_datadir (),"com-certs.pem", NULL);
           filelist[1] = NULL;
-          if (!access (filelist[0], F_OK))
+          if (!gnupg_access (filelist[0], F_OK))
             {
               log_info (_("importing common certificates '%s'\n"),
                         filelist[0]);
@@ -2206,7 +2213,7 @@
   fd = check_special_filename (filename, 0, 0);
   if (fd != -1)
     return fd;
-  fd = open (filename, O_RDONLY | O_BINARY);
+  fd = gnupg_open (filename, O_RDONLY | O_BINARY, 0);
   if (fd == -1)
     {
       log_error (_("can't open '%s': %s\n"), filename, strerror (errno));
diff -Nru gnupg2-2.2.20/sm/gpgsm.h gnupg2-2.2.27/sm/gpgsm.h
--- gnupg2-2.2.20/sm/gpgsm.h	2020-02-10 16:23:33.000000000 +0100
+++ gnupg2-2.2.27/sm/gpgsm.h	2020-07-13 14:22:17.000000000 +0200
@@ -124,6 +124,7 @@
   int no_crl_check;         /* Don't do a CRL check */
   int no_trusted_cert_crl_check; /* Don't run a CRL check for trusted certs. */
   int force_crl_refresh;    /* Force refreshing the CRL. */
+  int enable_issuer_based_crl_check; /* Backward compatibility hack.  */
   int enable_ocsp;          /* Default to use OCSP checks. */
 
   char *policy_file;        /* full pathname of policy file */
@@ -263,11 +264,13 @@
 unsigned char *gpgsm_get_keygrip (ksba_cert_t cert, unsigned char *array);
 char *gpgsm_get_keygrip_hexstring (ksba_cert_t cert);
 int  gpgsm_get_key_algo_info (ksba_cert_t cert, unsigned int *nbits);
+char *gpgsm_pubkey_algo_string (ksba_cert_t cert, int *r_algoid);
 char *gpgsm_get_certid (ksba_cert_t cert);
 
 
 /*-- certdump.c --*/
 void gpgsm_print_serial (estream_t fp, ksba_const_sexp_t p);
+void gpgsm_print_serial_decimal (estream_t fp, ksba_const_sexp_t sn);
 void gpgsm_print_time (estream_t fp, ksba_isotime_t t);
 void gpgsm_print_name2 (FILE *fp, const char *string, int translate);
 void gpgsm_print_name (FILE *fp, const char *string);
@@ -293,8 +296,10 @@
 
 /*-- certcheck.c --*/
 int gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert);
-int gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
-                               gcry_md_hd_t md, int hash_algo, int *r_pkalgo);
+int gpgsm_check_cms_signature (ksba_cert_t cert, gcry_sexp_t sigval,
+                               gcry_md_hd_t md,
+                               int hash_algo, unsigned int pkalgoflags,
+                               int *r_pkalgo);
 /* fixme: move create functions to another file */
 int gpgsm_create_cms_signature (ctrl_t ctrl,
                                 ksba_cert_t cert, gcry_md_hd_t md, int mdalgo,
@@ -423,7 +428,8 @@
 int gpgsm_dirmngr_isvalid (ctrl_t ctrl,
                            ksba_cert_t cert, ksba_cert_t issuer_cert,
                            int use_ocsp);
-int gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names, int cache_only,
+int gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names, const char *uri,
+                          int cache_only,
                           void (*cb)(void*, ksba_cert_t), void *cb_value);
 int gpgsm_dirmngr_run_command (ctrl_t ctrl, const char *command,
                                int argc, char **argv);
@@ -435,6 +441,9 @@
                               int mdalgo,
                               unsigned char **r_newsigval,
                               size_t *r_newsigvallen);
+gcry_sexp_t gpgsm_ksba_cms_get_sig_val (ksba_cms_t cms, int idx);
+int gpgsm_get_hash_algo_from_sigval (gcry_sexp_t sigval,
+                                     unsigned int *r_pkalgo_flags);
 
 
 
diff -Nru gnupg2-2.2.20/sm/gpgsm-w32info.rc gnupg2-2.2.27/sm/gpgsm-w32info.rc
--- gnupg2-2.2.20/sm/gpgsm-w32info.rc	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/sm/gpgsm-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -48,3 +48,5 @@
       VALUE "Translation", 0x409, 0x4b0
     END
   END
+
+1 RT_MANIFEST "gpgsm.w32-manifest"
diff -Nru gnupg2-2.2.20/sm/gpgsm.w32-manifest.in gnupg2-2.2.27/sm/gpgsm.w32-manifest.in
--- gnupg2-2.2.20/sm/gpgsm.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/sm/gpgsm.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (X409/CMS tool)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpgsm"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/sm/import.c gnupg2-2.2.27/sm/import.c
--- gnupg2-2.2.20/sm/import.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/import.c	2020-05-12 18:32:21.000000000 +0200
@@ -836,7 +836,7 @@
       log_error ("can't calculate keygrip\n");
       goto leave;
     }
-  log_printhex ("keygrip=", grip, 20);
+  log_printhex (grip, 20, "keygrip=");
 
   /* Convert to canonical encoding using a function which pads it to a
      multiple of 64 bits.  We need this padding for AESWRAP.  */
diff -Nru gnupg2-2.2.20/sm/keydb.c gnupg2-2.2.27/sm/keydb.c
--- gnupg2-2.2.20/sm/keydb.c	2019-08-23 16:01:34.000000000 +0200
+++ gnupg2-2.2.27/sm/keydb.c	2020-11-04 16:25:57.000000000 +0100
@@ -75,33 +75,10 @@
 static void
 try_make_homedir (const char *fname)
 {
-  const char *defhome = standard_homedir ();
-
-  /* Create the directory only if the supplied directory name is the
-     same as the default one.  This way we avoid to create arbitrary
-     directories when a non-default home directory is used.  To cope
-     with HOME, we do compare only the suffix if we see that the
-     default homedir does start with a tilde.  */
   if ( opt.dry_run || opt.no_homedir_creation )
     return;
 
-  if (
-#ifdef HAVE_W32_SYSTEM
-      ( !compare_filenames (fname, defhome) )
-#else
-      ( *defhome == '~'
-        && (strlen(fname) >= strlen (defhome+1)
-            && !strcmp(fname+strlen(fname)-strlen(defhome+1), defhome+1 ) ))
-      || (*defhome != '~'  && !compare_filenames( fname, defhome ) )
-#endif
-      )
-    {
-      if (gnupg_mkdir (fname, "-rwx"))
-        log_info (_("can't create directory '%s': %s\n"),
-                  fname, strerror(errno) );
-      else if (!opt.quiet )
-        log_info (_("directory '%s' created\n"), fname);
-    }
+  gnupg_maybe_make_homedir (fname, opt.quiet);
 }
 
 
@@ -113,8 +90,9 @@
 static gpg_error_t
 maybe_create_keybox (char *filename, int force, int *r_created)
 {
+  gpg_err_code_t ec;
   dotlock_t lockhd = NULL;
-  FILE *fp;
+  estream_t fp;
   int rc;
   mode_t oldmask;
   char *last_slash_in_filename;
@@ -124,8 +102,8 @@
     *r_created = 0;
 
   /* A quick test whether the filename already exists. */
-  if (!access (filename, F_OK))
-    return !access (filename, R_OK)? 0 : gpg_error (GPG_ERR_EACCES);
+  if (!gnupg_access (filename, F_OK))
+    return !gnupg_access (filename, R_OK)? 0 : gpg_error (GPG_ERR_EACCES);
 
   /* If we don't want to create a new file at all, there is no need to
      go any further - bail out right here.  */
@@ -151,7 +129,7 @@
                                            not happen though.  */
   save_slash = *last_slash_in_filename;
   *last_slash_in_filename = 0;
-  if (access(filename, F_OK))
+  if (gnupg_access(filename, F_OK))
     {
       static int tried;
 
@@ -160,9 +138,9 @@
           tried = 1;
           try_make_homedir (filename);
         }
-      if (access (filename, F_OK))
+      if ((ec = gnupg_access (filename, F_OK)))
         {
-          rc = gpg_error_from_syserror ();
+          rc = gpg_error (ec);
           *last_slash_in_filename = save_slash;
           goto leave;
         }
@@ -205,7 +183,7 @@
 
   /* The file does not yet exist, create it now. */
   oldmask = umask (077);
-  fp = fopen (filename, "wb");
+  fp = es_fopen (filename, "wb");
   if (!fp)
     {
       rc = gpg_error_from_syserror ();
@@ -222,7 +200,7 @@
   rc = _keybox_write_header_blob (fp, 0);
   if (rc)
     {
-      fclose (fp);
+      es_fclose (fp);
       log_error (_("error creating keybox '%s': %s\n"),
                  filename, gpg_strerror (rc));
       goto leave;
@@ -233,7 +211,7 @@
   if (r_created)
     *r_created = 1;
 
-  fclose (fp);
+  es_fclose (fp);
   rc = 0;
 
  leave:
@@ -300,14 +278,15 @@
   /* see whether we can determine the filetype */
   if (rt == KEYDB_RESOURCE_TYPE_NONE)
     {
-      FILE *fp = fopen( filename, "rb" );
+      estream_t fp;
 
+      fp = es_fopen( filename, "rb" );
       if (fp)
         {
           u32 magic;
 
           /* FIXME: check for the keybox magic */
-          if (fread (&magic, 4, 1, fp) == 1 )
+          if (es_fread (&magic, 4, 1, fp) == 1 )
             {
               if (magic == 0x13579ace || magic == 0xce9a5713)
                 ; /* GDBM magic - no more support */
@@ -316,7 +295,8 @@
             }
           else /* maybe empty: assume keybox */
             rt = KEYDB_RESOURCE_TYPE_KEYBOX;
-          fclose (fp);
+
+          es_fclose (fp);
         }
       else /* no file yet: create keybox */
         rt = KEYDB_RESOURCE_TYPE_KEYBOX;
diff -Nru gnupg2-2.2.20/sm/keylist.c gnupg2-2.2.27/sm/keylist.c
--- gnupg2-2.2.20/sm/keylist.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/keylist.c	2020-08-04 11:14:06.000000000 +0200
@@ -361,7 +361,10 @@
 {
   int hashalgo;
 
-  if (gnupg_pk_is_compliant (CO_DE_VS, algo, NULL, nbits, NULL))
+  /* Note that we do not need to test for PK_ALGO_FLAG_RSAPSS because
+   * that is not a property of the key but one of the created
+   * signature.  */
+  if (gnupg_pk_is_compliant (CO_DE_VS, algo, 0, NULL, nbits, NULL))
     {
       hashalgo = gcry_md_map_name (ksba_cert_get_digest_algo (cert));
       if (gnupg_digest_is_compliant (CO_DE_VS, hashalgo))
@@ -556,6 +559,10 @@
   es_putc ('\n', fp);
   xfree (fpr); fpr = NULL; chain_id = NULL;
   xfree (chain_id_buffer); chain_id_buffer = NULL;
+  /* SHA256 FPR record */
+  fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA256);
+  es_fprintf (fp, "fp2:::::::::%s::::\n", fpr);
+  xfree (fpr); fpr = NULL;
 
   /* Always print the keygrip.  */
   if ( (p = gpgsm_get_keygrip_hexstring (cert)))
@@ -738,8 +745,11 @@
   sexp = ksba_cert_get_serial (cert);
   es_fputs ("          S/N: ", fp);
   gpgsm_print_serial (fp, sexp);
-  ksba_free (sexp);
   es_putc ('\n', fp);
+  es_fputs ("        (dec): ", fp);
+  gpgsm_print_serial_decimal (fp, sexp);
+  es_putc ('\n', fp);
+  ksba_free (sexp);
 
   dn = ksba_cert_get_issuer (cert, 0);
   es_fputs ("       Issuer: ", fp);
@@ -767,6 +777,10 @@
       es_putc ('\n', fp);
     }
 
+  dn = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA256);
+  es_fprintf (fp, "     sha2_fpr: %s\n", dn?dn:"error");
+  xfree (dn);
+
   dn = gpgsm_get_fingerprint_string (cert, 0);
   es_fprintf (fp, "     sha1_fpr: %s\n", dn?dn:"error");
   xfree (dn);
@@ -1118,8 +1132,11 @@
   sexp = ksba_cert_get_serial (cert);
   es_fputs ("          S/N: ", fp);
   gpgsm_print_serial (fp, sexp);
-  ksba_free (sexp);
   es_putc ('\n', fp);
+  es_fputs ("        (dec): ", fp);
+  gpgsm_print_serial_decimal (fp, sexp);
+  es_putc ('\n', fp);
+  ksba_free (sexp);
 
   dn = ksba_cert_get_issuer (cert, 0);
   es_fputs ("       Issuer: ", fp);
@@ -1286,6 +1303,10 @@
   es_fprintf (fp, "  fingerprint: %s\n", dn?dn:"error");
   xfree (dn);
 
+  dn = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA256);
+  es_fprintf (fp, "     sha2 fpr: %s\n", dn?dn:"error");
+  xfree (dn);
+
   if (opt.with_keygrip)
     {
       dn = gpgsm_get_keygrip_hexstring (cert);
@@ -1607,7 +1628,7 @@
   parm.with_chain = ctrl->with_chain;
   parm.raw_mode  = raw_mode;
 
-  rc = gpgsm_dirmngr_lookup (ctrl, names, 0, list_external_cb, &parm);
+  rc = gpgsm_dirmngr_lookup (ctrl, names, NULL, 0, list_external_cb, &parm);
   if (gpg_err_code (rc) == GPG_ERR_EOF || rc == -1
       || gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
     rc = 0; /* "Not found" is not an error here. */
diff -Nru gnupg2-2.2.20/sm/Makefile.am gnupg2-2.2.27/sm/Makefile.am
--- gnupg2-2.2.20/sm/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/sm/Makefile.am	2020-10-23 20:08:54.000000000 +0200
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc
+EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc gpgsm.w32-manifest.in
 
 bin_PROGRAMS = gpgsm
 
@@ -27,7 +27,10 @@
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-resource_objs += gpgsm-w32info.o
+gpgsm_robjs = $(resource_objs) gpgsm-w32info.o
+gpgsm-w32info.o : gpgsm.w32-manifest
+else
+gpgsm_robjs =
 endif
 
 gpgsm_SOURCES = \
@@ -62,7 +65,7 @@
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
               $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
-	      $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	      $(LIBICONV) $(gpgsm_robjs) $(extra_sys_libs) $(NETLIBS)
 gpgsm_LDFLAGS = $(extra_bin_ldflags)
 
 # Make sure that all libs are build before we use them.  This is
diff -Nru gnupg2-2.2.20/sm/Makefile.in gnupg2-2.2.27/sm/Makefile.in
--- gnupg2-2.2.20/sm/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/sm/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -141,7 +141,6 @@
 @GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 @GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-@HAVE_W32_SYSTEM_TRUE@am__append_8 = gpgsm-w32info.o
 subdir = sm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -163,7 +162,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = gpgsm.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -177,11 +176,14 @@
 	minip12.$(OBJEXT) qualified.$(OBJEXT) passphrase.$(OBJEXT)
 gpgsm_OBJECTS = $(am_gpgsm_OBJECTS)
 am__DEPENDENCIES_1 =
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpgsm-w32info.o
 gpgsm_DEPENDENCIES = $(common_libs) ../common/libgpgrl.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(resource_objs) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 gpgsm_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgsm_LDFLAGS) \
 	$(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -251,7 +253,8 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/am/cmacros.am \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/gpgsm.w32-manifest.in $(top_srcdir)/am/cmacros.am \
 	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -263,6 +266,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -429,6 +433,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -437,7 +442,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc
+EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc gpgsm.w32-manifest.in
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
 
 # NB: AM_CFLAGS may also be used by tools running on the build
@@ -456,13 +461,15 @@
 @HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
 @HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags = 
 @HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
-resource_objs = $(am__append_8)
+resource_objs = 
 
 # Convenience macros
 libcommon = ../common/libcommon.a
 libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
+@HAVE_W32_SYSTEM_FALSE@gpgsm_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpgsm_robjs = $(resource_objs) gpgsm-w32info.o
 gpgsm_SOURCES = \
 	gpgsm.c	gpgsm.h \
 	misc.c \
@@ -493,7 +500,7 @@
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
               $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
-	      $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	      $(LIBICONV) $(gpgsm_robjs) $(extra_sys_libs) $(NETLIBS)
 
 gpgsm_LDFLAGS = $(extra_bin_ldflags)
 all: all-am
@@ -530,6 +537,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+gpgsm.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpgsm.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -886,6 +895,7 @@
 
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+@HAVE_W32_SYSTEM_TRUE@gpgsm-w32info.o : gpgsm.w32-manifest
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.
diff -Nru gnupg2-2.2.20/sm/minip12.c gnupg2-2.2.27/sm/minip12.c
--- gnupg2-2.2.20/sm/minip12.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/minip12.c	2020-11-10 11:59:59.000000000 +0100
@@ -2565,7 +2565,7 @@
   gcry_control (GCRYCTL_DISABLE_SECMEM, NULL);
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL);
 
-  fp = fopen (argv[1], "rb");
+  fp = gnupg_fopen (argv[1], "rb");
   if (!fp)
     {
       fprintf (stderr, "can't open '%s': %s\n", argv[1], strerror (errno));
diff -Nru gnupg2-2.2.20/sm/misc.c gnupg2-2.2.27/sm/misc.c
--- gnupg2-2.2.20/sm/misc.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/misc.c	2020-07-13 14:22:17.000000000 +0200
@@ -216,3 +216,93 @@
 
   return err;
 }
+
+
+/* Wrapper around ksba_cms_get_sig_val to return a gcrypt object
+ * instaed of ksba's canonical s-expression.  On errror NULL is return
+ * and in some cases an error message is printed.  */
+gcry_sexp_t
+gpgsm_ksba_cms_get_sig_val (ksba_cms_t cms, int idx)
+{
+  gpg_error_t err;
+  ksba_sexp_t sigval;
+  gcry_sexp_t s_sigval;
+  size_t n;
+
+  sigval = ksba_cms_get_sig_val (cms, idx);
+  if (!sigval)
+    return NULL;
+  n = gcry_sexp_canon_len (sigval, 0, NULL, NULL);
+  if (!n)
+    {
+      log_error ("%s: libksba did not return a proper S-Exp\n", __func__);
+      ksba_free (sigval);
+      return NULL;
+    }
+  err = gcry_sexp_sscan (&s_sigval, NULL, (char*)sigval, n);
+  ksba_free (sigval);
+  if (err)
+    {
+      log_error ("%s: gcry_sexp_scan failed: %s\n",
+                 __func__, gpg_strerror (err));
+      s_sigval = NULL;
+    }
+
+  return s_sigval;
+}
+
+
+/* Return the hash algorithm from the S-expression SIGVAL.  Returns 0
+ * if the hash algorithm is not encoded in SIGVAL or it is not
+ * supported by libgcrypt.  It further stores flag values for the
+ * public key algorithm at R_PKALGO_FLAGS; the only flag we currently
+ * support is PK_ALGO_FLAG_RSAPSS.  */
+int
+gpgsm_get_hash_algo_from_sigval (gcry_sexp_t sigval_arg,
+                                 unsigned int *r_pkalgo_flags)
+{
+  gcry_sexp_t sigval, l1;
+  size_t n;
+  const char *s;
+  char *string;
+  int hashalgo;
+  int i;
+
+  *r_pkalgo_flags = 0;
+
+  sigval = gcry_sexp_find_token (sigval_arg, "sig-val", 0);
+  if (!sigval)
+    return 0;   /* Not a sig-val.  */
+
+  /* First check whether this is a rsaPSS signature and return that as
+   * additional info.  */
+  l1 = gcry_sexp_find_token (sigval, "flags", 0);
+  if (l1)
+    {
+      /* Note that the flag parser assumes that the list of flags
+       * contains only strings and in particular not a sub-list.  This
+       * is always the case for the current libksba. */
+      for (i=1; (s = gcry_sexp_nth_data (l1, i, &n)); i++)
+        if (n == 3 && !memcmp (s, "pss", 3))
+          {
+            *r_pkalgo_flags |= PK_ALGO_FLAG_RSAPSS;
+            break;
+          }
+      gcry_sexp_release (l1);
+    }
+
+  l1 = gcry_sexp_find_token (sigval, "hash", 0);
+  if (!l1)
+    {
+      gcry_sexp_release (sigval);
+      return 0; /* hash algorithm not given in sigval. */
+    }
+  string = gcry_sexp_nth_string (l1, 1);
+  gcry_sexp_release (sigval);
+  if (!string)
+    return 0; /* hash algorithm has no value. */
+  hashalgo = gcry_md_map_name (string);
+  gcry_free (string);
+
+  return hashalgo;
+}
diff -Nru gnupg2-2.2.20/sm/qualified.c gnupg2-2.2.27/sm/qualified.c
--- gnupg2-2.2.20/sm/qualified.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/qualified.c	2020-10-23 20:08:54.000000000 +0200
@@ -35,7 +35,7 @@
    NULL indicates that this module has been initialized and if the
    LISTFP is also NULL, no list of qualified signatures exists. */
 static char *listname;
-static FILE *listfp;
+static estream_t listfp;
 
 
 /* Read the trustlist and return entry by entry.  KEY must point to a
@@ -59,7 +59,7 @@
   if (!listname)
     {
       listname = make_filename (gnupg_datadir (), "qualified.txt", NULL);
-      listfp = fopen (listname, "r");
+      listfp = es_fopen (listname, "r");
       if (!listfp && errno != ENOENT)
         {
           err = gpg_error_from_syserror ();
@@ -73,9 +73,9 @@
 
   do
     {
-      if (!fgets (line, DIM(line)-1, listfp) )
+      if (!es_fgets (line, DIM(line)-1, listfp) )
         {
-          if (feof (listfp))
+          if (es_feof (listfp))
             return gpg_error (GPG_ERR_EOF);
           return gpg_error_from_syserror ();
         }
@@ -83,7 +83,7 @@
       if (!*line || line[strlen(line)-1] != '\n')
         {
           /* Eat until end of line. */
-          while ( (c=getc (listfp)) != EOF && c != '\n')
+          while ((c = es_getc (listfp)) != EOF && c != '\n')
             ;
           return gpg_error (*line? GPG_ERR_LINE_TOO_LONG
                                  : GPG_ERR_INCOMPLETE_LINE);
@@ -163,8 +163,8 @@
   if (listfp)
     {
       /* W32ce has no rewind, thus we use the equivalent code.  */
-      fseek (listfp, 0, SEEK_SET);
-      clearerr (listfp);
+      es_fseek (listfp, 0, SEEK_SET);
+      es_clearerr (listfp);
     }
   while (!(err = read_list (key, mycountry, &lnr)))
     {
diff -Nru gnupg2-2.2.20/sm/sign.c gnupg2-2.2.27/sm/sign.c
--- gnupg2-2.2.20/sm/sign.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/sign.c	2020-07-13 14:22:17.000000000 +0200
@@ -486,7 +486,7 @@
         unsigned int nbits;
         int pk_algo = gpgsm_get_key_algo_info (cl->cert, &nbits);
 
-        if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_SIGNING, pk_algo,
+        if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_SIGNING, pk_algo, 0,
                                    NULL, nbits, NULL))
           {
             char  kidstr[10+1];
diff -Nru gnupg2-2.2.20/sm/verify.c gnupg2-2.2.27/sm/verify.c
--- gnupg2-2.2.20/sm/verify.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/sm/verify.c	2020-07-13 14:22:17.000000000 +0200
@@ -1,6 +1,8 @@
 /* verify.c - Verify a messages signature
  * Copyright (C) 2001, 2002, 2003, 2007,
  *               2010 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2019 Werner Koch
+ * Copyright (C) 2015-2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -286,7 +289,7 @@
   for (signer=0; ; signer++)
     {
       char *issuer = NULL;
-      ksba_sexp_t sigval = NULL;
+      gcry_sexp_t sigval = NULL;
       ksba_isotime_t sigtime, keyexptime;
       ksba_sexp_t serial;
       char *msgdigest = NULL;
@@ -294,7 +297,11 @@
       char *ctattr;
       int sigval_hash_algo;
       int info_pkalgo;
-      unsigned int verifyflags;
+      unsigned int nbits;
+      int pkalgo;
+      char *pkalgostr = NULL;
+      char *pkfpr = NULL;
+      unsigned int pkalgoflags, verifyflags;
 
       rc = ksba_cms_get_issuer_serial (cms, signer, &issuer, &serial);
       if (!signer && gpg_err_code (rc) == GPG_ERR_NO_DATA
@@ -400,20 +407,19 @@
       rc = 0;
 
 
-      sigval = ksba_cms_get_sig_val (cms, signer);
+      sigval = gpgsm_ksba_cms_get_sig_val (cms, signer);
       if (!sigval)
         {
           log_error ("no signature value available\n");
           audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
           goto next_signer;
         }
-      sigval_hash_algo = hash_algo_from_sigval (sigval);
+
+      sigval_hash_algo = gpgsm_get_hash_algo_from_sigval (sigval, &pkalgoflags);
       if (DBG_X509)
         {
-          log_debug ("signer %d - signature available (sigval hash=%d)",
-                     signer, sigval_hash_algo);
-/*           log_printhex ("sigval    ", sigval, */
-/*                         gcry_sexp_canon_len (sigval, 0, NULL, NULL)); */
+          log_debug ("signer %d - signature available (sigval hash=%d pkaf=%u)",
+                     signer, sigval_hash_algo, pkalgoflags);
         }
       if (!sigval_hash_algo)
         sigval_hash_algo = algo; /* Fallback used e.g. with old libksba. */
@@ -450,49 +456,68 @@
           goto next_signer;
         }
 
-      /* Check compliance.  */
-      {
-        unsigned int nbits;
-        int pk_algo = gpgsm_get_key_algo_info (cert, &nbits);
-
-        if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_VERIFICATION,
-                                   pk_algo, NULL, nbits, NULL))
-          {
-            char  kidstr[10+1];
-
-            snprintf (kidstr, sizeof kidstr, "0x%08lX",
-                      gpgsm_get_short_fingerprint (cert, NULL));
-            log_error (_("key %s may not be used for signing in %s mode\n"),
-                       kidstr,
-                       gnupg_compliance_option_string (opt.compliance));
-            goto next_signer;
-          }
-
-        if (! gnupg_digest_is_allowed (opt.compliance, 0, sigval_hash_algo))
-          {
-            log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
-                       gcry_md_algo_name (sigval_hash_algo),
-                       gnupg_compliance_option_string (opt.compliance));
-            goto next_signer;
-          }
-
-        /* Check compliance with CO_DE_VS.  */
-        if (gnupg_pk_is_compliant (CO_DE_VS, pk_algo, NULL, nbits, NULL)
-            && gnupg_digest_is_compliant (CO_DE_VS, sigval_hash_algo))
-          gpgsm_status (ctrl, STATUS_VERIFICATION_COMPLIANCE_MODE,
-                        gnupg_status_compliance_flag (CO_DE_VS));
-      }
+      pkfpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
+      pkalgostr = gpgsm_pubkey_algo_string (cert, NULL);
+      pkalgo = gpgsm_get_key_algo_info (cert, &nbits);
 
       log_info (_("Signature made "));
       if (*sigtime)
-        dump_isotime (sigtime);
+        {
+          /* We take the freedom as noted in RFC3339 to use a space
+           * instead of the "T" delimiter between date and time.  We
+           * also append a separate UTC instead of a "Z" or "+00:00"
+           * suffix because that makes it clear to everyone what kind
+           * of time this is.  */
+          dump_isotime (sigtime);
+          log_printf (" UTC");
+        }
       else
         log_printf (_("[date not given]"));
-      log_printf (_(" using certificate ID 0x%08lX\n"),
-                  gpgsm_get_short_fingerprint (cert, NULL));
+      log_info (_("               using %s key %s\n"), pkalgostr, pkfpr);
+      if (opt.verbose)
+        {
+          log_info (_("algorithm:"));
+          log_printf (" %s + %s",
+                      pubkey_algo_to_string (pkalgo),
+                      gcry_md_algo_name (sigval_hash_algo));
+          if (algo != sigval_hash_algo)
+            log_printf (" (%s)", gcry_md_algo_name (algo));
+          log_printf ("\n");
+        }
 
       audit_log_i (ctrl->audit, AUDIT_DATA_HASH_ALGO, algo);
 
+      /* Check compliance.  */
+      if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_VERIFICATION,
+                                 pkalgo, pkalgoflags, NULL, nbits, NULL))
+        {
+          char  kidstr[10+1];
+
+          snprintf (kidstr, sizeof kidstr, "0x%08lX",
+                    gpgsm_get_short_fingerprint (cert, NULL));
+          log_error (_("key %s may not be used for signing in %s mode\n"),
+                     kidstr,
+                     gnupg_compliance_option_string (opt.compliance));
+          goto next_signer;
+        }
+
+      if (!gnupg_digest_is_allowed (opt.compliance, 0, sigval_hash_algo))
+        {
+          log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
+                     gcry_md_algo_name (sigval_hash_algo),
+                     gnupg_compliance_option_string (opt.compliance));
+          goto next_signer;
+        }
+
+      /* Check compliance with CO_DE_VS.  */
+      if (gnupg_pk_is_compliant (CO_DE_VS, pkalgo, pkalgoflags,
+                                 NULL, nbits, NULL)
+          && gnupg_digest_is_compliant (CO_DE_VS, sigval_hash_algo))
+        gpgsm_status (ctrl, STATUS_VERIFICATION_COMPLIANCE_MODE,
+                      gnupg_status_compliance_flag (CO_DE_VS));
+
+
+      /* Now we can check the signature.  */
       if (msgdigest)
         { /* Signed attributes are available. */
           gcry_md_hd_t md;
@@ -512,10 +537,10 @@
               if (DBG_X509)
                 {
                   if (msgdigest)
-                    log_printhex ("message:  ", msgdigest, msgdigestlen);
+                    log_printhex (msgdigest, msgdigestlen, "message:  ");
                   if (s)
-                    log_printhex ("computed: ",
-                                  s, gcry_md_get_algo_dlen (algo));
+                    log_printhex (s, gcry_md_get_algo_dlen (algo),
+                                  "computed: ");
                 }
               fpr = gpgsm_fpr_and_name_for_status (cert);
               gpgsm_status (ctrl, STATUS_BADSIG, fpr);
@@ -545,14 +570,14 @@
               audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "error");
               goto next_signer;
             }
-          rc = gpgsm_check_cms_signature (cert, sigval, md,
-                                          sigval_hash_algo, &info_pkalgo);
+          rc = gpgsm_check_cms_signature (cert, sigval, md, sigval_hash_algo,
+                                          pkalgoflags, &info_pkalgo);
           gcry_md_close (md);
         }
       else
         {
           rc = gpgsm_check_cms_signature (cert, sigval, data_md,
-                                          algo, &info_pkalgo);
+                                          algo, pkalgoflags, &info_pkalgo);
         }
 
       if (rc)
@@ -669,8 +694,10 @@
       rc = 0;
       xfree (issuer);
       xfree (serial);
-      xfree (sigval);
+      gcry_sexp_release (sigval);
       xfree (msgdigest);
+      xfree (pkalgostr);
+      xfree (pkfpr);
       ksba_cert_release (cert);
       cert = NULL;
     }
diff -Nru gnupg2-2.2.20/tests/gpgme/Makefile.am gnupg2-2.2.27/tests/gpgme/Makefile.am
--- gnupg2-2.2.20/tests/gpgme/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tests/gpgme/Makefile.am	2020-08-04 10:10:22.000000000 +0200
@@ -30,7 +30,7 @@
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
+	PATH="../gpgscm:$(PATH)" \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
diff -Nru gnupg2-2.2.20/tests/gpgme/Makefile.in gnupg2-2.2.27/tests/gpgme/Makefile.in
--- gnupg2-2.2.20/tests/gpgme/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/gpgme/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -195,6 +195,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -361,6 +362,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -402,7 +404,7 @@
 AM_CFLAGS = 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
+	PATH="../gpgscm:$(PATH)" \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
diff -Nru gnupg2-2.2.20/tests/gpgscm/main.c gnupg2-2.2.27/tests/gpgscm/main.c
--- gnupg2-2.2.20/tests/gpgscm/main.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tests/gpgscm/main.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -78,9 +79,8 @@
 static void
 parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
 {
-  int no_more_options = 0;
 
-  while (!no_more_options && optfile_parse (NULL, NULL, NULL, pargs, popts))
+  while (gnupg_argparse (NULL, pargs, popts))
     {
       switch (pargs->r_opt)
         {
@@ -89,7 +89,7 @@
           break;
 
         default:
-	  pargs->err = 2;
+	  pargs->err = ARGPARSE_PRINT_ERROR;
 	  break;
 	}
     }
@@ -103,9 +103,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "gpgscm (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -297,6 +299,7 @@
   pargs.argv  = &argv;
   pargs.flags = 0;
   parse_arguments (&pargs, opts);
+  gnupg_argparse (NULL, &pargs, NULL);
 
   if (log_get_errorcount (0))
     exit (2);
diff -Nru gnupg2-2.2.20/tests/gpgscm/Makefile.in gnupg2-2.2.27/tests/gpgscm/Makefile.in
--- gnupg2-2.2.20/tests/gpgscm/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/gpgscm/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -255,6 +255,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -421,6 +422,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru gnupg2-2.2.20/tests/gpgsm/Makefile.am gnupg2-2.2.27/tests/gpgsm/Makefile.am
--- gnupg2-2.2.20/tests/gpgsm/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tests/gpgsm/Makefile.am	2020-08-04 10:10:22.000000000 +0200
@@ -30,10 +30,10 @@
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
-	abs_top_srcdir=$(abs_top_srcdir) \
-	objdir=$(abs_top_builddir) \
-	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
+	PATH="../gpgscm:$(PATH)" \
+	abs_top_srcdir="$(abs_top_srcdir)" \
+	objdir="$(abs_top_builddir)" \
+	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
 	import.scm \
diff -Nru gnupg2-2.2.20/tests/gpgsm/Makefile.in gnupg2-2.2.27/tests/gpgsm/Makefile.in
--- gnupg2-2.2.20/tests/gpgsm/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/gpgsm/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -195,6 +195,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -361,6 +362,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -402,10 +404,10 @@
 AM_CFLAGS = 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
-	abs_top_srcdir=$(abs_top_srcdir) \
-	objdir=$(abs_top_builddir) \
-	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
+	PATH="../gpgscm:$(PATH)" \
+	abs_top_srcdir="$(abs_top_srcdir)" \
+	objdir="$(abs_top_builddir)" \
+	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
 	import.scm \
diff -Nru gnupg2-2.2.20/tests/Makefile.am gnupg2-2.2.27/tests/Makefile.am
--- gnupg2-2.2.20/tests/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tests/Makefile.am	2020-08-20 10:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.am -tests makefile for libxtime
+# Makefile.am
 #     	Copyright (C) 2002 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -26,7 +26,7 @@
 # if the shell used for inittests would uses an internal version of
 # pwd which handles symlinks differently.
 TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
-                    GPGSM=$(GPGSM) $(srcdir)/runtest
+                    GPGSM="$(GPGSM)" "$(srcdir)/runtest"
 
 testscripts = sm-sign+verify sm-verify
 
diff -Nru gnupg2-2.2.20/tests/Makefile.in gnupg2-2.2.27/tests/Makefile.in
--- gnupg2-2.2.20/tests/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Makefile.am -tests makefile for libxtime
+# Makefile.am
 #     	Copyright (C) 2002 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -266,6 +266,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -432,6 +433,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -447,7 +449,7 @@
 # if the shell used for inittests would uses an internal version of
 # pwd which handles symlinks differently.
 TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
-                    GPGSM=$(GPGSM) $(srcdir)/runtest
+                    GPGSM="$(GPGSM)" "$(srcdir)/runtest"
 
 testscripts = sm-sign+verify sm-verify
 EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
diff -Nru gnupg2-2.2.20/tests/migrations/Makefile.am gnupg2-2.2.27/tests/migrations/Makefile.am
--- gnupg2-2.2.20/tests/migrations/Makefile.am	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tests/migrations/Makefile.am	2020-08-04 10:10:22.000000000 +0200
@@ -30,10 +30,10 @@
 
 TESTS_ENVIRONMENT = GPG_AGENT_INFO= LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
-	abs_top_srcdir=$(abs_top_srcdir) \
-	objdir=$(abs_top_builddir) \
-	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
+	PATH="../gpgscm:$(PATH)" \
+	abs_top_srcdir="$(abs_top_srcdir)" \
+	objdir="$(abs_top_builddir)" \
+	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = from-classic.scm \
 	extended-pkf.scm \
diff -Nru gnupg2-2.2.20/tests/migrations/Makefile.in gnupg2-2.2.27/tests/migrations/Makefile.in
--- gnupg2-2.2.20/tests/migrations/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/migrations/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -195,6 +195,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -361,6 +362,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -402,10 +404,10 @@
 AM_CFLAGS = 
 TESTS_ENVIRONMENT = GPG_AGENT_INFO= LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
-	abs_top_srcdir=$(abs_top_srcdir) \
-	objdir=$(abs_top_builddir) \
-	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
+	PATH="../gpgscm:$(PATH)" \
+	abs_top_srcdir="$(abs_top_srcdir)" \
+	objdir="$(abs_top_builddir)" \
+	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = from-classic.scm \
 	extended-pkf.scm \
diff -Nru gnupg2-2.2.20/tests/openpgp/defs.scm gnupg2-2.2.27/tests/openpgp/defs.scm
--- gnupg2-2.2.20/tests/openpgp/defs.scm	2019-11-25 16:14:26.000000000 +0100
+++ gnupg2-2.2.27/tests/openpgp/defs.scm	2020-10-23 20:08:54.000000000 +0200
@@ -123,6 +123,7 @@
 
 (define bin-prefix (getenv "BIN_PREFIX"))
 (define installed? (not (string=? "" bin-prefix)))
+(define with-valgrind? (not (string=? (getenv "with_valgrind") "")))
 
 (define (tool-hardcoded which)
   (let ((t (assoc which tools)))
@@ -138,7 +139,8 @@
 ;; (set! gpg `(,@valgrind ,@gpg))
 ;;
 (define valgrind
-  '("/usr/bin/valgrind" --leak-check=full --error-exitcode=154))
+  '("/usr/bin/valgrind" -q --leak-check=no --track-origins=yes
+                        --error-exitcode=154 --exit-on-first-error=yes))
 
 (unless installed?
 	(setenv "GNUPG_BUILDDIR" (getenv "objdir") #t))
@@ -496,4 +498,12 @@
 		   "but got" trust))))
 
 
+;;
+;; Enable checking with valgrind if the envvar "with_valgrind" is set
+;;
+(when with-valgrind?
+  (set! gpg `(,@valgrind ,@gpg)))
+
+
+
 ;; end
diff -Nru gnupg2-2.2.20/tests/openpgp/Makefile.am gnupg2-2.2.27/tests/openpgp/Makefile.am
--- gnupg2-2.2.20/tests/openpgp/Makefile.am	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/tests/openpgp/Makefile.am	2020-08-04 10:10:22.000000000 +0200
@@ -35,10 +35,10 @@
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
-	abs_top_srcdir=$(abs_top_srcdir) \
-	objdir=$(abs_top_builddir) \
-	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
+	PATH="../gpgscm:$(PATH)" \
+	abs_top_srcdir="$(abs_top_srcdir)" \
+	objdir="$(abs_top_builddir)" \
+	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
 	version.scm \
@@ -279,6 +279,8 @@
 	     gnupg-test.stop random_seed gpg-agent.log tofu.db \
 	     passphrases sshcontrol S.gpg-agent.ssh report.xml
 
+XTESTS += trust-pgp-4.scm
+
 clean-local:
 	-rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d
 
diff -Nru gnupg2-2.2.20/tests/openpgp/Makefile.in gnupg2-2.2.27/tests/openpgp/Makefile.in
--- gnupg2-2.2.20/tests/openpgp/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/openpgp/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -238,6 +238,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -404,6 +405,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -446,73 +448,28 @@
 fake_pinentry_SOURCES = fake-pinentry.c
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
-	PATH=../gpgscm:$(PATH) \
-	abs_top_srcdir=$(abs_top_srcdir) \
-	objdir=$(abs_top_builddir) \
-	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
-
-XTESTS = \
-	version.scm \
-	enarmor.scm \
-	mds.scm \
-	decrypt.scm \
-	decrypt-multifile.scm \
-	decrypt-dsa.scm \
-	decrypt-session-key.scm \
-	decrypt-unwrap-verify.scm \
-	sigs.scm \
-	sigs-dsa.scm \
-	encrypt.scm \
-	encrypt-multifile.scm \
-	encrypt-dsa.scm \
-	compression.scm \
-	seat.scm \
-	clearsig.scm \
-	encryptp.scm \
-	detach.scm \
-	detachm.scm \
-	armsigs.scm \
-	armencrypt.scm \
-	armencryptp.scm \
-	signencrypt.scm \
-	signencrypt-dsa.scm \
-	armsignencrypt.scm \
-	armdetach.scm \
-	armdetachm.scm \
-	genkey1024.scm \
-	conventional.scm \
-	conventional-mdc.scm \
-	multisig.scm \
-	verify.scm \
-	verify-multifile.scm \
-	gpgv.scm \
-	gpgv-forged-keyring.scm \
-	armor.scm \
-	import.scm \
-	import-revocation-certificate.scm \
-	ecc.scm \
-	4gb-packet.scm \
-	tofu.scm \
-	trust-pgp-1.scm \
-	trust-pgp-2.scm \
-	trust-pgp-3.scm \
-	gpgtar.scm \
-	use-exact-key.scm \
-	default-key.scm \
-	export.scm \
-	ssh-import.scm \
-	ssh-export.scm \
-	quick-key-manipulation.scm \
-	key-selection.scm \
-	delete-keys.scm \
-	gpgconf.scm \
-	issue2015.scm \
-	issue2346.scm \
-	issue2417.scm \
-	issue2419.scm \
-	issue2929.scm \
-	issue2941.scm
-
+	PATH="../gpgscm:$(PATH)" \
+	abs_top_srcdir="$(abs_top_srcdir)" \
+	objdir="$(abs_top_builddir)" \
+	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
+
+XTESTS = version.scm enarmor.scm mds.scm decrypt.scm \
+	decrypt-multifile.scm decrypt-dsa.scm decrypt-session-key.scm \
+	decrypt-unwrap-verify.scm sigs.scm sigs-dsa.scm encrypt.scm \
+	encrypt-multifile.scm encrypt-dsa.scm compression.scm seat.scm \
+	clearsig.scm encryptp.scm detach.scm detachm.scm armsigs.scm \
+	armencrypt.scm armencryptp.scm signencrypt.scm \
+	signencrypt-dsa.scm armsignencrypt.scm armdetach.scm \
+	armdetachm.scm genkey1024.scm conventional.scm \
+	conventional-mdc.scm multisig.scm verify.scm \
+	verify-multifile.scm gpgv.scm gpgv-forged-keyring.scm \
+	armor.scm import.scm import-revocation-certificate.scm ecc.scm \
+	4gb-packet.scm tofu.scm trust-pgp-1.scm trust-pgp-2.scm \
+	trust-pgp-3.scm gpgtar.scm use-exact-key.scm default-key.scm \
+	export.scm ssh-import.scm ssh-export.scm \
+	quick-key-manipulation.scm key-selection.scm delete-keys.scm \
+	gpgconf.scm issue2015.scm issue2346.scm issue2417.scm \
+	issue2419.scm issue2929.scm issue2941.scm trust-pgp-4.scm
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
 	     plain-largeo.asc plain-large.asc \
diff -Nru gnupg2-2.2.20/tests/openpgp/README gnupg2-2.2.27/tests/openpgp/README
--- gnupg2-2.2.20/tests/openpgp/README	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tests/openpgp/README	2020-10-23 20:08:54.000000000 +0200
@@ -25,6 +25,9 @@
 programs are executed, or verbose=3 to see even more program output
 and exit codes.
 
+If you want to run gpg under valgrind add with_valgrind=1.
+
+
 ** Inspecting the test environment
 
 To inspect the environment in which tests are running, or to quickly
diff -Nru gnupg2-2.2.20/tests/pkits/Makefile.in gnupg2-2.2.27/tests/pkits/Makefile.in
--- gnupg2-2.2.20/tests/pkits/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tests/pkits/Makefile.in	2021-01-11 18:46:55.000000000 +0100
@@ -182,6 +182,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -348,6 +349,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru gnupg2-2.2.20/tools/gpg-check-pattern.c gnupg2-2.2.27/tools/gpg-check-pattern.c
--- gnupg2-2.2.20/tools/gpg-check-pattern.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/tools/gpg-check-pattern.c	2020-12-18 11:22:45.000000000 +0100
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -37,13 +38,13 @@
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <regex.h>
 #include <ctype.h>
 
 #include "../common/util.h"
 #include "../common/i18n.h"
 #include "../common/sysutils.h"
 #include "../common/init.h"
+#include "../regexp/jimregexp.h"
 
 
 enum cmd_and_opt_values
@@ -133,9 +134,11 @@
   const char *p;
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "gpg-check-pattern (@GnuPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -176,8 +179,8 @@
 
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* (do not remove the args) */
-  while (arg_parse (&pargs, opts) )
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -189,6 +192,8 @@
         default : pargs.err = 2; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
   if (log_get_errorcount(0))
     exit (2);
 
@@ -227,7 +232,7 @@
 static char *
 read_file (const char *fname, size_t *r_length)
 {
-  FILE *fp;
+  estream_t fp;
   char *buf;
   size_t buflen;
 
@@ -235,10 +240,8 @@
     {
       size_t nread, bufsize = 0;
 
-      fp = stdin;
-#ifdef HAVE_DOSISH_SYSTEM
-      setmode ( fileno(fp) , O_BINARY );
-#endif
+      fp = es_stdin;
+      es_set_binary (fp);
       buf = NULL;
       buflen = 0;
 #define NCHUNK 8192
@@ -250,8 +253,8 @@
           else
             buf = xrealloc (buf, bufsize+1);
 
-          nread = fread (buf+buflen, 1, NCHUNK, fp);
-          if (nread < NCHUNK && ferror (fp))
+          nread = es_fread (buf+buflen, 1, NCHUNK, fp);
+          if (nread < NCHUNK && es_ferror (fp))
             {
               log_error ("error reading '[stdin]': %s\n", strerror (errno));
               xfree (buf);
@@ -267,30 +270,30 @@
     {
       struct stat st;
 
-      fp = fopen (fname, "rb");
+      fp = es_fopen (fname, "rb");
       if (!fp)
         {
           log_error ("can't open '%s': %s\n", fname, strerror (errno));
           return NULL;
         }
 
-      if (fstat (fileno(fp), &st))
+      if (fstat (es_fileno (fp), &st))
         {
           log_error ("can't stat '%s': %s\n", fname, strerror (errno));
-          fclose (fp);
+          es_fclose (fp);
           return NULL;
         }
 
       buflen = st.st_size;
       buf = xmalloc (buflen+1);
-      if (fread (buf, buflen, 1, fp) != 1)
+      if (es_fread (buf, buflen, 1, fp) != 1)
         {
           log_error ("error reading '%s': %s\n", fname, strerror (errno));
-          fclose (fp);
+          es_fclose (fp);
           xfree (buf);
           return NULL;
         }
-      fclose (fp);
+      es_fclose (fp);
     }
   buf[buflen] = 0;
   *r_length = buflen;
@@ -369,7 +372,7 @@
             p[strlen(p)-1] = 0;  /* Remove optional delimiter.  */
           array[arrayidx].u.r.regex = xcalloc (1, sizeof (regex_t));
           rerr = regcomp (array[arrayidx].u.r.regex, p,
-                          REG_ICASE|REG_NOSUB|REG_EXTENDED);
+                          REG_ICASE|REG_EXTENDED);
           if (rerr)
             {
               char *rerrbuf = get_regerror (rerr, array[arrayidx].u.r.regex);
@@ -491,4 +494,3 @@
   if (opt.verbose)
     log_info ("no input line matches the pattern - accepted\n");
 }
-
diff -Nru gnupg2-2.2.20/tools/gpg-check-pattern-w32info.rc gnupg2-2.2.27/tools/gpg-check-pattern-w32info.rc
--- gnupg2-2.2.20/tools/gpg-check-pattern-w32info.rc	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-check-pattern-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,52 @@
+/* gpg-check-pattern-w32info.rc                             -*- c -*-
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s pattern checker\0"
+            VALUE "InternalName", "gpg-check-pattern\0"
+            VALUE "OriginalFilename", "gpg-check-pattern.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "gpg-check-pattern.w32-manifest"
diff -Nru gnupg2-2.2.20/tools/gpg-check-pattern.w32-manifest.in gnupg2-2.2.27/tools/gpg-check-pattern.w32-manifest.in
--- gnupg2-2.2.20/tools/gpg-check-pattern.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-check-pattern.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Pattern checker)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpg-check-pattern"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/tools/gpgconf.c gnupg2-2.2.27/tools/gpgconf.c
--- gnupg2-2.2.20/tools/gpgconf.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgconf.c	2020-12-18 11:22:45.000000000 +0100
@@ -1,6 +1,6 @@
 /* gpgconf.c - Configuration utility for GnuPG
  * Copyright (C) 2003, 2007, 2009, 2011 Free Software Foundation, Inc.
- * Copyright (C) 2016 g10 Code GmbH.
+ * Copyright (C) 2016, 2020 g10 Code GmbH.
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -31,6 +32,7 @@
 #include "../common/sysutils.h"
 #include "../common/init.h"
 #include "../common/status.h"
+#include "../common/exechelp.h"
 
 
 /* Constants to identify the commands and options. */
@@ -65,7 +67,8 @@
     aCreateSocketDir,
     aRemoveSocketDir,
     aApplyProfile,
-    aReload
+    aReload,
+    aShowVersions
   };
 
 
@@ -96,6 +99,8 @@
     { aKill,          "kill", 256,   N_("kill a given component")},
     { aCreateSocketDir, "create-socketdir", 256, "@"},
     { aRemoveSocketDir, "remove-socketdir", 256, "@"},
+    ARGPARSE_c (aShowVersions, "show-versions", "@"),
+
 
     { 301, NULL, 0, N_("@\nOptions:\n ") },
 
@@ -120,6 +125,9 @@
  * this is NULL.  */
 static estream_t statusfp;
 
+static void show_versions (estream_t fp);
+
+
 
 /* Print usage information and provide strings for help. */
 static const char *
@@ -129,9 +137,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@GPGCONF@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -557,17 +567,15 @@
   /* Parse the command line. */
   pargs.argc  = &argc;
   pargs.argv  = &argv;
-  pargs.flags =  1;  /* Do not remove the args.  */
-  while (!no_more_options && optfile_parse (NULL, NULL, NULL, &pargs, opts))
+  pargs.flags = ARGPARSE_FLAG_KEEP;
+  while (!no_more_options && gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
         case oOutput:    opt.outfile = pargs.r.ret_str; break;
 	case oQuiet:     opt.quiet = 1; break;
         case oDryRun:    opt.dry_run = 1; break;
-        case oRuntime:
-	  opt.runtime = 1;
-	  break;
+        case oRuntime:   opt.runtime = 1; break;
         case oVerbose:   opt.verbose++; break;
         case oNoVerbose: opt.verbose = 0; break;
         case oHomedir:   gnupg_set_homedir (pargs.r.ret_str); break;
@@ -594,12 +602,14 @@
         case aKill:
         case aCreateSocketDir:
         case aRemoveSocketDir:
+        case aShowVersions:
 	  cmd = pargs.r_opt;
 	  break;
 
-        default: pargs.err = 2; break;
+        default: pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (log_get_errorcount (0))
     gpgconf_failure (GPG_ERR_USER_2);
@@ -773,12 +783,16 @@
 	  es_putc ('\n', es_stderr);
 	  gpgconf_failure (GPG_ERR_USER_2);
 	}
+      if (!opt.dry_run && gnupg_access (gnupg_homedir (), F_OK))
+        gnupg_maybe_make_homedir (gnupg_homedir (), opt.quiet);
       gc_component_retrieve_options (-1);
       if (gc_process_gpgconf_conf (NULL, 1, 1, NULL))
         gpgconf_failure (0);
       break;
 
     case aApplyProfile:
+      if (!opt.dry_run && gnupg_access (gnupg_homedir (), F_OK))
+        gnupg_maybe_make_homedir (gnupg_homedir (), opt.quiet);
       gc_component_retrieve_options (-1);
       if (gc_apply_profile (fname))
         gpgconf_failure (0);
@@ -897,6 +911,13 @@
       }
       break;
 
+    case aShowVersions:
+      {
+        get_outfp (&outfp);
+        show_versions (outfp);
+      }
+      break;
+
     }
 
   if (outfp != es_stdout)
@@ -923,3 +944,155 @@
      gpg_err_code (err) == GPG_ERR_USER_2? GPG_ERR_EINVAL : err);
   exit (gpg_err_code (err) == GPG_ERR_USER_2? 2 : 1);
 }
+
+
+
+/* Parse the revision part from the extended version blurb.  */
+static const char *
+get_revision_from_blurb (const char *blurb, int *r_len)
+{
+  const char *s = blurb? blurb : "";
+  int n;
+
+  for (; *s; s++)
+    if (*s == '\n' && s[1] == '(')
+      break;
+  if (s)
+    {
+      s += 2;
+      for (n=0; s[n] && s[n] != ' '; n++)
+        ;
+    }
+  else
+    {
+      s = "?";
+      n = 1;
+    }
+  *r_len = n;
+  return s;
+}
+
+
+static void
+show_version_gnupg (estream_t fp)
+{
+  es_fprintf (fp, "* GnuPG %s (%s)\n%s\n",
+              strusage (13), BUILD_REVISION, strusage (17));
+#ifdef HAVE_W32_SYSTEM
+  {
+    OSVERSIONINFO osvi = { sizeof (osvi) };
+
+    GetVersionEx (&osvi);
+    es_fprintf (fp, "Windows %lu.%lu build %lu%s%s%s\n",
+                (unsigned long)osvi.dwMajorVersion,
+                (unsigned long)osvi.dwMinorVersion,
+                (unsigned long)osvi.dwBuildNumber,
+                *osvi.szCSDVersion? " (":"",
+                osvi.szCSDVersion,
+                *osvi.szCSDVersion? ")":""
+                );
+  }
+#endif /*HAVE_W32_SYSTEM*/
+}
+
+
+static void
+show_version_libgcrypt (estream_t fp)
+{
+  const char *s;
+  int n;
+
+  s = get_revision_from_blurb (gcry_check_version ("\x01\x01"), &n);
+  es_fprintf (fp, "* Libgcrypt %s (%.*s)\n",
+              gcry_check_version (NULL), n, s);
+  s = gcry_get_config (0, NULL);
+  if (s)
+    es_fputs (s, fp);
+}
+
+
+static void
+show_version_gpgrt (estream_t fp)
+{
+  const char *s;
+  int n;
+
+  s = get_revision_from_blurb (gpg_error_check_version ("\x01\x01"), &n);
+  es_fprintf (fp, "* GpgRT %s (%.*s)\n",
+              gpg_error_check_version (NULL), n, s);
+}
+
+
+/* Printing version information for other libraries is problematic
+ * because we don't want to link gpgconf to all these libraries.  The
+ * best solution is delegating this to dirmngr which uses libassuan,
+ * libksba, libnpth and ntbtls anyway.  */
+static void
+show_versions_via_dirmngr (estream_t fp)
+{
+  gpg_error_t err;
+  const char *pgmname;
+  const char *argv[2];
+  estream_t outfp;
+  pid_t pid;
+  char *line = NULL;
+  size_t line_len = 0;
+  ssize_t length;
+  int exitcode;
+
+  pgmname = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
+  argv[0] = "--gpgconf-versions";
+  argv[1] = NULL;
+  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+                             NULL, &outfp, NULL, &pid);
+  if (err)
+    {
+      log_error ("error spawning %s: %s", pgmname, gpg_strerror (err));
+      es_fprintf (fp, "[error: can't get further info]\n");
+      return;
+    }
+
+  while ((length = es_read_line (outfp, &line, &line_len, NULL)) > 0)
+    {
+      /* Strip newline and carriage return, if present.  */
+      while (length > 0
+	     && (line[length - 1] == '\n' || line[length - 1] == '\r'))
+	line[--length] = '\0';
+      es_fprintf (fp, "%s\n", line);
+    }
+  if (length < 0 || es_ferror (outfp))
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("error reading from %s: %s\n", pgmname, gpg_strerror (err));
+    }
+  if (es_fclose (outfp))
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("error closing output stream of %s: %s\n",
+                 pgmname, gpg_strerror (err));
+    }
+
+  err = gnupg_wait_process (pgmname, pid, 1, &exitcode);
+  if (err)
+    {
+      log_error ("running %s failed (exitcode=%d): %s\n",
+                 pgmname, exitcode, gpg_strerror (err));
+      es_fprintf (fp, "[error: can't get further info]\n");
+    }
+  gnupg_release_process (pid);
+  xfree (line);
+}
+
+
+/* Show all kind of version information.  */
+static void
+show_versions (estream_t fp)
+{
+  show_version_gnupg (fp);
+  es_fputc ('\n', fp);
+  show_version_libgcrypt (fp);
+  es_fputc ('\n', fp);
+  show_version_gpgrt (fp);
+  es_fputc ('\n', fp);
+  show_versions_via_dirmngr (fp);
+}
diff -Nru gnupg2-2.2.20/tools/gpgconf-comp.c gnupg2-2.2.27/tools/gpgconf-comp.c
--- gnupg2-2.2.20/tools/gpgconf-comp.c	2020-03-19 12:52:34.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgconf-comp.c	2021-01-07 13:21:14.000000000 +0100
@@ -757,10 +757,10 @@
      "gnupg", N_("|MECHANISMS|use MECHANISMS to locate keys by mail address"),
      GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
    { "auto-key-import", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     N_("import missing key from a signature"), "gnupg",
+     "gnupg", N_("import missing key from a signature"),
      GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
    { "include-key-block", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     N_("include the public key in signatures"), "gnupg",
+     "gnupg", N_("include the public key in signatures"),
      GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
    { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
      NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
@@ -2115,7 +2115,7 @@
   argv[i++] = "--gpgconf-list";
   argv[i++] = NULL;
 
-  if (only_installed && access (pgmname, X_OK))
+  if (only_installed && gnupg_access (pgmname, X_OK))
     {
       return;  /* The component is not installed.  */
     }
@@ -3016,8 +3016,9 @@
   *dest_filenamep = dest_filename;
   *orig_filenamep = orig_filename;
 
-  /* Use open() so that we can use O_EXCL.  */
-  fd = open (src_filename, O_CREAT | O_EXCL | O_WRONLY, 0644);
+  /* Use open() so that we can use O_EXCL.
+   * FIXME: gpgrt has an x flag for quite some time now - use that.  */
+  fd = gnupg_open (src_filename, O_CREAT | O_EXCL | O_WRONLY, 0644);
   if (fd < 0)
     return -1;
   src_file = gpgrt_fdopen (fd, "w");
@@ -4055,7 +4056,7 @@
        * is installed and use that instead of the given file name.  */
       fname_buffer = xstrconcat (gnupg_datadir (), DIRSEP_S,
                                  fname, ".prf", NULL);
-      if (!access (fname_buffer, F_OK))
+      if (!gnupg_access (fname_buffer, F_OK))
         fname = fname_buffer;
     }
 
diff -Nru gnupg2-2.2.20/tools/gpgconf-w32info.rc gnupg2-2.2.27/tools/gpgconf-w32info.rc
--- gnupg2-2.2.20/tools/gpgconf-w32info.rc	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgconf-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,52 @@
+/* gpgconf-w32info.rc                                         -*- c -*-
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s config tool\0"
+            VALUE "InternalName", "gpgconf\0"
+            VALUE "OriginalFilename", "gpgconf.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "gpgconf.w32-manifest"
diff -Nru gnupg2-2.2.20/tools/gpgconf.w32-manifest.in gnupg2-2.2.27/tools/gpgconf.w32-manifest.in
--- gnupg2-2.2.20/tools/gpgconf.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgconf.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Config tool)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpgconf"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/tools/gpg-connect-agent.c gnupg2-2.2.27/tools/gpg-connect-agent.c
--- gnupg2-2.2.20/tools/gpg-connect-agent.c	2018-10-24 20:30:17.000000000 +0200
+++ gnupg2-2.2.27/tools/gpg-connect-agent.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -166,7 +167,7 @@
 static pid_t server_pid = (pid_t)(-1);
 
 /* The current datasink file or NULL.  */
-static FILE *current_datasink;
+static estream_t current_datasink;
 
 /* A list of open file descriptors. */
 static struct
@@ -195,9 +196,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@GPG@-connect-agent (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -874,7 +877,7 @@
 static void
 do_sendfd (assuan_context_t ctx, char *line)
 {
-  FILE *fp;
+  estream_t fp;
   char *name, *mode, *p;
   int rc, fd;
 
@@ -900,14 +903,14 @@
     }
 
   /* Open and send. */
-  fp = fopen (name, mode);
+  fp = es_fopen (name, mode);
   if (!fp)
     {
       log_error ("can't open '%s' in \"%s\" mode: %s\n",
                  name, mode, strerror (errno));
       return;
     }
-  fd = fileno (fp);
+  fd = es_fileno (fp);
 
   if (opt.verbose)
     log_error ("file '%s' opened in \"%s\" mode, fd=%d\n",
@@ -916,7 +919,7 @@
   rc = assuan_sendfd (ctx, INT2FD (fd) );
   if (rc)
     log_error ("sending descriptor %d failed: %s\n", fd, gpg_strerror (rc));
-  fclose (fp);
+  es_fclose (fp);
 }
 
 
@@ -932,7 +935,7 @@
 static void
 do_open (char *line)
 {
-  FILE *fp;
+  estream_t fp;
   char *varname, *name, *mode, *p;
   int fd;
 
@@ -976,14 +979,14 @@
     }
 
   /* Open and send. */
-  fp = fopen (name, mode);
+  fp = es_fopen (name, mode);
   if (!fp)
     {
       log_error ("can't open '%s' in \"%s\" mode: %s\n",
                  name, mode, strerror (errno));
       return;
     }
-  fd = dup (fileno (fp));
+  fd = dup (es_fileno (fp));
   if (fd >= 0 && fd < DIM (open_fd_table))
     {
       open_fd_table[fd].inuse = 1;
@@ -1033,7 +1036,7 @@
       if (fd != -1)
         close (fd); /* Table was full.  */
     }
-  fclose (fp);
+  es_fclose (fp);
 }
 
 
@@ -1182,6 +1185,7 @@
 
   assuan_set_gpg_err_source (0);
 
+  gnupg_init_signals (0, NULL);
 
   opt.autostart = 1;
   opt.connect_flags = 1;
@@ -1189,8 +1193,8 @@
   /* Parse the command line. */
   pargs.argc  = &argc;
   pargs.argv  = &argv;
-  pargs.flags =  1;  /* Do not remove the args.  */
-  while (!no_more_options && optfile_parse (NULL, NULL, NULL, &pargs, opts))
+  pargs.flags = ARGPARSE_FLAG_KEEP;
+  while (!no_more_options && gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -1218,6 +1222,7 @@
         default: pargs.err = 2; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (log_get_errorcount (0))
     exit (2);
@@ -1565,17 +1570,17 @@
 
               if (current_datasink)
                 {
-                  if (current_datasink != stdout)
-                    fclose (current_datasink);
+                  if (current_datasink != es_stdout)
+                    es_fclose (current_datasink);
                   current_datasink = NULL;
                 }
               tmpline = opt.enable_varsubst? substitute_line (p) : NULL;
               fname = tmpline? tmpline : p;
               if (fname && !strcmp (fname, "-"))
-                current_datasink = stdout;
+                current_datasink = es_stdout;
               else if (fname && *fname)
                 {
-                  current_datasink = fopen (fname, "wb");
+                  current_datasink = es_fopen (fname, "wb");
                   if (!current_datasink)
                     log_error ("can't open '%s': %s\n",
                                fname, strerror (errno));
@@ -1904,6 +1909,7 @@
 {
   const char *name;
   definq_t d;
+  /* FIXME: Due to the use of popen we can't easily switch to estream.  */
   FILE *fp = NULL;
   char buffer[1024];
   int rc, n;
@@ -1965,7 +1971,7 @@
         }
       else
         {
-          fp = fopen (d->file, "rb");
+          fp = gnupg_fopen (d->file, "rb");
           if (!fp)
             log_error ("error opening '%s': %s\n", d->file, strerror (errno));
           else if (opt.verbose)
@@ -2055,7 +2061,7 @@
                     }
                   else
                     c = *s;
-                  putc (c, current_datasink);
+                  es_putc (c, current_datasink);
                 }
             }
           else if (opt.hex)
@@ -2126,7 +2132,7 @@
         {
           if (need_lf)
             {
-              if (!current_datasink || current_datasink != stdout)
+              if (!current_datasink || current_datasink != es_stdout)
                 putchar ('\n');
               need_lf = 0;
             }
@@ -2135,7 +2141,7 @@
               && line[0] == 'S'
               && (line[1] == '\0' || line[1] == ' '))
             {
-              if (!current_datasink || current_datasink != stdout)
+              if (!current_datasink || current_datasink != es_stdout)
                 {
                   fwrite (line, linelen, 1, stdout);
                   putchar ('\n');
@@ -2145,7 +2151,7 @@
                    && line[0] == 'O' && line[1] == 'K'
                    && (line[2] == '\0' || line[2] == ' '))
             {
-              if (!current_datasink || current_datasink != stdout)
+              if (!current_datasink || current_datasink != es_stdout)
                 {
                   fwrite (line, linelen, 1, stdout);
                   putchar ('\n');
@@ -2163,7 +2169,7 @@
               if (!errval)
                 errval = -1;
               set_int_var ("?", errval);
-              if (!current_datasink || current_datasink != stdout)
+              if (!current_datasink || current_datasink != es_stdout)
                 {
                   fwrite (line, linelen, 1, stdout);
                   putchar ('\n');
@@ -2177,7 +2183,7 @@
                    && line[6] == 'E'
                    && (line[7] == '\0' || line[7] == ' '))
             {
-              if (!current_datasink || current_datasink != stdout)
+              if (!current_datasink || current_datasink != es_stdout)
                 {
                   fwrite (line, linelen, 1, stdout);
                   putchar ('\n');
@@ -2189,7 +2195,7 @@
                    && line[0] == 'E' && line[1] == 'N' && line[2] == 'D'
                    && (line[3] == '\0' || line[3] == ' '))
             {
-              if (!current_datasink || current_datasink != stdout)
+              if (!current_datasink || current_datasink != es_stdout)
                 {
                   fwrite (line, linelen, 1, stdout);
                   putchar ('\n');
diff -Nru gnupg2-2.2.20/tools/gpg-connect-agent-w32info.rc gnupg2-2.2.27/tools/gpg-connect-agent-w32info.rc
--- gnupg2-2.2.20/tools/gpg-connect-agent-w32info.rc	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/tools/gpg-connect-agent-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -1,4 +1,4 @@
-/* scdaemon-w32info.rc                                        -*- c -*-
+/* gpg-connect-agent-w32info.rc                               -*- c -*-
  * Copyright (C) 2013 g10 Code GmbH
  *
  * This file is free software; as a special exception the author gives
@@ -32,8 +32,7 @@
     BEGIN
         BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
         BEGIN
-            VALUE "FileDescription", L"GnuPG\x2019s command line access \
-to the agent\0"
+            VALUE "FileDescription", L"GnuPG\x2019s IPC tool\0"
             VALUE "InternalName", "gpg-connect-agent\0"
             VALUE "OriginalFilename", "gpg-connect-agent.exe\0"
             VALUE "ProductName",    W32INFO_PRODUCTNAME
@@ -49,3 +48,5 @@
       VALUE "Translation", 0x409, 0x4b0
     END
   END
+
+1 RT_MANIFEST "gpg-connect-agent.w32-manifest"
diff -Nru gnupg2-2.2.20/tools/gpg-connect-agent.w32-manifest.in gnupg2-2.2.27/tools/gpg-connect-agent.w32-manifest.in
--- gnupg2-2.2.20/tools/gpg-connect-agent.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-connect-agent.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (IPC tool)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpg-connect-agent"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/tools/gpgsplit.c gnupg2-2.2.27/tools/gpgsplit.c
--- gnupg2-2.2.20/tools/gpgsplit.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tools/gpgsplit.c	2020-12-18 11:22:45.000000000 +0100
@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -86,9 +87,11 @@
   const char *p;
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "gpgsplit (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = "Please report bugs to <@EMAIL@>.\n"; break;
 
@@ -122,8 +125,8 @@
 
   pargs.argc = &argc;
   pargs.argv = &argv;
-  pargs.flags=  1;  /* do not remove the args */
-  while (optfile_parse( NULL, NULL, NULL, &pargs, opts))
+  pargs.flags= ARGPARSE_FLAG_KEEP;
+  while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
@@ -132,9 +135,10 @@
         case oUncompress: opt_uncompress = 1; break;
         case oSecretToPublic: opt_secret_to_public = 1; break;
         case oNoSplit: opt_no_split = 1; break;
-        default : pargs.err = 2; break;
+        default : pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
     }
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (log_get_errorcount(0))
     g10_exit (2);
@@ -552,7 +556,7 @@
     {
       if (opt_verbose)
         log_info ("writing '%s'\n", outname);
-      fpout = fopen (outname, "wb");
+      fpout = gnupg_fopen (outname, "wb");
       if (!fpout)
         {
           log_error ("error creating '%s': %s\n", outname, strerror(errno));
@@ -873,7 +877,7 @@
       fp = stdin;
       fname = "-";
     }
-  else if ( !(fp = fopen (fname,"rb")) )
+  else if ( !(fp = gnupg_fopen (fname,"rb")) )
     {
       log_error ("can't open '%s': %s\n", fname, strerror (errno));
       return;
diff -Nru gnupg2-2.2.20/tools/gpgtar.c gnupg2-2.2.27/tools/gpgtar.c
--- gnupg2-2.2.20/tools/gpgtar.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgtar.c	2020-12-18 11:22:45.000000000 +0100
@@ -1,5 +1,6 @@
 /* gpgtar.c - A simple TAR implementation mainly useful for Windows.
  * Copyright (C) 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -15,6 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* GnuPG comes with a shell script gpg-zip which creates archive files
@@ -73,6 +75,7 @@
     oCMS,
     oSetFilename,
     oNull,
+    oUtf8Strings,
 
     /* Compatibility with gpg-zip.  */
     oGpgArgs,
@@ -117,6 +120,12 @@
   ARGPARSE_s_s (oFilesFrom, "files-from",
                 N_("|FILE|get names to create from FILE")),
   ARGPARSE_s_n (oNull, "null", N_("-T reads null-terminated names")),
+#ifdef HAVE_W32_SYSTEM
+  ARGPARSE_s_n (oUtf8Strings, "utf8-strings",
+                N_("-T reads UTF-8 encoded names")),
+#else
+  ARGPARSE_s_n (oUtf8Strings, "utf8-strings", "@"),
+#endif
 
   ARGPARSE_s_s (oGpgArgs, "gpg-args", "@"),
   ARGPARSE_s_s (oTarArgs, "tar-args", "@"),
@@ -138,10 +147,10 @@
 
 
 /* Global flags.  */
-enum cmd_and_opt_values cmd = 0;
-int skip_crypto = 0;
-const char *files_from = NULL;
-int null_names = 0;
+static enum cmd_and_opt_values cmd = 0;
+static int skip_crypto = 0;
+static const char *files_from = NULL;
+static int null_names = 0;
 
 
 
@@ -154,9 +163,11 @@
 
   switch (level)
     {
+    case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@GPGTAR@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -307,7 +318,7 @@
 {
   int no_more_options = 0;
 
-  while (!no_more_options && optfile_parse (NULL, NULL, NULL, pargs, popts))
+  while (!no_more_options && gnupg_argparse (NULL, pargs, popts))
     {
       switch (pargs->r_opt)
         {
@@ -319,6 +330,7 @@
         case oNoVerbose: opt.verbose = 0; break;
         case oFilesFrom: files_from = pargs->r.ret_str; break;
         case oNull: null_names = 1; break;
+        case oUtf8Strings: opt.utf8strings = 1; break;
 
 	case aList:
         case aDecrypt:
@@ -377,7 +389,7 @@
           }
           break;
 
-        case oTarArgs:;
+        case oTarArgs:
           {
             int tar_argc;
             char **tar_argv;
@@ -392,6 +404,7 @@
                 tar_args.argv = &tar_argv;
                 tar_args.flags = ARGPARSE_FLAG_ARG0;
                 parse_arguments (&tar_args, tar_opts);
+                gnupg_argparse (NULL, &tar_args, NULL);
                 if (tar_args.err)
                   log_error ("unsupported tar arguments '%s'\n",
                              pargs->r.ret_str);
@@ -418,8 +431,6 @@
   const char *fname;
   ARGPARSE_ARGS pargs;
 
-  assert (sizeof (struct ustar_raw_header) == 512);
-
   gnupg_reopen_std (GPGTAR_NAME);
   set_strusage (my_strusage);
   log_set_prefix (GPGTAR_NAME, GPGRT_LOG_WITH_PREFIX);
@@ -428,16 +439,14 @@
   i18n_init();
   init_common_subsystems (&argc, &argv);
 
+  log_assert (sizeof (struct ustar_raw_header) == 512);
+
   /* Parse the command line. */
   pargs.argc  = &argc;
   pargs.argv  = &argv;
   pargs.flags = ARGPARSE_FLAG_KEEP;
   parse_arguments (&pargs, opts);
-
-  if ((files_from && !null_names) || (!files_from && null_names))
-    log_error ("--files-from and --null may only be used in conjunction\n");
-  if (files_from && strcmp (files_from, "-"))
-    log_error ("--files-from only supports argument \"-\"\n");
+  gnupg_argparse (NULL, &pargs, NULL);
 
   if (log_get_errorcount (0))
     exit (2);
@@ -476,12 +485,14 @@
     case aEncrypt:
     case aSign:
     case aSignEncrypt:
-      if ((!argc && !null_names)
-          || (argc && null_names))
+      if ((!argc && !files_from)
+          || (argc && files_from))
         usage (1);
       if (opt.filename)
         log_info ("note: ignoring option --set-filename\n");
-      err = gpgtar_create (null_names? NULL :argv,
+      err = gpgtar_create (files_from? NULL : argv,
+                           files_from,
+                           null_names,
                            !skip_crypto
                            && (cmd == aEncrypt || cmd == aSignEncrypt),
                            cmd == aSign || cmd == aSignEncrypt);
diff -Nru gnupg2-2.2.20/tools/gpgtar-create.c gnupg2-2.2.27/tools/gpgtar-create.c
--- gnupg2-2.2.20/tools/gpgtar-create.c	2019-03-07 10:56:18.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgtar-create.c	2020-10-23 20:08:54.000000000 +0200
@@ -42,7 +42,7 @@
 #include "gpgtar.h"
 
 #ifndef HAVE_LSTAT
-#define lstat(a,b) stat ((a), (b))
+#define lstat(a,b) gnupg_stat ((a), (b))
 #endif
 
 
@@ -58,6 +58,38 @@
 
 
 
+/* On Windows convert name to UTF8 and return it; caller must release
+ * the result.  On Unix or if ALREADY_UTF8 is set, this function is a
+ * mere xtrystrcopy.  On failure NULL is returned and ERRNO set. */
+static char *
+name_to_utf8 (const char *name, int already_utf8)
+{
+#ifdef HAVE_W32_SYSTEM
+  wchar_t *wstring;
+  char *result;
+
+  if (already_utf8)
+    result = xtrystrdup (name);
+  else
+    {
+      wstring = native_to_wchar (name);
+      if (!wstring)
+        return NULL;
+      result = wchar_to_utf8 (wstring);
+      xfree (wstring);
+    }
+  return result;
+
+#else /*!HAVE_W32_SYSTEM */
+
+  (void)already_utf8;
+  return xtrystrdup (name);
+
+#endif /*!HAVE_W32_SYSTEM */
+}
+
+
+
 
 /* Given a fresh header object HDR with only the name field set, try
    to gather all available info.  This is the W32 version.  */
@@ -73,7 +105,7 @@
   for (p=hdr->name; *p; p++)
     if (*p == '/')
       *p = '\\';
-  wfname = native_to_wchar (hdr->name);
+  wfname = utf8_to_wchar (hdr->name);
   for (p=hdr->name; *p; p++)
     if (*p == '\\')
       *p = '/';
@@ -213,7 +245,7 @@
 #endif /*!HAVE_W32_SYSTEM*/
 
 
-/* Add a new entry.  The name of a director entry is ENTRYNAME; if
+/* Add a new entry.  The name of a directory entry is ENTRYNAME; if
    that is NULL, DNAME is the name of the directory itself.  Under
    Windows ENTRYNAME shall have backslashes replaced by standard
    slashes.  */
@@ -225,7 +257,7 @@
   char *p;
   size_t dnamelen = strlen (dname);
 
-  assert (dnamelen);
+  log_assert (dnamelen);
 
   hdr = xtrycalloc (1, sizeof *hdr + dnamelen + 1
                     + (entryname? strlen (entryname) : 0) + 1);
@@ -269,6 +301,8 @@
   gpg_error_t err = 0;
 
 #ifdef HAVE_W32_SYSTEM
+  /* Note that we introduced gnupg_opendir only after we had deployed
+   * this code and thus we don't change it for now.  */
   WIN32_FIND_DATAW fi;
   HANDLE hd = INVALID_HANDLE_VALUE;
   char *p;
@@ -300,7 +334,7 @@
     for (p=fname; *p; p++)
       if (*p == '/')
         *p = '\\';
-    wfname = native_to_wchar (fname);
+    wfname = utf8_to_wchar (fname);
     xfree (fname);
     if (!wfname)
       {
@@ -323,7 +357,7 @@
 
   do
     {
-      char *fname = wchar_to_native (fi.cFileName);
+      char *fname = wchar_to_utf8 (fi.cFileName);
       if (!fname)
         {
           err = gpg_error_from_syserror ();
@@ -744,24 +778,54 @@
 
 /* Create a new tarball using the names in the array INPATTERN.  If
    INPATTERN is NULL take the pattern as null terminated strings from
-   stdin.  */
+   stdin or from the file specified by FILES_FROM.  If NULL_NAMES is
+   set the filenames in such a file are delimited by a binary Nul and
+   not by a LF.  */
 gpg_error_t
-gpgtar_create (char **inpattern, int encrypt, int sign)
+gpgtar_create (char **inpattern, const char *files_from, int null_names,
+               int encrypt, int sign)
 {
   gpg_error_t err = 0;
   struct scanctrl_s scanctrl_buffer;
   scanctrl_t scanctrl = &scanctrl_buffer;
   tar_header_t hdr, *start_tail;
+  estream_t files_from_stream = NULL;
   estream_t outstream = NULL;
   estream_t cipher_stream = NULL;
   int eof_seen = 0;
 
-  if (!inpattern)
-    es_set_binary (es_stdin);
-
   memset (scanctrl, 0, sizeof *scanctrl);
   scanctrl->flist_tail = &scanctrl->flist;
 
+  /* { unsigned int cpno, cpno2, cpno3; */
+
+  /*   cpno = GetConsoleOutputCP (); */
+  /*   cpno2 = GetACP (); */
+  /*   cpno3 = GetOEMCP (); */
+  /*   log_debug ("Codepages: Console: %u  ANSI: %u  OEM: %u\n", */
+  /*              cpno, cpno2, cpno3); */
+  /* } */
+
+
+  if (!inpattern)
+    {
+      if (!files_from || !strcmp (files_from, "-"))
+        {
+          files_from = "-";
+          files_from_stream = es_stdin;
+          if (null_names)
+            es_set_binary (es_stdin);
+        }
+      else if (!(files_from_stream=es_fopen (files_from, null_names? "rb":"r")))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error opening '%s': %s\n",
+                     files_from, gpg_strerror (err));
+          return err;
+        }
+    }
+
+
   if (opt.directory && gnupg_chdir (opt.directory))
     {
       err = gpg_error_from_syserror ();
@@ -786,9 +850,9 @@
           if (!*pattern)
             continue;
 
-          pat = xtrystrdup (pattern);
+          pat = name_to_utf8 (pattern, 0);
         }
-      else /* Read null delimited pattern from stdin.  */
+      else /* Read Nul or LF delimited pattern from files_from_stream.  */
         {
           int c;
           char namebuf[4096];
@@ -796,17 +860,16 @@
 
           for (;;)
             {
-              if ((c = es_getc (es_stdin)) == EOF)
+              if ((c = es_getc (files_from_stream)) == EOF)
                 {
-                  if (es_ferror (es_stdin))
+                  if (es_ferror (files_from_stream))
                     {
                       err = gpg_error_from_syserror ();
                       log_error ("error reading '%s': %s\n",
-                                 "[stdin]", strerror (errno));
+                                 files_from, gpg_strerror (err));
                       goto leave;
                     }
-                  /* Note: The Nul is a delimiter and not a terminator.  */
-                  c = 0;
+                  c = null_names ? 0 : '\n';
                   eof_seen = 1;
                 }
               if (n >= sizeof namebuf - 1)
@@ -815,22 +878,45 @@
                     {
                       skip_this = 1;
                       log_error ("error reading '%s': %s\n",
-                                 "[stdin]", "filename too long");
+                                 files_from, "filename too long");
                     }
                 }
               else
                 namebuf[n++] = c;
-              if (!c)
+
+              if (null_names)
                 {
-                  namebuf[n] = 0;
-                  break;
+                  if (!c)
+                    {
+                      namebuf[n] = 0;
+                      break;
+                    }
+                }
+              else /* Shall be LF delimited.  */
+                {
+                  if (!c)
+                    {
+                      if (!skip_this)
+                        {
+                          skip_this = 1;
+                          log_error ("error reading '%s': %s\n",
+                                     files_from, "filename with embedded Nul");
+                        }
+                    }
+                  else if ( c == '\n' )
+                    {
+                      namebuf[n] = 0;
+                      ascii_trim_spaces (namebuf);
+                      n = strlen (namebuf);
+                      break;
+                    }
                 }
             }
 
           if (skip_this || n < 2)
             continue;
 
-          pat = xtrystrdup (namebuf);
+          pat = name_to_utf8 (namebuf, opt.utf8strings);
         }
 
       if (!pat)
@@ -856,6 +942,9 @@
       xfree (pat);
     }
 
+  if (files_from_stream && files_from_stream != es_stdin)
+    es_fclose (files_from_stream);
+
   if (opt.outfile)
     {
       if (!strcmp (opt.outfile, "-"))
diff -Nru gnupg2-2.2.20/tools/gpgtar.h gnupg2-2.2.27/tools/gpgtar.h
--- gnupg2-2.2.20/tools/gpgtar.h	2020-02-10 16:19:38.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgtar.h	2020-08-22 14:38:20.000000000 +0200
@@ -32,6 +32,7 @@
   unsigned int debug_level;
   int quiet;
   int dry_run;
+  int utf8strings;
   const char *gpg_program;
   strlist_t gpg_arguments;
   const char *outfile;
@@ -121,7 +122,7 @@
 
   unsigned long long nrecords; /* Number of data records.  */
 
-  char name[1];             /* Filename (dynamically extended).  */
+  char name[1];             /* Filename (UTF-8, dynamically extended).  */
 };
 
 
@@ -130,7 +131,8 @@
 gpg_error_t write_record (estream_t stream, const void *record);
 
 /*-- gpgtar-create.c --*/
-gpg_error_t gpgtar_create (char **inpattern, int encrypt, int sign);
+gpg_error_t gpgtar_create (char **inpattern, const char *files_from,
+                           int null_names, int encrypt, int sign);
 
 /*-- gpgtar-extract.c --*/
 gpg_error_t gpgtar_extract (const char *filename, int decrypt);
diff -Nru gnupg2-2.2.20/tools/gpgtar-w32info.rc gnupg2-2.2.27/tools/gpgtar-w32info.rc
--- gnupg2-2.2.20/tools/gpgtar-w32info.rc	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgtar-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,52 @@
+/* gpgtar-w32info.rc                                         -*- c -*-
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s archive tool\0"
+            VALUE "InternalName", "gpgtar\0"
+            VALUE "OriginalFilename", "gpgtar.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "gpgtar.w32-manifest"
diff -Nru gnupg2-2.2.20/tools/gpgtar.w32-manifest.in gnupg2-2.2.27/tools/gpgtar.w32-manifest.in
--- gnupg2-2.2.20/tools/gpgtar.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpgtar.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Archive tool)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpgtar"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/tools/gpg-wks-client.c gnupg2-2.2.27/tools/gpg-wks-client.c
--- gnupg2-2.2.20/tools/gpg-wks-client.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-wks-client.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include <config.h>
@@ -159,9 +160,11 @@
 
   switch (level)
     {
+    case  9: p = "LGPL-2.1-or-later"; break;
     case 11: p = "gpg-wks-client"; break;
     case 12: p = "@GNUPG@"; break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = ("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -196,7 +199,7 @@
   enum cmd_and_opt_values cmd = 0;
   int no_more_options = 0;
 
-  while (!no_more_options && optfile_parse (NULL, NULL, NULL, pargs, popts))
+  while (!no_more_options && gnupg_argparse (NULL, pargs, popts))
     {
       switch (pargs->r_opt)
         {
@@ -244,7 +247,7 @@
           cmd = pargs->r_opt;
           break;
 
-        default: pargs->err = 2; break;
+        default: pargs->err = ARGPARSE_PRINT_ERROR; break;
 	}
     }
 
@@ -277,6 +280,7 @@
   pargs.argv  = &argv;
   pargs.flags = ARGPARSE_FLAG_KEEP;
   cmd = parse_arguments (&pargs, opts);
+  gnupg_argparse (NULL, &pargs, NULL);
 
   if (log_get_errorcount (0))
     exit (2);
@@ -307,7 +311,7 @@
     {
       struct stat sb;
 
-      if (stat (opt.directory, &sb))
+      if (gnupg_stat (opt.directory, &sb))
         {
           err = gpg_error_from_syserror ();
           log_error ("error accessing directory '%s': %s\n",
diff -Nru gnupg2-2.2.20/tools/gpg-wks-client-w32info.rc gnupg2-2.2.27/tools/gpg-wks-client-w32info.rc
--- gnupg2-2.2.20/tools/gpg-wks-client-w32info.rc	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-wks-client-w32info.rc	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,52 @@
+/* gpg-wks-client-w32info.rc                              -*- c -*-
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+  FILEVERSION    W32INFO_VI_FILEVERSION
+  PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+  FILEFLAGSMASK  0x3fL
+#ifdef _DEBUG
+  FILEFLAGS      0x01L    /* VS_FF_DEBUG (0x1)*/
+#else
+  FILEFLAGS      0x00L
+#endif
+  FILEOS         0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4)  */
+  FILETYPE       0x1L     /* VFT_APP (0x1)  */
+  FILESUBTYPE    0x0L     /* VFT2_UNKNOWN   */
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"  /* US English (0409), Unicode (04b0) */
+        BEGIN
+            VALUE "FileDescription", L"GnuPG\x2019s Web Key Service client\0"
+            VALUE "InternalName", "gpg-wks-client\0"
+            VALUE "OriginalFilename", "gpg-wks-client.exe\0"
+            VALUE "ProductName",    W32INFO_PRODUCTNAME
+            VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+            VALUE "CompanyName", W32INFO_COMPANYNAME
+            VALUE "FileVersion", W32INFO_FILEVERSION
+            VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+            VALUE "Comments",    W32INFO_COMMENTS
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 0x4b0
+    END
+  END
+
+1 RT_MANIFEST "gpg-wks-client.w32-manifest"
diff -Nru gnupg2-2.2.20/tools/gpg-wks-client.w32-manifest.in gnupg2-2.2.27/tools/gpg-wks-client.w32-manifest.in
--- gnupg2-2.2.20/tools/gpg-wks-client.w32-manifest.in	1970-01-01 01:00:00.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-wks-client.w32-manifest.in	2020-10-23 20:08:54.000000000 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Web Key Service client)</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.gpg-wks-client"
+    version="@BUILD_VERSION@"
+    />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+  <application>
+    <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+    <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+    <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+    <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+    <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+  </application>
+</compatibility>
+</assembly>
diff -Nru gnupg2-2.2.20/tools/gpg-wks-server.c gnupg2-2.2.27/tools/gpg-wks-server.c
--- gnupg2-2.2.20/tools/gpg-wks-server.c	2020-02-10 16:12:13.000000000 +0100
+++ gnupg2-2.2.27/tools/gpg-wks-server.c	2020-12-18 11:22:45.000000000 +0100
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 /* The Web Key Service I-D defines an update protocol to store a
@@ -172,9 +173,11 @@
 
   switch (level)
     {
+    case  9: p = "LGPL-2.1-or-later"; break;
     case 11: p = "gpg-wks-server"; break;
     case 12: p = "@GNUPG@"; break;
     case 13: p = VERSION; break;
+    case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = ("Please report bugs to <@EMAIL@>.\n"); break;
 
@@ -209,7 +212,7 @@
   enum cmd_and_opt_values cmd = 0;
   int no_more_options = 0;
 
-  while (!no_more_options && optfile_parse (NULL, NULL, NULL, pargs, popts))
+  while (!no_more_options && gnupg_argparse (NULL, pargs, popts))
     {
       switch (pargs->r_opt)
         {
@@ -258,7 +261,7 @@
           cmd = pargs->r_opt;
           break;
 
-        default: pargs->err = 2; break;
+        default: pargs->err = ARGPARSE_PRINT_ERROR; break;
 	}
     }
 
@@ -287,6 +290,7 @@
   pargs.argv  = &argv;
   pargs.flags = ARGPARSE_FLAG_KEEP;
   cmd = parse_arguments (&pargs, opts);
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (log_get_errorcount (0))
     exit (2);
@@ -332,7 +336,7 @@
   {
     struct stat sb;
 
-    if (stat (opt.directory, &sb))
+    if (gnupg_stat (opt.directory, &sb))
       {
         err = gpg_error_from_syserror ();
         log_error ("error accessing directory '%s': %s\n",
@@ -1177,7 +1181,7 @@
           goto leave;
         }
 
-      if (access (dname, W_OK))
+      if (gnupg_access (dname, W_OK))
         {
           log_info ("skipping address '%s': Domain not configured\n", sl->mbox);
           continue;
@@ -1454,7 +1458,7 @@
       err = gpg_error_from_syserror ();
       goto leave;
     }
-  if (!access (fnewname, W_OK))
+  if (!gnupg_access (fnewname, W_OK))
     {
       /* Yes, we have a dane directory.  */
       s = strchr (address, '@');
@@ -1608,22 +1612,22 @@
 get_domain_list (strlist_t *r_list)
 {
   gpg_error_t err;
-  DIR *dir = NULL;
+  gnupg_dir_t dir = NULL;
   char *fname = NULL;
-  struct dirent *dentry;
+  gnupg_dirent_t dentry;
   struct stat sb;
   strlist_t list = NULL;
 
   *r_list = NULL;
 
-  dir = opendir (opt.directory);
+  dir = gnupg_opendir (opt.directory);
   if (!dir)
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
 
-  while ((dentry = readdir (dir)))
+  while ((dentry = gnupg_readdir (dir)))
     {
       if (*dentry->d_name == '.')
         continue;
@@ -1640,7 +1644,7 @@
           goto leave;
         }
 
-      if (stat (fname, &sb))
+      if (gnupg_stat (fname, &sb))
         {
           err = gpg_error_from_syserror ();
           log_error ("error accessing '%s': %s\n", fname, gpg_strerror (err));
@@ -1663,8 +1667,7 @@
 
  leave:
   free_strlist (list);
-  if (dir)
-    closedir (dir);
+  gnupg_closedir (dir);
   xfree (fname);
   return err;
 }
@@ -1677,8 +1680,8 @@
   gpg_error_t err;
   char *dirname;
   char *fname = NULL;
-  DIR *dir = NULL;
-  struct dirent *dentry;
+  gnupg_dir_t dir = NULL;
+  gnupg_dirent_t dentry;
   struct stat sb;
   time_t now = gnupg_get_time ();
 
@@ -1691,7 +1694,7 @@
       goto leave;
     }
 
-  dir = opendir (dirname);
+  dir = gnupg_opendir (dirname);
   if (!dir)
     {
       err = gpg_error_from_syserror ();
@@ -1700,7 +1703,7 @@
       goto leave;
     }
 
-  while ((dentry = readdir (dir)))
+  while ((dentry = gnupg_readdir (dir)))
     {
       if (*dentry->d_name == '.')
         continue;
@@ -1718,7 +1721,7 @@
           log_info ("garbage file '%s' ignored\n", fname);
           continue;
         }
-      if (stat (fname, &sb))
+      if (gnupg_stat (fname, &sb))
         {
           err = gpg_error_from_syserror ();
           log_error ("error accessing '%s': %s\n", fname, gpg_strerror (err));
@@ -1749,8 +1752,7 @@
   err = 0;
 
  leave:
-  if (dir)
-    closedir (dir);
+  gnupg_closedir (dir);
   xfree (dirname);
   xfree (fname);
   return err;
@@ -1790,7 +1792,7 @@
     { "pending", "-rwx" },
     { "hu",      "-rwxr-xr-x" }
   };
-
+  gpg_err_code_t ec;
   gpg_error_t err;
   strlist_t domaindirs;
   strlist_t sl;
@@ -1827,9 +1829,9 @@
               err = gpg_error_from_syserror ();
               goto leave;
             }
-          if (access (fname, W_OK))
+          if ((ec = gnupg_access (fname, W_OK)))
             {
-              err = gpg_error_from_syserror ();
+              err = gpg_error (ec);
               if (gpg_err_code (err) == GPG_ERR_ENOENT)
                 {
                   if (gnupg_mkdir (fname, requireddirs[i].perm))
@@ -1857,9 +1859,9 @@
           err = gpg_error_from_syserror ();
           goto leave;
         }
-      if (access (fname, F_OK))
+      if ((ec = gnupg_access (fname, F_OK)))
         {
-          err = gpg_error_from_syserror ();
+          err = gpg_error (ec);
           if (gpg_err_code (err) == GPG_ERR_ENOENT)
             log_error ("domain %s: submission address not configured\n",
                        domain);
@@ -1936,6 +1938,7 @@
 static gpg_error_t
 command_check_key (const char *userid)
 {
+  gpg_err_code_t ec;
   gpg_error_t err;
   char *addrspec = NULL;
   char *fname = NULL;
@@ -1944,9 +1947,9 @@
   if (err)
     goto leave;
 
-  if (access (fname, R_OK))
+  if ((ec = gnupg_access (fname, R_OK)))
     {
-      err = gpg_error_from_syserror ();
+      err = gpg_error (ec);
       if (opt_with_file)
         es_printf ("%s n %s\n", addrspec, fname);
       if (gpg_err_code (err) == GPG_ERR_ENOENT)
diff -Nru gnupg2-2.2.20/tools/Makefile.am gnupg2-2.2.27/tools/Makefile.am
--- gnupg2-2.2.20/tools/Makefile.am	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/tools/Makefile.am	2020-12-21 17:24:44.000000000 +0100
@@ -20,14 +20,35 @@
 	Manifest watchgnupg.c no-libgcrypt.c \
 	addgnupghome applygnupgdefaults \
 	lspgpot mail-signed-keys convert-from-106 sockprox.c \
-	ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
+	ccidmon.c ChangeLog-2011 \
+	gpgconf-w32info.rc           gpgconf.w32-manifest.in \
+	gpgtar-w32info.rc            gpgtar.w32-manifest.in \
+        gpg-connect-agent-w32info.rc gpg-connect-agent.w32-manifest.in \
+	gpg-check-pattern-w32info.rc gpg-check-pattern.w32-manifest.in \
+	gpg-wks-client-w32info.rc    gpg-wks-client.w32-manifest.in
 
 
 AM_CPPFLAGS =
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-resource_objs += gpg-connect-agent-w32info.o
+gpgconf_robjs =           $(resource_objs) gpgconf-w32info.o
+gpgtar_robjs =            $(resource_objs) gpgtar-w32info.o
+gpg_connect_agent_robjs = $(resource_objs) gpg-connect-agent-w32info.o
+gpg_check_pattern_robjs = $(resource_objs) gpg-check-pattern-w32info.o
+gpg_wks_client_robjs =    $(resource_objs) gpg-wks-client-w32info.o
+
+gpgconf-w32info.o:           gpgconf.w32-manifest
+gpgtar-w32info.o:            gpgtar.w32-manifest
+gpg-connect-agent-w32info.o: gpg-connect-agent.w32-manifest
+gpg-check-pattern-w32info.o: gpg-check-pattern.w32-manifest
+gpg-wks-client-w32info.o:    gpg-wks-client.w32-manifest
+else
+gpg_connect_agent_robjs =
+gpgconf_robjs =
+gpg_check_pattern_robjs =
+gpgtar_robjs =
+gpg_wks_client_robjs =
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
@@ -39,12 +60,6 @@
 noinst_SCRIPTS = gpg-zip
 endif
 
-if BUILD_SYMCRYPTRUN
-  symcryptrun = symcryptrun
-else
-  symcryptrun =
-endif
-
 if BUILD_WKS_TOOLS
   gpg_wks_server = gpg-wks-server
 else
@@ -53,17 +68,17 @@
 
 libexec_PROGRAMS = gpg-wks-client
 
-bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
+bin_PROGRAMS = gpgconf gpg-connect-agent
 if !HAVE_W32_SYSTEM
-bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server}
+bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
+else
+bin_PROGRAMS += gpgconf-w32
 endif
 
-if !DISABLE_REGEX
 libexec_PROGRAMS += gpg-check-pattern
-endif
 
 if !HAVE_W32CE_SYSTEM
-noinst_PROGRAMS = clean-sat make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat make-dns-cert
 endif
 
 if !HAVE_W32CE_SYSTEM
@@ -94,6 +109,9 @@
 opt_libassuan_libs = $(LIBASSUAN_LIBS)
 endif
 
+regexp_libs = ../regexp/libregexp.a
+
+
 gpgsplit_LDADD = $(common_libs) \
 	         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		 $(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
@@ -104,17 +122,17 @@
 # do not eliminate the supposed-to-be-unused-inline-functions).
 gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
                 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
-	        $(LIBICONV) $(W32SOCKLIBS)
+	        $(LIBICONV) $(W32SOCKLIBS) \
+	        $(gpgconf_robjs)
 gpgconf_LDFLAGS = $(extra_bin_ldflags)
 
+gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
+gpgconf_w32_LDADD = $(gpgconf_LDADD)
+gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows
+
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
 gpgparsemail_LDADD =
 
-symcryptrun_SOURCES = symcryptrun.c
-symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
-                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
-                    $(LIBICONV) $(NETLIBS) $(W32SOCKLIBS) $(LIBASSUAN_LIBS)
-
 watchgnupg_SOURCES = watchgnupg.c
 watchgnupg_LDADD = $(NETLIBS)
 
@@ -123,16 +141,14 @@
 	                  $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
                           $(GPG_ERROR_LIBS) \
                           $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-                          $(resource_objs)
+                          $(gpg_connect_agent_robjs)
 
-
-if !DISABLE_REGEX
 gpg_check_pattern_SOURCES = gpg-check-pattern.c
 gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
-gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+gpg_check_pattern_LDADD = $(common_libs) $(regexp_libs) $(LIBGCRYPT_LIBS) \
+			  $(GPG_ERROR_LIBS) \
 			  $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
-			  $(LIBICONV)
-endif
+			  $(LIBICONV) $(gpg_check_pattern_robjs)
 
 gpgtar_SOURCES = \
 	gpgtar.c gpgtar.h \
@@ -141,7 +157,8 @@
 	gpgtar-list.c
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS)
 gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
+	       $(gpgtar_robjs)
 
 gpg_wks_server_SOURCES = \
 	gpg-wks-server.c \
@@ -171,7 +188,8 @@
 gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_client_LDADD = $(libcommon) \
 		       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-		       $(LIBINTL) $(LIBICONV)
+		       $(LIBINTL) $(LIBICONV) $(NETLIBS) \
+		       $(gpg_wks_client_robjs)
 
 
 # Make sure that all libs are build before we use them.  This is
diff -Nru gnupg2-2.2.20/tools/Makefile.in gnupg2-2.2.27/tools/Makefile.in
--- gnupg2-2.2.20/tools/Makefile.in	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/tools/Makefile.in	2021-01-11 18:46:56.000000000 +0100
@@ -142,17 +142,16 @@
 @GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 @GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-@HAVE_W32_SYSTEM_TRUE@am__append_8 = gpg-connect-agent-w32info.o
-libexec_PROGRAMS = gpg-wks-client$(EXEEXT) $(am__EXEEXT_5)
+libexec_PROGRAMS = gpg-wks-client$(EXEEXT) gpg-check-pattern$(EXEEXT)
 bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_4)
-@HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail ${gpg_wks_server}
-@DISABLE_REGEX_FALSE@am__append_10 = gpg-check-pattern
+	$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
+@HAVE_W32_SYSTEM_FALSE@am__append_8 = watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
+@HAVE_W32_SYSTEM_TRUE@am__append_9 = gpgconf-w32
 @HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
 @HAVE_W32CE_SYSTEM_FALSE@	make-dns-cert$(EXEEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	gpgsplit$(EXEEXT) $(am__EXEEXT_6)
-@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__append_11 = gpgtar
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__append_12 = gpgtar
+@HAVE_W32CE_SYSTEM_FALSE@	$(am__EXEEXT_5)
+@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgtar
+@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__append_11 = gpgtar
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -174,44 +173,47 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gpg-zip
+CONFIG_CLEAN_FILES = gpg-zip gpgconf.w32-manifest gpgtar.w32-manifest \
+	gpg-connect-agent.w32-manifest gpg-check-pattern.w32-manifest \
+	gpg-wks-client.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
-@BUILD_SYMCRYPTRUN_TRUE@am__EXEEXT_1 = symcryptrun$(EXEEXT)
-@BUILD_WKS_TOOLS_TRUE@am__EXEEXT_2 = gpg-wks-server$(EXEEXT)
-@HAVE_W32_SYSTEM_FALSE@am__EXEEXT_3 = watchgnupg$(EXEEXT) \
-@HAVE_W32_SYSTEM_FALSE@	gpgparsemail$(EXEEXT) $(am__EXEEXT_2)
+@BUILD_WKS_TOOLS_TRUE@am__EXEEXT_1 = gpg-wks-server$(EXEEXT)
+@HAVE_W32_SYSTEM_FALSE@am__EXEEXT_2 = watchgnupg$(EXEEXT) \
+@HAVE_W32_SYSTEM_FALSE@	gpgparsemail$(EXEEXT) $(am__EXEEXT_1) \
+@HAVE_W32_SYSTEM_FALSE@	gpgsplit$(EXEEXT)
+@HAVE_W32_SYSTEM_TRUE@am__EXEEXT_3 = gpgconf-w32$(EXEEXT)
 @BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 =  \
 @BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@	gpgtar$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)"
-@DISABLE_REGEX_FALSE@am__EXEEXT_5 = gpg-check-pattern$(EXEEXT)
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_6 =  \
+@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_5 =  \
 @BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@	gpgtar$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 clean_sat_SOURCES = clean-sat.c
 clean_sat_OBJECTS = clean-sat.$(OBJEXT)
 clean_sat_LDADD = $(LDADD)
-am__gpg_check_pattern_SOURCES_DIST = gpg-check-pattern.c
-@DISABLE_REGEX_FALSE@am_gpg_check_pattern_OBJECTS = gpg_check_pattern-gpg-check-pattern.$(OBJEXT)
+am_gpg_check_pattern_OBJECTS =  \
+	gpg_check_pattern-gpg-check-pattern.$(OBJEXT)
 gpg_check_pattern_OBJECTS = $(am_gpg_check_pattern_OBJECTS)
 am__DEPENDENCIES_1 =
-@DISABLE_REGEX_FALSE@gpg_check_pattern_DEPENDENCIES = $(common_libs) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_REGEX_FALSE@	$(am__DEPENDENCIES_1)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpg-check-pattern-w32info.o
+gpg_check_pattern_DEPENDENCIES = $(common_libs) $(regexp_libs) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 gpg_check_pattern_LINK = $(CCLD) $(gpg_check_pattern_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_gpg_connect_agent_OBJECTS = gpg-connect-agent.$(OBJEXT)
 gpg_connect_agent_OBJECTS = $(am_gpg_connect_agent_OBJECTS)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpg-connect-agent-w32info.o
 gpg_connect_agent_DEPENDENCIES = ../common/libgpgrl.a $(common_libs) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(resource_objs)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
 am_gpg_wks_client_OBJECTS = gpg_wks_client-gpg-wks-client.$(OBJEXT) \
 	gpg_wks_client-wks-util.$(OBJEXT) \
 	gpg_wks_client-wks-receive.$(OBJEXT) \
@@ -221,9 +223,12 @@
 	gpg_wks_client-send-mail.$(OBJEXT) \
 	gpg_wks_client-call-dirmngr.$(OBJEXT)
 gpg_wks_client_OBJECTS = $(am_gpg_wks_client_OBJECTS)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpg-wks-client-w32info.o
 gpg_wks_client_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4)
 gpg_wks_client_LINK = $(CCLD) $(gpg_wks_client_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_gpg_wks_server_OBJECTS = gpg_wks_server-gpg-wks-server.$(OBJEXT) \
@@ -241,13 +246,27 @@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_gpgconf_OBJECTS = gpgconf.$(OBJEXT) gpgconf-comp.$(OBJEXT)
 gpgconf_OBJECTS = $(am_gpgconf_OBJECTS)
-@HAVE_W32CE_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-gpgconf_DEPENDENCIES = $(maybe_commonpth_libs) $(am__DEPENDENCIES_2) \
+@HAVE_W32CE_SYSTEM_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpgconf-w32info.o
+gpgconf_DEPENDENCIES = $(maybe_commonpth_libs) $(am__DEPENDENCIES_5) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_6)
 gpgconf_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgconf_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am__objects_1 = gpgconf.$(OBJEXT) gpgconf-comp.$(OBJEXT)
+am_gpgconf_w32_OBJECTS = $(am__objects_1)
+gpgconf_w32_OBJECTS = $(am_gpgconf_w32_OBJECTS)
+am__DEPENDENCIES_7 = $(maybe_commonpth_libs) $(am__DEPENDENCIES_5) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_6)
+gpgconf_w32_DEPENDENCIES = $(am__DEPENDENCIES_7)
+gpgconf_w32_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(gpgconf_w32_LDFLAGS) $(LDFLAGS) -o $@
 am_gpgparsemail_OBJECTS = gpgparsemail.$(OBJEXT) rfc822parse.$(OBJEXT)
 gpgparsemail_OBJECTS = $(am_gpgparsemail_OBJECTS)
 gpgparsemail_DEPENDENCIES =
@@ -261,24 +280,17 @@
 	gpgtar-gpgtar-create.$(OBJEXT) gpgtar-gpgtar-extract.$(OBJEXT) \
 	gpgtar-gpgtar-list.$(OBJEXT)
 gpgtar_OBJECTS = $(am_gpgtar_OBJECTS)
+@HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \
+@HAVE_W32_SYSTEM_TRUE@	gpgtar-w32info.o
 gpgtar_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
 gpgtar_LINK = $(CCLD) $(gpgtar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 make_dns_cert_SOURCES = make-dns-cert.c
 make_dns_cert_OBJECTS = make-dns-cert.$(OBJEXT)
 make_dns_cert_LDADD = $(LDADD)
-am_symcryptrun_OBJECTS = symcryptrun.$(OBJEXT)
-symcryptrun_OBJECTS = $(am_symcryptrun_OBJECTS)
-@HAVE_W32CE_SYSTEM_FALSE@am__DEPENDENCIES_3 =  \
-@HAVE_W32CE_SYSTEM_FALSE@	../common/libsimple-pwquery.a
-symcryptrun_DEPENDENCIES = $(am__DEPENDENCIES_1) $(common_libs) \
-	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_watchgnupg_OBJECTS = watchgnupg.$(OBJEXT)
 watchgnupg_OBJECTS = $(am_watchgnupg_OBJECTS)
 watchgnupg_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -349,7 +361,7 @@
 	./$(DEPDIR)/gpgtar-gpgtar-extract.Po \
 	./$(DEPDIR)/gpgtar-gpgtar-list.Po ./$(DEPDIR)/gpgtar-gpgtar.Po \
 	./$(DEPDIR)/make-dns-cert.Po ./$(DEPDIR)/rfc822parse.Po \
-	./$(DEPDIR)/symcryptrun.Po ./$(DEPDIR)/watchgnupg.Po
+	./$(DEPDIR)/watchgnupg.Po
 am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -370,13 +382,13 @@
 SOURCES = clean-sat.c $(gpg_check_pattern_SOURCES) \
 	$(gpg_connect_agent_SOURCES) $(gpg_wks_client_SOURCES) \
 	$(gpg_wks_server_SOURCES) $(gpgconf_SOURCES) \
-	$(gpgparsemail_SOURCES) gpgsplit.c $(gpgtar_SOURCES) \
-	make-dns-cert.c $(symcryptrun_SOURCES) $(watchgnupg_SOURCES)
-DIST_SOURCES = clean-sat.c $(am__gpg_check_pattern_SOURCES_DIST) \
+	$(gpgconf_w32_SOURCES) $(gpgparsemail_SOURCES) gpgsplit.c \
+	$(gpgtar_SOURCES) make-dns-cert.c $(watchgnupg_SOURCES)
+DIST_SOURCES = clean-sat.c $(gpg_check_pattern_SOURCES) \
 	$(gpg_connect_agent_SOURCES) $(gpg_wks_client_SOURCES) \
 	$(gpg_wks_server_SOURCES) $(gpgconf_SOURCES) \
-	$(gpgparsemail_SOURCES) gpgsplit.c $(gpgtar_SOURCES) \
-	make-dns-cert.c $(symcryptrun_SOURCES) $(watchgnupg_SOURCES)
+	$(gpgconf_w32_SOURCES) $(gpgparsemail_SOURCES) gpgsplit.c \
+	$(gpgtar_SOURCES) make-dns-cert.c $(watchgnupg_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -401,8 +413,13 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gpg-zip.in \
-	$(top_srcdir)/am/cmacros.am $(top_srcdir)/build-aux/depcomp \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/gpg-check-pattern.w32-manifest.in \
+	$(srcdir)/gpg-connect-agent.w32-manifest.in \
+	$(srcdir)/gpg-wks-client.w32-manifest.in $(srcdir)/gpg-zip.in \
+	$(srcdir)/gpgconf.w32-manifest.in \
+	$(srcdir)/gpgtar.w32-manifest.in $(top_srcdir)/am/cmacros.am \
+	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -413,6 +430,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
 BUILD_HOSTNAME = @BUILD_HOSTNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -579,6 +597,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -591,7 +610,12 @@
 	Manifest watchgnupg.c no-libgcrypt.c \
 	addgnupghome applygnupgdefaults \
 	lspgpot mail-signed-keys convert-from-106 sockprox.c \
-	ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
+	ccidmon.c ChangeLog-2011 \
+	gpgconf-w32info.rc           gpgconf.w32-manifest.in \
+	gpgtar-w32info.rc            gpgtar.w32-manifest.in \
+        gpg-connect-agent-w32info.rc gpg-connect-agent.w32-manifest.in \
+	gpg-check-pattern-w32info.rc gpg-check-pattern.w32-manifest.in \
+	gpg-wks-client-w32info.rc    gpg-wks-client.w32-manifest.in
 
 
 # NB: AM_CFLAGS may also be used by tools running on the build
@@ -609,20 +633,28 @@
 @HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
 @HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags = 
 @HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
-resource_objs = $(am__append_8)
+resource_objs = 
 
 # Convenience macros
 libcommon = ../common/libcommon.a
 libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
+@HAVE_W32_SYSTEM_FALSE@gpgconf_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpgconf_robjs = $(resource_objs) gpgconf-w32info.o
+@HAVE_W32_SYSTEM_FALSE@gpgtar_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpgtar_robjs = $(resource_objs) gpgtar-w32info.o
+@HAVE_W32_SYSTEM_FALSE@gpg_connect_agent_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpg_connect_agent_robjs = $(resource_objs) gpg-connect-agent-w32info.o
+@HAVE_W32_SYSTEM_FALSE@gpg_check_pattern_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpg_check_pattern_robjs = $(resource_objs) gpg-check-pattern-w32info.o
+@HAVE_W32_SYSTEM_FALSE@gpg_wks_client_robjs = 
+@HAVE_W32_SYSTEM_TRUE@gpg_wks_client_robjs = $(resource_objs) gpg-wks-client-w32info.o
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 
 # bin_SCRIPTS += gpg-zip
 @HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
-@BUILD_SYMCRYPTRUN_FALSE@symcryptrun = 
-@BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
 @BUILD_WKS_TOOLS_FALSE@gpg_wks_server = 
 @BUILD_WKS_TOOLS_TRUE@gpg_wks_server = gpg-wks-server
 common_libs = $(libcommon)
@@ -634,6 +666,7 @@
 @HAVE_W32CE_SYSTEM_FALSE@pwquery_libs = ../common/libsimple-pwquery.a
 @HAVE_W32CE_SYSTEM_TRUE@pwquery_libs = 
 @HAVE_W32CE_SYSTEM_TRUE@opt_libassuan_libs = $(LIBASSUAN_LIBS)
+regexp_libs = ../regexp/libregexp.a
 gpgsplit_LDADD = $(common_libs) \
 	         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		 $(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
@@ -644,16 +677,15 @@
 # do not eliminate the supposed-to-be-unused-inline-functions).
 gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
                 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
-	        $(LIBICONV) $(W32SOCKLIBS)
+	        $(LIBICONV) $(W32SOCKLIBS) \
+	        $(gpgconf_robjs)
 
 gpgconf_LDFLAGS = $(extra_bin_ldflags)
+gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
+gpgconf_w32_LDADD = $(gpgconf_LDADD)
+gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
 gpgparsemail_LDADD = 
-symcryptrun_SOURCES = symcryptrun.c
-symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
-                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
-                    $(LIBICONV) $(NETLIBS) $(W32SOCKLIBS) $(LIBASSUAN_LIBS)
-
 watchgnupg_SOURCES = watchgnupg.c
 watchgnupg_LDADD = $(NETLIBS)
 gpg_connect_agent_SOURCES = gpg-connect-agent.c
@@ -661,13 +693,14 @@
 	                  $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
                           $(GPG_ERROR_LIBS) \
                           $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-                          $(resource_objs)
+                          $(gpg_connect_agent_robjs)
 
-@DISABLE_REGEX_FALSE@gpg_check_pattern_SOURCES = gpg-check-pattern.c
-@DISABLE_REGEX_FALSE@gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
-@DISABLE_REGEX_FALSE@gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-@DISABLE_REGEX_FALSE@			  $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
-@DISABLE_REGEX_FALSE@			  $(LIBICONV)
+gpg_check_pattern_SOURCES = gpg-check-pattern.c
+gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
+gpg_check_pattern_LDADD = $(common_libs) $(regexp_libs) $(LIBGCRYPT_LIBS) \
+			  $(GPG_ERROR_LIBS) \
+			  $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
+			  $(LIBICONV) $(gpg_check_pattern_robjs)
 
 gpgtar_SOURCES = \
 	gpgtar.c gpgtar.h \
@@ -677,7 +710,8 @@
 
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS)
 gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+               $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
+	       $(gpgtar_robjs)
 
 gpg_wks_server_SOURCES = \
 	gpg-wks-server.c \
@@ -707,7 +741,8 @@
 gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_client_LDADD = $(libcommon) \
 		       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-		       $(LIBINTL) $(LIBICONV)
+		       $(LIBINTL) $(LIBICONV) $(NETLIBS) \
+		       $(gpg_wks_client_robjs)
 
 all: all-am
 
@@ -745,6 +780,16 @@
 $(am__aclocal_m4_deps):
 gpg-zip: $(top_builddir)/config.status $(srcdir)/gpg-zip.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpgconf.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpgconf.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpgtar.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpgtar.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpg-connect-agent.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpg-connect-agent.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpg-check-pattern.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpg-check-pattern.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpg-wks-client.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpg-wks-client.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -857,6 +902,10 @@
 	@rm -f gpgconf$(EXEEXT)
 	$(AM_V_CCLD)$(gpgconf_LINK) $(gpgconf_OBJECTS) $(gpgconf_LDADD) $(LIBS)
 
+gpgconf-w32$(EXEEXT): $(gpgconf_w32_OBJECTS) $(gpgconf_w32_DEPENDENCIES) $(EXTRA_gpgconf_w32_DEPENDENCIES) 
+	@rm -f gpgconf-w32$(EXEEXT)
+	$(AM_V_CCLD)$(gpgconf_w32_LINK) $(gpgconf_w32_OBJECTS) $(gpgconf_w32_LDADD) $(LIBS)
+
 gpgparsemail$(EXEEXT): $(gpgparsemail_OBJECTS) $(gpgparsemail_DEPENDENCIES) $(EXTRA_gpgparsemail_DEPENDENCIES) 
 	@rm -f gpgparsemail$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gpgparsemail_OBJECTS) $(gpgparsemail_LDADD) $(LIBS)
@@ -873,10 +922,6 @@
 	@rm -f make-dns-cert$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(make_dns_cert_OBJECTS) $(make_dns_cert_LDADD) $(LIBS)
 
-symcryptrun$(EXEEXT): $(symcryptrun_OBJECTS) $(symcryptrun_DEPENDENCIES) $(EXTRA_symcryptrun_DEPENDENCIES) 
-	@rm -f symcryptrun$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(symcryptrun_OBJECTS) $(symcryptrun_LDADD) $(LIBS)
-
 watchgnupg$(EXEEXT): $(watchgnupg_OBJECTS) $(watchgnupg_DEPENDENCIES) $(EXTRA_watchgnupg_DEPENDENCIES) 
 	@rm -f watchgnupg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(watchgnupg_OBJECTS) $(watchgnupg_LDADD) $(LIBS)
@@ -950,7 +995,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgtar-gpgtar.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make-dns-cert.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822parse.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symcryptrun.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watchgnupg.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
@@ -1409,7 +1453,6 @@
 	-rm -f ./$(DEPDIR)/gpgtar-gpgtar.Po
 	-rm -f ./$(DEPDIR)/make-dns-cert.Po
 	-rm -f ./$(DEPDIR)/rfc822parse.Po
-	-rm -f ./$(DEPDIR)/symcryptrun.Po
 	-rm -f ./$(DEPDIR)/watchgnupg.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -1485,7 +1528,6 @@
 	-rm -f ./$(DEPDIR)/gpgtar-gpgtar.Po
 	-rm -f ./$(DEPDIR)/make-dns-cert.Po
 	-rm -f ./$(DEPDIR)/rfc822parse.Po
-	-rm -f ./$(DEPDIR)/symcryptrun.Po
 	-rm -f ./$(DEPDIR)/watchgnupg.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1529,6 +1571,12 @@
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
 
+@HAVE_W32_SYSTEM_TRUE@gpgconf-w32info.o:           gpgconf.w32-manifest
+@HAVE_W32_SYSTEM_TRUE@gpgtar-w32info.o:            gpgtar.w32-manifest
+@HAVE_W32_SYSTEM_TRUE@gpg-connect-agent-w32info.o: gpg-connect-agent.w32-manifest
+@HAVE_W32_SYSTEM_TRUE@gpg-check-pattern-w32info.o: gpg-check-pattern.w32-manifest
+@HAVE_W32_SYSTEM_TRUE@gpg-wks-client-w32info.o:    gpg-wks-client.w32-manifest
+
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.
 $(PROGRAMS): $(common_libs) $(pwquery_libs) ../common/libgpgrl.a
diff -Nru gnupg2-2.2.20/tools/send-mail.c gnupg2-2.2.27/tools/send-mail.c
--- gnupg2-2.2.20/tools/send-mail.c	2019-07-09 11:08:45.000000000 +0200
+++ gnupg2-2.2.27/tools/send-mail.c	2020-03-30 17:37:28.000000000 +0200
@@ -33,7 +33,7 @@
 run_sendmail (estream_t data)
 {
   gpg_error_t err;
-  const char pgmname[] = "/usr/lib/sendmail";
+  const char pgmname[] = NAME_OF_SENDMAIL;
   const char *argv[3];
 
   argv[0] = "-oi";
diff -Nru gnupg2-2.2.20/tools/symcryptrun.c gnupg2-2.2.27/tools/symcryptrun.c
--- gnupg2-2.2.20/tools/symcryptrun.c	2017-08-28 12:22:54.000000000 +0200
+++ gnupg2-2.2.27/tools/symcryptrun.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,1035 +0,0 @@
-/* symcryptrun.c - Tool to call simple symmetric encryption tools.
- *	Copyright (C) 2005, 2007 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <https://www.gnu.org/licenses/>.
- */
-
-
-/* Sometimes simple encryption tools are already in use for a long
-   time and there is a desire to integrate them into the GnuPG
-   framework.  The protocols and encryption methods might be
-   non-standard or not even properly documented, so that a
-   full-fledged encryption tool with an interface like gpg is not
-   doable.  This simple wrapper program provides a solution: It
-   operates by calling the encryption/decryption module and providing
-   the passphrase for a key (or even the key directly) using the
-   standard pinentry mechanism through gpg-agent.  */
-
-/* This program is invoked in the following way:
-
-   symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE \
-     [--decrypt | --encrypt]
-
-   For encryption, the plain text must be provided on STDIN, and the
-   ciphertext will be output to STDOUT.  For decryption vice versa.
-
-   CLASS can currently only be "confucius".
-
-   PROGRAM must be the path to the crypto engine.
-
-   KEYFILE must contain the secret key, which may be protected by a
-   passphrase.  The passphrase is retrieved via the pinentry program.
-
-
-   The GPG Agent _must_ be running before starting symcryptrun.
-
-   The possible exit status codes:
-
-   0	Success
-   1	Some error occurred
-   2	No valid passphrase was provided
-   3	The operation was canceled by the user
-
-   Other classes may be added in the future.  */
-
-#define SYMC_BAD_PASSPHRASE	2
-#define SYMC_CANCELED		3
-
-
-#include <config.h>
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#ifdef HAVE_PTY_H
-#include <pty.h>
-#else
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-#ifdef HAVE_UTIL_H
-#include <util.h>
-#endif
-#ifdef HAVE_LIBUTIL_H
-#include <libutil.h>
-#endif
-#endif
-
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#include <ctype.h>
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_LANGINFO_CODESET
-#include <langinfo.h>
-#endif
-#include <gpg-error.h>
-
-#include "../common/i18n.h"
-#include "../common/util.h"
-#include "../common/init.h"
-#include "../common/sysutils.h"
-
-/* FIXME: Bah.  For spwq_secure_free.  */
-#define SIMPLE_PWQUERY_IMPLEMENTATION 1
-#include "../common/simple-pwquery.h"
-
-
-/* From simple-gettext.c.  */
-
-/* We assume to have 'unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-/* The so called 'hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-
-static __inline__ ulong
-hash_string( const char *str_param )
-{
-    unsigned long int hval, g;
-    const char *str = str_param;
-
-    hval = 0;
-    while (*str != '\0')
-    {
-	hval <<= 4;
-	hval += (unsigned long int) *str++;
-	g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-	if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-    return hval;
-}
-
-
-/* Constants to identify the commands and options. */
-enum cmd_and_opt_values
-  {
-    aNull = 0,
-    oQuiet      = 'q',
-    oVerbose	= 'v',
-
-    oNoVerbose	= 500,
-    oOptions,
-    oNoOptions,
-    oLogFile,
-    oHomedir,
-    oClass,
-    oProgram,
-    oKeyfile,
-    oDecrypt,
-    oEncrypt,
-    oInput
-  };
-
-
-/* The list of commands and options.  */
-static ARGPARSE_OPTS opts[] =
-  {
-    { 301, NULL, 0, N_("@\nCommands:\n ") },
-
-    { oDecrypt, "decrypt", 0, N_("decryption modus") },
-    { oEncrypt, "encrypt", 0, N_("encryption modus") },
-
-    { 302, NULL, 0, N_("@\nOptions:\n ") },
-
-    { oClass, "class", 2, N_("tool class (confucius)") },
-    { oProgram, "program", 2, N_("program filename") },
-
-    { oKeyfile, "keyfile", 2, N_("secret key file (required)") },
-    { oInput, "inputfile", 2, N_("input file name (default stdin)") },
-    { oVerbose, "verbose",  0, N_("verbose") },
-    { oQuiet, "quiet",      0, N_("quiet") },
-    { oLogFile, "log-file", 2, N_("use a log file for the server") },
-    { oOptions,  "options"  , 2, N_("|FILE|read options from FILE") },
-
-    /* Hidden options.  */
-    { oNoVerbose, "no-verbose",  0, "@" },
-    { oHomedir, "homedir", 2, "@" },
-    { oNoOptions, "no-options", 0, "@" },/* shortcut for --options /dev/null */
-
-    ARGPARSE_end ()
-  };
-
-
-/* We keep all global options in the structure OPT.  */
-struct
-{
-  int verbose;		/* Verbosity level.  */
-  int quiet;		/* Be extra quiet.  */
-  const char *homedir;  /* Configuration directory name */
-
-  char *class;
-  char *program;
-  char *keyfile;
-  char *input;
-} opt;
-
-
-/* Print usage information and provide strings for help.  */
-static const char *
-my_strusage (int level)
-{
-  const char *p;
-
-  switch (level)
-    {
-    case 11: p = "symcryptrun (@GNUPG@)";
-      break;
-    case 13: p = VERSION; break;
-    case 17: p = PRINTABLE_OS_NAME; break;
-    case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
-
-    case 1:
-    case 40: p = _("Usage: symcryptrun [options] (-h for help)");
-      break;
-    case 41:
-      p = _("Syntax: symcryptrun --class CLASS --program PROGRAM "
-	    "--keyfile KEYFILE [options...] COMMAND [inputfile]\n"
-            "Call a simple symmetric encryption tool\n");
-      break;
-    case 31: p = "\nHome: "; break;
-    case 32: p = gnupg_homedir (); break;
-    case 33: p = "\n"; break;
-
-    default: p = NULL; break;
-    }
-  return p;
-}
-
-
-
-/* This is in the GNU C library in unistd.h.  */
-
-#ifndef TEMP_FAILURE_RETRY
-/* Evaluate EXPRESSION, and repeat as long as it returns -1 with 'errno'
-   set to EINTR.  */
-
-# define TEMP_FAILURE_RETRY(expression) \
-  (__extension__                                                              \
-    ({ long int __result;                                                     \
-       do __result = (long int) (expression);                                 \
-       while (__result == -1L && errno == EINTR);                             \
-       __result; }))
-#endif
-
-/* Unlink a file, and shred it if SHRED is true.  */
-int
-remove_file (char *name, int shred)
-{
-  if (!shred)
-    return unlink (name);
-  else
-    {
-      int status;
-      pid_t pid;
-
-      pid = fork ();
-      if (pid == 0)
-	{
-	  /* Child.  */
-
-	  /* -f forces file to be writable, and -u unlinks it afterwards.  */
-	  char *args[] = { SHRED, "-uf", name, NULL };
-
-	  execv (SHRED, args);
-	  _exit (127);
-	}
-      else if (pid < 0)
-	{
-	  /* Fork failed.  */
-	  status = -1;
-	}
-      else
-	{
-	  /* Parent.  */
-
-	  if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
-	    status = -1;
-	}
-
-      if (!WIFEXITED (status))
-	{
-	  log_error (_("%s on %s aborted with status %i\n"),
-		     SHRED, name, status);
-	  unlink (name);
-	  return 1;
-	}
-      else if (WEXITSTATUS (status))
-	{
-	  log_error (_("%s on %s failed with status %i\n"), SHRED, name,
-		     WEXITSTATUS (status));
-	  unlink (name);
-	  return 1;
-	}
-
-      return 0;
-    }
-}
-
-
-/* Class Confucius.
-
-   "Don't worry that other people don't know you;
-   worry that you don't know other people."            Analects--1.16.  */
-
-/* Create temporary directory with mode 0700.  Returns a dynamically
-   allocated string with the filename of the directory.  */
-static char *
-confucius_mktmpdir (void)
-{
-  char *name, *p;
-
-  p = getenv ("TMPDIR");
-  if (!p || !*p)
-    p = "/tmp";
-  if (p[strlen (p) - 1] == '/')
-    name = xstrconcat (p, "gpg-XXXXXX", NULL);
-  else
-    name = xstrconcat (p, "/", "gpg-XXXXXX", NULL);
-  if (!name || !gnupg_mkdtemp (name))
-    {
-      log_error (_("can't create temporary directory '%s': %s\n"),
-                 name?name:"", strerror (errno));
-      return NULL;
-    }
-
-  return name;
-}
-
-
-/* Buffer size for I/O operations.  */
-#define CONFUCIUS_BUFSIZE 4096
-
-/* Buffer size for output lines.  */
-#define CONFUCIUS_LINESIZE 4096
-
-
-/* Copy the file IN to OUT, either of which may be "-".  If PLAIN is
-   true, and the copying fails, and OUT is not STDOUT, then shred the
-   file instead unlinking it.  */
-static int
-confucius_copy_file (char *infile, char *outfile, int plain)
-{
-  FILE *in;
-  int in_is_stdin = 0;
-  FILE *out;
-  int out_is_stdout = 0;
-  char data[CONFUCIUS_BUFSIZE];
-  ssize_t data_len;
-
-  if (infile[0] == '-' && infile[1] == '\0')
-    {
-      /* FIXME: Is stdin in binary mode?  */
-      in = stdin;
-      in_is_stdin = 1;
-    }
-  else
-    {
-      in = fopen (infile, "rb");
-      if (!in)
-	{
-	  log_error (_("could not open %s for writing: %s\n"),
-		     infile, strerror (errno));
-	  return 1;
-	}
-    }
-
-  if (outfile[0] == '-' && outfile[1] == '\0')
-    {
-      /* FIXME: Is stdout in binary mode?  */
-      out = stdout;
-      out_is_stdout = 1;
-    }
-  else
-    {
-      out = fopen (outfile, "wb");
-      if (!out)
-	{
-	  log_error (_("could not open %s for writing: %s\n"),
-		     infile, strerror (errno));
-	  return 1;
-	}
-    }
-
-  /* Now copy the data.  */
-  while ((data_len = fread (data, 1, sizeof (data), in)) > 0)
-    {
-      if (fwrite (data, 1, data_len, out) != data_len)
-	{
-	  log_error (_("error writing to %s: %s\n"), outfile,
-		     strerror (errno));
-	  goto copy_err;
-	}
-    }
-  if (data_len < 0 || ferror (in))
-    {
-      log_error (_("error reading from %s: %s\n"), infile, strerror (errno));
-      goto copy_err;
-    }
-
-  /* Close IN if appropriate.  */
-  if (!in_is_stdin && fclose (in) && ferror (in))
-    {
-      log_error (_("error closing %s: %s\n"), infile, strerror (errno));
-      goto copy_err;
-    }
-
-  /* Close OUT if appropriate.  */
-  if (!out_is_stdout && fclose (out) && ferror (out))
-    {
-      log_error (_("error closing %s: %s\n"), infile, strerror (errno));
-      goto copy_err;
-    }
-
-  return 0;
-
- copy_err:
-  if (!out_is_stdout)
-    remove_file (outfile, plain);
-
-  return 1;
-}
-
-
-/* Get a passphrase in secure storage (if possible).  If AGAIN is
-   true, then this is a repeated attempt.  If CANCELED is not a null
-   pointer, it will be set to true or false, depending on if the user
-   canceled the operation or not.  On error (including cancellation), a
-   null pointer is returned.  The passphrase must be deallocated with
-   confucius_drop_pass.  CACHEID is the ID to be used for passphrase
-   caching and can be NULL to disable caching.  */
-char *
-confucius_get_pass (const char *cacheid, int again, int *canceled)
-{
-  int err;
-  char *pw;
-  char *orig_codeset;
-
-  if (canceled)
-    *canceled = 0;
-
-  orig_codeset = i18n_switchto_utf8 ();
-  pw = simple_pwquery (cacheid,
-                       again ? _("does not match - try again"):NULL,
-                       _("Passphrase:"), NULL, 0, &err);
-  i18n_switchback (orig_codeset);
-
-  if (!pw)
-    {
-      if (err)
-        log_error (_("error while asking for the passphrase: %s\n"),
-                   gpg_strerror (err));
-      else
-        {
-	  log_info (_("cancelled\n"));
-	  if (canceled)
-	    *canceled = 1;
-	}
-    }
-
-  return pw;
-}
-
-
-/* Drop a passphrase retrieved with confucius_get_pass.  */
-void
-confucius_drop_pass (char *pass)
-{
-  if (pass)
-    spwq_secure_free (pass);
-}
-
-
-/* Run a confucius crypto engine.  If MODE is oEncrypt, encryption is
-   requested.  If it is oDecrypt, decryption is requested.  INFILE and
-   OUTFILE are the temporary files used in the process.  */
-int
-confucius_process (int mode, char *infile, char *outfile,
-		   int argc, char *argv[])
-{
-  char **args;
-  int cstderr[2];
-  int master;
-  int slave;
-  int res;
-  pid_t pid;
-  pid_t wpid;
-  int tries = 0;
-  char cacheid[40];
-
-  signal (SIGPIPE, SIG_IGN);
-
-  if (!opt.program)
-    {
-      log_error (_("no --program option provided\n"));
-      return 1;
-    }
-
-  if (mode != oDecrypt && mode != oEncrypt)
-    {
-      log_error (_("only --decrypt and --encrypt are supported\n"));
-      return 1;
-    }
-
-  if (!opt.keyfile)
-    {
-      log_error (_("no --keyfile option provided\n"));
-      return 1;
-    }
-
-  /* Generate a hash from the keyfile name for caching.  */
-  snprintf (cacheid, sizeof (cacheid), "confucius:%lu",
-	    hash_string (opt.keyfile));
-  cacheid[sizeof (cacheid) - 1] = '\0';
-  args = malloc (sizeof (char *) * (10 + argc));
-  if (!args)
-    {
-      log_error (_("cannot allocate args vector\n"));
-      return 1;
-    }
-  args[0] = opt.program;
-  args[1] = (mode == oEncrypt) ? "-m1" : "-m2";
-  args[2] = "-q";
-  args[3] = infile;
-  args[4] = "-z";
-  args[5] = outfile;
-  args[6] = "-s";
-  args[7] = opt.keyfile;
-  args[8] = (mode == oEncrypt) ? "-af" : "-f";
-  args[9 + argc] = NULL;
-  while (argc--)
-    args[9 + argc] = argv[argc];
-
-  if (pipe (cstderr) < 0)
-    {
-      log_error (_("could not create pipe: %s\n"), strerror (errno));
-      free (args);
-      return 1;
-    }
-
-  if (openpty (&master, &slave, NULL, NULL, NULL) == -1)
-    {
-      log_error (_("could not create pty: %s\n"), strerror (errno));
-      close (cstderr[0]);
-      close (cstderr[1]);
-      free (args);
-      return -1;
-    }
-
-  /* We don't want to deal with the worst case scenarios.  */
-  assert (master > 2);
-  assert (slave > 2);
-  assert (cstderr[0] > 2);
-  assert (cstderr[1] > 2);
-
-  pid = fork ();
-  if (pid < 0)
-    {
-      log_error (_("could not fork: %s\n"), strerror (errno));
-      close (master);
-      close (slave);
-      close (cstderr[0]);
-      close (cstderr[1]);
-      free (args);
-      return 1;
-    }
-  else if (pid == 0)
-    {
-      /* Child.  */
-
-      /* Close the parent ends.  */
-      close (master);
-      close (cstderr[0]);
-
-      /* Change controlling terminal.  */
-      if (login_tty (slave))
-	{
-	  /* It's too early to output a debug message.  */
-	  _exit (1);
-	}
-
-      dup2 (cstderr[1], 2);
-      close (cstderr[1]);
-
-      /* Now kick off the engine program.  */
-      execv (opt.program, args);
-      log_error (_("execv failed: %s\n"), strerror (errno));
-      _exit (1);
-    }
-  else
-    {
-      /* Parent.  */
-      char buffer[CONFUCIUS_LINESIZE];
-      int buffer_len = 0;
-      fd_set fds;
-      int slave_closed = 0;
-      int stderr_closed = 0;
-
-      close (slave);
-      close (cstderr[1]);
-      free (args);
-
-      /* Listen on the output FDs.  */
-      do
-	{
-	  FD_ZERO (&fds);
-
-	  if (!slave_closed)
-	    FD_SET (master, &fds);
-	  if (!stderr_closed)
-	    FD_SET (cstderr[0], &fds);
-
-	  res = select (FD_SETSIZE, &fds, NULL, NULL, NULL);
-	  if (res < 0)
-	    {
-	      log_error (_("select failed: %s\n"), strerror (errno));
-
-	      kill (pid, SIGTERM);
-	      close (master);
-	      close (cstderr[0]);
-     	      return 1;
-	    }
-
-	  if (FD_ISSET (cstderr[0], &fds))
-	    {
-	      /* We got some output on stderr.  This is just passed
-		 through via the logging facility.  */
-
-	      res = read (cstderr[0], &buffer[buffer_len],
-			  sizeof (buffer) - buffer_len - 1);
-	      if (res < 0)
-		{
-		  log_error (_("read failed: %s\n"), strerror (errno));
-
-		  kill (pid, SIGTERM);
-		  close (master);
-		  close (cstderr[0]);
-		  return 1;
-		}
-	      else
-		{
-		  char *newline;
-
-		  buffer_len += res;
-		  for (;;)
-		    {
-		      buffer[buffer_len] = '\0';
-		      newline = strchr (buffer, '\n');
-		      if (newline)
-			{
-			  *newline = '\0';
-			  log_error ("%s\n", buffer);
-			  buffer_len -= newline + 1 - buffer;
-			  memmove (buffer, newline + 1, buffer_len);
-			}
-		      else if (buffer_len == sizeof (buffer) - 1)
-			{
-			  /* Overflow.  */
-			  log_error ("%s\n", buffer);
-			  buffer_len = 0;
-			}
-		      else
-			break;
-		    }
-
-		  if (res == 0)
-		    stderr_closed = 1;
-		}
-	    }
-	  else if (FD_ISSET (master, &fds))
-	    {
-	      char data[512];
-
-	      res = read (master, data, sizeof (data));
-	      if (res < 0)
-		{
-		  if (errno == EIO)
-		    {
-		      /* Slave-side close leads to readable fd and
-			 EIO.  */
-		      slave_closed = 1;
-		    }
-		  else
-		    {
-		      log_error (_("pty read failed: %s\n"), strerror (errno));
-
-		      kill (pid, SIGTERM);
-		      close (master);
-		      close (cstderr[0]);
-		      return 1;
-		    }
-		}
-	      else if (res == 0)
-		/* This never seems to be what happens on slave-side
-		   close.  */
-		slave_closed = 1;
-	      else
-		{
-		  /* Check for password prompt.  */
-		  if (data[res - 1] == ':')
-		    {
-		      char *pass;
-		      int canceled;
-
-		      /* If this is not the first attempt, the
-			 passphrase seems to be wrong, so clear the
-			 cache.  */
-		      if (tries)
-			simple_pwclear (cacheid);
-
-		      pass = confucius_get_pass (cacheid,
-						 tries ? 1 : 0, &canceled);
-		      if (!pass)
-			{
-			  kill (pid, SIGTERM);
-			  close (master);
-			  close (cstderr[0]);
-			  return canceled ? SYMC_CANCELED : 1;
-			}
- 		      write (master, pass, strlen (pass));
- 		      write (master, "\n", 1);
-		      confucius_drop_pass (pass);
-
-		      tries++;
-		    }
-		}
-	    }
-	}
-      while (!stderr_closed || !slave_closed);
-
-      close (master);
-      close (cstderr[0]);
-
-      wpid = waitpid (pid, &res, 0);
-      if (wpid < 0)
-	{
-	  log_error (_("waitpid failed: %s\n"), strerror (errno));
-
-	  kill (pid, SIGTERM);
-	  /* State of cached password is unclear.  Just remove it.  */
-	  simple_pwclear (cacheid);
-	  return 1;
-	}
-      else
-	{
-	  /* Shouldn't happen, as we don't use WNOHANG.  */
-	  assert (wpid != 0);
-
-	  if (!WIFEXITED (res))
-	    {
-	      log_error (_("child aborted with status %i\n"), res);
-
-	      /* State of cached password is unclear.  Just remove it.  */
-	      simple_pwclear (cacheid);
-
-	      return 1;
-	    }
-
-	  if (WEXITSTATUS (res))
-	    {
-	      /* The passphrase was wrong.  Remove it from the cache.  */
-	      simple_pwclear (cacheid);
-
-	      /* We probably exceeded our number of attempts at guessing
-		 the password.  */
-	      if (tries >= 3)
-		return SYMC_BAD_PASSPHRASE;
-	      else
-		return 1;
-	    }
-
-	  return 0;
-	}
-    }
-
-  /* Not reached.  */
-}
-
-
-/* Class confucius main program.  If MODE is oEncrypt, encryption is
-   requested.  If it is oDecrypt, decryption is requested.  The other
-   parameters are taken from the global option data.  */
-int
-confucius_main (int mode, int argc, char *argv[])
-{
-  int res;
-  char *tmpdir;
-  char *infile;
-  int infile_from_stdin = 0;
-  char *outfile;
-
-  tmpdir = confucius_mktmpdir ();
-  if (!tmpdir)
-    return 1;
-
-  if (opt.input && !(opt.input[0] == '-' && opt.input[1] == '\0'))
-    infile = xstrdup (opt.input);
-  else
-    {
-      infile_from_stdin = 1;
-
-      /* TMPDIR + "/" + "in" + "\0".  */
-      infile = malloc (strlen (tmpdir) + 1 + 2 + 1);
-      if (!infile)
-	{
-	  log_error (_("cannot allocate infile string: %s\n"),
-		     strerror (errno));
-	  rmdir (tmpdir);
-	  return 1;
-	}
-      strcpy (infile, tmpdir);
-      strcat (infile, "/in");
-    }
-
-  /* TMPDIR + "/" + "out" + "\0".  */
-  outfile = malloc (strlen (tmpdir) + 1 + 3 + 1);
-  if (!outfile)
-    {
-      log_error (_("cannot allocate outfile string: %s\n"), strerror (errno));
-      free (infile);
-      rmdir (tmpdir);
-      return 1;
-    }
-  strcpy (outfile, tmpdir);
-  strcat (outfile, "/out");
-
-  if (infile_from_stdin)
-    {
-      /* Create INFILE and fill it with content.  */
-      res = confucius_copy_file ("-", infile, mode == oEncrypt);
-      if (res)
-	{
-	  free (outfile);
-	  free (infile);
-	  rmdir (tmpdir);
-	  return res;
-	}
-    }
-
-  /* Run the engine and thus create the output file, handling
-     passphrase retrieval.  */
-  res = confucius_process (mode, infile, outfile, argc, argv);
-  if (res)
-    {
-      remove_file (outfile, mode == oDecrypt);
-      if (infile_from_stdin)
-	remove_file (infile, mode == oEncrypt);
-      free (outfile);
-      free (infile);
-      rmdir (tmpdir);
-      return res;
-    }
-
-  /* Dump the output file to stdout.  */
-  res = confucius_copy_file (outfile, "-", mode == oDecrypt);
-  if (res)
-    {
-      remove_file (outfile, mode == oDecrypt);
-      if (infile_from_stdin)
-	remove_file (infile, mode == oEncrypt);
-      free (outfile);
-      free (infile);
-      rmdir (tmpdir);
-      return res;
-    }
-
-  remove_file (outfile, mode == oDecrypt);
-  if (infile_from_stdin)
-    remove_file (infile, mode == oEncrypt);
-  free (outfile);
-  free (infile);
-  rmdir (tmpdir);
-  return 0;
-}
-
-
-/* symcryptrun's entry point.  */
-int
-main (int argc, char **argv)
-{
-  ARGPARSE_ARGS pargs;
-  int orig_argc;
-  char **orig_argv;
-  FILE *configfp = NULL;
-  char *configname = NULL;
-  unsigned configlineno;
-  int mode = 0;
-  int res;
-  char *logfile = NULL;
-  int default_config = 1;
-
-  early_system_init ();
-  set_strusage (my_strusage);
-  log_set_prefix ("symcryptrun", GPGRT_LOG_WITH_PREFIX);
-
-  /* Make sure that our subsystems are ready.  */
-  i18n_init();
-  init_common_subsystems (&argc, &argv);
-
-  /* Check whether we have a config file given on the commandline */
-  orig_argc = argc;
-  orig_argv = argv;
-  pargs.argc = &argc;
-  pargs.argv = &argv;
-  pargs.flags= 1|(1<<6);  /* do not remove the args, ignore version */
-  while (arg_parse( &pargs, opts))
-    {
-      if (pargs.r_opt == oOptions)
-        { /* Yes there is one, so we do not try the default one, but
-	     read the option file when it is encountered at the
-	     commandline */
-          default_config = 0;
-	}
-      else if (pargs.r_opt == oNoOptions)
-        default_config = 0; /* --no-options */
-      else if (pargs.r_opt == oHomedir)
-	gnupg_set_homedir (pargs.r.ret_str);
-    }
-
-  if (default_config)
-    configname = make_filename (gnupg_homedir (), "symcryptrun.conf", NULL );
-
-  argc = orig_argc;
-  argv = orig_argv;
-  pargs.argc = &argc;
-  pargs.argv = &argv;
-  pargs.flags= 1;  /* do not remove the args */
- next_pass:
-  if (configname)
-    {
-      configlineno = 0;
-      configfp = fopen (configname, "r");
-      if (!configfp)
-        {
-          if (!default_config)
-            {
-              log_error (_("option file '%s': %s\n"),
-                         configname, strerror(errno) );
-              exit(1);
-	    }
-          xfree (configname);
-          configname = NULL;
-	}
-      default_config = 0;
-    }
-
-  /* Parse the command line. */
-  while (optfile_parse (configfp, configname, &configlineno, &pargs, opts))
-    {
-      switch (pargs.r_opt)
-        {
-        case oDecrypt:   mode = oDecrypt; break;
-        case oEncrypt:   mode = oEncrypt; break;
-
-	case oQuiet:     opt.quiet = 1; break;
-        case oVerbose:   opt.verbose++; break;
-        case oNoVerbose: opt.verbose = 0; break;
-
-	case oClass:	opt.class = pargs.r.ret_str; break;
-	case oProgram:	opt.program = pargs.r.ret_str; break;
-	case oKeyfile:	opt.keyfile = pargs.r.ret_str; break;
-	case oInput:	opt.input = pargs.r.ret_str; break;
-
-        case oLogFile:  logfile = pargs.r.ret_str; break;
-
-        case oOptions:
-          /* Config files may not be nested (silently ignore them) */
-          if (!configfp)
-            {
-		xfree(configname);
-		configname = xstrdup(pargs.r.ret_str);
-		goto next_pass;
-	    }
-          break;
-        case oNoOptions: break; /* no-options */
-        case oHomedir: /* Ignore this option here. */; break;
-
-        default : pargs.err = configfp? 1:2; break;
-	}
-    }
-  if (configfp)
-    {
-      fclose( configfp );
-      configfp = NULL;
-      configname = NULL;
-      goto next_pass;
-    }
-  xfree (configname);
-  configname = NULL;
-
-  if (!mode)
-    log_error (_("either %s or %s must be given\n"),
-               "--decrypt", "--encrypt");
-
-  if (log_get_errorcount (0))
-    exit (1);
-
-  if (logfile)
-    log_set_file (logfile);
-
-  gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
-  setup_libgcrypt_logging ();
-  gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
-
-  /* Tell simple-pwquery about the standard socket name.  */
-  {
-    char *tmp = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL);
-    simple_pw_set_socket (tmp);
-    xfree (tmp);
-  }
-
-  if (!opt.class)
-    {
-      log_error (_("no class provided\n"));
-      res = 1;
-    }
-  else if (!strcmp (opt.class, "confucius"))
-    {
-      res = confucius_main (mode, argc, argv);
-    }
-  else
-    {
-      log_error (_("class %s is not supported\n"), opt.class);
-      res = 1;
-    }
-
-  return res;
-}
diff -Nru gnupg2-2.2.20/tools/wks-util.c gnupg2-2.2.27/tools/wks-util.c
--- gnupg2-2.2.20/tools/wks-util.c	2019-11-23 13:50:21.000000000 +0100
+++ gnupg2-2.2.27/tools/wks-util.c	2020-12-30 15:06:33.000000000 +0100
@@ -843,13 +843,13 @@
 
   /* Try to create missing directories below opt.directory.  */
   fname = make_filename_try (opt.directory, domain, NULL);
-  if (fname && stat (fname, &sb)
+  if (fname && gnupg_stat (fname, &sb)
       && gpg_err_code_from_syserror () == GPG_ERR_ENOENT)
     if (!gnupg_mkdir (fname, "-rwxr--r--") && opt.verbose)
       log_info ("directory '%s' created\n", fname);
   xfree (fname);
   fname = make_filename_try (opt.directory, domain, "hu", NULL);
-  if (fname && stat (fname, &sb)
+  if (fname && gnupg_stat (fname, &sb)
       && gpg_err_code_from_syserror () == GPG_ERR_ENOENT)
     if (!gnupg_mkdir (fname, "-rwxr--r--") && opt.verbose)
       log_info ("directory '%s' created\n", fname);
@@ -873,6 +873,7 @@
 static gpg_error_t
 ensure_policy_file (const char *addrspec)
 {
+  gpg_err_code_t ec;
   gpg_error_t err;
   const char *domain;
   char *fname;
@@ -890,12 +891,12 @@
     goto leave;
 
   /* First a quick check whether it already exists.  */
-  if (!access (fname, F_OK))
+  if (!(ec = gnupg_access (fname, F_OK)))
     {
       err = 0; /* File already exists.  */
       goto leave;
     }
-  err = gpg_error_from_syserror ();
+  err = gpg_error (ec);
   if (gpg_err_code (err) == GPG_ERR_ENOENT)
     err = 0;
   else
@@ -911,7 +912,7 @@
     {
       err = gpg_error_from_syserror ();
       if (gpg_err_code (err) == GPG_ERR_EEXIST)
-        err = 0; /* Was created between the access() and fopen().  */
+        err = 0; /* Was created between the gnupg_access() and es_fopen().  */
       else
         log_error ("domain %s: error creating '%s': %s\n",
                    domain, fname, gpg_strerror (err));
@@ -930,7 +931,7 @@
     log_info ("policy file '%s' created\n", fname);
 
   /* Make sure the policy file world readable.  */
-  if (gnupg_chmod (fname, "-rw-rw-r--"))
+  if (gnupg_chmod (fname, "-rw-r--r--"))
     {
       err = gpg_error_from_syserror ();
       log_error ("can't set permissions of '%s': %s\n",
@@ -1131,7 +1132,7 @@
     }
 
   /* Make sure it is world readable.  */
-  if (gnupg_chmod (huname, "-rwxr--r--"))
+  if (gnupg_chmod (huname, "-rw-r--r--"))
     log_error ("can't set permissions of '%s': %s\n",
                huname, gpg_strerror (gpg_err_code_from_syserror()));
 
diff -Nru gnupg2-2.2.20/VERSION gnupg2-2.2.27/VERSION
--- gnupg2-2.2.20/VERSION	2020-03-20 16:38:00.000000000 +0100
+++ gnupg2-2.2.27/VERSION	2021-01-11 18:46:56.000000000 +0100
@@ -1 +1 @@
-2.2.20
+2.2.27